Use shared SHX container reader

**What**

Typing a command with the Greek keyboard layout active (ΛΙΝΕ for LINE, ΜΙΡΡΟΡ for MIRROR) now works like typing the Latin name, in four places: starting a command, answering a prompt keyword (ΘΝΔΟ = Undo), the selection words at "Select objects" (ΑΛΛ = ALL), and command-line AutoComplete. The layout puts each Greek letter on the key of the Latin letter it sounds like (θ on U, ψ on C, ω on V, Q types `;`, W the final sigma), so `keyboard::latin_keys` maps letter by letter and ignores accents, including a combining tonos or dialytika straight after its letter. It returns `None` for a word with no Greek letter, so Latin input is never touched. ASCII characters in a Greek word are kept, in lower case (the dash of `-ΛΑΥΕΡ`), and a word with any other character is not read as Latin keys.

A command the interface handles itself answers to its Greek-typed name too: ΨΛΟΣΕ asks about unsaved changes as CLOSE does, `;ΣΑΩΕ` opens the Save picker for a drawing without a file, ΛΑΥΕΡ opens the Layers dialog.

What keeps existing behaviour:
- A word that is already a command, alias or LISP function keeps its own meaning, as typed or in another case or accent (a Greek `(defun c:ΛΙΝΕ …)` runs as itself, also when typed λινε).
- A keyword a prompt offers in its own Greek spelling (a LISP program's list) wins over its Latin reading, with Greek case folded.
- A selection word wins over a keyword on the same key, as it does for Latin typing: at COUNT's "Select object to count or [List/Spaces]", Λ is Last, like L.
- A name that exists wins over the keyword or selection word its keys spell: an existing block at BEDIT's "block name or select" and at BLOCKREPLACE's two name prompts (a block called Μ opens at BEDIT, it is not Multiple), and a loaded hatch pattern at HATCH's pattern prompt (a pattern called ΣΟΛΙΔ is that pattern, not Solid). The name is found in any case or accent and the command gets it as stored.
- Only the lookup reads the Greek keys: text that is no selection word reaches the command as typed (a Greek block name at BEDIT's "block name or select"), and an unknown Greek command is reported as typed.

Known and accepted:
- At a prompt that takes a name and offers a keyword, a Greek word whose keys spell the keyword is the keyword while no block has that name (Σ is Select at BLOCKREPLACE), as the Latin `S` is there.
- Two aliases whose Greek names differ only in case or accent can both exist (the alias editor folds ASCII only). Each runs when typed as stored; another spelling of the word runs the first of them in the store's order.
- Object snap overrides and the other point modifiers (END, FROM, M2P, TT, TK, `.X`) are not read from Greek-layout typing. They need the Latin layout, as before.
- Calls by command id are unchanged: a `cmd {json}` line and `execute` (control channel, MCP) do not read a Greek-typed name.
- In a script a line that starts with `;` is still a comment, so a line `;ΣΑΩΕ` there is not QSAVE.

Also adds 46 `el.tsv` rows for strings that were in the source but missing from the catalog when the rows were written (alias editor, save-on-close and units dialogs, a few menu and command labels). On this head the i18n report lists 39 strings that fall back to English for `el` (mostly keyboard shortcuts, right-click customization and alias import); they are not in this PR. Four command labels keep the English name in parentheses, like the rest of the catalog. The `el.tsv` row of `ATTRIBUTION.md` credits these rows (AI-assisted, read by the contributor, a native Greek speaker), and `contributors/people.toml` has the author's entry.

**Tests**
- `keyboard::tests`: the mapping, non-Greek words left alone, combining marks only straight after a Greek letter, one Greek word in any case, accent or final sigma, a character the layout does not type is no spelling of a Greek letter (the micro sign is not μ), 100 000-letter and malformed input do not panic
- `engine/tests/it/greek_keyboard.rs`: ΛΙΝΕ draws a line (lower case and accents too), `;ΣΑΩΕ`, an unknown Greek word is reported as typed, the selection word ΑΛΛ, Λ, λ and ΛΑΣΤ at COUNT's prompt count like L (Last, not the List option), keywords at MIRROR's prompt (Ν is read as No and keeps the sources, Υ erases them), a Greek LISP command runs as itself and in any case or accent, a Greek block name at BEDIT reaches the command as typed, a block called Μ opens at BEDIT (in either case), a block called Σ at BLOCKREPLACE, a loaded pattern called ΣΟΛΙΔ at HATCH's pattern prompt (upper case, lower case, accented)
- `engine/tests/greek_keyboard_aliases.rs` (its own binary, the alias store is process-global): a Greek alias keeps its meaning, as typed and in any case or accent; a word of 1 000 000 Greek letters is looked up among 5 000 Greek aliases within 5 s (170 s before the word was folded once per lookup)
- `prompt::tests`: a Greek keyword is matched as spelled, before its Latin reading
- `ui-egui`: ΨΛΟΣΕ asks before it closes a drawing with unsaved changes, and a LISP `c:ΨΛΟΣΕ` still runs as itself; ΛΑΥΕΡ (also λάυερ) opens the Layers dialog and `;ΣΑΩΕ` the Save picker; AutoComplete reads a Greek prefix as Latin keys, offers the Greek alias that Enter would run, and leaves a Greek word the drawing's LISP defines as typed
- Each fix after review landed with a test that failed before it.

**What ran** on e171e083, `cargo xtask ci` step by step: `cargo fmt --all -- --check` and `cargo clippy --workspace --all-targets -- -D warnings` clean; `cargo test --workspace --lib --bins --tests --no-fail-fast`: 3759 passed, 0 failed, 28 ignored; the doctest step (the workspace has no doctests), the i18n report, `cargo xtask assets`, `cargo xtask layers` and `cargo xtask wasm` passed. The same steps passed on e171e083 merged with main at e1d379ad, a local merge that is not pushed: 3761 passed, 0 failed, 28 ignored.

Main is merged in. The merge commit e3b3a2e0 had kept only this branch's side of `cmd/file.rs` and `cmd/file/pgp.rs`; e8a79d19 restores main's alias-persistence helpers and exports next to `greek_alias`, so those two files are main's again plus this PR's own lines.

**Docs (not edited here, per AGENTS.md)**: `docs/localization.md` "Greek (`el`) interface" and `docs/localization-parity.md` row "Greek | el" (its row count) could mention that commands typed with the Greek layout are accepted.

Nothing here is Autodesk-derived: the mapping is the standard Greek layout, written from the layout itself.

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

* **New Features**
  * Greek keyboard-layout input is recognized as Latin keystrokes when entering commands, aliases, autocomplete prefixes, selection keywords, and prompt options.
  * Greek commands and aliases can be matched across case and accent variants. Existing commands, aliases, and matching block names take precedence over Greek-layout interpretations; unrecognized input retains its original text.
  * At prompts that accept either a block name or a selection keyword, Greek input is treated as a name when a matching block exists; otherwise, it can be interpreted as a selection keyword.
  * Greek-layout input can also match loaded or built-in hatch pattern names, which take precedence over prompt keyword interpretation.
  * In BLOCKREPLACE prompts, you can select a block reference to choose a block.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

.github/workflows/release.yml

@@ -1,6 +1,10 @@
 name: Release
 
 on:
+  # A nightly dry run on main: every release build except macOS, nothing signed or released
+  # (craft-common-actions release.yml `dry-run`). Finds release-only breakage before release day.
+  schedule:
+    - cron: "8 1 * * *"
   push:
     branches: [release]
   workflow_dispatch:
@@ -34,6 +38,7 @@ jobs:
     # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
     uses: storytold/craft-common-actions/.github/workflows/release.yml@main
     with:
+      dry-run: ${{ github.event_name == 'schedule' }}
       app-name: cadcraft
       app-title: CADCraft
       craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83

ATTRIBUTION.md

@@ -62,6 +62,7 @@ Generated-in-code assets are original and have no file to list:
 | Asset | Author | Source | Licence | Notes |
 |---|---|---|---|---|
 | `crates/ui-egui/src/i18n/uk.tsv` | @dmatviichuk | Original Ukrainian translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied |
+| `crates/ui-egui/src/i18n/pl.tsv` | @neronek22 (Echo Rozumu & Gadajło; AI-assisted) | Original Polish translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied |
 | `crates/ui-egui/src/i18n/de.tsv` | the CADCraft contributors | Original German translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied |
 | `crates/ui-egui/src/i18n/es.tsv` | @PedroGuille | Original Spanish translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied |
 | `crates/ui-egui/src/i18n/pt_br.tsv` | @WladmirJunior | Original Brazilian Portuguese translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied |
@@ -76,6 +77,6 @@ Generated-in-code assets are original and have no file to list:
 | `crates/ui-egui/src/i18n/ar.tsv` | @hasan-sdaif | Original Arabic translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied |
 | `crates/ui-egui/src/i18n/hu.tsv` | @Skaywalker | Original Hungarian translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied |
 | `crates/ui-egui/src/i18n/tr.tsv` | @ogzhnklvz (AI-assisted) | Original Turkish translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied; written from the English strings, no other catalog used as a source; the running app reviewed by a native speaker |
-| `crates/ui-egui/src/i18n/el.tsv` | @Camthalion77 with ChatGPT (AI-assisted) | Original Greek translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied; independent native proofreading pending |
+| `crates/ui-egui/src/i18n/el.tsv` | @Camthalion77 with ChatGPT (AI-assisted); 46 later rows: @V1dalTheAbidal with Claude Code (AI-assisted) | Original Greek translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied; the 46 later rows were read by their contributor, a native Greek speaker; independent native proofreading of the whole file pending |
 | `crates/ui-egui/src/i18n/vi.tsv` | @2ez4gcx with Claude Code (AI-assisted) | Original Vietnamese translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied; terminology chosen with a native speaker, full proofreading pending |
 | `crates/ui-egui/src/i18n/ka.tsv` | Davit Matchakhelidze (@devius), native speaker, with Claude Code | Original Georgian translations of CADCraft English strings | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) | No proprietary localization resources copied; written from the English strings, no other catalog used as a source; terminology and doubtful strings decided by a native Georgian speaker; no font assets added (the Georgian face comes from craft-fonts) |

Cargo.lock

@@ -614,7 +614,7 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 
 [[package]]
 name = "cadcraft"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-engine",
  "cadcraft-io",
@@ -645,7 +645,7 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-cli"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-engine",
  "cadcraft-io",
@@ -661,14 +661,14 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-color"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cadcraft-constraints"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-doc",
  "cadcraft-geom",
@@ -678,7 +678,7 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-doc"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-color",
  "cadcraft-geom",
@@ -687,36 +687,19 @@ dependencies = [
  "thiserror 2.0.21",
 ]
 
-[[package]]
-name = "cadcraft-dwg"
-version = "0.20.1"
-dependencies = [
- "acadrust",
- "log",
-]
-
-[[package]]
-name = "cadcraft-dxf"
-version = "0.20.1"
-dependencies = [
- "encoding_rs",
- "log",
- "thiserror 2.0.21",
-]
-
 [[package]]
 name = "cadcraft-engine"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-color",
  "cadcraft-constraints",
  "cadcraft-doc",
- "cadcraft-dxf",
  "cadcraft-fonts",
  "cadcraft-geom",
  "cadcraft-io",
  "cadcraft-render",
  "craft-docpath",
+ "craft-dxf",
  "libc",
  "log",
  "rstar",
@@ -727,10 +710,11 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-fonts"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
- "cadcraft-dxf",
  "cadcraft-geom",
+ "craft-dxf",
+ "craft-shx",
  "encoding_rs",
  "harfrust 0.14.0",
  "icu_segmenter",
@@ -740,23 +724,23 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-geom"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cadcraft-io"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "acadrust",
  "cadcraft-color",
  "cadcraft-doc",
- "cadcraft-dwg",
- "cadcraft-dxf",
  "cadcraft-fonts",
  "cadcraft-geom",
  "cadcraft-render",
+ "craft-dwg",
+ "craft-dxf",
  "craft-pdf",
  "image",
  "miniz_oxide 0.9.1",
@@ -769,7 +753,7 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-mcp"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-engine",
  "cadcraft-io",
@@ -784,7 +768,7 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-render"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-color",
  "cadcraft-doc",
@@ -798,13 +782,14 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-ui-egui"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-color",
  "cadcraft-doc",
  "cadcraft-engine",
  "cadcraft-fonts",
  "cadcraft-geom",
+ "cadcraft-io",
  "cadcraft-render",
  "chrono",
  "craft-ui",
@@ -825,7 +810,7 @@ dependencies = [
 
 [[package]]
 name = "cadcraft-web"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "cadcraft-engine",
  "cadcraft-fonts",
@@ -1152,6 +1137,25 @@ name = "craft-docpath"
 version = "0.1.0"
 source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 
+[[package]]
+name = "craft-dwg"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=7bb6c90076a0177d01cc4c482e7fd8dc9f31a8bf#7bb6c90076a0177d01cc4c482e7fd8dc9f31a8bf"
+dependencies = [
+ "acadrust",
+ "log",
+]
+
+[[package]]
+name = "craft-dxf"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=006e4df225fca57e95ead0fb1f91920900798a99#006e4df225fca57e95ead0fb1f91920900798a99"
+dependencies = [
+ "encoding_rs",
+ "log",
+ "thiserror 2.0.21",
+]
+
 [[package]]
 name = "craft-fonts-build"
 version = "0.1.0"
@@ -1190,6 +1194,11 @@ dependencies = [
  "thiserror 2.0.21",
 ]
 
+[[package]]
+name = "craft-shx"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=3c5007339754def577b3c5274f523d96384a35c4#3c5007339754def577b3c5274f523d96384a35c4"
+
 [[package]]
 name = "craft-ui"
 version = "0.1.0"
@@ -5994,7 +6003,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"
 
 [[package]]
 name = "xtask"
-version = "0.20.1"
+version = "0.21.0"
 dependencies = [
  "chrono",
  "serde_json",

Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
 # default-members
 
 [workspace.package]
-version = "0.20.1"
+version = "0.21.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -13,8 +13,10 @@ repository = "https://github.com/storytold/cadcraft"
 [workspace.dependencies]
 # internal
 cadcraft-geom = { path = "crates/geom" }
-cadcraft-dxf = { path = "crates/dxf" }
-cadcraft-dwg = { path = "crates/dwg" }
+# DXF tags: the shared reader and writer (moved from crates/dxf; craft-libs#791).
+craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "006e4df225fca57e95ead0fb1f91920900798a99" }
+craft-dwg = { git = "https://github.com/storytold/craft-libs", rev = "7bb6c90076a0177d01cc4c482e7fd8dc9f31a8bf" }
+craft-shx = { git = "https://github.com/storytold/craft-libs", rev = "3c5007339754def577b3c5274f523d96384a35c4" }
 cadcraft-color = { path = "crates/color" }
 cadcraft-doc = { path = "crates/doc" }
 cadcraft-constraints = { path = "crates/constraints" }

contributors/people.toml

@@ -118,3 +118,6 @@ sync_github_name = true
 
 [people.helenkwok]
 real_name = "Helen Kwok"
+
+[people.V1dalTheAbidal]
+sync_github_name = true

crates/dwg/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "cadcraft-dwg"
-description = "CADCraft DWG bridge: converts DWG to and from DXF bytes using the acadrust crate (MPL-2.0, used unmodified)"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
-log = { workspace = true }
-
-# The same targets as build.rs's `no_dwg_bridge` leave acadrust out: wasm32, and FreeBSD aarch64,
-# where acadrust 0.6.6 passes a `*const c_char` (u8 there) to its own `*const i8` sysctlbyname.
-# 0.6.7 and 0.6.8 fix that but read some damaged DWGs as empty with no note (tests.rs, #800).
-[target.'cfg(not(any(target_arch = "wasm32", all(target_os = "freebsd", target_arch = "aarch64"))))'.dependencies]
-# MPL-2.0: used as an unmodified dependency only (see plan/adr/0001 and NOTICE).
-acadrust = "0.6.6"

crates/dwg/build.rs

@@ -1,12 +0,0 @@
-//! Sets `no_dwg_bridge` on the targets built without acadrust (see Cargo.toml): the DWG functions
-//! there return an error that says to use DXF.
-
-fn main() {
-    println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo::rustc-check-cfg=cfg(no_dwg_bridge)");
-    let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
-    let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
-    if arch == "wasm32" || (os == "freebsd" && arch == "aarch64") {
-        println!("cargo::rustc-cfg=no_dwg_bridge");
-    }
-}

crates/dwg/src/proxy_transport.rs

@@ -1,632 +0,0 @@
-//! Another application's entities and their classes through the DWG bridge: on reading a DWG,
-//! registered entities acadrust has no model for become proxy entities of their class; on writing
-//! one, the DWG gets the source DXF's classes in their places, so every proxy names its own class.
-
-use std::collections::{HashMap, HashSet};
-
-use acadrust::CadDocument;
-use acadrust::classes::{DxfClass, ProxyFlags};
-use acadrust::entities::{EntityType, ExtendedEntityData, ProxyEntityData};
-use acadrust::objects::{ObjectType, ProxyPayload};
-
-fn class_number(index: usize) -> Result<i16, String> {
-    index.checked_add(500).and_then(|n| i16::try_from(n).ok()).ok_or_else(|| "DXF: too many application classes".into())
-}
-
-/// After a DWG read: each registered entity of another application's class that acadrust keeps
-/// only as its record and opaque data (no decoded properties) becomes a proxy entity of that class
-/// (DXF Reference, ACAD_PROXY_ENTITY), with its graphics, data bits, R2007+ strings and object
-/// references, so the DXF keeps it; and every proxy's class number becomes 500 plus its class's
-/// place in the classes, as a DXF numbers it. A record that can't be converted (its class is
-/// missing or not unique) is left out and named in the notes; one with decoded properties stays as
-/// read, also named, as its opaque data has no DXF form beside them.
-pub(super) fn prepare(doc: &mut CadDocument) -> Vec<String> {
-    let classes: Vec<_> = doc.classes.iter().cloned().collect();
-    let mut numbers = HashMap::new();
-    let mut identities = HashMap::new();
-    for (index, class) in classes.iter().enumerate() {
-        let number = class_number(index).ok();
-        numbers.entry(i32::from(class.class_number)).and_modify(|v| *v = None).or_insert(number.map(i32::from));
-        let identity = (class.dxf_name.as_str(), class.cpp_class_name.as_str(), class.is_an_entity);
-        identities.entry(identity).and_modify(|v| *v = None).or_insert(number);
-    }
-    let identity = |dxf: &str, cpp: &str, entity: bool| {
-        identities
-            .get(&(dxf, cpp, entity))
-            .copied()
-            .flatten()
-            .map(i32::from)
-            .ok_or_else(|| format!("missing or ambiguous application CLASS for {dxf:.80} ({cpp:.80})"))
-    };
-    let Some(dwg_version) = super::native::proxy_dwg_version(doc.dwg_source_version.unwrap_or(doc.version)) else { return Vec::new() };
-    let maintenance = i32::from(doc.maintenance_version);
-    let remap = |id: i32| numbers.get(&id).copied().flatten().ok_or_else(|| format!("proxy names missing or ambiguous application class {id}"));
-    // Only mutate proxies: entities_mut invalidates the decoder's verbatim records for every entity.
-    let handles: Vec<_> = doc
-        .entities()
-        .filter_map(|e| match e {
-            EntityType::Extended(e) => match &e.data {
-                ExtendedEntityData::Proxy(_) => Some(e.common.handle),
-                ExtendedEntityData::RegisteredClass(data) if data.properties.is_empty() || data.payload.bit_count > 0 => Some(e.common.handle),
-                _ => None,
-            },
-            _ => None,
-        })
-        .collect();
-    let mut notes = Vec::new();
-    let mut entity_count = 0usize;
-    let mut object_count = 0usize;
-    let mut semantic = 0usize;
-    for handle in handles {
-        // Ok(None): not an application record; Ok(Some(None)): kept as read, with its properties.
-        let converted = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| -> Result<Option<Option<ExtendedEntityData>>, String> {
-            let Some(EntityType::Extended(entity)) = doc.get_entity(handle) else { return Ok(None) };
-            let data = match &entity.data {
-                ExtendedEntityData::Proxy(data) => {
-                    let mut proxy = data.clone();
-                    proxy.class_id = remap(proxy.class_id)?;
-                    ExtendedEntityData::Proxy(proxy)
-                }
-                ExtendedEntityData::RegisteredClass(data) => {
-                    if !data.properties.is_empty() {
-                        return Ok(Some(None));
-                    }
-                    let class_id = identity(&data.dxf_name, &data.cpp_class_name, true)?;
-                    let text_payload = entity.common.raw_record.as_deref().map(registered_text).transpose()?.unwrap_or_default();
-                    ExtendedEntityData::Proxy(ProxyEntityData {
-                        proxy_id: 498,
-                        class_id,
-                        dxf_subclass: String::new(),
-                        version: (maintenance << 16) | dwg_version,
-                        dwg_version,
-                        maintenance_version: maintenance,
-                        from_dxf: false,
-                        graphics: ProxyPayload::from_bytes(entity.common.graphic_data.as_deref().unwrap_or_default()),
-                        payload: data.payload.clone(),
-                        text_payload,
-                        object_ids: data.object_ids.clone(),
-                    })
-                }
-                _ => return Ok(None),
-            };
-            Ok(Some(Some(data)))
-        }))
-        .unwrap_or_else(|_| Err("application record conversion failed".into()));
-        match converted {
-            Ok(Some(Some(data))) => {
-                if let Some(EntityType::Extended(entity)) = doc.get_entity_mut(handle) {
-                    entity.data = data;
-                }
-            }
-            Ok(Some(None)) => semantic = semantic.saturating_add(1),
-            Ok(None) => {}
-            Err(why) => {
-                doc.remove_entity(handle);
-                entity_count = entity_count.saturating_add(1);
-                skipped_note(&mut notes, "entity", handle, &why);
-            }
-        }
-    }
-    doc.objects.retain(|handle, object| {
-        if let ObjectType::ProxyObject(proxy) = object {
-            match remap(proxy.class_id) {
-                Ok(id) => proxy.class_id = id,
-                Err(why) => {
-                    object_count = object_count.saturating_add(1);
-                    skipped_note(&mut notes, "object", *handle, &why);
-                    return false;
-                }
-            }
-        }
-        true
-    });
-    if entity_count > 0 || object_count > 0 {
-        notes.insert(0, format!("DWG: partial read; application proxy records left out (entities: {entity_count}, objects: {object_count})"));
-    }
-    if semantic > 0 {
-        notes.push(format!(
-            "DWG: {semantic} registered entities with decoded properties keep them, without their other data; saving over the original file would lose it"
-        ));
-    }
-    notes
-}
-
-fn skipped_note(notes: &mut Vec<String>, kind: &str, handle: acadrust::types::Handle, why: &str) {
-    if notes.len() < 6 {
-        let why: String = why.chars().take(256).collect();
-        notes.push(format!("DWG: proxy {kind} {handle} left out: {why}"));
-    }
-}
-
-/// The decoder's registered-class representation omits the separate R2007+ string stream.
-fn registered_text(raw: &acadrust::entities::RawRecord) -> Result<ProxyPayload, String> {
-    use acadrust::io::dwg::DwgVersion;
-    use acadrust::io::dwg::dwg_stream_readers::object_reader::DwgObjectReader;
-    use acadrust::io::dwg::dwg_stream_writers::bit_writer::DwgBitWriter;
-    use acadrust::types::DxfVersion;
-
-    if raw.version < DxfVersion::AC1021 {
-        return Ok(ProxyPayload::default());
-    }
-    let version = DwgVersion::from_dxf_version(raw.version).map_err(|e| format!("DWG proxy text: {e}"))?;
-    let handle_bits = usize::try_from(raw.handle_bits).map_err(|_| "DWG proxy text: negative handle stream size")?;
-    let total_bits = raw.data.len().checked_mul(8).ok_or("DWG proxy text: record too large")?;
-    if handle_bits > total_bits {
-        return Err("DWG proxy text: handle stream exceeds record".into());
-    }
-    // Frame the verbatim record for the dependency's checked object reader.
-    let mut frame = DwgBitWriter::new(version, raw.version);
-    frame.write_modular_short(raw.data.len());
-    if raw.version >= DxfVersion::AC1024 {
-        frame.write_modular_char(handle_bits);
-    }
-    frame.write_bytes(&raw.data);
-    let reader = DwgObjectReader::new(frame.into_bytes(), raw.version, HashMap::new()).map_err(|e| format!("DWG proxy text: {e}"))?;
-    let (kind, mut streams) = reader.read_record_at(0).map_err(|e| format!("DWG proxy text: {e}"))?;
-    reader.read_common_entity_data(&mut streams, kind);
-    if kind == 498 {
-        // An existing registered-class envelope is a proxy and carries its class name first.
-        streams.read_variable_text();
-    } else if kind < 500 {
-        return Err("DWG proxy text: registered entity has no application class".into());
-    }
-    streams.check_error().map_err(|e| format!("DWG proxy text: {e}"))?;
-    let bits = usize::try_from(streams.text_remaining_bits()).map_err(|_| "DWG proxy text: negative string stream size")?;
-    if bits > total_bits {
-        return Err("DWG proxy text: string stream exceeds record".into());
-    }
-    let count = u32::try_from(bits).map_err(|_| "DWG proxy text: string stream too large")?;
-    let mut bytes = vec![0; bits.div_ceil(8)];
-    for (index, byte) in bytes.iter_mut().enumerate() {
-        for bit in 0..8.min(bits.saturating_sub(index * 8)) {
-            if streams.read_text_bit() {
-                *byte |= 0x80 >> bit;
-            }
-        }
-    }
-    streams.check_error().map_err(|e| format!("DWG proxy text: {e}"))?;
-    Ok(ProxyPayload::from_bits(&bytes, count))
-}
-
-/// ASCII DXF pairs decoded with the bridge's public code-page and escape codecs. A malformed
-/// pair yields `None`, so both class scans fall back rather than guessing its identity.
-pub(super) fn text_pairs(dxf: &[u8]) -> Option<impl Iterator<Item = Option<(i32, String)>> + '_> {
-    use acadrust::io::dxf::code_page::{decode_legacy_escapes, encoding_from_code_page};
-
-    if dxf.starts_with(b"AutoCAD Binary DXF") {
-        return None;
-    }
-    let version =
-        super::native::header_value(dxf, b"$ACADVER").and_then(|(_, v)| std::str::from_utf8(v).ok()).map(acadrust::DxfVersion::from_version_string);
-    let unicode = version.is_some_and(|v| v >= acadrust::DxfVersion::AC1021);
-    let encoding = if version.is_some_and(|v| v < acadrust::DxfVersion::AC1021) {
-        super::native::header_value(dxf, b"$DWGCODEPAGE").and_then(|(_, page)| std::str::from_utf8(page).ok()).and_then(encoding_from_code_page)
-    } else {
-        None
-    };
-    let mut lines = dxf.split(|b| *b == b'\n').map(|line| line.strip_suffix(b"\r").unwrap_or(line));
-    Some(std::iter::from_fn(move || {
-        let code = lines.next()?;
-        let Some(value) = lines.next() else { return (!code.trim_ascii().is_empty()).then_some(None) };
-        let pair = || {
-            let code = std::str::from_utf8(code).ok()?.trim().parse().ok()?;
-            let text = if let Some(encoding) = encoding {
-                encoding.decode(value).0.into_owned()
-            } else if unicode {
-                String::from_utf8_lossy(value).into_owned()
-            } else {
-                // The decoder uses UTF-8 with Latin-1 fallback when no encoding was declared.
-                std::str::from_utf8(value).map_or_else(|_| value.iter().map(|&b| char::from(b)).collect(), str::to_string)
-            };
-            let text = decode_legacy_escapes(&text);
-            // DXF's escaped control characters are decoded after CIF/MIF, as in the bridge.
-            let text = text.replace("^J", "\n").replace("^M", "\r").replace("^I", "\t").replace("^ ", "^");
-            Some((code, text))
-        };
-        Some(pair())
-    }))
-}
-
-/// The CLASS records of an ASCII DXF, in CLASSES order and numbered by place from 500 (DXF
-/// Reference, CLASSES; a proxy's group 91 is that number). `None` for a binary DXF (CADCraft's own
-/// bridge DXF is ASCII), and for one with a record that can't be written back as it is: no names,
-/// flags or instance count out of range, more classes than the numbers allow. Then
-/// `proxy_classes` matches the classes by name instead.
-pub(super) fn source_classes(dxf: &[u8]) -> Option<Vec<DxfClass>> {
-    let pairs = text_pairs(dxf)?;
-    let mut records: Vec<Vec<(i32, String)>> = Vec::new();
-    let (mut section, mut in_classes) = (false, false);
-    for pair in pairs {
-        let (code, value) = pair?;
-        match (code, value.as_str()) {
-            (0, "ENDSEC") if in_classes => break,
-            (0, "SECTION") => section = true,
-            (2, name) if section => {
-                in_classes = name == "CLASSES";
-                section = false;
-            }
-            (0, kind) if in_classes => {
-                if kind != "CLASS" {
-                    return None;
-                }
-                records.push(Vec::new());
-            }
-            (code, value) if in_classes => records.last_mut()?.push((code, value.to_string())),
-            _ => section = false,
-        }
-    }
-    records.iter().enumerate().map(|(index, groups)| source_class(groups, class_number(index).ok()?)).collect()
-}
-
-/// One CLASS record's groups as the class `number`, or `None` when it can't be written back.
-fn source_class(groups: &[(i32, String)], number: i16) -> Option<DxfClass> {
-    let text = |code| groups.iter().find(|(c, _)| *c == code).map(|(_, v)| v.clone()).unwrap_or_default();
-    let integer = |code| groups.iter().find(|(c, _)| *c == code).map_or(Some(0), |(_, v)| v.trim().parse::<i64>().ok());
-    let mut class = DxfClass::new(text(1), text(2));
-    if class.dxf_name.is_empty() || class.cpp_class_name.is_empty() {
-        return None;
-    }
-    class.application_name = text(3);
-    class.proxy_flags = ProxyFlags(u16::try_from(integer(90)?).ok()?);
-    class.instance_count = i32::try_from(integer(91)?).ok()?;
-    class.was_zombie = integer(280)? != 0;
-    class.is_an_entity = integer(281)? != 0;
-    class.item_class_id = if class.is_an_entity { 498 } else { 499 };
-    class.class_number = number;
-    Some(class)
-}
-
-/// Give a DWG of 2013 or later the source DXF's classes (`classes`, from [`source_classes`]) in
-/// their places, with their metadata and duplicate names, so each proxy's DXF class number names
-/// its own class; the decoder's default classes the source lacks follow them. A proxy whose number
-/// names no source class is left out, as `proxy_classes` leaves it out. Returns how many proxy objects and
-/// entities were left out; nothing changes when the drawing has no proxies. `None`, with nothing
-/// changed, when the classes would be more than the class numbers allow.
-pub(super) fn restore_classes(doc: &mut CadDocument, classes: Vec<DxfClass>) -> Option<(usize, usize)> {
-    let fits = |number: i32| number.checked_sub(500).and_then(|n| usize::try_from(n).ok()).is_some_and(|i| i < classes.len());
-    let mut any = false;
-    let mut entities = Vec::new();
-    for entity in doc.entities() {
-        if let EntityType::Extended(e) = entity
-            && let ExtendedEntityData::Proxy(p) = &e.data
-        {
-            any = true;
-            if !fits(p.class_id) {
-                entities.push(e.common.handle);
-            }
-        }
-    }
-    let mut objects = Vec::new();
-    for (handle, object) in &doc.objects {
-        if let ObjectType::ProxyObject(p) = object {
-            any = true;
-            if !fits(p.class_id) {
-                objects.push(*handle);
-            }
-        }
-    }
-    if !any {
-        return Some((0, 0));
-    }
-    let mut names: HashSet<_> = classes.iter().map(|c| c.dxf_name.to_uppercase()).collect();
-    let defaults: Vec<_> = doc.classes.iter().filter(|c| names.insert(c.dxf_name.to_uppercase())).cloned().collect();
-    if let Some(last) = classes.len().checked_add(defaults.len())?.checked_sub(1) {
-        class_number(last).ok()?;
-    }
-    for handle in &entities {
-        doc.remove_entity(*handle);
-    }
-    for handle in &objects {
-        doc.objects.remove(handle);
-    }
-    doc.classes.clear();
-    for (index, mut class) in classes.into_iter().chain(defaults).enumerate() {
-        class.class_number = class_number(index).ok()?;
-        doc.classes.push_preserving(class);
-    }
-    Some((objects.len(), entities.len()))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use acadrust::entities::{EntityCommon, ExtendedEntity, RegisteredClassEntityData};
-    use acadrust::types::DxfVersion;
-
-    fn proxy_doc() -> CadDocument {
-        let mut doc = CadDocument::new();
-        doc.version = DxfVersion::AC1032;
-        doc.add_entity(EntityType::Extended(Box::new(ExtendedEntity {
-            common: EntityCommon::default(),
-            data: ExtendedEntityData::Proxy(ProxyEntityData {
-                proxy_id: 498,
-                class_id: 501,
-                dxf_subclass: String::new(),
-                version: 33,
-                dwg_version: 33,
-                maintenance_version: 0,
-                from_dxf: false,
-                graphics: ProxyPayload::default(),
-                payload: ProxyPayload::from_bits(&[0x80], 1),
-                text_payload: ProxyPayload::default(),
-                object_ids: vec![],
-            }),
-        })))
-        .unwrap();
-        doc
-    }
-
-    /// An ASCII DXF of `groups`, `(code, value)` per pair of lines.
-    fn dxf(groups: &[(i32, &str)]) -> Vec<u8> {
-        groups.iter().map(|(c, v)| format!("{c}\n{v}\n")).collect::<String>().into_bytes()
-    }
-
-    #[test]
-    fn source_classes_keep_duplicates_and_metadata_before_defaults() {
-        let bytes = dxf(&[
-            (0, "SECTION"),
-            (2, "HEADER"),
-            (9, "$DIMSTYLE"),
-            (2, "CLASSES"),
-            (0, "ENDSEC"),
-            (0, "SECTION"),
-            (2, "CLASSES"),
-            (0, "CLASS"),
-            (1, "Объект"),
-            (2, "First"),
-            (3, "Первый"),
-            (90, "1025"),
-            (91, "7"),
-            (280, "1"),
-            (281, "1"),
-            (0, "CLASS"),
-            (1, "Объект"),
-            (2, "Second"),
-            (3, "Второй"),
-            (90, "128"),
-            (281, "1"),
-            (0, "ENDSEC"),
-            (0, "EOF"),
-        ]);
-        let classes = source_classes(&bytes).unwrap();
-        assert_eq!(classes.len(), 2);
-        assert_eq!(classes[0].application_name, "Первый");
-        assert_eq!(classes[0].proxy_flags.0, 1025);
-        assert_eq!(classes[0].instance_count, 7);
-        assert!(classes[0].was_zombie);
-        assert_eq!((classes[0].class_number, classes[1].class_number), (500, 501));
-        assert_eq!(classes[1].cpp_class_name, "Second");
-        let mut doc = proxy_doc();
-        assert_eq!(restore_classes(&mut doc, classes.clone()), Some((0, 0)));
-        assert_eq!(doc.classes.iter().take(2).cloned().collect::<Vec<_>>(), classes);
-        // A binary DXF, and a CLASS record that can't be written back as it is, give no classes.
-        assert!(source_classes(b"AutoCAD Binary DXF\r\n\x1a\0").is_none());
-        for (code, value) in [(1, ""), (2, ""), (90, "65536"), (91, "9223372036854775807"), (281, "x")] {
-            let mut class = vec![(1, "A"), (2, "A")];
-            class.retain(|(c, _)| *c != code);
-            class.push((code, value));
-            let mut groups = vec![(0, "SECTION"), (2, "CLASSES"), (0, "CLASS")];
-            groups.extend(class);
-            groups.extend([(0, "ENDSEC"), (0, "EOF")]);
-            assert!(source_classes(&dxf(&groups)).is_none(), "{code} {value}");
-        }
-    }
-
-    #[test]
-    fn source_classes_decode_escapes_once_and_respect_legacy_code_pages() {
-        let body = "0\nCLASS\n1\n\\U+041E\\U+0431\\U+044A\\U+0435\\U+043A\\U+0442\n2\nClass\n3\nCaf\\U+00E9\\U+D83D\\U+DE42\\U+005CU+0041\n281\n1\n0\nENDSEC\n0\nEOF\n";
-        let text = format!("0\nSECTION\n2\nCLASSES\n{body}");
-        let classes = source_classes(text.as_bytes()).unwrap();
-        assert_eq!(classes[0].dxf_name, "Объект");
-        assert_eq!(classes[0].application_name, "Café🙂\\U+0041");
-
-        let prefix =
-            b"0\nSECTION\n2\nHEADER\n9\n$ACADVER\n1\nAC1015\n9\n$DWGCODEPAGE\n3\nANSI_1251\n0\nENDSEC\n0\nSECTION\n2\nCLASSES\n0\nCLASS\n1\n";
-        let encoded = [prefix.as_slice(), b"\xCF\xF0\xE8\xEC\xE5\xF0", b"\n2\nClass\n3\nApp\n281\n1\n0\nENDSEC\n0\nEOF\n"].concat();
-        assert_eq!(source_classes(&encoded).unwrap()[0].dxf_name, "Пример");
-        // R2007+ text is UTF-8 even with a legacy code-page declaration.
-        let modern = String::from_utf8_lossy(prefix).replace("AC1015", "AC1032") + "Пример\n2\nClass\n3\nApp\n281\n1\n0\nENDSEC\n0\nEOF\n";
-        assert_eq!(source_classes(modern.as_bytes()).unwrap()[0].dxf_name, "Пример");
-    }
-
-    #[test]
-    fn proxies_of_missing_classes_are_left_out() {
-        for id in [-1, 499, 501, i32::MAX] {
-            let mut doc = proxy_doc();
-            if let Some(EntityType::Extended(e)) = doc.entities_mut().next()
-                && let ExtendedEntityData::Proxy(p) = &mut e.data
-            {
-                p.class_id = id;
-            }
-            let mut class = DxfClass::new_entity("ENTITY", "Entity");
-            class.class_number = 500;
-            assert_eq!(restore_classes(&mut doc, vec![class]), Some((0, 1)), "{id}");
-            assert_eq!(doc.entities().count(), 0);
-        }
-        // Class 501 is there: the proxy keeps it, in its place.
-        let mut doc = proxy_doc();
-        assert_eq!(restore_classes(&mut doc, vec![DxfClass::new("A", "A"), DxfClass::new_entity("B", "B")]), Some((0, 0)));
-        assert_eq!(doc.entities().count(), 1);
-        assert_eq!(doc.classes.iter().nth(1).map(|c| (c.dxf_name.clone(), c.class_number)), Some(("B".to_string(), 501)));
-        // Without proxies the classes stay the decoder's.
-        let mut doc = CadDocument::new();
-        let before: Vec<_> = doc.classes.iter().cloned().collect();
-        assert_eq!(restore_classes(&mut doc, vec![DxfClass::new("A", "A")]), Some((0, 0)));
-        assert_eq!(doc.classes.iter().cloned().collect::<Vec<_>>(), before);
-    }
-
-    #[test]
-    fn unrepresentable_proxies_keep_other_geometry_and_bounded_diagnostics() {
-        use acadrust::entities::{Line, RawRecord};
-        use acadrust::objects::ProxyObject;
-        use acadrust::types::{Handle, Vector3};
-        for count in [1, 10] {
-            let mut doc = proxy_doc();
-            if let Some(EntityType::Extended(e)) = doc.entities_mut().next()
-                && let ExtendedEntityData::Proxy(p) = &mut e.data
-            {
-                p.class_id = i32::MAX;
-            }
-            let template = doc.entities().next().unwrap().clone();
-            for _ in 1..count {
-                let mut entity = template.clone();
-                entity.common_mut().handle = Handle::NULL;
-                doc.add_entity(entity).unwrap();
-            }
-            let object = Handle::new(u64::MAX - 1);
-            assert!(!doc.objects.contains_key(&object));
-            doc.objects.insert(object, ObjectType::ProxyObject(ProxyObject { handle: object, class_id: i32::MAX, ..Default::default() }));
-            let line = doc.add_entity(EntityType::Line(Line::from_points(Vector3::new(2.0, 3.0, 0.0), Vector3::new(12.0, 13.0, 0.0)))).unwrap();
-            let raw = RawRecord { data: vec![0xAA, 0x55], handle_bits: 0, version: DxfVersion::AC1032 };
-            doc.get_entity_mut(line).unwrap().common_mut().raw_record = Some(std::sync::Arc::new(raw.clone()));
-            let notes = prepare(&mut doc);
-            assert_eq!(notes.len(), (count + 1).min(6) + 1);
-            assert!(notes.iter().all(|n| n.starts_with("DWG:")));
-            assert!(notes[0].contains(&format!("entities: {count}, objects: 1")));
-            assert_eq!(doc.entities().count(), 1);
-            assert!(!doc.objects.contains_key(&object));
-            let Some(EntityType::Line(actual)) = doc.get_entity(line) else { panic!("readable line") };
-            assert_eq!(actual.start, Vector3::new(2.0, 3.0, 0.0));
-            assert_eq!(actual.end, Vector3::new(12.0, 13.0, 0.0));
-            assert_eq!(doc.get_entity(line).unwrap().common().raw_record.as_deref(), Some(&raw));
-        }
-    }
-    #[test]
-    fn opaque_registered_class_ambiguity_is_not_guessed() {
-        let mut doc = CadDocument::new();
-        doc.classes.push_preserving(DxfClass::new_entity("CUSTOM", "Custom"));
-        doc.classes.push_preserving(DxfClass::new_entity("CUSTOM", "Custom"));
-        doc.add_entity(EntityType::Extended(Box::new(ExtendedEntity {
-            common: EntityCommon::default(),
-            data: ExtendedEntityData::RegisteredClass(RegisteredClassEntityData {
-                dxf_name: "CUSTOM".into(),
-                cpp_class_name: "Custom".into(),
-                properties: vec![],
-                payload: ProxyPayload::from_bits(&[0x80], 1),
-                object_ids: vec![],
-            }),
-        })))
-        .unwrap();
-        assert!(prepare(&mut doc).iter().any(|n| n.contains("ambiguous")));
-        assert_eq!(doc.entities().count(), 0);
-        assert!(class_number(usize::MAX).is_err());
-    }
-    #[test]
-    fn semantic_records_keep_verbatim_data_and_mixed_payloads_are_reported() {
-        use acadrust::entities::RawRecord;
-        use acadrust::objects::{SemanticProperty, SemanticPropertyValue};
-        for payload in [ProxyPayload::default(), ProxyPayload::from_bits(&[0x80], 1)] {
-            let mut doc = CadDocument::new();
-            let raw = RawRecord { data: vec![0xAA], handle_bits: 0, version: DxfVersion::AC1032 };
-            let handle = doc
-                .add_entity(EntityType::Extended(Box::new(ExtendedEntity {
-                    common: EntityCommon::default(),
-                    data: ExtendedEntityData::RegisteredClass(RegisteredClassEntityData {
-                        dxf_name: "SEMANTIC".into(),
-                        cpp_class_name: "Semantic".into(),
-                        properties: vec![SemanticProperty {
-                            subclass: "Semantic".into(),
-                            code: 1,
-                            value: SemanticPropertyValue::Text("value".into()),
-                        }],
-                        payload: payload.clone(),
-                        object_ids: vec![],
-                    }),
-                })))
-                .unwrap();
-            doc.get_entity_mut(handle).unwrap().common_mut().raw_record = Some(std::sync::Arc::new(raw.clone()));
-            assert_eq!(doc.get_entity(handle).unwrap().common().raw_record.as_deref(), Some(&raw));
-            if payload.bit_count == 0 {
-                assert!(prepare(&mut doc).is_empty());
-                assert_eq!(doc.get_entity(handle).unwrap().common().raw_record.as_deref(), Some(&raw));
-            } else {
-                // Kept as read, and named: its opaque data has no DXF form beside the properties.
-                assert!(prepare(&mut doc).iter().any(|n| n.contains("decoded properties")));
-                assert_eq!(doc.get_entity(handle).unwrap().common().raw_record.as_deref(), Some(&raw));
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod string_stream_tests {
-    use super::*;
-    use acadrust::entities::{EntityCommon, ExtendedEntity, RawRecord, RegisteredClassEntityData};
-    use acadrust::types::DxfVersion;
-    use std::io::Cursor;
-
-    #[test]
-    fn registered_transport_recovers_separate_non_byte_aligned_strings() {
-        for version in [DxfVersion::AC1027, DxfVersion::AC1032] {
-            let mut source = CadDocument::new();
-            source.version = version;
-            source.classes.add_or_update(DxfClass::new_entity("CUSTOM_TEXT", "CustomText"));
-            let class_id = i32::from(source.classes.get_by_name("CUSTOM_TEXT").unwrap().class_number);
-            let text = ProxyPayload::from_bits(&[0xA5, 0xC7, 0xE0], 19);
-            let payload = ProxyPayload::from_bits(&[0x80], 1);
-            source
-                .add_entity(EntityType::Extended(Box::new(ExtendedEntity {
-                    common: EntityCommon::default(),
-                    data: ExtendedEntityData::Proxy(ProxyEntityData {
-                        proxy_id: 498,
-                        class_id,
-                        dxf_subclass: "CustomText".into(),
-                        version: 33,
-                        dwg_version: 33,
-                        maintenance_version: 0,
-                        from_dxf: false,
-                        graphics: ProxyPayload::default(),
-                        payload: payload.clone(),
-                        text_payload: text.clone(),
-                        object_ids: vec![],
-                    }),
-                })))
-                .unwrap();
-            let bytes = acadrust::DwgWriter::write_to_vec(&source).unwrap();
-            let mut decoded = acadrust::DwgReader::from_stream(Cursor::new(bytes)).read().unwrap();
-            let entity = decoded.entities().next().unwrap();
-            let handle = entity.common().handle;
-            let raw = entity.common().raw_record.clone().unwrap();
-            assert_eq!(registered_text(&raw).unwrap().data(), text.data());
-            assert_eq!(registered_text(&raw).unwrap().bit_count, 19);
-            let EntityType::Extended(entity) = decoded.get_entity_mut(handle).unwrap() else { panic!() };
-            entity.data = ExtendedEntityData::RegisteredClass(RegisteredClassEntityData {
-                dxf_name: "CUSTOM_TEXT".into(),
-                cpp_class_name: "CustomText".into(),
-                properties: vec![],
-                payload: payload.clone(),
-                object_ids: vec![],
-            });
-            entity.common.raw_record = Some(raw);
-            assert!(prepare(&mut decoded).is_empty());
-            for _ in 0..2 {
-                let mut dxf = Vec::new();
-                acadrust::DxfWriter::new(&decoded).write_to_writer(&mut dxf).unwrap();
-                let bytes = crate::dxf_to_dwg_as(&dxf, "AC1032").unwrap();
-                decoded = acadrust::DwgReader::from_stream(Cursor::new(bytes)).read().unwrap();
-                let p = decoded
-                    .entities()
-                    .find_map(|e| match e {
-                        EntityType::Extended(e) => match &e.data {
-                            ExtendedEntityData::Proxy(p) => Some(p),
-                            _ => None,
-                        },
-                        _ => None,
-                    })
-                    .unwrap();
-                assert_eq!(p.payload.bit_count, 1);
-                assert_eq!(p.payload.data(), payload.data());
-                assert_eq!(p.text_payload.bit_count, 19);
-                assert_eq!(p.text_payload.data(), text.data());
-            }
-        }
-    }
-
-    #[test]
-    fn invalid_string_stream_boundaries_return_errors() {
-        for handle_bits in [-1, 1000] {
-            let raw = RawRecord { data: vec![0; 8], handle_bits, version: DxfVersion::AC1032 };
-            assert!(registered_text(&raw).is_err());
-        }
-    }
-}

crates/dwg/src/worker.rs

@@ -1,378 +0,0 @@
-//! The DWG reader and writer in a child process.
-//!
-//! An allocation failure or stack overflow in the third-party code ends the process it runs in, and
-//! `catch_unwind` can't stop that. So the app runs them in a copy of itself: [`use_own_worker`] says
-//! how to start one, and [`serve_if_asked`], first thing in `main`, turns the copy into a worker
-//! that reads one request from standard input and writes one reply to standard output. A file that
-//! kills the worker then costs that one open or save, and every other open drawing stays safe.
-//!
-//! Without a worker (libraries, tests, a build that can't start one) [`decode`] and [`encode_as`]
-//! run in the calling process, as they always did. There's no memory limit on the worker yet: that
-//! takes per-platform system calls, which `unsafe_code = "forbid"` keeps out of this crate.
-//!
-//! A reply comes from a process that just handled a possibly hostile file, so it is parsed as
-//! untrusted input.
-
-use std::ffi::OsString;
-use std::io::{Read, Write};
-use std::path::PathBuf;
-use std::process::{Command, Stdio};
-use std::sync::Mutex;
-use std::sync::mpsc::{RecvTimeoutError, channel};
-use std::time::Duration;
-
-use super::Limits;
-
-/// The argument that makes the app a worker.
-pub const WORKER_ARG: &str = "--dwg-worker";
-/// Bumped when the messages change: an app updated while running may start a newer copy.
-const PROTOCOL: u8 = 2;
-const DECODE: u8 = 1;
-const ENCODE: u8 = 2;
-const CRASH: u8 = 0xff;
-/// How long one file may take before the worker is stopped. It can't be interrupted otherwise.
-const TIMEOUT: Duration = Duration::from_secs(30 * 60);
-/// Most bytes accepted for what a reply carries besides the drawing.
-const MAX_NOTES_BYTES: u64 = 64 << 20;
-/// Most bytes accepted as a written DWG.
-const MAX_DWG_REPLY: u64 = 2 << 30;
-/// Most bytes one request holds: the largest input, whichever the direction, and its header.
-const MAX_REQUEST: u64 = (2 << 30) + 256;
-
-struct Worker {
-    program: PathBuf,
-    args: Vec<OsString>,
-}
-
-static WORKER: Mutex<Option<Worker>> = Mutex::new(None);
-
-/// Start `program args` as the worker from now on. `program` must call [`serve_if_asked`].
-pub fn use_worker(program: PathBuf, args: Vec<OsString>) {
-    if let Ok(mut w) = WORKER.lock() {
-        *w = Some(Worker { program, args });
-    }
-}
-
-/// Use a copy of this program as the worker, started with [`WORKER_ARG`]. If its path can't be
-/// found, the reader and writer stay in this process.
-pub fn use_own_worker() {
-    match std::env::current_exe() {
-        Ok(program) => use_worker(program, vec![WORKER_ARG.into()]),
-        Err(e) => log::warn!("DWG worker: can't find this program: {e}"),
-    }
-}
-
-/// Serve one request and return the exit code if this process was started as a worker.
-pub fn serve_if_asked() -> Option<i32> {
-    (std::env::args_os().nth(1)? == WORKER_ARG).then(|| serve(std::io::stdin().lock(), std::io::stdout().lock()))
-}
-
-/// [`super::dwg_to_dxf_noted`] in the worker, when there is one.
-pub fn decode(bytes: &[u8], limits: Limits) -> Result<(Vec<u8>, Vec<String>), String> {
-    // Before starting a process, and so the same limit holds with or without one.
-    if bytes.len() > limits.max_dwg_bytes {
-        return super::dwg_to_dxf_noted(bytes, limits);
-    }
-    let reply_limit = (limits.max_dxf_bytes as u64).saturating_add(MAX_NOTES_BYTES);
-    match call(&request(DECODE, limits, ""), bytes, reply_limit, "reading this file") {
-        Some(reply) => reply?,
-        None => super::dwg_to_dxf_noted(bytes, limits),
-    }
-}
-
-/// [`super::dxf_to_dwg_as`] in the worker, when there is one.
-pub fn encode_as(dxf: &[u8], version: &str) -> Result<Vec<u8>, String> {
-    encode_noted(dxf, version).map(|(dwg, _)| dwg)
-}
-
-/// [`super::dxf_to_dwg_noted`] in the worker, when there is one. What the writer left out comes
-/// back as notes of `TYPE<tab>count`.
-pub fn encode_noted(dxf: &[u8], version: &str) -> Result<(Vec<u8>, super::Unwritten), String> {
-    encode_kept_noted(dxf, version, None)
-}
-
-/// [`encode_noted`] for a DXF whose carried-over groups were read from a file of version `kept`
-/// ([`super::dxf_to_dwg_kept_noted`]); `None` is [`encode_noted`].
-pub fn encode_kept_noted(dxf: &[u8], version: &str, kept: Option<&str>) -> Result<(Vec<u8>, super::Unwritten), String> {
-    if u8::try_from(version.len()).is_err() {
-        return Err(super::unsupported(version));
-    }
-    // A kept version too long to send is no version CADCraft knows: it changes nothing.
-    let kept = kept.filter(|k| u8::try_from(k.len()).is_ok());
-    let mut header = request(ENCODE, Limits::DEFAULT, version);
-    push_str(&mut header, kept.unwrap_or(""));
-    match call(&header, dxf, MAX_DWG_REPLY, "writing this file") {
-        Some(reply) => reply?.map(|(dwg, notes)| (dwg, unwritten_from(&notes))),
-        None => encode_here(dxf, version, kept),
-    }
-}
-
-/// The conversion in this process.
-fn encode_here(dxf: &[u8], version: &str, kept: Option<&str>) -> Result<(Vec<u8>, super::Unwritten), String> {
-    match kept {
-        Some(kept) => super::dxf_to_dwg_kept_noted(dxf, version, kept),
-        None => super::dxf_to_dwg_noted(dxf, version),
-    }
-}
-
-fn unwritten_from(notes: &[String]) -> super::Unwritten {
-    notes.iter().filter_map(|n| n.split_once('\t')).filter_map(|(kind, n)| Some((kind.to_string(), n.parse::<usize>().ok()?))).fold(
-        super::Unwritten::new(),
-        |mut m, (kind, n)| {
-            *m.entry(kind).or_insert(0) = n;
-            m
-        },
-    )
-}
-
-/// Make the worker abort, as the third-party code can: what the tests prove isolation with.
-#[doc(hidden)]
-pub fn crash_worker_for_test() -> Result<(), String> {
-    call(&request(CRASH, Limits::DEFAULT, ""), &[], 1024, "testing").ok_or("no worker")??.map(|_| ())
-}
-
-fn request(op: u8, limits: Limits, version: &str) -> Vec<u8> {
-    let mut r = vec![PROTOCOL, op];
-    r.extend((limits.max_dwg_bytes as u64).to_le_bytes());
-    r.extend((limits.max_dxf_bytes as u64).to_le_bytes());
-    push_str(&mut r, version);
-    r
-}
-
-/// `text` with a one-byte length before it; callers keep it under 256 bytes.
-fn push_str(r: &mut Vec<u8>, text: &str) {
-    r.push(u8::try_from(text.len()).unwrap_or(0));
-    r.extend(text.as_bytes());
-}
-
-type Reply = Result<(Vec<u8>, Vec<String>), String>;
-
-/// Run one request in a worker. `None`: none could be started, so the caller does the work.
-/// `Err`: the worker went wrong, and `doing` says at what, for the user.
-fn call(header: &[u8], payload: &[u8], reply_limit: u64, doing: &str) -> Option<Result<Reply, String>> {
-    let mut command = {
-        let worker = WORKER.lock().ok()?;
-        let worker = worker.as_ref()?;
-        let mut c = Command::new(&worker.program);
-        c.args(&worker.args);
-        c
-    };
-    command.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::null());
-    #[cfg(windows)]
-    {
-        use std::os::windows::process::CommandExt;
-        const CREATE_NO_WINDOW: u32 = 0x0800_0000;
-        command.creation_flags(CREATE_NO_WINDOW);
-    }
-    let mut child = match command.spawn() {
-        Ok(c) => c,
-        Err(e) => {
-            log::warn!("DWG worker: can't start it: {e}");
-            return None;
-        }
-    };
-    let (Some(mut to_child), Some(from_child)) = (child.stdin.take(), child.stdout.take()) else {
-        let _ = child.kill();
-        let _ = child.wait();
-        return None;
-    };
-    let received = std::thread::scope(|scope| {
-        // Written beside the read: a worker that replies before it has read everything, or dies,
-        // must block neither side. A failed write shows up as the reply going wrong.
-        scope.spawn(move || {
-            let _ = to_child.write_all(header).and_then(|()| to_child.write_all(payload));
-        });
-        let (tx, rx) = channel();
-        scope.spawn(move || {
-            let mut reply = Vec::new();
-            let read = from_child.take(reply_limit).read_to_end(&mut reply);
-            let _ = tx.send(read.map(|_| reply));
-        });
-        let received = rx.recv_timeout(TIMEOUT);
-        if matches!(received, Err(RecvTimeoutError::Timeout)) {
-            let _ = child.kill();
-        }
-        received
-    });
-    let status = child.wait();
-    let stopped = || format!("the DWG worker stopped while {doing}; nothing else is affected");
-    Some(match (received, status) {
-        (Err(RecvTimeoutError::Timeout), _) => Err(format!("{doing} took too long, so the DWG worker was stopped; nothing else is affected")),
-        (Ok(Ok(reply)), Ok(status)) if status.success() => parse_reply(reply).ok_or_else(stopped),
-        _ => Err(stopped()),
-    })
-}
-
-/// Take `n` bytes off the front of `b`.
-fn take<'a>(b: &mut &'a [u8], n: usize) -> Option<&'a [u8]> {
-    let (head, tail) = b.split_at_checked(n)?;
-    *b = tail;
-    Some(head)
-}
-
-fn take_u32(b: &mut &[u8]) -> Option<usize> {
-    let bytes: [u8; 4] = take(b, 4)?.try_into().ok()?;
-    usize::try_from(u32::from_le_bytes(bytes)).ok()
-}
-
-fn take_u64(b: &mut &[u8]) -> Option<u64> {
-    Some(u64::from_le_bytes(take(b, 8)?.try_into().ok()?))
-}
-
-/// A reply: 0, the note count, each note with its length, then the bytes with their length; or 1
-/// and a message. `None` when it isn't one, whole. Takes the reply, because the bytes can be most
-/// of the memory the app may use: they are kept, not copied.
-fn parse_reply(mut reply: Vec<u8>) -> Option<Reply> {
-    let total = reply.len();
-    let mut b = &reply[..];
-    match *take(&mut b, 1)?.first()? {
-        0 => {
-            let count = take_u32(&mut b)?;
-            let mut notes = Vec::new();
-            for _ in 0..count {
-                let n = take_u32(&mut b)?;
-                notes.push(String::from_utf8_lossy(take(&mut b, n)?).into_owned());
-            }
-            let n = usize::try_from(take_u64(&mut b)?).ok()?;
-            if b.len() != n {
-                return None;
-            }
-            reply.drain(..total - n);
-            Some(Ok((reply, notes)))
-        }
-        1 => Some(Err(String::from_utf8_lossy(b).into_owned())),
-        _ => None,
-    }
-}
-
-fn write_reply(out: &mut impl Write, reply: Reply) -> std::io::Result<()> {
-    match reply {
-        Ok((bytes, notes)) => {
-            out.write_all(&[0])?;
-            out.write_all(&u32::try_from(notes.len()).unwrap_or(0).to_le_bytes())?;
-            for note in &notes {
-                out.write_all(&u32::try_from(note.len()).unwrap_or(0).to_le_bytes())?;
-                if u32::try_from(note.len()).is_ok() {
-                    out.write_all(note.as_bytes())?;
-                }
-            }
-            out.write_all(&(bytes.len() as u64).to_le_bytes())?;
-            out.write_all(&bytes)?;
-        }
-        Err(e) => {
-            out.write_all(&[1])?;
-            out.write_all(e.as_bytes())?;
-        }
-    }
-    out.flush()
-}
-
-/// What a request asks for, or why it can't be served.
-fn handle(mut b: &[u8]) -> Reply {
-    let bad = || "the DWG worker got a request it can't read (a different CADCraft version?)".to_string();
-    if take(&mut b, 1).and_then(<[u8]>::first) != Some(&PROTOCOL) {
-        return Err(bad());
-    }
-    let op = take(&mut b, 1).and_then(<[u8]>::first).copied().ok_or_else(bad)?;
-    let max_dwg_bytes = take_u64(&mut b).and_then(|n| usize::try_from(n).ok()).ok_or_else(bad)?;
-    let max_dxf_bytes = take_u64(&mut b).and_then(|n| usize::try_from(n).ok()).ok_or_else(bad)?;
-    let version_len = take(&mut b, 1).and_then(<[u8]>::first).copied().ok_or_else(bad)?;
-    let version = take(&mut b, usize::from(version_len)).and_then(|v| std::str::from_utf8(v).ok()).ok_or_else(bad)?;
-    match op {
-        DECODE => super::dwg_to_dxf_noted(b, Limits { max_dwg_bytes, max_dxf_bytes }),
-        ENCODE => {
-            // The version the DXF's carried-over groups were read from; empty for none.
-            let kept_len = take(&mut b, 1).and_then(<[u8]>::first).copied().ok_or_else(bad)?;
-            let kept = take(&mut b, usize::from(kept_len)).and_then(|v| std::str::from_utf8(v).ok()).ok_or_else(bad)?;
-            encode_here(b, version, (!kept.is_empty()).then_some(kept))
-                .map(|(dwg, left_out)| (dwg, left_out.iter().map(|(kind, n)| format!("{kind}\t{n}")).collect()))
-        }
-        CRASH => std::process::abort(),
-        _ => Err(bad()),
-    }
-}
-
-/// Serve the one request on `input`. The exit code is 0 unless the reply couldn't be sent.
-fn serve(input: impl Read, mut output: impl Write) -> i32 {
-    let mut request = Vec::new();
-    let reply = match input.take(MAX_REQUEST).read_to_end(&mut request) {
-        Ok(_) => handle(&request),
-        Err(e) => Err(format!("the DWG worker could not read its request: {e}")),
-    };
-    i32::from(write_reply(&mut output, reply).is_err())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn wire(reply: Reply) -> Vec<u8> {
-        let mut out = Vec::new();
-        write_reply(&mut out, reply).unwrap();
-        out
-    }
-
-    #[test]
-    fn what_the_writer_left_out_survives_the_reply() {
-        let notes = vec!["ACME_WIDGET\t2".to_string(), "not a count".to_string(), "X\tmany".to_string()];
-        assert_eq!(unwritten_from(&notes), [("ACME_WIDGET".to_string(), 2)].into_iter().collect());
-    }
-
-    #[test]
-    fn replies_round_trip() {
-        let ok: Reply = Ok((b"bytes".to_vec(), vec!["one".into(), "two é".into()]));
-        assert_eq!(parse_reply(wire(ok.clone())), Some(ok));
-        let failed: Reply = Err("DWG: no".into());
-        assert_eq!(parse_reply(wire(failed.clone())), Some(failed));
-    }
-
-    #[test]
-    fn a_reply_cut_short_or_made_up_is_refused() {
-        let whole = wire(Ok((b"bytes".to_vec(), vec!["note".into()])));
-        for n in 0..whole.len() {
-            assert_eq!(parse_reply(whole[..n].to_vec()), None, "cut at {n}");
-        }
-        assert_eq!(parse_reply(vec![7, 0, 0]), None);
-        // A note count far beyond what follows ends at the first missing note.
-        assert_eq!(parse_reply(vec![0, 0xff, 0xff, 0xff, 0xff]), None);
-        assert_eq!(parse_reply(vec![0, 1, 0, 0, 0, 0xff, 0xff, 0xff, 0xff]), None);
-    }
-
-    #[test]
-    fn a_request_it_cannot_read_is_an_error_not_a_crash() {
-        for request in [
-            &[][..],
-            &[PROTOCOL + 1, DECODE],
-            &[PROTOCOL],
-            &[PROTOCOL, DECODE, 1, 2, 3],
-            &[PROTOCOL, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-        ] {
-            assert!(handle(request).is_err(), "{request:?}");
-        }
-    }
-
-    /// An encode request carries the kept version after the target one; a request without it is
-    /// one it can't read, and one with it reaches the converter.
-    #[test]
-    fn an_encode_request_carries_the_kept_version() {
-        let bad = "the DWG worker got a request it can't read (a different CADCraft version?)";
-        let short = self::request(ENCODE, Limits::DEFAULT, "AC1032");
-        assert_eq!(handle(&short).unwrap_err(), bad);
-        for kept in ["", "AC1032"] {
-            let mut request = self::request(ENCODE, Limits::DEFAULT, "AC1032");
-            push_str(&mut request, kept);
-            request.extend(b"not a drawing");
-            let err = handle(&request).unwrap_err();
-            assert_ne!(err, bad, "kept {kept:?}");
-        }
-    }
-
-    #[test]
-    fn serving_reports_a_decode_failure_as_a_reply() {
-        let mut request = self::request(DECODE, Limits::DEFAULT, "");
-        request.extend(b"AC1032 not really a drawing");
-        let mut out = Vec::new();
-        assert_eq!(serve(&request[..], &mut out), 0);
-        assert!(matches!(parse_reply(out.clone()), Some(Err(_))), "{out:?}");
-    }
-}

crates/dxf/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "cadcraft-dxf"
-description = "Standalone DXF tag reader/writer (ASCII and binary, pre-2007 code pages), from the published DXF reference"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
-thiserror = { workspace = true }
-log = { workspace = true }
-encoding_rs = { workspace = true }

crates/dxf/src/codepage.rs

@@ -1,398 +0,0 @@
-//! Text decoding for DXF files.
-//!
-//! R2007 (AC1021) and later DXF files are UTF-8. Older ones store text in the code page named by
-//! the `$DWGCODEPAGE` header variable (`ANSI_1252`, `ANSI_932`, `DOS850`, …); characters outside
-//! it are written as `\U+XXXX` (any character) or `\M+nXXXX` (a double-byte character of an East
-//! Asian code page) escapes, which [`crate::parse`] decodes after the bytes.
-//!
-//! The Windows, ISO and East Asian code pages are decoded with `encoding_rs`; DOS 437, 850 and
-//! 852 with the tables below (the upper halves of the IBM PC code pages; the lower halves are
-//! ASCII). Decoding never fails: a byte sequence that is invalid in the code page (a truncated
-//! double-byte character, an unassigned byte) becomes U+FFFD and the bytes after it decode
-//! normally, so line ends and the group structure survive.
-
-use std::borrow::Cow;
-
-use encoding_rs::Encoding;
-
-/// How the bytes of a code page become text.
-#[derive(Clone, Copy, Debug)]
-pub(crate) enum Decoder {
-    Utf8,
-    Encoding(&'static Encoding),
-    /// Single-byte DOS code page: ASCII, then these 128 characters for bytes 0x80–0xFF.
-    Table(&'static [char; 128]),
-}
-
-/// The decoder for a `$DWGCODEPAGE` value (case-insensitive), or `None` when CADCraft doesn't
-/// know the code page.
-pub(crate) fn decoder(code_page: &str) -> Option<Decoder> {
-    use encoding_rs as e;
-    let name = code_page.trim().to_ascii_uppercase().replace(['-', ' '], "_");
-    let enc = match name.as_str() {
-        "UTF8" | "UTF_8" | "UNICODE" => return Some(Decoder::Utf8),
-        "ASCII" | "ANSI_1252" | "ISO8859_1" | "ISO_8859_1" => e::WINDOWS_1252,
-        "ANSI_874" => e::WINDOWS_874,
-        "ANSI_932" | "DOS932" | "SHIFT_JIS" => e::SHIFT_JIS,
-        "ANSI_936" | "GB2312" | "GBK" => e::GBK,
-        "ANSI_949" | "KSC5601" | "KOREAN" => e::EUC_KR,
-        "ANSI_950" | "BIG5" => e::BIG5,
-        "ANSI_1250" => e::WINDOWS_1250,
-        "ANSI_1251" => e::WINDOWS_1251,
-        "ANSI_1253" => e::WINDOWS_1253,
-        "ANSI_1254" | "ISO8859_9" | "ISO_8859_9" => e::WINDOWS_1254,
-        "ANSI_1255" => e::WINDOWS_1255,
-        "ANSI_1256" => e::WINDOWS_1256,
-        "ANSI_1257" => e::WINDOWS_1257,
-        "ANSI_1258" => e::WINDOWS_1258,
-        "ISO8859_2" | "ISO_8859_2" => e::ISO_8859_2,
-        "ISO8859_3" | "ISO_8859_3" => e::ISO_8859_3,
-        "ISO8859_4" | "ISO_8859_4" => e::ISO_8859_4,
-        "ISO8859_5" | "ISO_8859_5" => e::ISO_8859_5,
-        "ISO8859_6" | "ISO_8859_6" => e::ISO_8859_6,
-        "ISO8859_7" | "ISO_8859_7" => e::ISO_8859_7,
-        "ISO8859_8" | "ISO_8859_8" => e::ISO_8859_8,
-        "DOS866" => e::IBM866,
-        "MACINTOSH" | "MAC_ROMAN" => e::MACINTOSH,
-        "DOS437" => return Some(Decoder::Table(&DOS437)),
-        "DOS850" => return Some(Decoder::Table(&DOS850)),
-        "DOS852" => return Some(Decoder::Table(&DOS852)),
-        _ => return None,
-    };
-    Some(Decoder::Encoding(enc))
-}
-
-/// Decode `bytes` from the code page `code_page` names (a `$DWGCODEPAGE` value such as
-/// `ANSI_1251`), or `None` when CADCraft doesn't know that code page. Invalid sequences become
-/// U+FFFD; escapes (`\U+XXXX`, `\M+nXXXX`) are left as they are.
-pub fn decode_code_page(bytes: &[u8], code_page: &str) -> Option<String> {
-    decoder(code_page).map(|d| decode(bytes, d).into_owned())
-}
-
-/// The code page a pre-2007 file's text is written in, or `None` for pure ASCII with escapes:
-/// when CADCraft doesn't know `code_page`, and for `ASCII` (the reader takes such files as
-/// Windows-1252, but a writer must keep them ASCII) and `UTF8`/`UNICODE`, which no pre-2007
-/// reader expects.
-pub(crate) fn encoder(code_page: &str) -> Option<Decoder> {
-    if code_page.trim().eq_ignore_ascii_case("ASCII") {
-        return None;
-    }
-    decoder(code_page).filter(|d| !matches!(d, Decoder::Utf8))
-}
-
-/// Append the bytes of the non-ASCII character `c` in the code page `d`, and return true, when
-/// the code page has it; otherwise append nothing and return false (the caller escapes it).
-pub(crate) fn encode_char(c: char, d: Decoder, out: &mut Vec<u8>) -> bool {
-    let mut buf = [0; 4];
-    match d {
-        // Not a pre-2007 code page ([`encoder`] never gives it): escaped.
-        Decoder::Utf8 => return false,
-        Decoder::Encoding(e) => {
-            let (bytes, _, unmappable) = e.encode(c.encode_utf8(&mut buf));
-            // A code page byte that is ASCII would read back as another character, and a NUL,
-            // CR or LF would break the group, so only all-high-bit sequences or proper double-byte
-            // characters are kept (their trail byte may be ASCII, as in Shift-JIS).
-            if unmappable || bytes.is_empty() || !bytes.first().is_some_and(|b| *b >= 0x80) || bytes.iter().any(|b| matches!(b, 0 | b'\r' | b'\n')) {
-                return false;
-            }
-            out.extend_from_slice(&bytes);
-        }
-        Decoder::Table(t) => {
-            let Some(i) = t.iter().position(|&x| x == c).and_then(|i| u8::try_from(i).ok()) else { return false };
-            out.push(0x80 | i);
-        }
-    }
-    true
-}
-
-/// Decode bytes with a decoder. UTF-8 that isn't valid falls back to Windows-1252.
-pub(crate) fn decode(bytes: &[u8], d: Decoder) -> Cow<'_, str> {
-    match d {
-        Decoder::Utf8 => match std::str::from_utf8(bytes) {
-            Ok(s) => Cow::Borrowed(s),
-            Err(_) => encoding_rs::WINDOWS_1252.decode_without_bom_handling(bytes).0,
-        },
-        Decoder::Encoding(e) => e.decode_without_bom_handling(bytes).0,
-        Decoder::Table(t) => match std::str::from_utf8(bytes) {
-            Ok(s) if s.is_ascii() => Cow::Borrowed(s),
-            _ => Cow::Owned(
-                bytes
-                    .iter()
-                    .map(|&b| if b.is_ascii() { char::from(b) } else { t.get(usize::from(b & 0x7F)).copied().unwrap_or('\u{FFFD}') })
-                    .collect(),
-            ),
-        },
-    }
-}
-
-/// The `$DWGCODEPAGE` value of an ASCII DXF file: the line two lines after a `$DWGCODEPAGE`
-/// line (the group code `3` between them), looked for in the HEADER section only (the scan stops
-/// at the first `ENDSEC`). Works on the raw bytes, before they are decoded.
-fn ascii_code_page(bytes: &[u8]) -> Option<&[u8]> {
-    let mut lines = bytes.split(|&b| b == b'\n' || b == b'\r').map(<[u8]>::trim_ascii).filter(|l| !l.is_empty());
-    while let Some(line) = lines.next() {
-        if line == b"ENDSEC" {
-            return None;
-        }
-        if line.eq_ignore_ascii_case(b"$DWGCODEPAGE") {
-            return match (lines.next(), lines.next()) {
-                (Some(b"3"), Some(value)) => Some(value),
-                _ => None,
-            };
-        }
-    }
-    None
-}
-
-impl Decoder {
-    /// True for the multi-byte East Asian code pages (Shift-JIS, GBK, EUC-KR/Wansung, Big5).
-    /// Their short double-byte strings are often also valid UTF-8, so UTF-8 is only trusted for
-    /// a whole file there (see [`decode_ascii_file`] and [`BinaryText`]).
-    fn is_east_asian(self) -> bool {
-        use encoding_rs as e;
-        matches!(self, Decoder::Encoding(x) if x == e::SHIFT_JIS || x == e::GBK || x == e::EUC_KR || x == e::BIG5)
-    }
-}
-
-/// Decode one line of an ASCII DXF file: valid UTF-8 is read as UTF-8 (R2007+ files, pure-ASCII
-/// text, and older files from writers that ignored the code page); anything else comes from the
-/// code page `d`, so one stray byte spoils one line, not the whole file. Binary strings don't use
-/// this rule: a pre-R2007 binary file has no way to escape to UTF-8, so its strings are read
-/// from the code page (see [`BinaryText::string`]).
-pub(crate) fn decode_text(bytes: &[u8], d: Decoder) -> Cow<'_, str> {
-    match std::str::from_utf8(bytes) {
-        Ok(s) => Cow::Borrowed(s),
-        Err(_) => decode(bytes, d),
-    }
-}
-
-/// Decode a whole ASCII DXF file. A file that is valid UTF-8 throughout is UTF-8. Otherwise, for
-/// a single-byte code page, each line is decoded on its own (see [`decode_text`]): lines that
-/// aren't valid UTF-8 come from the file's `$DWGCODEPAGE`, or from Windows-1252 (the usual
-/// `ANSI_1252`) when the header has none or names a code page CADCraft doesn't know, which is
-/// logged as a warning. For a multi-byte East Asian code page the whole file is decoded from
-/// that code page, because a short double-byte string (two half-width katakana, many kanji
-/// pairs) can be valid UTF-8 by accident and must not be misread line by line.
-pub(crate) fn decode_ascii_file(bytes: &[u8]) -> Cow<'_, str> {
-    if let Ok(s) = std::str::from_utf8(bytes) {
-        return Cow::Borrowed(s);
-    }
-    let d = match ascii_code_page(bytes) {
-        Some(name) => {
-            let name = String::from_utf8_lossy(name);
-            decoder(&name).unwrap_or_else(|| {
-                log::warn!("DXF: unknown code page `{name}`; reading the text as ANSI_1252");
-                Decoder::Utf8
-            })
-        }
-        None => Decoder::Utf8,
-    };
-    if d.is_east_asian() {
-        return decode(bytes, d);
-    }
-    // Split after each line terminator (CR, LF or CRLF are all ASCII, so they never occur inside
-    // a multi-byte character of the supported code pages) and decode each line on its own.
-    let mut out = String::with_capacity(bytes.len());
-    for line in bytes.split_inclusive(|&b| b == b'\n' || b == b'\r') {
-        out.push_str(&decode_text(line, d));
-    }
-    Cow::Owned(out)
-}
-
-/// The text state of a binary DXF file, learnt from the header as the tags go by: `$ACADVER`
-/// (R2007+ strings are UTF-8) and `$DWGCODEPAGE` (the code page of older files). Both come
-/// first in the HEADER section and are ASCII, so every later string is decoded right.
-#[derive(Default)]
-pub(crate) struct BinaryText {
-    /// The header variable whose value comes next (after a group 9).
-    var: Option<HeaderVar>,
-    utf8: bool,
-    code_page: Option<Decoder>,
-    /// Decode every string of an East Asian code page file from the code page, never as UTF-8
-    /// (the second pass of [`BinaryText::needs_code_page_pass`]).
-    code_page_only: bool,
-    /// Non-ASCII strings seen under an East Asian code page: valid UTF-8 / not valid UTF-8.
-    ea_utf8: bool,
-    ea_other: bool,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-enum HeaderVar {
-    AcadVer,
-    CodePage,
-}
-
-impl BinaryText {
-    /// The state for the second pass over a file whose strings are a mix of valid UTF-8 and
-    /// not: every string of an East Asian code page is decoded from that code page.
-    pub(crate) fn code_page_pass() -> Self {
-        Self { code_page_only: true, ..Self::default() }
-    }
-
-    /// True when the file declared a multi-byte East Asian code page and its non-ASCII strings are
-    /// not all valid UTF-8 although some are: those can be short double-byte strings that look
-    /// like UTF-8 by accident, so the file must be parsed again with [`Self::code_page_pass`]. (A
-    /// file whose strings are all valid UTF-8 is UTF-8; one with none is plainly the code page.)
-    pub(crate) fn needs_code_page_pass(&self) -> bool {
-        !self.code_page_only && self.ea_utf8 && self.ea_other
-    }
-
-    /// Decode one string value of group `code` and update the state from it. Strings of R2007+
-    /// files, and of files without a code page, are UTF-8 when valid (else Windows-1252); a
-    /// pre-R2007 file's strings are in its code page, which a binary DXF cannot escape to, so
-    /// they are read from the code page even when their bytes are valid UTF-8 by accident —
-    /// except under an East Asian code page, where a file of all-valid-UTF-8 strings is taken
-    /// as UTF-8 (see [`Self::needs_code_page_pass`]).
-    pub(crate) fn string(&mut self, code: i32, raw: &[u8]) -> String {
-        let d = if self.utf8 { Decoder::Utf8 } else { self.code_page.unwrap_or(Decoder::Utf8) };
-        let s = if d.is_east_asian() && !self.code_page_only {
-            if !raw.is_ascii() {
-                if std::str::from_utf8(raw).is_ok() {
-                    self.ea_utf8 = true;
-                } else {
-                    self.ea_other = true;
-                }
-            }
-            decode_text(raw, d).into_owned()
-        } else {
-            decode(raw, d).into_owned()
-        };
-        match (code, self.var.take()) {
-            (9, _) => {
-                self.var = match s.trim() {
-                    "$ACADVER" => Some(HeaderVar::AcadVer),
-                    "$DWGCODEPAGE" => Some(HeaderVar::CodePage),
-                    _ => None,
-                }
-            }
-            (1, Some(HeaderVar::AcadVer)) => self.utf8 = is_utf8_version(&s),
-            (3, Some(HeaderVar::CodePage)) => {
-                self.code_page = decoder(&s);
-                if self.code_page.is_none() {
-                    log::warn!("DXF: unknown code page `{}`; reading the text as ANSI_1252", s.trim());
-                }
-            }
-            _ => {}
-        }
-        s
-    }
-}
-
-/// True for an `$ACADVER` of R2007 (AC1021) or later, whose text is UTF-8.
-fn is_utf8_version(acadver: &str) -> bool {
-    acadver.trim().strip_prefix("AC").and_then(|n| n.parse::<u32>().ok()).is_some_and(|n| n >= 1021)
-}
-
-/// The double-byte code page of a `\M+n` escape: 1 Japanese (Shift-JIS), 2 Traditional Chinese
-/// (Big5), 3 Korean (Wansung), 5 Simplified Chinese (GB 2312). 4 (Korean Johab) is not
-/// supported, so its escapes stay literal.
-pub(crate) fn mif_encoding(n: char) -> Option<&'static Encoding> {
-    match n {
-        '1' => Some(encoding_rs::SHIFT_JIS),
-        '2' => Some(encoding_rs::BIG5),
-        '3' => Some(encoding_rs::EUC_KR),
-        '5' => Some(encoding_rs::GBK),
-        _ => None,
-    }
-}
-
-// Generated from the IBM PC code page definitions (bytes 0x80–0xFF in order).
-const DOS437: [char; 128] = [
-    '\u{00C7}', '\u{00FC}', '\u{00E9}', '\u{00E2}', '\u{00E4}', '\u{00E0}', '\u{00E5}', '\u{00E7}', '\u{00EA}', '\u{00EB}', '\u{00E8}', '\u{00EF}',
-    '\u{00EE}', '\u{00EC}', '\u{00C4}', '\u{00C5}', '\u{00C9}', '\u{00E6}', '\u{00C6}', '\u{00F4}', '\u{00F6}', '\u{00F2}', '\u{00FB}', '\u{00F9}',
-    '\u{00FF}', '\u{00D6}', '\u{00DC}', '\u{00A2}', '\u{00A3}', '\u{00A5}', '\u{20A7}', '\u{0192}', '\u{00E1}', '\u{00ED}', '\u{00F3}', '\u{00FA}',
-    '\u{00F1}', '\u{00D1}', '\u{00AA}', '\u{00BA}', '\u{00BF}', '\u{2310}', '\u{00AC}', '\u{00BD}', '\u{00BC}', '\u{00A1}', '\u{00AB}', '\u{00BB}',
-    '\u{2591}', '\u{2592}', '\u{2593}', '\u{2502}', '\u{2524}', '\u{2561}', '\u{2562}', '\u{2556}', '\u{2555}', '\u{2563}', '\u{2551}', '\u{2557}',
-    '\u{255D}', '\u{255C}', '\u{255B}', '\u{2510}', '\u{2514}', '\u{2534}', '\u{252C}', '\u{251C}', '\u{2500}', '\u{253C}', '\u{255E}', '\u{255F}',
-    '\u{255A}', '\u{2554}', '\u{2569}', '\u{2566}', '\u{2560}', '\u{2550}', '\u{256C}', '\u{2567}', '\u{2568}', '\u{2564}', '\u{2565}', '\u{2559}',
-    '\u{2558}', '\u{2552}', '\u{2553}', '\u{256B}', '\u{256A}', '\u{2518}', '\u{250C}', '\u{2588}', '\u{2584}', '\u{258C}', '\u{2590}', '\u{2580}',
-    '\u{03B1}', '\u{00DF}', '\u{0393}', '\u{03C0}', '\u{03A3}', '\u{03C3}', '\u{00B5}', '\u{03C4}', '\u{03A6}', '\u{0398}', '\u{03A9}', '\u{03B4}',
-    '\u{221E}', '\u{03C6}', '\u{03B5}', '\u{2229}', '\u{2261}', '\u{00B1}', '\u{2265}', '\u{2264}', '\u{2320}', '\u{2321}', '\u{00F7}', '\u{2248}',
-    '\u{00B0}', '\u{2219}', '\u{00B7}', '\u{221A}', '\u{207F}', '\u{00B2}', '\u{25A0}', '\u{00A0}',
-];
-const DOS850: [char; 128] = [
-    '\u{00C7}', '\u{00FC}', '\u{00E9}', '\u{00E2}', '\u{00E4}', '\u{00E0}', '\u{00E5}', '\u{00E7}', '\u{00EA}', '\u{00EB}', '\u{00E8}', '\u{00EF}',
-    '\u{00EE}', '\u{00EC}', '\u{00C4}', '\u{00C5}', '\u{00C9}', '\u{00E6}', '\u{00C6}', '\u{00F4}', '\u{00F6}', '\u{00F2}', '\u{00FB}', '\u{00F9}',
-    '\u{00FF}', '\u{00D6}', '\u{00DC}', '\u{00F8}', '\u{00A3}', '\u{00D8}', '\u{00D7}', '\u{0192}', '\u{00E1}', '\u{00ED}', '\u{00F3}', '\u{00FA}',
-    '\u{00F1}', '\u{00D1}', '\u{00AA}', '\u{00BA}', '\u{00BF}', '\u{00AE}', '\u{00AC}', '\u{00BD}', '\u{00BC}', '\u{00A1}', '\u{00AB}', '\u{00BB}',
-    '\u{2591}', '\u{2592}', '\u{2593}', '\u{2502}', '\u{2524}', '\u{00C1}', '\u{00C2}', '\u{00C0}', '\u{00A9}', '\u{2563}', '\u{2551}', '\u{2557}',
-    '\u{255D}', '\u{00A2}', '\u{00A5}', '\u{2510}', '\u{2514}', '\u{2534}', '\u{252C}', '\u{251C}', '\u{2500}', '\u{253C}', '\u{00E3}', '\u{00C3}',
-    '\u{255A}', '\u{2554}', '\u{2569}', '\u{2566}', '\u{2560}', '\u{2550}', '\u{256C}', '\u{00A4}', '\u{00F0}', '\u{00D0}', '\u{00CA}', '\u{00CB}',
-    '\u{00C8}', '\u{0131}', '\u{00CD}', '\u{00CE}', '\u{00CF}', '\u{2518}', '\u{250C}', '\u{2588}', '\u{2584}', '\u{00A6}', '\u{00CC}', '\u{2580}',
-    '\u{00D3}', '\u{00DF}', '\u{00D4}', '\u{00D2}', '\u{00F5}', '\u{00D5}', '\u{00B5}', '\u{00FE}', '\u{00DE}', '\u{00DA}', '\u{00DB}', '\u{00D9}',
-    '\u{00FD}', '\u{00DD}', '\u{00AF}', '\u{00B4}', '\u{00AD}', '\u{00B1}', '\u{2017}', '\u{00BE}', '\u{00B6}', '\u{00A7}', '\u{00F7}', '\u{00B8}',
-    '\u{00B0}', '\u{00A8}', '\u{00B7}', '\u{00B9}', '\u{00B3}', '\u{00B2}', '\u{25A0}', '\u{00A0}',
-];
-const DOS852: [char; 128] = [
-    '\u{00C7}', '\u{00FC}', '\u{00E9}', '\u{00E2}', '\u{00E4}', '\u{016F}', '\u{0107}', '\u{00E7}', '\u{0142}', '\u{00EB}', '\u{0150}', '\u{0151}',
-    '\u{00EE}', '\u{0179}', '\u{00C4}', '\u{0106}', '\u{00C9}', '\u{0139}', '\u{013A}', '\u{00F4}', '\u{00F6}', '\u{013D}', '\u{013E}', '\u{015A}',
-    '\u{015B}', '\u{00D6}', '\u{00DC}', '\u{0164}', '\u{0165}', '\u{0141}', '\u{00D7}', '\u{010D}', '\u{00E1}', '\u{00ED}', '\u{00F3}', '\u{00FA}',
-    '\u{0104}', '\u{0105}', '\u{017D}', '\u{017E}', '\u{0118}', '\u{0119}', '\u{00AC}', '\u{017A}', '\u{010C}', '\u{015F}', '\u{00AB}', '\u{00BB}',
-    '\u{2591}', '\u{2592}', '\u{2593}', '\u{2502}', '\u{2524}', '\u{00C1}', '\u{00C2}', '\u{011A}', '\u{015E}', '\u{2563}', '\u{2551}', '\u{2557}',
-    '\u{255D}', '\u{017B}', '\u{017C}', '\u{2510}', '\u{2514}', '\u{2534}', '\u{252C}', '\u{251C}', '\u{2500}', '\u{253C}', '\u{0102}', '\u{0103}',
-    '\u{255A}', '\u{2554}', '\u{2569}', '\u{2566}', '\u{2560}', '\u{2550}', '\u{256C}', '\u{00A4}', '\u{0111}', '\u{0110}', '\u{010E}', '\u{00CB}',
-    '\u{010F}', '\u{0147}', '\u{00CD}', '\u{00CE}', '\u{011B}', '\u{2518}', '\u{250C}', '\u{2588}', '\u{2584}', '\u{0162}', '\u{016E}', '\u{2580}',
-    '\u{00D3}', '\u{00DF}', '\u{00D4}', '\u{0143}', '\u{0144}', '\u{0148}', '\u{0160}', '\u{0161}', '\u{0154}', '\u{00DA}', '\u{0155}', '\u{0170}',
-    '\u{00FD}', '\u{00DD}', '\u{0163}', '\u{00B4}', '\u{00AD}', '\u{02DD}', '\u{02DB}', '\u{02C7}', '\u{02D8}', '\u{00A7}', '\u{00F7}', '\u{00B8}',
-    '\u{00B0}', '\u{00A8}', '\u{02D9}', '\u{0171}', '\u{0158}', '\u{0159}', '\u{25A0}', '\u{00A0}',
-];
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn code_page_names() {
-        let d = |bytes: &[u8], cp: &str| decode_code_page(bytes, cp);
-        assert_eq!(d(b"\xCF\xF0\xE8\xE2\xE5\xF2", "ANSI_1251").as_deref(), Some("Привет"));
-        assert_eq!(d(b"\xCF\xF0\xE8\xE2\xE5\xF2", " ansi_1251 ").as_deref(), Some("Привет"));
-        assert_eq!(d(b"\x90\x7D\x96\xCA", "ANSI_932").as_deref(), Some("図面"));
-        assert_eq!(d(b"\xCD\xBC\xB2\xE3", "GB2312").as_deref(), Some("图层"));
-        assert_eq!(d(b"\xB9\xCF\xBC\x68", "BIG5").as_deref(), Some("圖層"));
-        assert_eq!(d(b"\xB5\xB5\xB8\xE9", "ANSI_949").as_deref(), Some("도면"));
-        assert_eq!(d(b"\xD3\xF7\xDD\xE4\xE9\xEF", "ANSI_1253").as_deref(), Some("Σχέδιο"));
-        assert_eq!(d(b"\xC0\xD2\xBE", "ANSI_874").as_deref(), Some("ภาพ"));
-        assert_eq!(d(b"\x80", "ANSI_1252").as_deref(), Some("€"));
-        // DOS 437 and 850 agree on letters but differ on 0x9B (¢ / ø).
-        assert_eq!(d(b"Gr\x94\xE1e \x9B", "DOS437").as_deref(), Some("Größe ¢"));
-        assert_eq!(d(b"Gr\x94\xE1e \x9B", "dos850").as_deref(), Some("Größe ø"));
-        assert_eq!(d(b"\xBD\xA2\x88w", "DOS852").as_deref(), Some("Żółw"));
-        assert_eq!(d(b"\x91\xAB\xAE\xA9", "DOS866").as_deref(), Some("Слой"));
-        assert_eq!(d("é".as_bytes(), "UTF8").as_deref(), Some("é"));
-        assert_eq!(d(b"x", "ANSI_1361"), None);
-        assert_eq!(d(b"x", "EBCDIC"), None);
-        assert_eq!(d(b"x", ""), None);
-    }
-
-    #[test]
-    fn invalid_sequences_become_replacement_characters() {
-        // A Shift-JIS lead byte cut off by the line end keeps the line end.
-        assert_eq!(decode_code_page(b"\x90\n1\n", "ANSI_932").as_deref(), Some("\u{FFFD}\n1\n"));
-        assert_eq!(decode_code_page(b"\x90", "ANSI_932").as_deref(), Some("\u{FFFD}"));
-        assert_eq!(decode_code_page(b"\xFF\xFF", "ANSI_936").as_deref(), Some("\u{FFFD}\u{FFFD}"));
-    }
-
-    #[test]
-    fn header_scan() {
-        let head = b"0\nSECTION\n2\nHEADER\n9\n$ACADVER\n1\nAC1015\n9\n$DWGCODEPAGE\n3\nANSI_1251\r\n0\nENDSEC\n";
-        assert_eq!(ascii_code_page(head), Some(&b"ANSI_1251"[..]));
-        // Only the HEADER section counts.
-        assert_eq!(ascii_code_page(b"0\nSECTION\n2\nHEADER\n0\nENDSEC\n9\n$DWGCODEPAGE\n3\nANSI_1251\n"), None);
-        // Wrong group code, or the file ends early.
-        assert_eq!(ascii_code_page(b"9\n$DWGCODEPAGE\n1\nANSI_1251\n"), None);
-        assert_eq!(ascii_code_page(b"9\n$DWGCODEPAGE\n3"), None);
-        assert!(is_utf8_version("AC1021") && is_utf8_version(" AC1032 "));
-        assert!(!is_utf8_version("AC1018") && !is_utf8_version("AC1009") && !is_utf8_version("garbage"));
-    }
-
-    #[test]
-    fn mif_escapes() {
-        let one = |s: &str| crate::parse(format!("1\n{s}\n0\nEOF\n").as_bytes()).unwrap()[0].str();
-        assert_eq!(one("\\M+5BCFE\\M+1907D\\M+2B9CF\\M+3B5B5!"), "件図圖도!");
-        assert_eq!(one("\\M+5BCFE\\U+0021"), "件!");
-        // Johab, unknown code pages, bad hex, short escapes and unassigned codes stay literal.
-        for s in ["\\M+4ABCD", "\\M+9BCFE", "\\M+5GGGG", "\\M+5BC", "\\M+", "\\M+50041", "\\M+5FFFF"] {
-            assert_eq!(one(s), s);
-        }
-    }
-}

crates/dxf/src/lib.rs

@@ -1,925 +0,0 @@
-//! A standalone DXF tag reader and writer.
-//!
-//! DXF is a sequence of (group code, value) pairs. This crate parses ASCII and binary DXF into a
-//! flat list of [`Tag`]s, splits them into sections and entities, and writes tags back. Mapping
-//! tags to a drawing model is left to the caller. Written from Autodesk's published DXF
-//! Reference; depends on nothing else in the workspace.
-#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
-#![forbid(unsafe_code)]
-
-use std::fmt::Write as _;
-use std::io::Write as _;
-
-mod version;
-pub use version::Version;
-
-#[derive(Debug, thiserror::Error)]
-pub enum DxfError {
-    #[error("not a DXF file")]
-    NotDxf,
-    #[error("line {line}: bad group code `{text}`")]
-    BadCode { line: usize, text: String },
-    #[error("unexpected end of file")]
-    Eof,
-    /// More group codes than [`MAX_TAGS`]: `tags` is the count found (or the count read when the
-    /// limit was reached), `limit` the maximum.
-    #[error("drawing too large: {tags} DXF group codes, more than the {limit} CADCraft reads (set CADCRAFT_MAX_DXF_TAGS to read more)")]
-    TooLarge { tags: usize, limit: usize },
-    /// The memory for `tags` group codes couldn't be had: an error, not the process ending.
-    #[error("not enough memory to read this drawing's {tags} DXF group codes")]
-    OutOfMemory { tags: usize },
-}
-
-pub type Result<T> = std::result::Result<T, DxfError>;
-
-/// A typed group value.
-#[derive(Clone, Debug, PartialEq)]
-pub enum Value {
-    Str(String),
-    Real(f64),
-    Int(i64),
-    Bool(bool),
-    /// Binary chunk (310–319, 1004) as hex text.
-    Hex(String),
-}
-
-impl Value {
-    pub fn as_str(&self) -> String {
-        match self {
-            Value::Str(s) | Value::Hex(s) => s.clone(),
-            Value::Real(r) => format_real(*r),
-            Value::Int(i) => i.to_string(),
-            Value::Bool(b) => i64::from(*b).to_string(),
-        }
-    }
-    pub fn as_f64(&self) -> f64 {
-        match self {
-            Value::Real(r) if r.is_finite() => *r,
-            Value::Int(i) => *i as f64,
-            Value::Str(s) => s.trim().parse::<f64>().ok().filter(|v| v.is_finite()).unwrap_or(0.0),
-            Value::Bool(b) => f64::from(u8::from(*b)),
-            _ => 0.0,
-        }
-    }
-    pub fn as_i64(&self) -> i64 {
-        match self {
-            Value::Int(i) => *i,
-            Value::Real(r) if r.is_finite() => *r as i64,
-            Value::Str(s) => {
-                s.trim().parse::<i64>().unwrap_or_else(|_| s.trim().parse::<f64>().ok().filter(|f| f.is_finite()).map_or(0, |f| f as i64))
-            }
-            Value::Bool(b) => i64::from(*b),
-            _ => 0,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Tag {
-    pub code: i32,
-    pub value: Value,
-}
-
-impl Tag {
-    pub fn new(code: i32, value: Value) -> Self {
-        Tag { code, value }
-    }
-    pub fn s(code: i32, v: impl Into<String>) -> Self {
-        Tag { code, value: Value::Str(v.into()) }
-    }
-    pub fn f(code: i32, v: f64) -> Self {
-        Tag { code, value: Value::Real(if v.is_finite() { v } else { 0.0 }) }
-    }
-    pub fn i(code: i32, v: i64) -> Self {
-        Tag { code, value: Value::Int(v) }
-    }
-    pub fn str(&self) -> String {
-        self.value.as_str()
-    }
-    pub fn f64(&self) -> f64 {
-        self.value.as_f64()
-    }
-    pub fn i64(&self) -> i64 {
-        self.value.as_i64()
-    }
-}
-
-/// The value type for a group code (DXF Reference, "Group Code Value Types").
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Kind {
-    Str,
-    Real,
-    Int16,
-    Int32,
-    Int64,
-    Bool,
-    Hex,
-}
-
-pub fn kind_of(code: i32) -> Kind {
-    match code {
-        0..=9 => Kind::Str,
-        10..=59 => Kind::Real,
-        60..=79 => Kind::Int16,
-        90..=99 => Kind::Int32,
-        100..=109 => Kind::Str,
-        110..=149 => Kind::Real,
-        160..=169 => Kind::Int64,
-        170..=179 => Kind::Int16,
-        210..=239 => Kind::Real,
-        270..=289 => Kind::Int16,
-        290..=299 => Kind::Bool,
-        300..=309 => Kind::Str,
-        310..=319 => Kind::Hex,
-        320..=369 => Kind::Str,
-        370..=389 => Kind::Int16,
-        390..=399 => Kind::Str,
-        400..=409 => Kind::Int16,
-        410..=419 => Kind::Str,
-        420..=429 => Kind::Int32,
-        430..=439 => Kind::Str,
-        440..=449 => Kind::Int32,
-        450..=459 => Kind::Int32,
-        460..=469 => Kind::Real,
-        470..=479 => Kind::Str,
-        480..=481 => Kind::Str,
-        999 => Kind::Str,
-        1000..=1003 => Kind::Str,
-        1004 => Kind::Hex,
-        1005..=1009 => Kind::Str,
-        1010..=1059 => Kind::Real,
-        1060..=1070 => Kind::Int16,
-        1071 => Kind::Int32,
-        _ => Kind::Str,
-    }
-}
-
-fn typed(code: i32, text: &str) -> Value {
-    let t = text.trim();
-    match kind_of(code) {
-        Kind::Real => t.parse::<f64>().ok().filter(|v| v.is_finite()).map(Value::Real).unwrap_or(Value::Real(0.0)),
-        Kind::Int16 | Kind::Int32 | Kind::Int64 => {
-            // A float spelling ("1e3", "12.0") is accepted when finite, clamped to what the
-            // group's width holds, signed or unsigned (files write 16-bit flags up to 65535, as
-            // the integer spelling reads them); NaN, inf and text become 0.
-            let (lo, hi) = match kind_of(code) {
-                Kind::Int16 => (i64::from(i16::MIN), i64::from(u16::MAX)),
-                Kind::Int32 => (i64::from(i32::MIN), i64::from(u32::MAX)),
-                _ => (i64::MIN, i64::MAX),
-            };
-            t.parse::<i64>()
-                .map(Value::Int)
-                .unwrap_or_else(|_| Value::Int(t.parse::<f64>().ok().filter(|f| f.is_finite()).map_or(0, |f| (f as i64).clamp(lo, hi))))
-        }
-        Kind::Bool => Value::Bool(t.parse::<i64>().unwrap_or(0) != 0),
-        Kind::Hex => Value::Hex(normalize_hex(t)),
-        Kind::Str => Value::Str(text.trim_end_matches(['\r', '\n']).to_string()),
-    }
-}
-
-const BINARY_SENTINEL: &[u8] = b"AutoCAD Binary DXF\r\n\x1a\0";
-const UTF8_BOM: &[u8] = b"\xEF\xBB\xBF";
-/// Most group codes read from one file by default. A `Tag` takes 40 bytes plus its text, so this
-/// bounds the tag list to about 4 GB plus text. 50 million rejected large DWGs that converted fine
-/// (a 172 MB drawing has 56 million, issue #1948). The file-size limits bound memory too: 512 MB
-/// for a DXF opened directly, 1 GB for a DWG's DXF rendition. Set `CADCRAFT_MAX_DXF_TAGS` to
-/// raise or lower it.
-pub const MAX_TAGS: usize = 100_000_000;
-
-/// Environment variable overriding [`MAX_TAGS`] (a positive integer).
-pub const MAX_TAGS_ENV: &str = "CADCRAFT_MAX_DXF_TAGS";
-
-/// The group-code limit in effect: [`MAX_TAGS_ENV`] when set to a positive integer, else
-/// [`MAX_TAGS`].
-pub fn max_tags() -> usize {
-    max_tags_from(std::env::var(MAX_TAGS_ENV).ok().as_deref())
-}
-
-fn max_tags_from(v: Option<&str>) -> usize {
-    v.and_then(|s| s.trim().replace('_', "").parse::<usize>().ok()).filter(|&n| n > 0).unwrap_or(MAX_TAGS)
-}
-
-mod codepage;
-pub use codepage::decode_code_page;
-
-/// Parse a DXF file (ASCII or binary).
-pub fn parse(bytes: &[u8]) -> Result<Vec<Tag>> {
-    parse_with_limit(bytes, max_tags())
-}
-
-/// [`parse`] with an explicit group-code limit. For ASCII DXF the limit is checked up front from
-/// the line count, before the text is decoded or any tag allocated, so an oversized file fails in
-/// milliseconds instead of after it has filled memory.
-pub fn parse_with_limit(bytes: &[u8], max_tags: usize) -> Result<Vec<Tag>> {
-    if let Some(body) = bytes.strip_prefix(BINARY_SENTINEL) {
-        return parse_binary_with_limit(body, max_tags);
-    }
-    let bytes = bytes.strip_prefix(UTF8_BOM).unwrap_or(bytes);
-    // Count nonblank group-code/value pairs (LF, CRLF and a lone CR each end a line), stopping at
-    // EOF just as the parser does. Blank lines do not count toward the limit.
-    let mut lines = byte_lines(bytes);
-    let mut tags = 0;
-    while let Some(code) = lines.next() {
-        let code = code.trim_ascii();
-        if code.is_empty() {
-            continue;
-        }
-        let Some(value) = lines.next() else { break };
-        tags += 1;
-        if code == b"0" && value.trim_ascii() == b"EOF" {
-            break;
-        }
-    }
-    if tags > max_tags {
-        return Err(DxfError::TooLarge { tags, limit: max_tags });
-    }
-    parse_ascii_counted(&codepage::decode_ascii_file(bytes), max_tags, tags)
-}
-
-/// The four hex digits of a `\U+XXXX` escape starting at `chars[i]`, if there is one.
-fn escape_at(chars: &[char], i: usize) -> Option<u32> {
-    if chars.get(i) != Some(&'\\') || chars.get(i + 1) != Some(&'U') || chars.get(i + 2) != Some(&'+') {
-        return None;
-    }
-    let hex = chars.get(i + 3..i + 7)?;
-    if !hex.iter().all(char::is_ascii_hexdigit) {
-        return None;
-    }
-    hex.iter().try_fold(0u32, |acc, c| Some(acc * 16 + c.to_digit(16)?))
-}
-
-/// The character of a `\M+nXXXX` escape starting at `chars[i]`, if there is one: `n` names a
-/// double-byte code page and `XXXX` is the character's two bytes in hex.
-pub fn mif_escape_at(chars: &[char], i: usize) -> Option<char> {
-    if chars.get(i) != Some(&'\\') || chars.get(i + 1) != Some(&'M') || chars.get(i + 2) != Some(&'+') {
-        return None;
-    }
-    let enc = codepage::mif_encoding(*chars.get(i + 3)?)?;
-    let hex = chars.get(i + 4..i + 8)?;
-    if !hex.iter().all(char::is_ascii_hexdigit) {
-        return None;
-    }
-    let code = hex.iter().try_fold(0u16, |acc, c| Some(acc * 16 + u16::try_from(c.to_digit(16)?).ok()?))?;
-    let bytes = code.to_be_bytes();
-    let text = enc.decode_without_bom_handling_and_without_replacement(&bytes)?;
-    let mut it = text.chars();
-    it.next().filter(|_| it.next().is_none())
-}
-
-/// Unescape the `\U+XXXX` sequences pre-R2007 DXF uses for characters outside the file's code
-/// page (four hex digits, one UTF-16 code unit; characters above U+FFFF are a surrogate pair of
-/// escapes), and the `\M+nXXXX` sequences for double-byte East Asian characters. Malformed
-/// escapes, unpaired surrogates and unknown `\M+` code pages are kept as literal text.
-fn unescape_unicode(s: &str) -> String {
-    if !s.contains("\\U+") && !s.contains("\\M+") {
-        return s.to_string();
-    }
-    let mut out = String::with_capacity(s.len());
-    let chars: Vec<char> = s.chars().collect();
-    let mut i = 0;
-    while let Some(&c) = chars.get(i) {
-        if let Some(ch) = mif_escape_at(&chars, i) {
-            out.push(ch);
-            i += 8;
-            continue;
-        }
-        if let Some(unit) = escape_at(&chars, i) {
-            if let Some(ch) = char::from_u32(unit) {
-                out.push(ch);
-                i += 7;
-                continue;
-            }
-            if (0xD800..0xDC00).contains(&unit)
-                && let Some(low) = escape_at(&chars, i + 7).filter(|u| (0xDC00..0xE000).contains(u))
-                && let Some(ch) = char::from_u32(0x10000 + ((unit - 0xD800) << 10) + (low - 0xDC00))
-            {
-                out.push(ch);
-                i += 14;
-                continue;
-            }
-        }
-        out.push(c);
-        i += 1;
-    }
-    out
-}
-
-/// The lines of an ASCII DXF text: LF, CRLF and a lone CR (old Mac files) all end a line, like
-/// [`str::lines`] otherwise (no empty line after a final terminator).
-fn ascii_lines(text: &str) -> impl Iterator<Item = &str> {
-    let mut rest = text;
-    std::iter::from_fn(move || {
-        if rest.is_empty() {
-            return None;
-        }
-        let end = rest.find(['\r', '\n']).unwrap_or(rest.len());
-        let line = rest.get(..end).unwrap_or_default();
-        let after = rest.get(end..).unwrap_or_default();
-        rest = after.strip_prefix("\r\n").or_else(|| after.strip_prefix(['\r', '\n'])).unwrap_or(after);
-        Some(line)
-    })
-}
-
-/// Byte-level twin of [`ascii_lines`] for the up-front limit check, so the count matches the parser.
-fn byte_lines(mut rest: &[u8]) -> impl Iterator<Item = &[u8]> {
-    std::iter::from_fn(move || {
-        if rest.is_empty() {
-            return None;
-        }
-        let end = rest.iter().position(|&b| b == b'\r' || b == b'\n').unwrap_or(rest.len());
-        let line = &rest[..end];
-        let after = &rest[end..];
-        rest = match after {
-            [b'\r', b'\n', tail @ ..] | [b'\r' | b'\n', tail @ ..] => tail,
-            _ => after,
-        };
-        Some(line)
-    })
-}
-
-pub fn parse_ascii(text: &str) -> Result<Vec<Tag>> {
-    parse_ascii_counted(text, max_tags(), 0)
-}
-
-/// [`parse_ascii`] of a file known to hold `expected` group codes. Their list is reserved first,
-/// with an allocation that can fail: where the system refuses that much memory, opening the file
-/// is an error instead of the end of the app. Growing the list instead could also briefly take
-/// half as much again.
-#[allow(clippy::while_let_loop)]
-fn parse_ascii_counted(text: &str, max_tags: usize, expected: usize) -> Result<Vec<Tag>> {
-    let mut tags = Vec::new();
-    tags.try_reserve_exact(expected.min(max_tags)).map_err(|_| DxfError::OutOfMemory { tags: expected })?;
-    let mut lines = ascii_lines(text.strip_prefix('\u{feff}').unwrap_or(text)).enumerate();
-    loop {
-        let Some((ln, code_line)) = lines.next() else { break };
-        let ct = code_line.trim();
-        if ct.is_empty() {
-            continue;
-        }
-        let code: i32 = ct.parse().map_err(|_| DxfError::BadCode { line: ln + 1, text: ct.chars().take(40).collect() })?;
-        let Some((_, val)) = lines.next() else { return Err(DxfError::Eof) };
-        let v = typed(code, val);
-        let v = match v {
-            Value::Str(s) => Value::Str(unescape_unicode(&s)),
-            o => o,
-        };
-        tags.push(Tag { code, value: v });
-        if tags.len() > max_tags {
-            return Err(DxfError::TooLarge { tags: tags.len(), limit: max_tags });
-        }
-        if code == 0 && tags.last().is_some_and(|t| t.str().trim_end() == "EOF") {
-            break;
-        }
-    }
-    if tags.is_empty() {
-        return Err(DxfError::NotDxf);
-    }
-    Ok(tags)
-}
-
-struct Cur<'a> {
-    b: &'a [u8],
-    p: usize,
-}
-
-impl<'a> Cur<'a> {
-    fn take(&mut self, n: usize) -> Result<&[u8]> {
-        let end = self.p.checked_add(n).ok_or(DxfError::Eof)?;
-        let s = self.b.get(self.p..end).ok_or(DxfError::Eof)?;
-        self.p = end;
-        Ok(s)
-    }
-    fn u8(&mut self) -> Result<u8> {
-        Ok(*self.take(1)?.first().ok_or(DxfError::Eof)?)
-    }
-    fn i16(&mut self) -> Result<i16> {
-        let s = self.take(2)?;
-        Ok(i16::from_le_bytes([s[0], s[1]]))
-    }
-    fn i32(&mut self) -> Result<i32> {
-        let s = self.take(4)?;
-        Ok(i32::from_le_bytes([s[0], s[1], s[2], s[3]]))
-    }
-    fn i64(&mut self) -> Result<i64> {
-        let s = self.take(8)?;
-        let mut a = [0u8; 8];
-        a.copy_from_slice(s);
-        Ok(i64::from_le_bytes(a))
-    }
-    fn f64(&mut self) -> Result<f64> {
-        let s = self.take(8)?;
-        let mut a = [0u8; 8];
-        a.copy_from_slice(s);
-        Ok(f64::from_le_bytes(a))
-    }
-    /// The bytes of a zero-terminated string (without the zero), decoded by the caller.
-    fn cstr(&mut self) -> Result<&'a [u8]> {
-        let start = self.p;
-        while self.p < self.b.len() && self.b.get(self.p) != Some(&0) {
-            self.p += 1;
-        }
-        let s = self.b.get(start..self.p).unwrap_or(&[]);
-        if self.p >= self.b.len() {
-            return Err(DxfError::Eof);
-        }
-        self.p += 1;
-        Ok(s)
-    }
-}
-
-/// Binary DXF (R13+: 2-byte group codes).
-pub fn parse_binary(b: &[u8]) -> Result<Vec<Tag>> {
-    parse_binary_with_limit(b, max_tags())
-}
-
-fn parse_binary_with_limit(b: &[u8], max_tags: usize) -> Result<Vec<Tag>> {
-    let mut text = codepage::BinaryText::default();
-    let tags = parse_binary_pass(b, max_tags, &mut text)?;
-    if !text.needs_code_page_pass() {
-        return Ok(tags);
-    }
-    // The first pass's tags go before the second pass runs: both held at once would double
-    // the peak near the tag limit.
-    drop(tags);
-    parse_binary_pass(b, max_tags, &mut codepage::BinaryText::code_page_pass())
-}
-
-fn parse_binary_pass(b: &[u8], max_tags: usize, text: &mut codepage::BinaryText) -> Result<Vec<Tag>> {
-    let mut c = Cur { b, p: 0 };
-    let mut tags = Vec::new();
-    while c.p < b.len() {
-        let mut code = i32::from(c.i16()?);
-        if code == 255 {
-            code = i32::from(c.i16()?);
-        }
-        let v = match kind_of(code) {
-            Kind::Str => Value::Str(unescape_unicode(&text.string(code, c.cstr()?))),
-            Kind::Real => Value::Real(Some(c.f64()?).filter(|v| v.is_finite()).unwrap_or(0.0)),
-            Kind::Int16 => Value::Int(i64::from(c.i16()?)),
-            Kind::Int32 => Value::Int(i64::from(c.i32()?)),
-            Kind::Int64 => Value::Int(c.i64()?),
-            Kind::Bool => Value::Bool(c.u8()? != 0),
-            Kind::Hex => {
-                let n = usize::from(c.u8()?);
-                let bytes = c.take(n)?;
-                let mut s = String::with_capacity(n * 2);
-                for x in bytes {
-                    let _ = write!(s, "{x:02X}");
-                }
-                Value::Hex(s)
-            }
-        };
-        let eof = code == 0 && matches!(&v, Value::Str(s) if s.trim_end() == "EOF");
-        tags.push(Tag { code, value: v });
-        if tags.len() > max_tags {
-            return Err(DxfError::TooLarge { tags: tags.len(), limit: max_tags });
-        }
-        if eof {
-            break;
-        }
-    }
-    if tags.is_empty() {
-        return Err(DxfError::NotDxf);
-    }
-    Ok(tags)
-}
-
-/// Format a real the way DXF writers usually do (shortest round-trip, with a decimal point).
-pub fn format_real(v: f64) -> String {
-    if !v.is_finite() {
-        return "0.0".into();
-    }
-    let s = format!("{v}");
-    if s.contains('.') || s.contains('e') || s.contains("inf") || s.contains("NaN") { s } else { format!("{s}.0") }
-}
-
-/// Write tags as ASCII DXF (CRLF line ends, codes right-aligned to 3 as is conventional).
-///
-/// The output is pure ASCII: non-ASCII characters in strings are written as `\U+XXXX` escapes,
-/// the pre-R2007 convention, so it is correct whatever `$DWGCODEPAGE` the header declares.
-pub fn write_ascii(tags: &[Tag]) -> String {
-    write_ascii_as(tags, false)
-}
-
-/// Write tags as ASCII DXF with text in UTF-8 (`utf8`, the R2007+ convention: non-ASCII
-/// characters as they are) or escaped as `\U+XXXX` (older versions, see [`write_ascii`]). Line
-/// breaks inside strings become spaces either way.
-pub fn write_ascii_as(tags: &[Tag], utf8: bool) -> String {
-    let bytes = ascii(tags, if utf8 { Strings::Utf8 } else { Strings::Escaped(None) });
-    // Both forms are UTF-8 (the escaped one is ASCII).
-    String::from_utf8(bytes).unwrap_or_else(|e| String::from_utf8_lossy(e.as_bytes()).into_owned())
-}
-
-/// Write tags as pre-R2007 ASCII DXF with text in the code page `code_page` names (a
-/// `$DWGCODEPAGE` value such as `ANSI_1252`), as the DXF Reference describes for those versions:
-/// a character the code page has is written as its bytes, any other as a `\U+XXXX` escape. A
-/// code page CADCraft doesn't know, `ASCII`, and `UTF8`/`UNICODE` (not a pre-2007 code page)
-/// give [`write_ascii`]'s pure ASCII output. So does a file whose code page bytes happen to be
-/// valid UTF-8 (`СІ` in ANSI_1251 is D1 B2, U+0472), since readers, ours included, take an ASCII
-/// DXF that is valid UTF-8 as UTF-8.
-pub fn write_ascii_in(tags: &[Tag], code_page: &str) -> Vec<u8> {
-    let bytes = ascii(tags, Strings::Escaped(codepage::encoder(code_page)));
-    if !bytes.is_ascii() && std::str::from_utf8(&bytes).is_ok() {
-        return ascii(tags, Strings::Escaped(None));
-    }
-    bytes
-}
-
-/// How a writer stores string values.
-#[derive(Clone, Copy)]
-enum Strings {
-    /// As they are (R2007+).
-    Utf8,
-    /// ASCII as it is, other characters in this code page when it has them, otherwise as
-    /// `\U+XXXX` escapes (before R2007).
-    Escaped(Option<codepage::Decoder>),
-}
-
-fn ascii(tags: &[Tag], strings: Strings) -> Vec<u8> {
-    let mut out = Vec::with_capacity(tags.len() * 16);
-    for t in tags {
-        let _ = write!(out, "{:>3}\r\n", t.code);
-        match &t.value {
-            Value::Str(s) => push_string(s, strings, &mut out),
-            Value::Real(r) => out.extend_from_slice(format_real(*r).as_bytes()),
-            Value::Int(i) => out.extend_from_slice(i.to_string().as_bytes()),
-            Value::Bool(b) => out.extend_from_slice(i64::from(*b).to_string().as_bytes()),
-            Value::Hex(h) => {
-                // The DXF Reference limits a binary chunk line to 254 hex digits (127 bytes);
-                // longer data continues in further groups of the same code. Only hex digits are
-                // written, so a hostile value can't inject tags.
-                let digits = normalize_hex(h);
-                let mut chunks: Vec<&str> = digits.as_bytes().chunks(254).map(|c| std::str::from_utf8(c).unwrap_or_default()).collect();
-                if chunks.is_empty() {
-                    chunks.push("");
-                }
-                for (n, chunk) in chunks.into_iter().enumerate() {
-                    if n > 0 {
-                        let _ = write!(out, "\r\n{:>3}\r\n", t.code);
-                    }
-                    out.extend_from_slice(chunk.as_bytes());
-                }
-            }
-        }
-        out.extend_from_slice(b"\r\n");
-    }
-    out
-}
-
-/// Write tags as binary DXF (DXF Reference, "Binary DXF Files", R13+ layout): the sentinel,
-/// then per tag a 2-byte little-endian group code and the value in the binary form of the code's
-/// [`Kind`]: a zero-terminated string, an 8-byte real, a 2-, 4- or 8-byte integer, a 1-byte
-/// boolean, or a binary chunk (one length byte, then up to 255 bytes; longer data is split into
-/// several groups of the same code). Strings are UTF-8 when `utf8` (R2007+), otherwise escaped as
-/// in [`write_ascii`]. A tag's value is converted to its code's kind, so a number written as text
-/// is stored as a number; a code outside the 16-bit range is skipped.
-pub fn write_binary(tags: &[Tag], utf8: bool) -> Vec<u8> {
-    binary(tags, if utf8 { Strings::Utf8 } else { Strings::Escaped(None) })
-}
-
-/// Write tags as pre-R2007 binary DXF with text in the code page `code_page` names, as
-/// [`write_ascii_in`] does.
-pub fn write_binary_in(tags: &[Tag], code_page: &str) -> Vec<u8> {
-    binary(tags, Strings::Escaped(codepage::encoder(code_page)))
-}
-
-fn binary(tags: &[Tag], strings: Strings) -> Vec<u8> {
-    let mut out = Vec::with_capacity(BINARY_SENTINEL.len() + tags.len() * 12);
-    out.extend_from_slice(BINARY_SENTINEL);
-    for t in tags {
-        let Ok(code) = i16::try_from(t.code) else { continue };
-        let code_bytes = code.to_le_bytes();
-        match kind_of(t.code) {
-            Kind::Str => {
-                out.extend_from_slice(&code_bytes);
-                let s = match &t.value {
-                    Value::Str(s) => s.clone(),
-                    v => v.as_str(),
-                };
-                let mut text = Vec::with_capacity(s.len());
-                push_string(&s, strings, &mut text);
-                out.extend(text.into_iter().filter(|&b| b != 0));
-                out.push(0);
-            }
-            Kind::Real => {
-                out.extend_from_slice(&code_bytes);
-                out.extend_from_slice(&t.value.as_f64().to_le_bytes());
-            }
-            Kind::Int16 => {
-                out.extend_from_slice(&code_bytes);
-                out.extend_from_slice(&wrap_i16(t.value.as_i64()));
-            }
-            Kind::Int32 => {
-                out.extend_from_slice(&code_bytes);
-                out.extend_from_slice(&wrap_i32(t.value.as_i64()));
-            }
-            Kind::Int64 => {
-                out.extend_from_slice(&code_bytes);
-                out.extend_from_slice(&t.value.as_i64().to_le_bytes());
-            }
-            Kind::Bool => {
-                out.extend_from_slice(&code_bytes);
-                out.push(u8::from(t.value.as_i64() != 0));
-            }
-            Kind::Hex => {
-                let bytes = hex_bytes(&t.value.as_str());
-                // An empty chunk is still one group, as in ASCII.
-                let mut chunks: Vec<&[u8]> = bytes.chunks(255).collect();
-                if chunks.is_empty() {
-                    chunks.push(&[]);
-                }
-                for chunk in chunks {
-                    out.extend_from_slice(&code_bytes);
-                    out.push(u8::try_from(chunk.len()).unwrap_or(u8::MAX));
-                    out.extend_from_slice(chunk);
-                }
-            }
-        }
-    }
-    out
-}
-
-/// Hex text cleaned up: only the hex digits are kept, and an odd trailing digit is padded with
-/// `0` (so the bytes before it are never shifted). Used by the reader and both writers.
-fn normalize_hex(s: &str) -> String {
-    let mut out: String = s.chars().filter(char::is_ascii_hexdigit).collect();
-    if out.len() % 2 == 1 {
-        out.push('0');
-    }
-    out
-}
-
-/// The bytes of hex text, two digits each (see [`normalize_hex`]).
-fn hex_bytes(s: &str) -> Vec<u8> {
-    let digits: Vec<u8> = normalize_hex(s).bytes().filter_map(|b| char::from(b).to_digit(16).and_then(|d| u8::try_from(d).ok())).collect();
-    digits.as_chunks::<2>().0.iter().map(|[hi, lo]| (hi << 4) | lo).collect()
-}
-
-/// A 16- or 32-bit integer for binary DXF: values that fit the unsigned width wrap into the
-/// signed one (65535 is -1, as writers that store unsigned flags expect); anything else clamps.
-fn wrap_i16(v: i64) -> [u8; 2] {
-    match u16::try_from(v) {
-        Ok(u) => u.to_le_bytes(),
-        Err(_) => i16::try_from(v.clamp(i64::from(i16::MIN), i64::from(i16::MAX))).unwrap_or_default().to_le_bytes(),
-    }
-}
-
-fn wrap_i32(v: i64) -> [u8; 4] {
-    match u32::try_from(v) {
-        Ok(u) => u.to_le_bytes(),
-        Err(_) => i32::try_from(v.clamp(i64::from(i32::MIN), i64::from(i32::MAX))).unwrap_or_default().to_le_bytes(),
-    }
-}
-
-/// Whether `bytes` are a binary DXF file (they start with the binary sentinel).
-pub fn is_binary(bytes: &[u8]) -> bool {
-    bytes.starts_with(BINARY_SENTINEL)
-}
-
-/// A string value as `strings` stores it. Line breaks become spaces. Before R2007 the text is
-/// in the `$DWGCODEPAGE` code page: ASCII stays as it is, a character the code page has becomes
-/// its bytes, and every other one `\U+XXXX` (a surrogate pair of escapes above U+FFFF). Without
-/// a code page the result is ASCII, so it is valid in any code page. In every form a backslash
-/// that would start a `\U+` or `\M+` sequence is written as `\U+005C`, so the reader gives back
-/// the literal text (#2050). So is a double-byte character whose trail byte is 0x5C (`\`) in that
-/// place, such as Shift-JIS `表` or Big5 `許`: CADCraft decodes the code page before it looks for
-/// escapes, but a reader that looks first would take that byte and the `U+` after it for one.
-fn push_string(s: &str, strings: Strings, out: &mut Vec<u8>) {
-    let chars: Vec<char> = s.chars().collect();
-    let escape_at = |j: usize| matches!(chars.get(j), Some('U' | 'M')) && chars.get(j + 1) == Some(&'+');
-    for (i, &c) in chars.iter().enumerate() {
-        match (c, strings) {
-            ('\r' | '\n', _) => out.push(b' '),
-            ('\\', _) if escape_at(i + 1) => {
-                out.extend_from_slice(b"\\U+005C");
-            }
-            (c, Strings::Utf8) => out.extend_from_slice(c.encode_utf8(&mut [0; 4]).as_bytes()),
-            (c, _) if c.is_ascii() => out.extend_from_slice(c.encode_utf8(&mut [0; 4]).as_bytes()),
-            (c, Strings::Escaped(Some(d))) if code_page_bytes(c, d, escape_at(i + 1), out) => {}
-            (c, Strings::Escaped(_)) => {
-                let mut units = [0u16; 2];
-                for u in c.encode_utf16(&mut units) {
-                    let _ = write!(out, "\\U+{u:04X}");
-                }
-            }
-        }
-    }
-}
-
-/// `c` in the code page `d`, if it has it, unless it is a double-byte character whose trail byte
-/// is 0x5C and an escape's `U+` or `M+` follows (`before_escape`): see [`push_string`].
-fn code_page_bytes(c: char, d: codepage::Decoder, before_escape: bool, out: &mut Vec<u8>) -> bool {
-    let start = out.len();
-    if !codepage::encode_char(c, d, out) {
-        return false;
-    }
-    if before_escape && out.len() - start > 1 && out.last() == Some(&b'\\') {
-        out.truncate(start);
-        return false;
-    }
-    true
-}
-
-/// A section: `0 SECTION / 2 NAME ... 0 ENDSEC`.
-#[derive(Clone, Debug, Default)]
-pub struct Section {
-    pub name: String,
-    pub tags: Vec<Tag>,
-}
-
-/// Split a tag stream into sections.
-pub fn sections(tags: &[Tag]) -> Vec<Section> {
-    let mut out = Vec::new();
-    let mut i = 0;
-    while i < tags.len() {
-        let is_sec = tags.get(i).is_some_and(|t| t.code == 0 && t.str().trim_end() == "SECTION");
-        if is_sec {
-            let name = tags.get(i + 1).filter(|t| t.code == 2).map(|t| t.str().trim_end().to_string()).unwrap_or_default();
-            let start = i + 2;
-            let mut j = start;
-            while j < tags.len() && !(tags.get(j).is_some_and(|t| t.code == 0 && t.str().trim_end() == "ENDSEC")) {
-                j += 1;
-            }
-            out.push(Section { name, tags: tags.get(start..j).unwrap_or(&[]).to_vec() });
-            i = j + 1;
-        } else {
-            i += 1;
-        }
-    }
-    out
-}
-
-/// Split a run of tags into records starting at each code-0 tag: (type, tags after the 0).
-pub fn records(tags: &[Tag]) -> Vec<(String, Vec<Tag>)> {
-    let mut out: Vec<(String, Vec<Tag>)> = Vec::new();
-    for t in tags {
-        if t.code == 0 {
-            out.push((t.str(), Vec::new()));
-        } else if let Some(last) = out.last_mut() {
-            last.1.push(t.clone());
-        }
-    }
-    out
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn literal_escape_text_roundtrips() {
-        for utf8 in [false, true] {
-            for text in ["\\U+00E9", "\\M+183A4F", "a\\nb \\P", "\\\\U+00E9", "\\U+005C"] {
-                let tags = vec![Tag::s(8, text)];
-                let back = parse_ascii(&write_ascii_as(&tags, utf8)).unwrap();
-                assert_eq!(back, tags, "utf8={utf8} {text}");
-                let back = parse_binary(&write_binary(&tags, utf8)).unwrap();
-                assert_eq!(back[1..], tags[..], "binary utf8={utf8} {text}");
-            }
-        }
-    }
-
-    #[test]
-    fn blank_lines_do_not_consume_group_code_limit() {
-        let tags = parse_with_limit(b"0\nEOF\n\n\n", 1).expect("one group code should fit a limit of one");
-        assert_eq!(tags, vec![Tag::s(0, "EOF")]);
-    }
-
-    #[test]
-    fn ascii_roundtrip() {
-        let tags = vec![
-            Tag::s(0, "SECTION"),
-            Tag::s(2, "ENTITIES"),
-            Tag::s(0, "LINE"),
-            Tag::s(8, "0"),
-            Tag::f(10, 1.5),
-            Tag::f(20, 2.0),
-            Tag::i(62, 1),
-            Tag::s(0, "ENDSEC"),
-            Tag::s(0, "EOF"),
-        ];
-        let text = write_ascii(&tags);
-        let back = parse(text.as_bytes()).unwrap();
-        assert_eq!(back, tags);
-        let secs = sections(&back);
-        assert_eq!(secs.len(), 1);
-        assert_eq!(secs[0].name, "ENTITIES");
-        let recs = records(&secs[0].tags);
-        assert_eq!(recs[0].0, "LINE");
-        assert_eq!(recs[0].1.len(), 4);
-    }
-
-    #[test]
-    fn binary_parse() {
-        let mut b = BINARY_SENTINEL.to_vec();
-        let push_str = |b: &mut Vec<u8>, code: i16, s: &str| {
-            b.extend_from_slice(&code.to_le_bytes());
-            b.extend_from_slice(s.as_bytes());
-            b.push(0);
-        };
-        push_str(&mut b, 0, "LINE");
-        b.extend_from_slice(&10i16.to_le_bytes());
-        b.extend_from_slice(&3.25f64.to_le_bytes());
-        b.extend_from_slice(&62i16.to_le_bytes());
-        b.extend_from_slice(&5i16.to_le_bytes());
-        push_str(&mut b, 0, "EOF");
-        let tags = parse(&b).unwrap();
-        assert_eq!(tags[1], Tag::f(10, 3.25));
-        assert_eq!(tags[2], Tag::i(62, 5));
-    }
-
-    #[test]
-    fn malformed_inputs() {
-        assert!(parse(b"").is_err());
-        assert!(parse(b"abc\nxyz\n").is_err());
-        assert!(parse(b"0\n").is_err());
-        let mut b = BINARY_SENTINEL.to_vec();
-        b.extend_from_slice(&10i16.to_le_bytes());
-        b.extend_from_slice(&[1, 2, 3]);
-        assert!(parse(&b).is_err());
-        // Bad numbers become 0 rather than failing.
-        let t = parse(b"10\nnotanumber\n0\nEOF\n").unwrap();
-        assert_eq!(t[0].f64(), 0.0);
-    }
-
-    #[test]
-    fn unicode_escapes_and_latin1() {
-        let t = parse(b"1\nCaf\\U+00E9\n0\nEOF\n").unwrap();
-        assert_eq!(t[0].str(), "Café");
-        let t = parse(b"1\nCaf\xe9\n0\nEOF\n").unwrap();
-        assert_eq!(t[0].str(), "Café");
-    }
-
-    #[test]
-    fn surrogate_pair_escapes() {
-        let t = parse(b"1\n\\U+D83D\\U+DE00 \\u+56fe\\U+53f7\n0\nEOF\n").unwrap();
-        assert_eq!(t[0].str(), "😀 \\u+56fe号");
-    }
-
-    #[test]
-    fn hostile_escapes_stay_literal() {
-        for s in [
-            "\\U+",
-            "\\U",
-            "\\",
-            "a\\U+ZZZZ",
-            "\\U+12",
-            "\\U+D800",
-            "\\U+DC00",
-            "\\U+D800\\U+0041",
-            "\\U+D83D\\U+DE",
-            "\\U++123",
-            "\\U+-123",
-            "x\\U+12\u{e9}4",
-        ] {
-            let t = parse(format!("1\n{s}\n0\nEOF\n").as_bytes()).unwrap();
-            let expect = if s == "\\U+D800\\U+0041" { "\\U+D800A" } else { s };
-            assert_eq!(t[0].str(), expect, "{s:?}");
-        }
-    }
-
-    #[test]
-    fn writes_non_ascii_as_escapes() {
-        let tags = vec![Tag::s(1, "图号 Ä°ø 😀\r\nend"), Tag::s(1000, "Ø"), Tag::s(0, "EOF")];
-        let text = write_ascii(&tags);
-        assert!(text.is_ascii());
-        assert!(text.contains("\\U+56FE\\U+53F7 \\U+00C4\\U+00B0\\U+00F8 \\U+D83D\\U+DE00  end\r\n"));
-        let back = parse(text.as_bytes()).unwrap();
-        assert_eq!(back[0].str(), "图号 Ä°ø 😀  end");
-        assert_eq!(back[1].str(), "Ø");
-    }
-
-    #[test]
-    fn binary_strings_unescape() {
-        let mut b = BINARY_SENTINEL.to_vec();
-        b.extend_from_slice(&1i16.to_le_bytes());
-        b.extend_from_slice(b"\\U+56FE\\U+53F7\0");
-        b.extend_from_slice(&0i16.to_le_bytes());
-        b.extend_from_slice(b"EOF\0");
-        assert_eq!(parse(&b).unwrap()[0].str(), "图号");
-    }
-}
-
-#[cfg(test)]
-mod limit_tests {
-    use super::*;
-
-    #[test]
-    fn tag_limit_defaults_and_env_override() {
-        assert_eq!(max_tags_from(None), MAX_TAGS);
-        assert_eq!(max_tags_from(Some("")), MAX_TAGS);
-        assert_eq!(max_tags_from(Some("0")), MAX_TAGS);
-        assert_eq!(max_tags_from(Some("abc")), MAX_TAGS);
-        assert_eq!(max_tags_from(Some(" 400_000_000 ")), 400_000_000);
-        // Issue #1948: the default must admit a DXF rendition well above 50 million group codes.
-        const { assert!(MAX_TAGS >= 100_000_000) };
-    }
-
-    #[test]
-    fn the_tag_list_is_reserved_once_and_a_refusal_is_an_error() {
-        let tags = parse_ascii_counted("0\nSECTION\n0\nENDSEC\n0\nEOF\n", MAX_TAGS, 3).unwrap();
-        assert_eq!((tags.len(), tags.capacity()), (3, 3));
-        let e = parse_ascii_counted("0\nEOF\n", usize::MAX, usize::MAX).unwrap_err();
-        assert!(matches!(e, DxfError::OutOfMemory { .. }), "{e}");
-    }
-}

crates/dxf/src/version.rs

@@ -1,117 +0,0 @@
-//! The DXF/DWG file versions CADCraft writes (DXF Reference, HEADER `$ACADVER`).
-
-/// A file version CADCraft can save: the AutoCAD release that introduced the format. Each format
-/// also serves the releases after it (2018 is still AutoCAD's current format).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum Version {
-    /// AutoCAD 2000/2002 (AC1015).
-    R2000,
-    /// AutoCAD 2004–2006 (AC1018).
-    R2004,
-    /// AutoCAD 2007–2009 (AC1021): the first version whose DXF text is UTF-8.
-    R2007,
-    /// AutoCAD 2010–2012 (AC1024).
-    R2010,
-    /// AutoCAD 2013–2017 (AC1027).
-    R2013,
-    /// AutoCAD 2018 and later (AC1032), the default.
-    #[default]
-    R2018,
-}
-
-impl Version {
-    /// Every version, oldest first.
-    pub const ALL: [Version; 6] = [Version::R2000, Version::R2004, Version::R2007, Version::R2010, Version::R2013, Version::R2018];
-
-    /// The `$ACADVER` code ("AC1032").
-    pub fn code(self) -> &'static str {
-        match self {
-            Version::R2000 => "AC1015",
-            Version::R2004 => "AC1018",
-            Version::R2007 => "AC1021",
-            Version::R2010 => "AC1024",
-            Version::R2013 => "AC1027",
-            Version::R2018 => "AC1032",
-        }
-    }
-
-    /// The release year that names the version ("2018").
-    pub fn year(self) -> &'static str {
-        match self {
-            Version::R2000 => "2000",
-            Version::R2004 => "2004",
-            Version::R2007 => "2007",
-            Version::R2010 => "2010",
-            Version::R2013 => "2013",
-            Version::R2018 => "2018",
-        }
-    }
-
-    /// A version named by its year ("2018", "R2018") or its `$ACADVER` code ("AC1032"), any case.
-    pub fn parse(s: &str) -> Option<Version> {
-        let s = s.trim();
-        let year = s.strip_prefix(['R', 'r']).unwrap_or(s);
-        Version::ALL.into_iter().find(|v| v.year() == year || v.code().eq_ignore_ascii_case(s))
-    }
-
-    /// The version to save a file of `$ACADVER` `code` in: the same version when CADCraft writes
-    /// it, else the nearest one it does (R2000 for older files, 2018 for newer ones); `None` when
-    /// the code isn't a version code at all.
-    pub fn for_acadver(code: &str) -> Option<Version> {
-        let code = code.trim();
-        if let Some(v) = Version::ALL.into_iter().find(|v| v.code().eq_ignore_ascii_case(code)) {
-            return Some(v);
-        }
-        code.get(..2).filter(|p| p.eq_ignore_ascii_case("AC"))?;
-        let n = code.get(2..).filter(|d| d.bytes().all(|b| b.is_ascii_digit())).and_then(|d| d.parse::<u32>().ok())?;
-        Some(match n {
-            ..1018 => Version::R2000,
-            1018..1021 => Version::R2004,
-            1021..1024 => Version::R2007,
-            1024..1027 => Version::R2010,
-            1027..1032 => Version::R2013,
-            _ => Version::R2018,
-        })
-    }
-
-    /// Whether text in this version's DXF is UTF-8 (2007 and later). Older versions keep text in
-    /// the `$DWGCODEPAGE` code page, which CADCraft avoids by escaping non-ASCII as `\U+XXXX`.
-    pub fn utf8(self) -> bool {
-        self >= Version::R2007
-    }
-}
-
-impl std::fmt::Display for Version {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.year())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parses_years_and_codes() {
-        assert_eq!(Version::parse("2018"), Some(Version::R2018));
-        assert_eq!(Version::parse(" r2004 "), Some(Version::R2004));
-        assert_eq!(Version::parse("ac1021"), Some(Version::R2007));
-        assert_eq!(Version::parse("2005"), None);
-        assert_eq!(Version::parse(""), None);
-        for v in Version::ALL {
-            assert_eq!(Version::parse(v.code()), Some(v));
-            assert_eq!(Version::parse(v.year()), Some(v));
-        }
-    }
-
-    #[test]
-    fn file_versions_map_to_the_nearest_writable_one() {
-        assert_eq!(Version::for_acadver("AC1009"), Some(Version::R2000));
-        assert_eq!(Version::for_acadver("AC1014"), Some(Version::R2000));
-        assert_eq!(Version::for_acadver("AC1024"), Some(Version::R2010));
-        assert_eq!(Version::for_acadver("AC1035"), Some(Version::R2018));
-        assert_eq!(Version::for_acadver("MC0.0"), None);
-        assert_eq!(Version::for_acadver("AC"), None);
-        assert_eq!(Version::for_acadver("AC99999999999999999999"), None);
-    }
-}

crates/dxf/tests/ascii_bom.rs

@@ -1,19 +0,0 @@
-//! A UTF-8 byte order mark at the start of an ASCII DXF is skipped.
-
-const BODY: &str = "  0\r\nSECTION\r\n  2\r\nENTITIES\r\n  0\r\nENDSEC\r\n  0\r\nEOF\r\n";
-
-#[test]
-fn utf8_bom_bytes_are_skipped() {
-    let plain = cadcraft_dxf::parse(BODY.as_bytes()).expect("plain parses");
-    let mut bytes = vec![0xEF, 0xBB, 0xBF];
-    bytes.extend_from_slice(BODY.as_bytes());
-    let with_bom = cadcraft_dxf::parse(&bytes);
-    assert!(with_bom.is_ok(), "{with_bom:?}");
-    assert_eq!(with_bom.map(|t| t.len()).unwrap_or(0), plain.len());
-}
-
-#[test]
-fn bom_text_is_skipped() {
-    let text = format!("\u{feff}{BODY}");
-    assert!(cadcraft_dxf::parse_ascii(&text).is_ok());
-}

crates/dxf/tests/binary_write.rs

@@ -1,75 +0,0 @@
-//! Binary DXF writing (#421): every value kind round-trips through `write_binary` and `parse`,
-//! and hostile binary input never panics.
-
-use cadcraft_dxf::{Tag, Value, is_binary, parse, write_ascii_as, write_binary};
-
-fn sample() -> Vec<Tag> {
-    vec![
-        Tag::s(0, "SECTION"),
-        Tag::s(2, "ENTITIES"),
-        Tag::s(0, "TEXT"),
-        Tag::s(5, "1F"),
-        Tag::f(10, -3.25),
-        Tag::i(62, 5),
-        Tag::i(90, 70_000),
-        Tag::i(160, 1 << 40),
-        Tag::new(290, Value::Bool(true)),
-        Tag::new(310, Value::Hex("00FFA5".into())),
-        Tag::s(1, "图号 Café 😀"),
-        Tag::i(1071, -2),
-        Tag::s(0, "ENDSEC"),
-        Tag::s(0, "EOF"),
-    ]
-}
-
-#[test]
-fn binary_roundtrips_every_value_kind() {
-    for utf8 in [false, true] {
-        let bytes = write_binary(&sample(), utf8);
-        assert!(is_binary(&bytes));
-        assert_eq!(parse(&bytes).unwrap(), sample(), "utf8 = {utf8}");
-    }
-    // Pre-2007 strings are escaped to ASCII, 2007+ ones are UTF-8.
-    let old = write_binary(&sample(), false);
-    assert!(old.windows(7).any(|w| w == b"\\U+56FE"));
-    let new = write_binary(&sample(), true);
-    assert!(new.windows("图号".len()).any(|w| w == "图号".as_bytes()));
-}
-
-#[test]
-fn binary_converts_values_to_their_codes_kind() {
-    // A number held as text at a numeric code, an out-of-range 16-bit value, a long chunk.
-    let long = "AB".repeat(300);
-    let tags = vec![Tag::s(70, "12"), Tag::i(62, 1 << 20), Tag::new(310, Value::Hex(long)), Tag::s(0, "EOF")];
-    let back = parse(&write_binary(&tags, true)).unwrap();
-    assert_eq!(back[0], Tag::i(70, 12));
-    assert_eq!(back[1], Tag::i(62, i64::from(i16::MAX)));
-    assert_eq!(back[2].code, 310);
-    assert_eq!(back[3].code, 310, "300 bytes are split into chunks of at most 255");
-    assert_eq!(back[2].str().len() + back[3].str().len(), 600);
-}
-
-#[test]
-fn utf8_ascii_keeps_text_and_drops_line_breaks() {
-    let text = write_ascii_as(&[Tag::s(1, "图号\r\nÄ"), Tag::s(0, "EOF")], true);
-    assert!(text.contains("图号  Ä\r\n"));
-    assert_eq!(parse(text.as_bytes()).unwrap()[0].str(), "图号  Ä");
-}
-
-#[test]
-fn hostile_binary_input_never_panics() {
-    let good = write_binary(&sample(), true);
-    // Every truncation, and every single-byte corruption of the body.
-    for n in 0..good.len() {
-        let _ = parse(good.get(..n).unwrap());
-    }
-    for i in 22..good.len() {
-        for b in [0u8, 0x7f, 0xff] {
-            let mut bad = good.clone();
-            bad[i] = b;
-            let _ = parse(&bad);
-        }
-    }
-    // A sentinel and nothing else is not a drawing.
-    assert!(parse(b"AutoCAD Binary DXF\r\n\x1a\0").is_err());
-}

crates/dxf/tests/code_page_write.rs

@@ -1,116 +0,0 @@
-//! Pre-R2007 DXF text is written in the `$DWGCODEPAGE` code page: characters it has as their
-//! bytes, the others as `\U+XXXX` escapes; every form reads back to the same text.
-
-use cadcraft_dxf::{Tag, parse, write_ascii, write_ascii_in, write_binary_in};
-
-fn file(code_page: &str, text: &str) -> Vec<Tag> {
-    vec![
-        Tag::s(0, "SECTION"),
-        Tag::s(2, "HEADER"),
-        Tag::s(9, "$ACADVER"),
-        Tag::s(1, "AC1015"),
-        Tag::s(9, "$DWGCODEPAGE"),
-        Tag::s(3, code_page),
-        Tag::s(0, "ENDSEC"),
-        Tag::s(0, "SECTION"),
-        Tag::s(2, "ENTITIES"),
-        Tag::s(0, "TEXT"),
-        Tag::s(1, text),
-        Tag::s(0, "ENDSEC"),
-        Tag::s(0, "EOF"),
-    ]
-}
-
-fn contains(bytes: &[u8], part: &[u8]) -> bool {
-    bytes.windows(part.len()).any(|w| w == part)
-}
-
-#[test]
-fn text_is_written_in_the_code_page() {
-    // (code page, text, the bytes written for it)
-    let cases: [(&str, &str, &[u8]); 6] = [
-        ("ANSI_1252", "Ação € 图", b"A\xE7\xE3o \x80 \\U+56FE"),
-        ("ANSI_1251", "Слой é", b"\xD1\xEB\xEE\xE9 \\U+00E9"),
-        ("ANSI_932", "表図面 é", b"\x95\x5C\x90\x7D\x96\xCA \\U+00E9"),
-        ("DOS850", "Größe €", b"Gr\x94\xE1e \\U+20AC"),
-        ("ANSI_1252", "😀", b"\\U+D83D\\U+DE00"),
-        // A code page CADCraft doesn't know: everything non-ASCII is escaped.
-        ("ANSI_1361", "Ação", b"A\\U+00E7\\U+00E3o"),
-    ];
-    for (cp, text, raw) in cases {
-        let tags = file(cp, text);
-        for (bytes, what) in [(write_ascii_in(&tags, cp), "ASCII"), (write_binary_in(&tags, cp), "binary")] {
-            assert!(contains(&bytes, raw), "{cp} {what}: {:?}", String::from_utf8_lossy(&bytes));
-            assert_eq!(parse(&bytes).unwrap()[10].str(), text, "{cp} {what}");
-        }
-    }
-}
-
-/// Without a known code page, and for `ASCII`, `UTF8` and `UNICODE` headers, the output is what
-/// `write_ascii` writes (pure ASCII with escapes), line breaks included.
-#[test]
-fn unknown_ascii_and_utf8_code_pages_are_pure_ascii() {
-    for cp in ["EBCDIC", "ASCII", "ascii ", "UTF8", "UNICODE"] {
-        let tags = file(cp, "Ação\r\nfim");
-        let bytes = write_ascii_in(&tags, cp);
-        assert!(bytes.is_ascii(), "{cp}");
-        assert_eq!(bytes, write_ascii(&tags).into_bytes(), "{cp}");
-        assert!(contains(&bytes, b"A\\U+00E7\\U+00E3o  fim"), "{cp}");
-        assert!(write_binary_in(&tags, cp).iter().all(u8::is_ascii), "{cp} binary");
-    }
-}
-
-/// Code page bytes that happen to form valid UTF-8 (`СІ` in ANSI_1251 is D1 B2, which is U+0472
-/// in UTF-8) would be read back as UTF-8 from an ASCII file, so that file is written with
-/// escapes. Binary DXF reads strings by the header's code page and keeps the bytes.
-#[test]
-fn code_page_bytes_that_are_valid_utf8_are_escaped_in_ascii() {
-    let tags = file("ANSI_1251", "СІ");
-    let ascii = write_ascii_in(&tags, "ANSI_1251");
-    assert!(ascii.is_ascii(), "{:?}", String::from_utf8_lossy(&ascii));
-    assert!(contains(&ascii, b"\\U+0421\\U+0406"));
-    assert_eq!(parse(&ascii).unwrap()[10].str(), "СІ");
-    let binary = write_binary_in(&tags, "ANSI_1251");
-    assert!(contains(&binary, b"\xD1\xB2"));
-    assert_eq!(parse(&binary).unwrap()[10].str(), "СІ");
-    // Bytes that are not valid UTF-8 stay as they are.
-    assert!(contains(&write_ascii_in(&file("ANSI_1251", "Слой"), "ANSI_1251"), b"\xD1\xEB\xEE\xE9"));
-}
-
-/// A literal `\U+` or `\M+` in the text (#2050) reads back as written alongside code page bytes,
-/// in ASCII and binary, including an ASCII file that falls back to escapes because its bytes
-/// would read as UTF-8.
-#[test]
-fn literal_escapes_survive_code_page_text() {
-    for (cp, text) in
-        [("ANSI_1252", "Ação \\U+00E9 \\M+183A4F"), ("ANSI_1251", "Слой \\U+0041"), ("ANSI_1251", "СІ \\U+0041"), ("ANSI_932", "表 \\M+1")]
-    {
-        let tags = file(cp, text);
-        for (bytes, what) in [(write_ascii_in(&tags, cp), "ASCII"), (write_binary_in(&tags, cp), "binary")] {
-            assert!(contains(&bytes, b"\\U+005C"), "{cp} {what}: {:?}", String::from_utf8_lossy(&bytes));
-            assert_eq!(parse(&bytes).unwrap()[10].str(), text, "{cp} {what}");
-        }
-    }
-}
-
-/// Double-byte code pages whose trail byte can be 0x5C (`\\`): Shift-JIS `表` (95 5C) and `ソ`
-/// (83 5C), Big5 `許` (B3 5C), GBK `乗` (81 5C). Right before `U+` or `M+`, such a character is
-/// written as an escape, so even a reader that looks for escapes before it decodes the code page
-/// reads it right. Elsewhere it stays as its bytes. Both forms read back as written.
-#[test]
-fn a_trail_byte_backslash_never_starts_an_escape() {
-    let cases: [(&str, &str, &[u8], &[u8]); 4] = [
-        ("ANSI_932", "表U+0041 表示", b"\\U+8868U+0041 \x95\x5C\x8E\xA6", b"\x95\x5CU+"),
-        ("ANSI_932", "ソM+1A2B", b"\\U+30BDM+1A2B", b"\x83\x5CM+"),
-        ("ANSI_950", "許U+0041", b"\\U+8A31U+0041", b"\xB3\x5CU+"),
-        ("ANSI_936", "乗U+0041", b"\\U+4E57U+0041", b"\x81\x5CU+"),
-    ];
-    for (cp, text, written, never) in cases {
-        let tags = file(cp, text);
-        for (bytes, what) in [(write_ascii_in(&tags, cp), "ASCII"), (write_binary_in(&tags, cp), "binary")] {
-            assert!(contains(&bytes, written), "{cp} {what}: {:?}", String::from_utf8_lossy(&bytes));
-            assert!(!contains(&bytes, never), "{cp} {what}: a trail byte starts an escape");
-            assert_eq!(parse(&bytes).unwrap()[10].str(), text, "{cp} {what}");
-        }
-    }
-}

crates/dxf/tests/conformance.rs

@@ -1,145 +0,0 @@
-//! Small independent byte fixtures for DXF tag types, text encoding, framing and failures.
-//! Handwritten examples, not files from a CAD application or generated by our writer.
-//! Background on the tag model and file structure:
-//! https://ezdxf.readthedocs.io/en/stable/dxfinternals/dxftags.html
-//! https://ezdxf.readthedocs.io/en/stable/dxfinternals/filestructure.html
-//! ASCII spacing is our writer's documented convention; binary fixtures specify actual bytes.
-
-use cadcraft_dxf::{DxfError, Tag, Value, parse, parse_with_limit, write_ascii_as, write_binary};
-
-const SENTINEL: &[u8] = b"AutoCAD Binary DXF\r\n\x1a\0";
-
-fn fixtures() -> Vec<(Tag, &'static [u8], &'static [u8])> {
-    vec![
-        (Tag::s(1, " A "), b"  1\r\n A \r\n", b"\x01\0 A \0"),
-        (Tag::s(1, ""), b"  1\r\n\r\n", b"\x01\0\0"),
-        (Tag::s(105, "AB12"), b"105\r\nAB12\r\n", b"\x69\0AB12\0"),
-        (Tag::new(10, Value::Real(-3.25)), b" 10\r\n-3.25\r\n", b"\x0a\0\0\0\0\0\0\0\x0a\xc0"),
-        (Tag::i(70, -32768), b" 70\r\n-32768\r\n", b"\x46\0\0\x80"),
-        (Tag::i(90, -2147483648), b" 90\r\n-2147483648\r\n", b"\x5a\0\0\0\0\x80"),
-        (Tag::i(160, 9223372036854775807), b"160\r\n9223372036854775807\r\n", b"\xa0\0\xff\xff\xff\xff\xff\xff\xff\x7f"),
-        (Tag::new(290, Value::Bool(false)), b"290\r\n0\r\n", b"\x22\x01\0"),
-        (Tag::new(299, Value::Bool(true)), b"299\r\n1\r\n", b"\x2b\x01\x01"),
-        (Tag::new(310, Value::Hex("00FF80".into())), b"310\r\n00FF80\r\n", b"\x36\x01\x03\0\xff\x80"),
-        (Tag::new(1004, Value::Hex(String::new())), b"1004\r\n\r\n", b"\xec\x03\0"),
-        (Tag::i(1070, -2), b"1070\r\n-2\r\n", b"\x2e\x04\xfe\xff"),
-        (Tag::i(1071, 65536), b"1071\r\n65536\r\n", b"\x2f\x04\0\0\x01\0"),
-    ]
-}
-
-#[test]
-fn reads_independently_authored_ascii_and_binary_values() {
-    for (expected, ascii, binary) in fixtures() {
-        assert_eq!(parse(ascii).unwrap(), std::slice::from_ref(&expected), "ASCII code {}", expected.code);
-        let bytes = [SENTINEL, binary].concat();
-        assert_eq!(parse(&bytes).unwrap(), std::slice::from_ref(&expected), "binary code {}", expected.code);
-    }
-}
-
-#[test]
-fn writes_independently_specified_ascii_and_binary_bytes() {
-    for (tag, ascii, binary) in fixtures() {
-        for utf8 in [false, true] {
-            let tags = std::slice::from_ref(&tag);
-            assert_eq!(write_ascii_as(tags, utf8).as_bytes(), ascii, "ASCII code {}", tag.code);
-            assert_eq!(write_binary(tags, utf8), [SENTINEL, binary].concat(), "binary code {}", tag.code);
-        }
-    }
-}
-
-#[test]
-fn integer_code_ranges_have_independent_binary_widths() {
-    // Specification ranges and widths, never kind_of(): a shared reader/writer mistake
-    // can round-trip every boundary value while still using the wrong number of bytes.
-    let widths = [
-        (vec![60..=79, 170..=179, 270..=289, 370..=389, 400..=409, 1060..=1070], 2, i64::from(i16::MIN), i64::from(i16::MAX)),
-        (vec![90..=99, 420..=429, 440..=459, 1071..=1071], 4, i64::from(i32::MIN), i64::from(i32::MAX)),
-        (std::iter::once(160..=169).collect(), 8, i64::MIN, i64::MAX),
-    ];
-    for (ranges, width, min, max) in widths {
-        for code in ranges.into_iter().flatten() {
-            for value in [min, min + 1, -1, 0, 1, max - 1, max] {
-                // Binary DXF uses a little-endian 16-bit group code and a fixed-width,
-                // little-endian two's-complement integer. Encoding is version-independent.
-                let code_bytes = u16::try_from(code).unwrap().to_le_bytes();
-                let value_bytes = value.to_le_bytes();
-                let expected = [SENTINEL, &code_bytes, &value_bytes[..width]].concat();
-                let tags = [Tag::i(code, value)];
-                for utf8 in [false, true] {
-                    assert_eq!(write_binary(&tags, utf8), expected, "code={code} value={value} utf8={utf8}");
-                }
-                assert_eq!(parse(&expected).unwrap(), tags, "code={code} value={value}");
-            }
-        }
-    }
-}
-
-#[test]
-fn text_encoding_has_independent_wire_expectations() {
-    let tags = [Tag::s(1, "é😀")];
-    let escaped = b"\\U+00E9\\U+D83D\\U+DE00";
-    let utf8 = b"\xc3\xa9\xf0\x9f\x98\x80";
-    for (unicode, text) in [(false, escaped.as_slice()), (true, utf8.as_slice())] {
-        let ascii = [b"  1\r\n".as_slice(), text, b"\r\n"].concat();
-        let binary = [SENTINEL, b"\x01\0", text, b"\0"].concat();
-        assert_eq!(write_ascii_as(&tags, unicode).as_bytes(), ascii, "utf8={unicode}");
-        assert_eq!(write_binary(&tags, unicode), binary, "utf8={unicode}");
-        assert_eq!(parse(&ascii).unwrap(), tags);
-        assert_eq!(parse(&binary).unwrap(), tags);
-    }
-    // Pre-2007 code-page bytes are independent of the writer, which emits Unicode escapes.
-    let ascii = b"0\nSECTION\n2\nHEADER\n9\n$ACADVER\n1\nAC1015\n9\n$DWGCODEPAGE\n3\nANSI_1252\n0\nENDSEC\n1\n\x80\xe9\n0\nEOF\n";
-    let binary = [
-        SENTINEL,
-        b"\0\0SECTION\0\x02\0HEADER\0\x09\0$ACADVER\0\x01\0AC1015\0\x09\0$DWGCODEPAGE\0\x03\0ANSI_1252\0\0\0ENDSEC\0\x01\0\x80\xe9\0\0\0EOF\0",
-    ]
-    .concat();
-    for bytes in [ascii.as_slice(), binary.as_slice()] {
-        let tags = parse(bytes).unwrap();
-        assert_eq!(tags[7], Tag::s(1, "ێ"));
-    }
-}
-
-#[test]
-fn ascii_accepts_line_endings_padding_and_no_final_newline() {
-    let expected = [Tag::i(70, -7), Tag::s(1, "  text  "), Tag::s(0, "EOF")];
-    for newline in ["\n", "\r\n"] {
-        for final_newline in [false, true] {
-            let mut text = [" 70 ", " -7 ", "1", "  text  ", "0", "EOF"].join(newline);
-            if final_newline {
-                text.push_str(newline);
-            }
-            assert_eq!(parse(text.as_bytes()).unwrap(), expected, "newline={newline:?} final={final_newline}");
-        }
-    }
-}
-
-#[test]
-fn malformed_and_truncated_values_are_errors_not_panics() {
-    assert!(matches!(parse(b""), Err(DxfError::NotDxf)));
-    assert!(matches!(parse(b"oops\nvalue\n"), Err(DxfError::BadCode { line: 1, .. })));
-    assert!(matches!(parse(b"10\n"), Err(DxfError::Eof)));
-    assert!(matches!(parse(SENTINEL), Err(DxfError::NotDxf)));
-    for (_, _, binary) in fixtures() {
-        // Every cut inside the first record is an error, unlike cuts between complete records:
-        // the tag API deliberately accepts streams without an EOF record.
-        for cut in 1..binary.len() {
-            let bytes = [SENTINEL, &binary[..cut]].concat();
-            assert!(matches!(parse(&bytes), Err(DxfError::Eof)), "binary={binary:?} cut={cut}");
-        }
-    }
-}
-
-#[test]
-fn tag_limit_accepts_the_exact_boundary_and_rejects_one_less() {
-    let ascii = b"1\nA\n70\n-7\n0\nEOF\n";
-    let binary = [SENTINEL, b"\x01\0A\0\x46\0\xf9\xff\0\0EOF\0"].concat();
-    for bytes in [ascii.as_slice(), binary.as_slice()] {
-        for limit in 0..3 {
-            assert!(matches!(parse_with_limit(bytes, limit), Err(DxfError::TooLarge { limit: actual, .. }) if actual == limit));
-        }
-        for limit in [3, 4] {
-            assert_eq!(parse_with_limit(bytes, limit).unwrap(), [Tag::s(1, "A"), Tag::i(70, -7), Tag::s(0, "EOF")]);
-        }
-    }
-}

crates/dxf/tests/hardening.rs

@@ -1,220 +0,0 @@
-//! Hostile-input hardening of the DXF reader and writer (#1025): one regression test per finding.
-
-use cadcraft_dxf::{Tag, Value, parse, parse_with_limit, sections, write_ascii, write_binary};
-
-const SENTINEL: &[u8] = b"AutoCAD Binary DXF\r\n\x1a\0";
-
-fn bin_with(f: impl FnOnce(&mut Vec<u8>)) -> Vec<u8> {
-    let mut b = SENTINEL.to_vec();
-    f(&mut b);
-    b.extend_from_slice(&0i16.to_le_bytes());
-    b.extend_from_slice(b"EOF\0");
-    b
-}
-
-#[test]
-fn binary_reals_that_are_not_finite_become_zero() {
-    for bits in [f64::NAN, f64::INFINITY, f64::NEG_INFINITY] {
-        let b = bin_with(|b| {
-            b.extend_from_slice(&10i16.to_le_bytes());
-            b.extend_from_slice(&bits.to_le_bytes());
-        });
-        let tags = parse(&b).unwrap();
-        assert_eq!(tags[0], Tag::f(10, 0.0), "{bits}");
-    }
-}
-
-#[test]
-fn ascii_accepts_bom_and_cr_only_line_ends() {
-    let want = vec![Tag::s(0, "SECTION"), Tag::s(2, "ENTITIES"), Tag::s(0, "ENDSEC"), Tag::s(0, "EOF")];
-    let text = "0\rSECTION\r2\rENTITIES\r0\rENDSEC\r0\rEOF\r";
-    assert_eq!(parse(text.as_bytes()).unwrap(), want);
-    let mut bom = b"\xEF\xBB\xBF".to_vec();
-    bom.extend_from_slice(text.replace('\r', "\r\n").as_bytes());
-    assert_eq!(parse(&bom).unwrap(), want);
-    // Mixed terminators.
-    assert_eq!(parse(b"0\r\nSECTION\r2\nENTITIES\n0\rENDSEC\r\n0\nEOF").unwrap(), want);
-}
-
-#[test]
-fn cr_only_files_count_against_the_tag_limit() {
-    let mut text = String::new();
-    for _ in 0..50 {
-        text.push_str("999\rcomment\r");
-    }
-    text.push_str("0\rEOF\r");
-    assert!(parse_with_limit(text.as_bytes(), 10).is_err());
-    assert_eq!(parse_with_limit(text.as_bytes(), 100).unwrap().len(), 51);
-}
-
-#[test]
-fn one_bad_byte_spoils_one_line_not_the_file() {
-    // Header says ANSI_1251; one line is UTF-8, one is Windows-1251, one has a stray byte.
-    let mut b = b"9\n$DWGCODEPAGE\n3\nANSI_1251\n1\n".to_vec();
-    b.extend_from_slice("Größe".as_bytes());
-    b.extend_from_slice(b"\n1\n\xCF\xF0\xE8\xE2\xE5\xF2\n0\nEOF\n");
-    let t = parse(&b).unwrap();
-    assert_eq!(t[1].str(), "ANSI_1251");
-    assert_eq!(t[2].str(), "Größe");
-    assert_eq!(t[3].str(), "Привет");
-}
-
-#[test]
-fn ascii_uses_utf8_per_line_and_binary_stays_in_the_code_page() {
-    // ANSI_1252 file with UTF-8 bytes in one string and a Latin-1 byte in another. The ASCII
-    // reader takes a line that is valid UTF-8 as UTF-8; the binary reader reads every string
-    // from the code page, because a pre-R2007 binary file has no way to escape to UTF-8.
-    let utf8 = "Größe".as_bytes();
-    let latin = b"Caf\xE9";
-    let mut a = b"9\n$DWGCODEPAGE\n3\nANSI_1252\n1\n".to_vec();
-    a.extend_from_slice(utf8);
-    a.extend_from_slice(b"\n1\n");
-    a.extend_from_slice(latin);
-    a.extend_from_slice(b"\n0\nEOF\n");
-    let from_ascii = parse(&a).unwrap();
-    let b = bin_with(|b| {
-        for (code, s) in [(9i16, &b"$DWGCODEPAGE"[..]), (3, b"ANSI_1252"), (1, utf8), (1, latin)] {
-            b.extend_from_slice(&code.to_le_bytes());
-            b.extend_from_slice(s);
-            b.push(0);
-        }
-    });
-    let from_binary = parse(&b).unwrap();
-    assert_eq!(from_ascii[2].str(), "Größe");
-    assert_eq!(from_ascii[3].str(), "Café");
-    assert_eq!(from_binary[2].str(), "Größe");
-    assert_eq!(from_binary[3].str(), "Café");
-}
-
-#[test]
-fn trailing_spaces_keep_sections_and_eof() {
-    let t = parse(b"0\nSECTION  \n2\nENTITIES \n0\nLINE\n0\nENDSEC \n0\nEOF \n0\nSECTION\n2\nX\n0\nENDSEC\n").unwrap();
-    // The EOF with a trailing space still ends the file.
-    assert_eq!(t.len(), 5);
-    let s = sections(&t);
-    assert_eq!(s.len(), 1);
-    assert_eq!(s[0].name, "ENTITIES");
-    assert_eq!(s[0].tags.len(), 1);
-    // Binary EOF too.
-    let mut b = SENTINEL.to_vec();
-    b.extend_from_slice(&0i16.to_le_bytes());
-    b.extend_from_slice(b"EOF  \0");
-    b.extend_from_slice(&1i16.to_le_bytes());
-    b.extend_from_slice(b"after\0");
-    assert_eq!(parse(&b).unwrap().len(), 1);
-}
-
-#[test]
-fn integer_groups_reject_non_finite_and_clamp() {
-    let t = parse(b"70\ninf\n70\nNaN\n70\n1e30\n70\n-1e30\n90\n1e30\n160\n1e30\n160\n-inf\n62\n12.0\n0\nEOF\n").unwrap();
-    assert_eq!(t[0], Tag::i(70, 0));
-    assert_eq!(t[1], Tag::i(70, 0));
-    // Clamped to what the group's width holds, unsigned values included (the binary writer
-    // keeps up to 65535 and 4294967295 as their bit patterns).
-    assert_eq!(t[2], Tag::i(70, i64::from(u16::MAX)));
-    assert_eq!(t[3], Tag::i(70, i64::from(i16::MIN)));
-    assert_eq!(t[4], Tag::i(90, i64::from(u32::MAX)));
-    assert_eq!(t[5], Tag::i(160, i64::MAX));
-    assert_eq!(t[6], Tag::i(160, 0));
-    assert_eq!(t[7], Tag::i(62, 12));
-    assert_eq!(Value::Str("inf".into()).as_i64(), 0);
-}
-
-/// An unsigned value spelled as a float reads as the same spelled as an integer (#1026 review):
-/// `65535.0` is 65535 like `65535`, not 32767.
-#[test]
-fn unsigned_values_read_the_same_in_either_spelling() {
-    let t = parse(b"70\n65535.0\n70\n65535\n90\n4294967295.0\n90\n4294967295\n0\nEOF\n").unwrap();
-    assert_eq!(t[0], t[1]);
-    assert_eq!(t[0], Tag::i(70, 65535));
-    assert_eq!(t[2], t[3]);
-    assert_eq!(t[2], Tag::i(90, 4_294_967_295));
-}
-
-#[test]
-fn hex_groups_pad_odd_digits_and_drop_junk() {
-    let t = parse(b"310\nABC\n310\nA-B zC1\n310\n\n1004\n0aF\n0\nEOF\n").unwrap();
-    assert_eq!(t[0].value, Value::Hex("ABC0".into()));
-    assert_eq!(t[1].value, Value::Hex("ABC1".into()));
-    assert_eq!(t[2].value, Value::Hex(String::new()));
-    assert_eq!(t[3].value, Value::Hex("0aF0".into()));
-    // The binary writer agrees with the reader: the odd digit is padded, nothing shifts.
-    let back = parse(&write_binary(&[Tag::new(310, Value::Hex("ABC".into())), Tag::s(0, "EOF")], true)).unwrap();
-    assert_eq!(back[0].value, Value::Hex("ABC0".into()));
-}
-
-#[test]
-fn ascii_hex_cannot_inject_tags_and_is_split_at_254_digits() {
-    let evil = Tag::new(310, Value::Hex("AB\r\n0\r\nEOF".into()));
-    let text = write_ascii(&[evil, Tag::s(0, "EOF")]);
-    let back = parse(text.as_bytes()).unwrap();
-    assert_eq!(back.len(), 2, "{text:?}");
-    assert_eq!(back[0].value, Value::Hex("AB0EF0".into()));
-    let long = "AB".repeat(300);
-    let back = parse(write_ascii(&[Tag::new(310, Value::Hex(long)), Tag::s(0, "EOF")]).as_bytes()).unwrap();
-    let sizes: Vec<usize> = back.iter().filter(|t| t.code == 310).map(|t| t.str().len()).collect();
-    assert_eq!(sizes, vec![254, 254, 92]);
-    // An empty chunk is still one group.
-    let back = parse(write_ascii(&[Tag::new(310, Value::Hex(String::new())), Tag::s(0, "EOF")]).as_bytes()).unwrap();
-    assert_eq!(back[0].code, 310);
-}
-
-#[test]
-fn binary_sixteen_and_thirty_two_bit_values_wrap_in_range_and_clamp_outside() {
-    let tags = [
-        Tag::i(70, 65535),
-        Tag::i(70, 40000),
-        Tag::i(70, 70000),
-        Tag::i(70, -40000),
-        Tag::i(90, 0xFFFF_FFFF),
-        Tag::i(90, 1 << 40),
-        Tag::i(90, -(1 << 40)),
-        Tag::s(0, "EOF"),
-    ];
-    let back = parse(&write_binary(&tags, true)).unwrap();
-    assert_eq!(back[0], Tag::i(70, -1));
-    assert_eq!(back[1], Tag::i(70, 40000 - 65536));
-    assert_eq!(back[2], Tag::i(70, i64::from(i16::MAX)));
-    assert_eq!(back[3], Tag::i(70, i64::from(i16::MIN)));
-    assert_eq!(back[4], Tag::i(90, -1));
-    assert_eq!(back[5], Tag::i(90, i64::from(i32::MAX)));
-    assert_eq!(back[6], Tag::i(90, i64::from(i32::MIN)));
-}
-
-/// Strings of a `$DWGCODEPAGE`-declared file as ASCII text and as a binary file.
-fn both_forms(code_page: &str, strings: &[&[u8]]) -> [Vec<Tag>; 2] {
-    let mut a = format!("9\n$DWGCODEPAGE\n3\n{code_page}\n").into_bytes();
-    for s in strings {
-        a.extend_from_slice(b"1\n");
-        a.extend_from_slice(s);
-        a.push(b'\n');
-    }
-    a.extend_from_slice(b"0\nEOF\n");
-    let b = bin_with(|b| {
-        for (code, s) in [(9i16, &b"$DWGCODEPAGE"[..]), (3, code_page.as_bytes())].into_iter().chain(strings.iter().map(|s| (1, *s))) {
-            b.extend_from_slice(&code.to_le_bytes());
-            b.extend_from_slice(s);
-            b.push(0);
-        }
-    });
-    [parse(&a).unwrap(), parse(&b).unwrap()]
-}
-
-#[test]
-fn east_asian_short_strings_that_look_like_utf8_stay_in_the_code_page() {
-    // C3 B1 is valid UTF-8 ("ñ") but is also two half-width katakana in Shift-JIS; the second
-    // string is plainly Shift-JIS, so the file is not UTF-8.
-    for t in both_forms("ANSI_932", &[b"\xC3\xB1", b"\x90\x7D\x96\xCA"]) {
-        assert_eq!(t[2].str(), "\u{FF83}\u{FF71}");
-        assert_eq!(t[3].str(), "図面");
-    }
-}
-
-#[test]
-fn east_asian_file_that_is_all_utf8_reads_as_utf8() {
-    for t in both_forms("ANSI_932", &["図面".as_bytes(), b"\xC3\xB1", b"plain"]) {
-        assert_eq!(t[2].str(), "図面");
-        assert_eq!(t[3].str(), "ñ");
-        assert_eq!(t[4].str(), "plain");
-    }
-}

crates/dxf/tests/hex_chunks.rs

@@ -1,119 +0,0 @@
-//! Hex payload conformance is distinct from binary framing capacity: DXF groups 310–319 and
-//! 1004 specify at most 127 payload bytes per chunk, even though a length byte represents 255.
-//! Inspect writer bytes without our parser; accept any compliant partition preserving payload,
-//! code and following-record framing. Oversized binary read fixtures test tolerance only.
-//! Pending writer regressions extend the chunk-size finding in issue #1025.
-//! Public DXF Reference, Group Codes in Numerical Order and Binary DXF Files:
-//! https://help.autodesk.com/cloudhelp/2025/ENU/AutoCAD-DXF/files/GUID-3F0380A5-1C15-464D-BC66-2C5F094BCFB9.htm
-//! https://help.autodesk.com/cloudhelp/2025/ENU/AutoCAD-DXF/files/GUID-FC1C3C69-DBC2-49E4-893A-000D6538C0FE.htm
-
-use cadcraft_dxf::{Tag, Value, parse, write_ascii_as, write_binary};
-
-const SENTINEL: &[u8] = b"AutoCAD Binary DXF\r\n\x1a\0";
-const FOLLOWING_BINARY: &[u8] = b"\x46\0\xf9\xff"; // group 70, signed i16 -7
-
-fn payload(length: usize) -> Vec<u8> {
-    (0..length).map(|index| u8::try_from(index * 37 % 256).unwrap()).collect()
-}
-
-fn hex(bytes: &[u8]) -> String {
-    bytes.iter().map(|byte| format!("{byte:02X}")).collect()
-}
-
-fn input(code: i32, bytes: &[u8]) -> [Tag; 2] {
-    [Tag::new(code, Value::Hex(hex(bytes))), Tag::i(70, -7)]
-}
-
-fn check_ascii(code: i32, bytes: &[u8], utf8: bool) {
-    let wire = write_ascii_as(&input(code, bytes), utf8);
-    let lines: Vec<_> = wire.lines().collect();
-    let (chunks, following) = lines.split_at(lines.len().checked_sub(2).unwrap());
-    assert_eq!(following[0].trim(), "70");
-    assert_eq!(following[1], "-7");
-    assert!(!chunks.is_empty(), "an empty payload must still have a tag");
-    let (records, remainder) = chunks.as_chunks::<2>();
-    assert!(remainder.is_empty(), "incomplete group/value pair");
-    let context = format!("ASCII code={code} bytes={} utf8={utf8}", bytes.len());
-    let mut back = Vec::new();
-    for record in records {
-        assert_eq!(record[0].trim().parse::<i32>().unwrap(), code, "{context}");
-        let text = record[1];
-        assert!(text.len() <= 254, "{context}: {} hex characters exceed 127 payload bytes", text.len());
-        assert!(text.bytes().all(|b| b.is_ascii_hexdigit()), "{context}: invalid hex");
-        let (pairs, remainder) = text.as_bytes().as_chunks::<2>();
-        assert!(remainder.is_empty(), "{context}: partial byte");
-        back.extend(pairs.iter().map(|pair| u8::from_str_radix(std::str::from_utf8(pair).unwrap(), 16).unwrap()));
-    }
-    assert_eq!(back, bytes, "{context}: complete payload and byte order");
-}
-
-fn check_binary(code: i32, bytes: &[u8], utf8: bool) {
-    let wire = write_binary(&input(code, bytes), utf8);
-    let mut chunks = wire.strip_prefix(SENTINEL).unwrap().strip_suffix(FOLLOWING_BINARY).unwrap();
-    assert!(!chunks.is_empty(), "an empty payload must still have a tag");
-    let context = format!("binary code={code} bytes={} utf8={utf8}", bytes.len());
-    let mut back = Vec::new();
-    while !chunks.is_empty() {
-        let (&[lo, hi, length], rest) = chunks.split_first_chunk::<3>().unwrap();
-        assert_eq!(i32::from(u16::from_le_bytes([lo, hi])), code, "{context}");
-        assert!(length <= 127, "{context}: {length} bytes exceed the documented group limit");
-        let (chunk, next) = rest.split_at(usize::from(length));
-        back.extend_from_slice(chunk);
-        chunks = next;
-    }
-    assert_eq!(back, bytes, "{context}: complete payload and byte order");
-}
-
-#[test]
-fn conforming_payloads_have_independent_ascii_and_binary_wire_checks() {
-    for code in (310..=319).chain([1004]) {
-        for length in [0, 1, 2, 126, 127] {
-            for utf8 in [false, true] {
-                let bytes = payload(length);
-                check_ascii(code, &bytes, utf8);
-                check_binary(code, &bytes, utf8);
-            }
-        }
-    }
-}
-
-#[test]
-fn binary_reader_tolerates_the_full_length_byte_domain() {
-    // This is deliberately permissive input, not an assertion that oversized chunks conform
-    // or that the writer should produce them. The following record catches framing mistakes.
-    for code in (310_u16..=319).chain([1004]) {
-        for length in 0..=u8::MAX {
-            let bytes = payload(usize::from(length));
-            let mut wire = SENTINEL.to_vec();
-            wire.extend_from_slice(&code.to_le_bytes());
-            wire.push(length);
-            wire.extend_from_slice(&bytes);
-            wire.extend_from_slice(FOLLOWING_BINARY);
-            assert_eq!(parse(&wire).unwrap(), input(i32::from(code), &bytes), "code={code} length={length}");
-        }
-    }
-}
-
-#[test]
-#[ignore = "Confirmed ASCII DXF writer nonconformance: hex payloads above 127 bytes are emitted as one oversized chunk"]
-fn ascii_writer_splits_large_payloads_into_conforming_chunks() {
-    for code in (310..=319).chain([1004]) {
-        for length in [128, 254, 255, 256, 1024] {
-            for utf8 in [false, true] {
-                check_ascii(code, &payload(length), utf8);
-            }
-        }
-    }
-}
-
-#[test]
-#[ignore = "Confirmed binary DXF writer nonconformance: 255-byte partitioning exceeds the documented 127-byte group limit"]
-fn binary_writer_splits_large_payloads_into_conforming_chunks() {
-    for code in (310..=319).chain([1004]) {
-        for length in [128, 254, 255, 256, 1024] {
-            for utf8 in [false, true] {
-                check_binary(code, &payload(length), utf8);
-            }
-        }
-    }
-}

crates/dxf/tests/roundtrip.rs

@@ -1,148 +0,0 @@
-//! Deterministic tag preservation through the public byte API, in both encodings and every
-//! supported version. Inputs have the group code's type and representable values; lossy
-//! coercions are not accepted as round-trip equality. Real values must retain their bits.
-
-use cadcraft_dxf::{Tag, Value, Version, is_binary, parse, write_ascii_as, write_binary};
-
-fn check(case: &str, body: &[Tag]) {
-    for version in Version::ALL {
-        let mut original = vec![
-            Tag::s(0, "SECTION"),
-            Tag::s(2, "HEADER"),
-            Tag::s(9, "$ACADVER"),
-            Tag::s(1, version.code()),
-            Tag::s(9, "$DWGCODEPAGE"),
-            Tag::s(3, "ANSI_1252"),
-            Tag::s(0, "ENDSEC"),
-            Tag::s(0, "SECTION"),
-            Tag::s(2, "ENTITIES"),
-        ];
-        original.extend_from_slice(body);
-        original.extend([Tag::s(0, "ENDSEC"), Tag::s(0, "EOF")]);
-        for binary in [false, true] {
-            let mut current = original.clone();
-            for pass in 1..=2 {
-                let context = format!("{case} · {version} · binary={binary} · pass={pass}");
-                let bytes = if binary { write_binary(&current, version.utf8()) } else { write_ascii_as(&current, version.utf8()).into_bytes() };
-                assert_eq!(is_binary(&bytes), binary, "{context}");
-                let back = parse(&bytes).unwrap_or_else(|e| panic!("{context}: {e}"));
-                assert_eq!(back.len(), original.len(), "{context}: tag count");
-                for (index, (expected, actual)) in original.iter().zip(&back).enumerate() {
-                    assert_eq!(actual, expected, "{context}: tag[{index}]");
-                    if let (Value::Real(a), Value::Real(b)) = (&expected.value, &actual.value) {
-                        assert_eq!(b.to_bits(), a.to_bits(), "{context}: tag[{index}] real bits");
-                    }
-                }
-                assert_eq!(back, current, "{context}: no additional changes on resave");
-                current = back;
-            }
-        }
-    }
-}
-
-#[test]
-fn integer_width_boundaries() {
-    // Explicit reference ranges, not obtained from the codec's kind_of().
-    let widths = [
-        (vec![60..=79, 170..=179, 270..=289, 370..=389, 400..=409, 1060..=1070], i64::from(i16::MIN), i64::from(i16::MAX)),
-        (vec![90..=99, 420..=429, 440..=459, 1071..=1071], i64::from(i32::MIN), i64::from(i32::MAX)),
-        (std::iter::once(160..=169).collect(), i64::MIN, i64::MAX),
-    ];
-    for (ranges, min, max) in widths {
-        for value in [min, min + 1, -1, 0, 1, max - 1, max] {
-            let tags: Vec<_> = ranges.iter().cloned().flatten().map(|code| Tag::i(code, value)).collect();
-            check(&format!("integer/{min}..{max}/{value}"), &tags);
-        }
-    }
-}
-
-#[test]
-fn finite_reals_keep_all_bits() {
-    let values = [
-        0.0,
-        -0.0,
-        f64::from_bits(1),
-        -f64::from_bits(1),
-        f64::MIN_POSITIVE,
-        f64::MIN_POSITIVE.next_down(),
-        0.1,
-        -3.25,
-        1.0_f64.next_down(),
-        1.0,
-        1.0_f64.next_up(),
-        1e-100,
-        -1e100,
-        f64::MAX,
-        f64::MIN,
-    ];
-    for value in values {
-        let tags: Vec<_> =
-            [10..=59, 110..=149, 210..=239, 460..=469, 1010..=1059].into_iter().flatten().map(|code| Tag::new(code, Value::Real(value))).collect();
-        check(&format!("real/{:016X}", value.to_bits()), &tags);
-    }
-}
-
-#[test]
-fn booleans() {
-    for value in [false, true] {
-        let tags: Vec<_> = (290..=299).map(|code| Tag::new(code, Value::Bool(value))).collect();
-        check(&format!("bool/{value}"), &tags);
-    }
-}
-
-#[test]
-fn strings_preserve_whitespace_unicode_and_literal_escapes() {
-    // No CR/LF or NUL: those are line/string delimiters, not losslessly writable payloads.
-    let values = [
-        ("empty", ""),
-        ("spaces", "  leading and trailing  "),
-        ("tabs", "\tindented\t"),
-        ("unicode", "Café Ø 图号 Україна 😀 e\u{301}"),
-        ("literal-escapes", r"\U+0041 \M+183A4 \U+D83D\U+DE00 \\U+005C \P %%c"),
-        ("malformed-escapes", r"\U+ \U+ZZZZ \U+D800 \U+DC00 \M+9FFFF"),
-    ];
-    for (case, value) in values {
-        let tags: Vec<_> =
-            [0..=9, 100..=100, 102..=102, 105..=105, 300..=309, 320..=369, 410..=419, 430..=439, 470..=479, 480..=481, 1000..=1003, 1005..=1005]
-                .into_iter()
-                .flatten()
-                .map(|code| Tag::s(code, value))
-                .collect();
-        check(case, &tags);
-    }
-    for length in [1, 254, 255, 256, 1024] {
-        check(&format!("string/length={length}"), &[Tag::s(1, "x".repeat(length))]);
-    }
-}
-
-#[test]
-fn hex_chunks_keep_bytes_and_order() {
-    // DXF groups 310–319 and 1004 permit 127 payload bytes per chunk. A binary length
-    // byte can represent more, but that is reader tolerance, not writer conformance.
-    // Larger payloads need chunk-size/reassembly checks rather than exact tag equality;
-    // see hex_chunks.rs for the independent wire checks and pending writer regressions.
-    for length in [0, 1, 2, 126, 127] {
-        let hex: String = (0..length).map(|i| format!("{:02X}", (i * 37) % 256)).collect();
-        let tags: Vec<_> = (310..=319).chain([1004]).map(|code| Tag::new(code, Value::Hex(hex.clone()))).collect();
-        check(&format!("hex/bytes={length}"), &tags);
-    }
-}
-
-#[test]
-fn mixed_values_and_repeated_codes_keep_order() {
-    check(
-        "mixed/repeated-codes",
-        &[
-            Tag::s(0, "TEST"),
-            Tag::f(10, 1.25),
-            Tag::s(1, "first"),
-            Tag::f(10, -2.5),
-            Tag::i(70, -7),
-            Tag::s(1, "second"),
-            Tag::new(290, Value::Bool(true)),
-            Tag::new(310, Value::Hex("00FF80".into())),
-            Tag::i(160, i64::MAX),
-            Tag::s(1, ""),
-        ],
-    );
-}

crates/engine/Cargo.toml

@@ -12,7 +12,7 @@ workspace = true
 cadcraft-geom = { workspace = true }
 cadcraft-color = { workspace = true }
 cadcraft-doc = { workspace = true }
-cadcraft-dxf = { workspace = true }
+craft-dxf = { workspace = true }
 cadcraft-constraints = { workspace = true }
 cadcraft-fonts = { workspace = true }
 cadcraft-render = { workspace = true }

crates/engine/src/cmd/blocks/blockreplace.rs

@@ -15,7 +15,7 @@ use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, St
 
 pub(super) fn blockreplace_spec() -> CommandSpec {
     CommandSpec::new("blockreplace", "Replace Block...", run_blockreplace)
-        .menu(&["Tools", "Express Tools", "Replace Block..."])
+        .menu(&["Tools", "Additional Tools", "Replace Block..."])
         .alias(&["-blockreplace"])
         .params("{block (the block whose references are replaced), with (the replacement block), purge?: bool (default false: remove the replaced block's definition when nothing references it any more)} → {block, with, replaced, purged}")
         .interactive(|_| Ok(Box::new(BlockreplaceM::default())))
@@ -184,8 +184,10 @@ impl Interactive for BlockreplaceM {
     }
     fn prompt(&self, _s: &Session) -> Prompt {
         match self.stage {
-            Stage::Old => Prompt::new("Enter the name of the block to replace", Accept::TEXT).kw(&["?", "Select"]),
-            Stage::New => Prompt::new(format!("Enter the name of the replacement block for {}", self.old), Accept::TEXT).kw(&["?", "Select"]),
+            Stage::Old => Prompt::new("Enter the name of the block to replace", Accept::TEXT).kw(&["?", "Select"]).takes_block(),
+            Stage::New => {
+                Prompt::new(format!("Enter the name of the replacement block for {}", self.old), Accept::TEXT).kw(&["?", "Select"]).takes_block()
+            }
             Stage::Select => Prompt::new("Select a block reference", Accept::SELECT),
             Stage::Purge => Prompt::new(format!("Purge the unreferenced block definition {}?", self.old), KW).kw(&["Yes", "No"]).default("Yes"),
         }

crates/engine/src/cmd/blocks/burst.rs

@@ -12,7 +12,7 @@ use crate::{Result, Session};
 
 pub(super) fn burst_spec() -> CommandSpec {
     CommandSpec::new("burst", "Explode Attributes to Text", run_burst)
-        .menu(&["Tools", "Express Tools", "Explode Attributes to Text"])
+        .menu(&["Tools", "Additional Tools", "Explode Attributes to Text"])
         .params("{handles?} (block references; other objects are left alone) → {handles}")
         .interactive(|_| Ok(Box::new(SelectRun::new("burst", "BURST"))))
 }

crates/engine/src/cmd/draw2/breakline.rs

@@ -20,7 +20,7 @@ use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, St
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         CommandSpec::new("breakline", "Break-line Symbol", run_breakline)
-            .menu(&["Tools", "Express Tools", "Break-line Symbol"])
+            .menu(&["Tools", "Additional Tools", "Break-line Symbol"])
             .params(
                 "{p1, p2, at?: [x,y] (symbol location; default the midpoint), size? (default 1, times DIMSCALE), \
                  extension? (past both points; default 0), block? (a block with two points on Defpoints; default the built-in symbol)} → {handle}",

crates/engine/src/cmd/edit.rs

@@ -557,9 +557,15 @@ fn run_clear(s: &mut Session, _p: &Value) -> Result<Value> {
 fn run_selectall(s: &mut Session, _p: &Value) -> Result<Value> {
     let space = s.space();
     let d = s.doc()?;
+    let frozen = s.viewport_frozen();
     let hs: Vec<Handle> = d
         .space(&space)
-        .map(|st| st.iter().filter(|e| d.is_visible(e) && d.layer(&e.common.layer).is_none_or(|l| !l.locked)).map(|e| e.handle).collect())
+        .map(|st| {
+            st.iter()
+                .filter(|e| crate::select::selectable(d, e, frozen) && d.layer(&e.common.layer).is_none_or(|l| !l.locked))
+                .map(|e| e.handle)
+                .collect()
+        })
         .unwrap_or_default();
     let n = hs.len();
     s.set_selection(hs);
@@ -580,16 +586,19 @@ fn run_select(s: &mut Session, p: &Value) -> Result<Value> {
     let add = bool_or(p, "add", false);
     let picked: Vec<Handle> = if let Some(w) = points_param(p, "window") {
         let (Some(a), Some(b)) = (w.first(), w.get(1)) else { return Err(bad("select", "window needs 2 corners")) };
-        crate::select::select_window(s.doc()?, &space, Bounds2::new(*a, *b), bool_or(p, "crossing", false))
+        crate::select::select_window_in(s.doc()?, &space, s.viewport_frozen(), Bounds2::new(*a, *b), bool_or(p, "crossing", false))
     } else if let Some(at) = point_param(p, "at") {
         let ap = f64_or(p, "aperture", s.pixel_size() * s.settings.pickbox * 1.5);
-        crate::select::pick(s.doc()?, &space, at, ap).into_iter().collect()
+        crate::select::pick_in(s.doc()?, &space, s.viewport_frozen(), at, ap).into_iter().collect()
     } else if let Some(f) = points_param(p, "fence") {
-        crate::select::select_fence(s.doc()?, &space, &f)
-    } else {
+        crate::select::select_fence_in(s.doc()?, &space, s.viewport_frozen(), &f)
+    } else if ["handles", "handle"].iter().any(|k| p.get(*k).is_some_and(|v| !v.is_null())) {
         targets(s, p)?
+    } else {
+        // Nothing to select with: the selection stays, also what the active viewport does not draw.
+        s.stored_selection()
     };
-    let mut sel = if add { s.selection() } else { Vec::new() };
+    let mut sel = if add { s.stored_selection() } else { Vec::new() };
     sel.extend(picked);
     s.set_selection(sel);
     let sel = s.selection();

crates/engine/src/cmd/file.rs

@@ -8,7 +8,7 @@ mod template;
 use std::sync::OnceLock;
 
 use cadcraft_doc::{Drawing, Format};
-pub use cadcraft_dxf::Version;
+pub use craft_dxf::Version;
 use serde_json::{Value, json};
 
 use super::{CommandSpec, EngineError, Interactive, always, bad, bool_or, find_command, ok, str_param};
@@ -17,7 +17,7 @@ use crate::{Accept, Input, Prompt, Result, Session, Step};
 
 /// The rules the Command Aliases dialog checks before it sends an alias to ALIASEDIT.
 pub use pgp::{MAX_ALIAS_PROFILE_BYTES, MAX_ALIASES, alias_name, alias_profile, command_id, restore_aliases};
-pub(crate) use pgp::{specs as alias_specs, user_alias};
+pub(crate) use pgp::{greek_alias, specs as alias_specs, user_alias};
 pub use template::{qnew_template, set_qnew_template};
 
 /// Largest drawing accepted from a local path, matching the per-file xref limit. A path naming an
@@ -53,9 +53,9 @@ pub fn io() -> Option<&'static IoHooks> {
 /// (installed by the app with the DXF reader and writer, a lower layer).
 pub struct EntityCodec {
     /// The entity's type name and the groups of its record, without its `0` group.
-    pub groups: fn(&Drawing, &cadcraft_doc::Entity) -> (String, Vec<cadcraft_dxf::Tag>),
+    pub groups: fn(&Drawing, &cadcraft_doc::Entity) -> (String, Vec<craft_dxf::Tag>),
     /// An entity from a type name and groups.
-    pub entity: fn(&str, &[cadcraft_dxf::Tag]) -> Option<(cadcraft_doc::Common, cadcraft_doc::EntityKind)>,
+    pub entity: fn(&str, &[craft_dxf::Tag]) -> Option<(cadcraft_doc::Common, cadcraft_doc::EntityKind)>,
 }
 
 static CODEC: OnceLock<EntityCodec> = OnceLock::new();
@@ -340,7 +340,7 @@ fn read_bytes(bytes: &[u8], name: &str, path: Option<String>) -> Result<ReadFile
         let dir = if dir.as_os_str().is_empty() { std::path::Path::new(".") } else { dir };
         cadcraft_fonts::shx::add_drawing_dir(&std::path::absolute(dir).unwrap_or_else(|_| dir.to_path_buf()));
     }
-    Ok(ReadFile { drawing, binary_dxf: cadcraft_dxf::is_binary(bytes), name: name.to_string(), path })
+    Ok(ReadFile { drawing, binary_dxf: craft_dxf::is_binary(bytes), name: name.to_string(), path })
 }
 
 fn add_read(s: &mut Session, drawing: Drawing, binary_dxf: bool, name: &str, path: Option<String>) -> usize {
@@ -503,7 +503,7 @@ pub fn backup_path(path: &std::path::Path) -> std::path::PathBuf {
 pub fn looks_like_drawing(bytes: &[u8]) -> bool {
     // DWG: a version tag like `AC1032` (R12 is `AC1009`).
     let dwg = bytes.len() >= 6 && bytes.starts_with(b"AC") && bytes[2..6].iter().all(|b| b.is_ascii_digit());
-    if dwg || cadcraft_dxf::is_binary(bytes) {
+    if dwg || craft_dxf::is_binary(bytes) {
         return true;
     }
     // ASCII DXF: optional comments (999), then group 0 SECTION.
@@ -533,7 +533,7 @@ pub fn completeness(head: &[u8], tail: &[u8], len: u64) -> Option<bool> {
         // Too short for any DWG's header: cut off, not unknown.
         return if head.len() < 256 { Some(false) } else { dwg_complete(head, len) };
     }
-    if cadcraft_dxf::is_binary(head) {
+    if craft_dxf::is_binary(head) {
         return Some(tail.ends_with(b"EOF\0"));
     }
     let text = String::from_utf8_lossy(tail);

crates/engine/src/cmd/file/pgp.rs

@@ -59,6 +59,12 @@ pub(crate) fn user_alias(name: &str) -> Option<String> {
     store().map.get(name).cloned()
 }
 
+/// The user alias that is the Greek word `word` in another case or accent.
+pub(crate) fn greek_alias(word: &str) -> Option<String> {
+    let same = crate::keyboard::same_greek_word_as(word)?;
+    store().map.keys().find(|alias| same(alias)).cloned()
+}
+
 /// The user aliases and the file REINIT reads, as the host's user profile keeps them:
 /// `{"aliases": {alias: command}, "file": path or null}`. Not drawing data.
 pub fn alias_profile() -> Value {

crates/engine/src/cmd/griphot.rs

@@ -43,7 +43,8 @@ pub(crate) struct GripEdit {
     hot: Vec<(Handle, usize)>,
     /// Typed `GRIP`: still collecting grips ("Select grips").
     picking: bool,
-    /// What MOVE/ROTATE/SCALE/MIRROR transform: the hot grips' objects and the selection.
+    /// What MOVE/ROTATE/SCALE/MIRROR transform: the hot grips' objects and the objects of the
+    /// selection that the view being edited shows.
     targets: Vec<Handle>,
     base: Vec2,
     mode: GripMode,
@@ -69,6 +70,13 @@ fn positive(v: Option<f64>) -> Result<f64> {
     v.filter(|f| f.is_finite() && *f > 1e-12).ok_or_else(|| other("Requires a positive number."))
 }
 
+/// Whether the view being edited shows `h`. A hidden object (HIDEOBJECTS, an off or frozen layer,
+/// a layer frozen in the active MSPACE viewport) takes no part in a grip edit, even when Undo or
+/// a selection command put it back into the selection.
+fn shown(s: &Session, h: Handle) -> bool {
+    s.state().is_ok_and(|st| st.doc.entity(h).is_some_and(|e| st.shows(e)))
+}
+
 impl GripEdit {
     fn new(s: &Session, hot: Vec<(Handle, usize)>) -> Result<Self> {
         let mut g = GripEdit {
@@ -87,16 +95,22 @@ impl GripEdit {
         Ok(g)
     }
 
-    /// Make grip `index` of `h` hot (the first one becomes the base point).
+    /// Make grip `index` of `h` hot (the first one becomes the base point). The grip of an object
+    /// the view being edited does not show is left out, and so are the hidden objects of the
+    /// selection.
     fn add_hot(&mut self, s: &Session, (h, i): (Handle, usize)) -> Result<()> {
         if self.hot.contains(&(h, i)) || self.hot.len() >= MAX_HOT {
             return Ok(());
         }
         let p = s.grips_of(h)?.get(i).copied().ok_or_else(|| other("no such grip"))?;
+        // After the lookup: a missing object or grip stays the error it was.
+        if !shown(s, h) {
+            return Ok(());
+        }
         if self.hot.is_empty() {
             self.base = p;
             self.targets.push(h);
-            self.targets.extend(s.selection().into_iter().filter(|x| *x != h));
+            self.targets.extend(s.selection().into_iter().filter(|x| *x != h && shown(s, *x)));
         } else if !self.targets.contains(&h) {
             self.targets.push(h);
         }
@@ -107,13 +121,13 @@ impl GripEdit {
     /// The grips of the selected objects at `p` (typed `GRIP`): all objects with a grip there.
     fn grips_at(s: &Session, p: Vec2) -> Vec<(Handle, usize)> {
         let tol = (s.pixel_size() * (s.settings.gripsize + 3.0)).max(1e-9 * (1.0 + p.len()));
-        let Ok(d) = s.doc() else { return Vec::new() };
+        let Ok(st) = s.state() else { return Vec::new() };
         let mut out = Vec::new();
         for h in s.selection().into_iter().take(MAX_HOT) {
             if super::curves::is_locked(s, h) {
                 continue;
             }
-            let Some(e) = d.entity(h) else { continue };
+            let Some(e) = st.doc.entity(h).filter(|e| st.shows(e)) else { continue };
             let gs = e.kind.grips();
             // The nearest grip of this object within the tolerance.
             let best = gs
@@ -470,7 +484,9 @@ impl Interactive for GripEdit {
 impl Session {
     /// Make grips hot and start editing them (the UI's click on a grip; Shift+click collects
     /// several first). `hot` lists (object, grip index); the first is the base grip. The grip
-    /// modes and their options then run at the command line like any prompt.
+    /// modes and their options then run at the command line like any prompt. Grips of objects the
+    /// view being edited does not show are left out (the first grip left is the base grip), and it
+    /// is an error when none is left.
     pub fn start_grip_edit(&mut self, hot: &[(Handle, usize)]) -> Result<()> {
         if self.running.is_some() {
             self.cancel();
@@ -479,6 +495,9 @@ impl Session {
             return Err(other("no grip"));
         }
         let g = GripEdit::new(self, hot.to_vec())?;
+        if g.hot.is_empty() {
+            return Err(other("no grip"));
+        }
         let label = g.label();
         let machine = crate::guard::Guarded::wrap(Box::new(g));
         let st = self.state()?;

crates/engine/src/cmd/groups/pick.rs

@@ -28,7 +28,8 @@ pub fn specs() -> Vec<CommandSpec> {
 const MEMBER_PICKS: &[&str] = &["groupedit", "-group"];
 
 /// `hs` plus the other members of the selectable groups they belong to (in the space being
-/// edited, visible), when PICKSTYLE has group selection on. Order: `hs` first.
+/// edited, visible, and inside an MSPACE viewport not on a layer frozen in it), when PICKSTYLE
+/// has group selection on. Order: `hs` first.
 pub(crate) fn expand(s: &Session, hs: Vec<Handle>) -> Vec<Handle> {
     if s.settings.pickstyle & 1 == 0 || hs.is_empty() || s.running.as_ref().is_some_and(|r| MEMBER_PICKS.contains(&r.id.as_str())) {
         return hs;
@@ -39,6 +40,7 @@ pub(crate) fn expand(s: &Session, hs: Vec<Handle>) -> Vec<Handle> {
     }
     let space = s.space();
     let Some(store) = d.space(&space) else { return hs };
+    let frozen = s.viewport_frozen();
     // Member → its selectable groups, built once (window selections may hold many objects).
     let mut of: HashMap<Handle, Vec<usize>> = HashMap::new();
     for (i, g) in d.groups.iter().enumerate().filter(|(_, g)| g.selectable) {
@@ -56,7 +58,7 @@ pub(crate) fn expand(s: &Session, hs: Vec<Handle>) -> Vec<Handle> {
             }
             let Some(g) = d.groups.get(*gi) else { continue };
             for m in &g.members {
-                if store.get(*m).is_some_and(|e| d.is_visible(e)) && seen.insert(*m) {
+                if store.get(*m).is_some_and(|e| crate::select::selectable(d, e, frozen)) && seen.insert(*m) {
                     out.push(*m);
                 }
             }

crates/engine/src/cmd/hatch.rs

@@ -533,6 +533,19 @@ fn run_region(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!({ "message": format!("{n} Region(s) created.") }))
 }
 
+/// Whether the upper-case `name` is a pattern: a standard one or a loaded one.
+fn pattern_exists(name: &str) -> bool {
+    cadcraft_doc::library::pattern(name).is_some() || patfile::user_pattern(name).is_some()
+}
+
+/// The existing pattern `name` means, typed at the pattern prompt: read upper-cased, else a loaded
+/// pattern's own name when only its Greek spelling differs in case or accent (σολιδ for ΣΟΛΙΔ).
+pub(crate) fn pattern_named(name: &str) -> Option<String> {
+    let name = name.trim();
+    let up = name.to_ascii_uppercase();
+    if pattern_exists(&up) { Some(up) } else { patfile::user_pattern_name(name) }
+}
+
 /// The origin sub-prompt's keywords (a point sets a new origin).
 const ORIGIN_KW: [&str; 6] = ["Bottom left", "bottom Right", "Top left", "top riGht", "Center", "Use current"];
 
@@ -597,7 +610,7 @@ impl HatchM {
                     Some(n) => n,
                     None => t.trim().to_ascii_uppercase(),
                 };
-                if cadcraft_doc::library::pattern(&up).is_some() || patfile::user_pattern(&up).is_some() {
+                if pattern_exists(&up) {
                     self.settings.pattern = up.clone();
                     s.doc_mut()?.header.set_str("HPNAME", &up);
                 } else {

crates/engine/src/cmd/hatch/patfile.rs

@@ -28,6 +28,13 @@ pub(crate) fn user_pattern(name: &str) -> Option<UserPattern> {
     store().iter().find(|p| p.name.eq_ignore_ascii_case(name)).cloned()
 }
 
+/// The name of the user pattern that is the Greek word `name` in another case or accent
+/// ([`user_pattern`] folds ASCII only).
+pub(crate) fn user_pattern_name(name: &str) -> Option<String> {
+    let same = crate::keyboard::same_greek_word_as(name)?;
+    store().iter().find(|p| same(&p.name)).map(|p| p.name.clone())
+}
+
 /// The line families a new hatch of pattern `name` carries: a user pattern's, else none (the
 /// library's patterns are drawn and saved from the library).
 pub(crate) fn lines_for(name: &str) -> Vec<PatternLine> {

crates/engine/src/cmd/inquiry.rs

@@ -591,7 +591,7 @@ fn run_inspect(s: &mut Session, p: &Value) -> Result<Value> {
         "dimStyles": d.dim_styles.iter().map(|l| l.name.clone()).collect::<Vec<_>>(),
         "blocks": d.blocks.keys().filter(|k| !k.starts_with('*')).cloned().collect::<Vec<_>>(),
         "layouts": d.layouts.iter().map(|l| l.name.clone()).collect::<Vec<_>>(),
-        "selection": st.selection.iter().map(|h| h.hex()).collect::<Vec<_>>(),
+        "selection": st.shown_selection().iter().map(|h| h.hex()).collect::<Vec<_>>(),
         "undo": st.undo.iter().rev().take(20).map(|u| u.label.clone()).collect::<Vec<_>>(),
         "view": { "center": [st.view().center.x, st.view().center.y], "height": st.view().height },
         // Records of the file the drawing came from that the reader could not place.

crates/engine/src/cmd/modify/stretch.rs

@@ -21,14 +21,17 @@ impl StretchArea {
     }
 }
 
-/// Add to `hs` the visible multilines in `space` with a control vertex inside `area`. A crossing
-/// selection tests the drawn element lines, which sit away from the control vertices by the
-/// multiline's scale, so a small area around a vertex alone would miss them.
-fn add_mline_vertex_hits(d: &cadcraft_doc::Drawing, space: &cadcraft_doc::Space, area: &StretchArea, hs: &mut Vec<Handle>) {
-    let Some(store) = d.space(space) else { return };
+/// Add to `hs` the multilines in the edit space that a selection can take there (visible, and
+/// inside an MSPACE viewport not on a layer frozen in it) with a control vertex inside `area`. A
+/// crossing selection tests the drawn element lines, which sit away from the control vertices by
+/// the multiline's scale, so a small area around a vertex alone would miss them.
+fn add_mline_vertex_hits(s: &Session, area: &StretchArea, hs: &mut Vec<Handle>) {
+    let Ok(d) = s.doc() else { return };
+    let Some(store) = d.space(&s.space()) else { return };
+    let frozen = s.viewport_frozen();
     for e in store.iter() {
         if let EntityKind::MLine(m) = &e.kind
-            && d.is_visible(e)
+            && crate::select::selectable(d, e, frozen)
             && !hs.contains(&e.handle)
             && m.vertices.iter().any(|v| area.contains(v.p.xy()))
         {
@@ -94,19 +97,19 @@ pub(super) fn run_stretch(s: &mut Session, p: &Value) -> Result<Value> {
     };
     // A fence marks no area: the objects it crosses move whole.
     if let Some(fence) = listed("fence", 2)? {
-        let hs = crate::select::select_fence(s.doc()?, &space, &fence);
+        let hs = crate::select::select_fence_in(s.doc()?, &space, s.viewport_frozen(), &fence);
         let moved = transform_entities(s, &hs, &Mat3::translate(d), false)?;
         return Ok(json!({ "stretched": moved.len() }));
     }
     let (mut hs, area) = if let Some(poly) = listed("polygon", 3)? {
-        (crate::select::select_polygon(s.doc()?, &space, &poly, true), StretchArea::Polygon(poly))
+        (crate::select::select_polygon_in(s.doc()?, &space, s.viewport_frozen(), &poly, true), StretchArea::Polygon(poly))
     } else {
         let w = points_param(p, "window").ok_or_else(|| bad("stretch", "`window` [[x,y],[x,y]], `polygon` or `fence` is required"))?;
         let (Some(a), Some(b)) = (w.first(), w.get(1)) else { return Err(bad("stretch", "window needs 2 corners")) };
         let bx = cadcraft_geom::Bounds2::new(*a, *b);
-        (crate::select::select_window(s.doc()?, &space, bx, true), StretchArea::Box(bx))
+        (crate::select::select_window_in(s.doc()?, &space, s.viewport_frozen(), bx, true), StretchArea::Box(bx))
     };
-    add_mline_vertex_hits(s.doc()?, &space, &area, &mut hs);
+    add_mline_vertex_hits(s, &area, &mut hs);
     hs.retain(|h| !crate::cmd::curves::is_locked(s, *h));
     let doc = s.doc_mut()?;
     let areas = [area];
@@ -173,7 +176,7 @@ impl StretchM {
     /// of two) the mode is dropped.
     fn finish_mode(&mut self, s: &mut Session, m: SelectMode) -> Result<()> {
         let space = s.space();
-        let Some(mut hs) = m.select(s.doc()?, &space) else { return Ok(()) };
+        let Some(mut hs) = m.select_in(s.doc()?, &space, s.viewport_frozen()) else { return Ok(()) };
         let crossing = match (m.kind, m.pts.first().zip(m.pts.get(1))) {
             (SelectKind::Crossing | SelectKind::CPolygon, _) => true,
             (SelectKind::Box, Some((a, b))) => b.x < a.x,
@@ -189,7 +192,7 @@ impl StretchM {
         };
         let whole = area.is_none();
         if let (Some(a), true, false) = (&area, crossing, self.removing) {
-            add_mline_vertex_hits(s.doc()?, &space, a, &mut hs);
+            add_mline_vertex_hits(s, a, &mut hs);
         }
         if let (Some(a), false) = (area, self.removing) {
             self.windows.push(a);
@@ -228,10 +231,10 @@ impl StretchM {
                 Some(c) => {
                     let bx = cadcraft_geom::Bounds2::new(c, p);
                     let space = s.space();
-                    let mut hs = crate::select::select_window(s.doc()?, &space, bx, p.x < c.x);
+                    let mut hs = crate::select::select_window_in(s.doc()?, &space, s.viewport_frozen(), bx, p.x < c.x);
                     if !self.removing {
                         if p.x < c.x {
-                            add_mline_vertex_hits(s.doc()?, &space, &StretchArea::Box(bx), &mut hs);
+                            add_mline_vertex_hits(s, &StretchArea::Box(bx), &mut hs);
                         }
                         self.windows.push(StretchArea::Box(bx));
                     }
@@ -240,7 +243,7 @@ impl StretchM {
                 None => {
                     let aperture = s.pixel_size() * s.settings.pickbox.max(1.0) * 1.5;
                     let space = s.space();
-                    match crate::select::pick(s.doc()?, &space, p, aperture) {
+                    match crate::select::pick_in(s.doc()?, &space, s.viewport_frozen(), p, aperture) {
                         Some(h) => self.add(s, vec![h], true),
                         None => self.corner = Some(p),
                     }
@@ -251,6 +254,7 @@ impl StretchM {
                 self.corner = None;
                 let d = s.doc()?;
                 let store = d.space(&s.space());
+                let frozen = s.viewport_frozen();
                 let word = t.trim().to_ascii_lowercase();
                 // `_C`, `_L`: the English name, as scripts write it.
                 let word = word.strip_prefix('_').unwrap_or(&word).to_string();
@@ -267,9 +271,14 @@ impl StretchM {
                         self.removing = false;
                         None
                     }
-                    "all" => Some(store.map(|st| st.iter().filter(|e| d.is_visible(e)).map(|e| e.handle).collect()).unwrap_or_default()),
-                    "l" | "last" => Some(store.and_then(|st| st.last()).map(|e| vec![e.handle]).unwrap_or_default()),
-                    "p" | "previous" => Some(s.state()?.previous_selection.clone()),
+                    "all" => Some(
+                        store.map(|st| st.iter().filter(|e| crate::select::selectable(d, e, frozen)).map(|e| e.handle).collect()).unwrap_or_default(),
+                    ),
+                    "l" | "last" => Some(store.and_then(|st| crate::select::last_in(st, frozen)).map(|h| vec![h]).unwrap_or_default()),
+                    "p" | "previous" => {
+                        let st = s.state()?;
+                        Some(st.drawn_in_viewport(&st.previous_selection))
+                    }
                     _ => {
                         s.echo("*Invalid selection*");
                         None

crates/engine/src/cmd/modify2.rs

@@ -65,7 +65,7 @@ pub fn specs() -> Vec<CommandSpec> {
             .params("{handle (block reference), pick?: [x,y] (nearest nested object; default all), delta? | from,to}")
             .interactive(|_| Ok(Box::new(NcopyM::default()))),
         CommandSpec::new("mocoro", "Move/Copy/Rotate", mocoro::run_mocoro)
-            .menu(&["Tools", "Express Tools", "Move/Copy/Rotate"])
+            .menu(&["Tools", "Additional Tools", "Move/Copy/Rotate"])
             .params("{handles?, base: [x,y], ops: [{move: [x,y]} | {copy: [x,y]} | {rotate: degrees} | {scale: factor} | {base: [x,y]}]} → {handles (copies)}")
             .interactive(|_| Ok(Box::new(mocoro::MocoroM::default()))),
         CommandSpec::new("chspace", "Change Space", run_chspace)

crates/engine/src/cmd/qselect.rs

@@ -280,7 +280,7 @@ fn run_qselect(s: &mut Session, p: &Value) -> Result<Value> {
     let sel = match mode.as_str() {
         "exclude" => excluded,
         "append" => {
-            let mut cur = s.selection();
+            let mut cur = s.stored_selection();
             for h in matched {
                 if !cur.contains(&h) {
                     cur.push(h);

crates/engine/src/cmd/selecttools.rs

@@ -99,14 +99,21 @@ pub(crate) fn similar(e: &Entity, r: &Entity, mode: u32) -> bool {
         && (mode & NAME == 0 || same_text(object_name(e), object_name(r)))
 }
 
-/// The visible objects of the current space like any of `refs`.
+/// The objects of the current space like any of `refs` that a selection can take there: visible,
+/// and inside an MSPACE viewport not on a layer frozen in it.
 fn similar_objects(s: &Session, d: &Drawing, refs: &[Handle], mode: u32) -> Vec<Handle> {
     let refs: Vec<&Entity> = refs.iter().filter_map(|h| d.entity(*h).map(|e| e.as_ref())).collect();
     if refs.is_empty() {
         return Vec::new();
     }
     let Some(store) = d.space(&s.space()) else { return Vec::new() };
-    store.iter().take(MAX_SCAN).filter(|e| d.is_visible(e) && refs.iter().any(|r| similar(e, r, mode))).map(|e| e.handle).collect()
+    let frozen = s.viewport_frozen();
+    store
+        .iter()
+        .take(MAX_SCAN)
+        .filter(|e| crate::select::selectable(d, e, frozen) && refs.iter().any(|r| similar(e, r, mode)))
+        .map(|e| e.handle)
+        .collect()
 }
 
 fn mode_param(s: &Session, p: &Value) -> Result<u32> {

crates/engine/src/cmd/trimextend.rs

@@ -59,7 +59,7 @@ fn fence(s: &mut Session, pts: &[Vec2], extending: bool, edges: Edges, quick: bo
     let fb = Bounds2::from_points(pts.iter().copied());
     let tol = crate::select::window_tol(&fb);
     let mut work: Vec<(Handle, Vec<Vec2>)> = Vec::new();
-    for h in crate::select::select_fence(d, &space, pts) {
+    for h in crate::select::select_fence_in(d, &space, s.viewport_frozen(), pts) {
         let Some(e) = d.entity(h) else { continue };
         let polys = crate::select::hit_polylines(d, e, tol);
         let mut xs: Vec<Vec2> = Vec::new();
@@ -96,7 +96,7 @@ fn crossing(s: &mut Session, a: Vec2, b: Vec2, extending: bool, edges: Edges, qu
     ];
     let inside = |p: Vec2| bx.expand(tol).contains(p);
     let mut work: Vec<(Handle, Vec<Vec2>)> = Vec::new();
-    for h in crate::select::select_window(d, &space, bx, true) {
+    for h in crate::select::select_window_in(d, &space, s.viewport_frozen(), bx, true) {
         let Some(e) = d.entity(h) else { continue };
         let mut best: Option<Vec2> = None;
         for pl in crate::select::hit_polylines(d, e, tol) {

crates/engine/src/cmd/txt2mtxt.rs

@@ -18,7 +18,7 @@ use crate::{Accept, EngineError, Input, Interactive, Prompt, Result, Session, St
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         CommandSpec::new("txt2mtxt", "Convert Text to Mtext", run_txt2mtxt)
-            .menu(&["Tools", "Express Tools", "Convert Text to Mtext"])
+            .menu(&["Tools", "Additional Tools", "Convert Text to Mtext"])
             .params(
                 "{handles? (default the selection; TEXT, and MTEXT when combining), combine? (default true: one MTEXT; false: one per TEXT), \
                  sort?: \"topdown\" (default) | \"selection\", wrap? (default false: one line per text)} → {handles}",

crates/engine/src/doc_state.rs

@@ -8,6 +8,12 @@ pub struct Snapshot {
     pub selection: Vec<Handle>,
 }
 
+/// [`DocState::drawn_in_viewport`] looks its handles up one by one while there is fewer than one
+/// of them for every `LOOKUP_COST` objects of model space, and passes over model space once
+/// otherwise. Timed on drawings of 40,000 and of 200,000 lines, the two cost the same at about
+/// one handle for every 47 and for every 18 objects.
+const LOOKUP_COST: usize = 32;
+
 /// One open drawing.
 #[derive(Clone, Debug)]
 pub struct DocState {
@@ -119,13 +125,65 @@ impl DocState {
     }
     /// The active MSPACE viewport, if it still exists in the current layout.
     pub fn active_viewport(&self) -> Option<(Handle, cadcraft_doc::Viewport)> {
+        self.active_viewport_ref().map(|(h, v)| (h, v.clone()))
+    }
+    /// [`DocState::active_viewport`] without copying the viewport.
+    fn active_viewport_ref(&self) -> Option<(Handle, &cadcraft_doc::Viewport)> {
         let h = self.mspace?;
         let e = self.doc.space(&self.space)?.get(h)?;
         match &e.kind {
-            cadcraft_doc::EntityKind::Viewport(v) if v.height > 1e-12 && v.view_height > 1e-12 => Some((h, v.clone())),
+            cadcraft_doc::EntityKind::Viewport(v) if v.height > 1e-12 && v.view_height > 1e-12 => Some((h, v)),
             _ => None,
         }
     }
+    /// The layers frozen in the active MSPACE viewport (VPLAYER, "VP Freeze"): that viewport does
+    /// not draw their objects, so picks, selections and grips made through it leave them out.
+    /// Empty in paper space and on the Model tab.
+    pub fn viewport_frozen(&self) -> &[String] {
+        match self.active_viewport_ref() {
+            Some((_, v)) => &v.frozen_layers,
+            None => &[],
+        }
+    }
+    /// Whether `e` is a model-space object the active MSPACE viewport does not draw: it is on a
+    /// layer frozen in that viewport ([`DocState::viewport_frozen`]). Objects on the sheet are not
+    /// drawn through the viewport, so its frozen layers do not hide them.
+    pub fn hidden_in_viewport(&self, e: &cadcraft_doc::Entity) -> bool {
+        crate::select::on_frozen_layer(self.viewport_frozen(), e) && self.doc.model.contains(e.handle)
+    }
+    /// Whether the view being edited shows `e`: the drawing shows it ([`Drawing::is_visible`]),
+    /// and the active MSPACE viewport, if there is one, draws it
+    /// ([`DocState::hidden_in_viewport`]).
+    pub fn shows(&self, e: &cadcraft_doc::Entity) -> bool {
+        self.doc.is_visible(e) && !self.hidden_in_viewport(e)
+    }
+    /// `handles` without the objects the active MSPACE viewport does not draw
+    /// ([`DocState::hidden_in_viewport`]): a set of objects made earlier (the selection, the
+    /// Previous set) as that viewport takes it. All of them anywhere else.
+    pub(crate) fn drawn_in_viewport(&self, handles: &[Handle]) -> Vec<Handle> {
+        let frozen = self.viewport_frozen();
+        if frozen.is_empty() || handles.is_empty() {
+            return handles.to_vec();
+        }
+        let model = &self.doc.model;
+        let hidden = |e: &Arc<cadcraft_doc::Entity>| crate::select::on_frozen_layer(frozen, e);
+        // The UI asks for the selection several times a frame. A few handles are looked up one
+        // by one; beyond that, one pass over model space costs less than the lookups.
+        if handles.len().saturating_mul(LOOKUP_COST) < model.len() {
+            return handles.iter().copied().filter(|h| !model.get(*h).is_some_and(hidden)).collect();
+        }
+        let mut gone: Vec<Handle> = model.iter().filter(|e| hidden(e)).map(|e| e.handle).collect();
+        gone.sort_unstable();
+        handles.iter().copied().filter(|h| gone.binary_search(h).is_err()).collect()
+    }
+    /// The selection as the view being edited has it: [`DocState::selection`] without the objects
+    /// the active MSPACE viewport does not draw. Those stay in [`DocState::selection`] until the
+    /// selection is replaced or cleared, and count as selected again once that viewport draws
+    /// them; until then nothing that starts from the selection (a command, a grip, a palette)
+    /// edits them through that viewport.
+    pub fn shown_selection(&self) -> Vec<Handle> {
+        self.drawn_in_viewport(&self.selection)
+    }
     pub fn paper_view(&self) -> View {
         self.views.iter().find(|(s, _)| *s == self.space).map(|(_, v)| *v).unwrap_or_default()
     }

crates/engine/src/keyboard.rs

@@ -0,0 +1,186 @@
+//! Words typed on a Greek keyboard layout.
+//!
+//! With the Greek layout active, the keys that type LINE produce ΛΙΝΕ. Command names, aliases and
+//! prompt keywords are Latin, so a Greek speaker would have to switch layouts for every command.
+//! [`latin_keys`] reads a word as the Latin keys that produced it (the layout puts each Greek
+//! letter on the key of the Latin letter it sounds like): the command line then accepts ΛΙΝΕ and
+//! ΣΤΡΕΤΨΗ as LINE and STRETCH. Accents (the layout's dead key) are ignored.
+
+/// The Latin key a Greek letter is typed on (lower case, accents removed).
+fn key_of(c: char) -> Option<char> {
+    Some(match c {
+        'α' | 'ά' => 'a',
+        'β' => 'b',
+        'γ' => 'g',
+        'δ' => 'd',
+        'ε' | 'έ' => 'e',
+        'ζ' => 'z',
+        'η' | 'ή' => 'h',
+        'θ' => 'u',
+        'ι' | 'ί' | 'ϊ' | 'ΐ' => 'i',
+        'κ' => 'k',
+        'λ' => 'l',
+        'μ' => 'm',
+        'ν' => 'n',
+        'ξ' => 'j',
+        'ο' | 'ό' => 'o',
+        'π' => 'p',
+        'ρ' => 'r',
+        'σ' => 's',
+        // The W key types the final sigma.
+        'ς' => 'w',
+        'τ' => 't',
+        'υ' | 'ύ' | 'ϋ' | 'ΰ' => 'y',
+        'φ' => 'f',
+        'χ' => 'x',
+        'ψ' => 'c',
+        'ω' | 'ώ' => 'v',
+        // The Q key types the semicolon, which Greek text writes as ";" or U+037E.
+        ';' | '\u{37e}' => 'q',
+        _ => return None,
+    })
+}
+
+/// Whether `c` is a Greek letter (the basic and accented ranges the layout types).
+fn is_greek_letter(c: char) -> bool {
+    matches!(c, '\u{386}'..='\u{3ce}') && c != '\u{387}'
+}
+
+/// `word` read as the Latin keys of a Greek-layout keyboard, lower case: `Some` only when the word
+/// has a Greek letter and every character is a Greek letter the layout types, the semicolon on
+/// the Q key, or ASCII (itself, in lower case). A combining tonos or dialytika, the accent of
+/// decomposed text, is ignored like the accent of a precomposed letter, but only straight after
+/// the Greek letter it accents and once each: anywhere else the word is not Greek-layout typing.
+pub fn latin_keys(word: &str) -> Option<String> {
+    let mut greek = false;
+    // What the previous Greek letter already carries (tonos, dialytika); `None` when the previous
+    // character is not a Greek letter, which leaves a combining mark nothing to accent.
+    let mut marks: Option<(bool, bool)> = None;
+    let mut out = String::with_capacity(word.len());
+    for c in word.chars() {
+        if matches!(c, '\u{301}' | '\u{308}') {
+            let (tonos, dialytika) = marks.as_mut()?;
+            if std::mem::replace(if c == '\u{301}' { tonos } else { dialytika }, true) {
+                return None;
+            }
+            continue;
+        }
+        if c.is_ascii() {
+            // The Q key types the ASCII semicolon in the Greek layout; every other ASCII character is itself.
+            out.push(if c == ';' { 'q' } else { c.to_ascii_lowercase() });
+            marks = None;
+            continue;
+        }
+        let lower = c.to_lowercase().next().unwrap_or(c);
+        out.push(key_of(lower)?);
+        let letter = is_greek_letter(lower);
+        greek |= letter;
+        marks = letter.then_some((false, false));
+    }
+    greek.then_some(out)
+}
+
+/// `word` with its case, accents and final sigma folded away, when it is Greek-layout typing: every
+/// spelling of one Greek word gives the same string. It is the word's keys, with the final sigma
+/// read as the letter sigma instead of the W key.
+pub fn greek_fold(word: &str) -> Option<String> {
+    latin_keys(&word.replace('ς', "σ"))
+}
+
+/// Whether `a` and `b` are one Greek word, whatever their case, accents or final sigma.
+pub fn same_greek_word(a: &str, b: &str) -> bool {
+    same_greek_word_as(b).is_some_and(|same| same(a))
+}
+
+/// A test for "is the Greek word `word`, whatever the case, accents or final sigma", or `None`
+/// when `word` is not Greek-layout typing. `word` is folded here, once: looking a typed word up
+/// among many names costs its length once, not once for every name.
+pub fn same_greek_word_as(word: &str) -> Option<impl Fn(&str) -> bool> {
+    let fold = greek_fold(word)?;
+    Some(move |name: &str| greek_fold(name).as_deref() == Some(fold.as_str()))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{latin_keys, same_greek_word};
+
+    /// One Greek word compares equal in any case, accent or final sigma; another word, or a Latin
+    /// one, does not.
+    #[test]
+    fn one_greek_word_is_the_same_in_any_case_accent_or_final_sigma() {
+        for (a, b) in [("ΣΟΛΙΔ", "σολιδ"), ("ΣΟΛΙΔ", "σολίδ"), ("ΛΑΣ", "λας"), ("ΛΑΣ", "λασ"), ("ΛΙ\u{301}ΝΕ", "λινε")]
+        {
+            assert!(same_greek_word(a, b), "{a} {b}");
+        }
+        for (a, b) in [("ΣΟΛΙΔ", "ΣΟΛΙ"), ("ΣΟΛΙΔ", "solid"), ("solid", "SOLID")] {
+            assert!(!same_greek_word(a, b), "{a} {b}");
+        }
+    }
+
+    /// A character the layout does not type is never taken for the Greek letter Unicode upper-cases
+    /// it to: the micro sign is not μ, the long s and the sharp s are not σ, an alpha with an iota
+    /// subscript is not αι, the theta symbol is not θ.
+    #[test]
+    fn a_character_the_layout_does_not_type_is_no_spelling_of_a_greek_letter() {
+        let pairs = [("\u{b5}", "μ"), ("Λ\u{17f}", "ΛΣ"), ("Λ\u{df}", "ΛΣΣ"), ("\u{1fb3}", "αι"), ("\u{3d1}", "θ")];
+        let same: Vec<_> = pairs.iter().filter(|(a, b)| same_greek_word(a, b) || same_greek_word(b, a)).collect();
+        assert!(same.is_empty(), "{same:?}");
+    }
+
+    /// Greek-layout typing reads as its Latin keys: plain, accented and decomposed letters, the Q
+    /// and W keys, ASCII prefixes.
+    #[test]
+    fn greek_layout_commands_read_as_their_latin_keys() {
+        assert_eq!(latin_keys("ΛΙΝΕ").as_deref(), Some("line"));
+        assert_eq!(latin_keys("λινε").as_deref(), Some("line"));
+        assert_eq!(latin_keys("ΣΤΡΕΤΨΗ").as_deref(), Some("stretch"));
+        assert_eq!(latin_keys("ΜΙΡΡΟΡ").as_deref(), Some("mirror"));
+        assert_eq!(latin_keys("ΘΝΔΟ").as_deref(), Some("undo"));
+        // The Q key types ";", the W key the final sigma.
+        assert_eq!(latin_keys(";ΣΑΩΕ").as_deref(), Some("qsave"));
+        assert_eq!(latin_keys("ςΒΛΟΨΚ").as_deref(), Some("wblock"));
+        // Accented letters (the layout's dead key) read as the plain letter.
+        assert_eq!(latin_keys("ΛΊΝΕ").as_deref(), Some("line"));
+        assert_eq!(latin_keys("ΆΡΡΑΥ").as_deref(), Some("array"));
+        // The same accents written as a combining mark after the letter (decomposed text).
+        assert_eq!(latin_keys("ΛΙ\u{301}ΝΕ").as_deref(), Some("line"));
+        assert_eq!(latin_keys("ΛΙΝΕ\u{301}").as_deref(), Some("line"));
+        assert_eq!(latin_keys("ΛΙ\u{308}ΝΕ").as_deref(), Some("line"));
+        assert_eq!(latin_keys("ΛΙ\u{308}\u{301}ΝΕ").as_deref(), Some("line"), "dialytika and tonos on one letter");
+        // Prefixes and digits are kept.
+        assert_eq!(latin_keys("-ΛΑΥΕΡ").as_deref(), Some("-layer"));
+        assert_eq!(latin_keys("_ΛΙΝΕ").as_deref(), Some("_line"));
+    }
+
+    /// A word with no Greek letter, or with a character the layout does not type, is not read.
+    #[test]
+    fn words_that_are_not_greek_layout_typing_are_left_alone() {
+        assert_eq!(latin_keys("line"), None, "no Greek letter");
+        assert_eq!(latin_keys(""), None);
+        assert_eq!(latin_keys(";"), None, "a semicolon alone is not a word");
+        assert_eq!(latin_keys("ΛΙΝΕ Ж"), None, "a letter the layout does not type");
+        assert_eq!(latin_keys("ΛΙΝΕ 日本"), None);
+        assert_eq!(latin_keys("\u{387}"), None, "the ano teleia is punctuation, not a letter");
+    }
+
+    /// A combining tonos or dialytika counts only straight after a Greek letter, and once each.
+    #[test]
+    fn a_combining_mark_must_follow_the_greek_letter_it_accents() {
+        assert_eq!(latin_keys("\u{301}ΛΙΝΕ"), None, "no letter before the mark");
+        assert_eq!(latin_keys("\u{308}ΛΙΝΕ"), None);
+        assert_eq!(latin_keys("ΛΙΝΕ-\u{301}"), None, "after punctuation");
+        assert_eq!(latin_keys("a\u{301}ΛΙΝΕ"), None, "after a Latin letter");
+        assert_eq!(latin_keys("Λ\u{301}\u{301}ΙΝΕ"), None, "a second tonos on one letter");
+        assert_eq!(latin_keys("Λ\u{308}\u{308}ΙΝΕ"), None, "a second dialytika on one letter");
+    }
+
+    /// A 100 000-letter word and odd code points are read or refused; nothing panics.
+    #[test]
+    fn hostile_text_never_panics() {
+        let long = "Ω".repeat(100_000);
+        assert_eq!(latin_keys(&long).map(|s| s.len()), Some(100_000));
+        for s in ["\u{0}", "\u{301}", "ΛΙΝΕ\u{301}", "\u{10ffff}", "ς\u{3c2}\u{3a3}"] {
+            let _ = latin_keys(s);
+        }
+    }
+}

crates/engine/src/lib.rs

@@ -22,6 +22,7 @@ mod finite;
 pub mod grip_dims;
 pub mod grips;
 mod guard;
+pub mod keyboard;
 pub mod lisp;
 pub mod mtext_edit;
 pub mod pointmod;
@@ -236,11 +237,25 @@ impl Session {
     pub fn space(&self) -> Space {
         self.state().map(DocState::edit_space).unwrap_or_default()
     }
+    /// The layers frozen in the active MSPACE viewport ([`DocState::viewport_frozen`]): what a
+    /// pick or a selection in [`Session::space`] leaves out. Empty with no drawing open.
+    pub fn viewport_frozen(&self) -> &[String] {
+        self.state().map(DocState::viewport_frozen).unwrap_or_default()
+    }
     /// The tab being displayed: Model or a layout, regardless of MSPACE.
     pub fn layout_space(&self) -> Space {
         self.state().map(|s| s.space.clone()).unwrap_or_default()
     }
+    /// The selected objects as the view being edited has them ([`DocState::shown_selection`]):
+    /// inside an MSPACE viewport, without the objects on layers frozen in that viewport. Commands,
+    /// grips and palettes start from this; [`DocState::selection`] holds every selected object.
     pub fn selection(&self) -> Vec<Handle> {
+        self.state().map(DocState::shown_selection).unwrap_or_default()
+    }
+    /// Every selected object ([`DocState::selection`]), also the ones the active MSPACE viewport
+    /// does not draw, which [`Session::selection`] leaves out. Adding to the selection or removing
+    /// from it starts from this, so that it keeps them.
+    pub(crate) fn stored_selection(&self) -> Vec<Handle> {
         self.state().map(|s| s.selection.clone()).unwrap_or_default()
     }
     pub fn set_selection(&mut self, sel: Vec<Handle>) {

crates/engine/src/lisp/drawing.rs

@@ -10,8 +10,8 @@
 use std::sync::{Arc, Mutex};
 
 use cadcraft_doc::{Entity, Handle, Space};
-use cadcraft_dxf::Tag;
 use cadcraft_geom::Vec2;
+use craft_dxf::Tag;
 
 use super::LispError;
 use super::builtins::args_err;
@@ -253,20 +253,20 @@ fn convert_angles(kind: &str, tags: &mut [Tag], f: fn(f64) -> f64) {
             continue;
         }
         let v = match t.value {
-            cadcraft_dxf::Value::Real(r) => r,
-            cadcraft_dxf::Value::Int(i) => i as f64,
+            craft_dxf::Value::Real(r) => r,
+            craft_dxf::Value::Int(i) => i as f64,
             _ => continue,
         };
-        t.value = cadcraft_dxf::Value::Real(f(v));
+        t.value = craft_dxf::Value::Real(f(v));
     }
 }
 
 fn tag_value(t: &Tag) -> Value {
     match &t.value {
-        cadcraft_dxf::Value::Str(s) | cadcraft_dxf::Value::Hex(s) => Value::str(s),
-        cadcraft_dxf::Value::Real(r) => Value::Real(*r),
-        cadcraft_dxf::Value::Int(i) => Value::Int(i32::try_from(*i).unwrap_or(if *i < 0 { i32::MIN } else { i32::MAX })),
-        cadcraft_dxf::Value::Bool(b) => Value::Int(i32::from(*b)),
+        craft_dxf::Value::Str(s) | craft_dxf::Value::Hex(s) => Value::str(s),
+        craft_dxf::Value::Real(r) => Value::Real(*r),
+        craft_dxf::Value::Int(i) => Value::Int(i32::try_from(*i).unwrap_or(if *i < 0 { i32::MIN } else { i32::MAX })),
+        craft_dxf::Value::Bool(b) => Value::Int(i32::from(*b)),
     }
 }
 
@@ -651,15 +651,19 @@ pub fn ssget(ctx: &mut Ctx<'_>, a: Vec<Value>) -> Result<Flow, LispError> {
         Some("X") => all(s, true),
         Some("L") => {
             let order = handles_in_order(ctx);
-            order.last().copied().into_iter().collect()
+            // Inside an MSPACE viewport, the objects that viewport does not draw are passed over.
+            let st = ctx.s.state().ok();
+            let drawn = |h: &Handle| st.is_none_or(|st| st.doc.entity(*h).is_none_or(|e| !st.hidden_in_viewport(e)));
+            order.iter().rev().copied().find(drawn).into_iter().collect()
         }
-        Some("P") => ctx.s.state().map(|st| st.previous_selection.clone()).unwrap_or_default(),
+        Some("P") => ctx.s.state().map(|st| st.drawn_in_viewport(&st.previous_selection)).unwrap_or_default(),
         Some("I") => ctx.s.selection(),
         Some("W") | Some("C") => {
             let (p1, p2) = (point(0)?, point(1)?);
             let s = &*ctx.s;
             let Ok(d) = s.doc() else { return Ok(Flow::Value(Value::Nil)) };
-            crate::select::select_window(d, &space, cadcraft_geom::Bounds2::from_points([p1, p2]), mode.as_deref() == Some("C"))
+            let bx = cadcraft_geom::Bounds2::from_points([p1, p2]);
+            crate::select::select_window_in(d, &space, s.viewport_frozen(), bx, mode.as_deref() == Some("C"))
         }
         Some("F") | Some("WP") | Some("CP") => {
             let poly: Vec<Vec2> =
@@ -667,8 +671,8 @@ pub fn ssget(ctx: &mut Ctx<'_>, a: Vec<Value>) -> Result<Flow, LispError> {
             let s = &*ctx.s;
             let Ok(d) = s.doc() else { return Ok(Flow::Value(Value::Nil)) };
             match mode.as_deref() {
-                Some("F") => crate::select::select_fence(d, &space, &poly),
-                m => crate::select::select_polygon(d, &space, &poly, m == Some("CP")),
+                Some("F") => crate::select::select_fence_in(d, &space, s.viewport_frozen(), &poly),
+                m => crate::select::select_polygon_in(d, &space, s.viewport_frozen(), &poly, m == Some("CP")),
             }
         }
         Some(":S") | Some("A") | None => {
@@ -684,7 +688,7 @@ pub fn ssget(ctx: &mut Ctx<'_>, a: Vec<Value>) -> Result<Flow, LispError> {
                 let s = &*ctx.s;
                 let ap = s.settings.pickbox.max(1.0) * s.pixel_size();
                 let Ok(d) = s.doc() else { return Ok(Flow::Value(Value::Nil)) };
-                crate::select::pick(d, &space, p, ap).into_iter().collect()
+                crate::select::pick_in(d, &space, s.viewport_frozen(), p, ap).into_iter().collect()
             }
         }
         Some(m) => return Err(LispError::new(format!("bad argument value: ssget mode {m}"))),

crates/engine/src/lisp/input.rs

@@ -141,7 +141,7 @@ impl GetRequest {
                 let ap = s.settings.pickbox.max(1.0) * s.pixel_size();
                 let space = s.state().map(|st| st.edit_space()).map_err(|e| Again::Msg(e.to_string()))?;
                 let d = s.doc().map_err(|e| Again::Msg(e.to_string()))?;
-                match crate::select::pick(d, &space, Vec2::new(p[0], p[1]), ap) {
+                match crate::select::pick_in(d, &space, s.viewport_frozen(), Vec2::new(p[0], p[1]), ap) {
                     Some(h) => Ok(Value::list(vec![Value::Ename(h), Value::point(&p)])),
                     None => Err("Missed, try again.".into()),
                 }

crates/engine/src/prompt.rs

@@ -102,6 +102,10 @@ pub struct Prompt {
     /// the routine writes, so it cannot be read for the word "Select" (#1598).
     #[serde(skip_serializing_if = "std::ops::Not::not")]
     pub picks_one: bool,
+    /// The prompt takes a block's name as well as its keywords: a Greek word that is an existing
+    /// block's name is that block, not a keyword read from its Latin keys.
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub takes_block: bool,
 }
 
 /// Parse `@distance<angle` (relative polar), returning `(distance, angle in radians)`.
@@ -136,6 +140,11 @@ impl Prompt {
         self.picker = Some(p);
         self
     }
+    /// Takes a block's name besides its keywords (the `takes_block` field).
+    pub fn takes_block(mut self) -> Self {
+        self.takes_block = true;
+        self
+    }
     pub fn kw(mut self, k: &[&str]) -> Self {
         self.keywords = k.iter().map(ToString::to_string).collect();
         self
@@ -215,6 +224,24 @@ impl Prompt {
             return None;
         }
         let tl = t.to_ascii_lowercase();
+        // A keyword typed with the Greek keyboard layout active (ΘΝΔΟ for Undo) is its Latin keys, unless
+        // the prompt offers that spelling itself (a Greek keyword in a LISP program's list): its word
+        // or a prefix of it as typed (ΘΝ for ΘΝΔΟ, not UN for Undo) is read before the Latin keys.
+        if let Some(latin) = crate::keyboard::latin_keys(t) {
+            // Greek letters have case, accents and a final sigma, which the ASCII-only folding above does not see.
+            let typed = crate::keyboard::greek_fold(t).unwrap_or_else(|| latin.clone());
+            let greek = || self.keywords.iter().filter_map(|k| crate::keyboard::greek_fold(k).map(|fold| (k, fold)));
+            return greek()
+                .find(|(_, k)| *k == typed)
+                .or_else(|| greek().find(|(_, k)| k.starts_with(&typed)))
+                .map(|(k, _)| k.clone())
+                .or_else(|| self.match_latin_keyword(&latin));
+        }
+        self.match_latin_keyword(&tl)
+    }
+
+    /// [`Prompt::match_keyword`] for text already read as Latin letters, in lower case.
+    fn match_latin_keyword(&self, tl: &str) -> Option<String> {
         let keys = self.keywords.iter().map(|k| {
             let shortcut: String = k.chars().filter(|c| c.is_ascii_uppercase() || c.is_ascii_digit()).collect::<String>().to_ascii_lowercase();
             let shortcut =
@@ -227,8 +254,8 @@ impl Prompt {
         // CHPROP: "Ambiguous response, please clarify..."), `LTS` is ltScale.
         let past_capitals = |k: &str| k.char_indices().rfind(|(_, c)| c.is_ascii_uppercase() || c.is_ascii_digit()).map_or(1, |(i, _)| i + 1);
         keys.clone()
-            .find(|(_, kl, sc)| tl == *kl || tl == *sc)
-            .or_else(|| keys.clone().find(|(k, kl, _)| tl.len() >= past_capitals(k) && kl.starts_with(&tl)))
+            .find(|(_, kl, sc)| tl == kl.as_str() || tl == sc.as_str())
+            .or_else(|| keys.clone().find(|(k, kl, _)| tl.len() >= past_capitals(k) && kl.starts_with(tl)))
             .map(|(k, _, _)| k.clone())
     }
 }
@@ -394,6 +421,29 @@ mod tests {
         assert_eq!(parse_point("1,2,3,4", last), None);
     }
 
+    /// A keyword the prompt offers in Greek is matched as spelled (any case, accent or final sigma,
+    /// or a prefix) before the Latin reading of the same keys; without one, the keys answer the
+    /// Latin keyword.
+    #[test]
+    fn a_greek_keyword_is_matched_as_spelled_before_its_latin_reading() {
+        // ΘΝΔΟ is the keys U-N-D-O, so it answers Undo, unless the prompt offers the Greek word itself
+        // (a LISP program's keyword list).
+        let both = Prompt::new("", Accept::TEXT).kw(&["Undo", "ΘΝΔΟ"]);
+        assert_eq!(both.match_keyword("ΘΝΔΟ").as_deref(), Some("ΘΝΔΟ"));
+        assert_eq!(both.match_keyword("θνδο").as_deref(), Some("ΘΝΔΟ"), "Greek case is folded like Latin case");
+        assert_eq!(both.match_keyword("Undo").as_deref(), Some("Undo"));
+        // A prefix of the Greek word as typed (ΘΝ) is that keyword, not the Latin prefix UN of Undo.
+        assert_eq!(both.match_keyword("ΘΝ").as_deref(), Some("ΘΝΔΟ"));
+        assert_eq!(both.match_keyword("θν").as_deref(), Some("ΘΝΔΟ"), "in either case");
+        assert_eq!(both.match_keyword("θνδό").as_deref(), Some("ΘΝΔΟ"), "with an accent");
+        let sigma = Prompt::new("", Accept::TEXT).kw(&["Last", "ΛΑΣΤ"]);
+        assert_eq!(sigma.match_keyword("λας").as_deref(), Some("ΛΑΣΤ"), "a final sigma folds too");
+        let latin = Prompt::new("", Accept::TEXT).kw(&["Undo"]);
+        assert_eq!(latin.match_keyword("ΘΝ").as_deref(), Some("Undo"));
+        assert_eq!(latin.match_keyword("ΘΝΔΟ").as_deref(), Some("Undo"));
+        assert_eq!(latin.match_keyword("Θ").as_deref(), Some("Undo"), "a Greek-layout shortcut still works");
+    }
+
     #[test]
     fn keywords() {
         let p = Prompt::new("Specify next point", Accept::POINT).kw(&["Undo", "Close"]);

crates/engine/src/select.rs

@@ -152,8 +152,28 @@ fn in_box(pts: impl Iterator<Item = Vec2>, angle: f64, p: Vec2) -> bool {
     !b.is_empty() && b.contains(turn(p))
 }
 
-fn selectable(d: &Drawing, e: &Entity) -> bool {
-    d.is_visible(e)
+/// Whether `e` is on one of the layers in `frozen`: the layers frozen in a layout viewport, which
+/// does not draw their objects. The names are compared as the renderer compares them.
+pub(crate) fn on_frozen_layer(frozen: &[String], e: &Entity) -> bool {
+    frozen.iter().any(|l| l.eq_ignore_ascii_case(&e.common.layer))
+}
+
+/// The last object of `store`, in draw order, that is not on one of the layers in `frozen`, the
+/// layers frozen in the layout viewport the selection is made through: what the Last option
+/// takes there. With no such layers it is the last object, whether the drawing shows it or not.
+pub(crate) fn last_in(store: &cadcraft_doc::EntityStore, frozen: &[String]) -> Option<Handle> {
+    if frozen.is_empty() {
+        return store.last().map(|e| e.handle);
+    }
+    store.iter().filter(|e| !on_frozen_layer(frozen, e)).last().map(|e| e.handle)
+}
+
+/// Whether a selection can take `e`: the drawing shows it ([`Drawing::is_visible`]) and it is not
+/// on one of the layers in `frozen`, the layers frozen in the layout viewport the selection is
+/// made through ([`crate::DocState::viewport_frozen`]; empty anywhere else). A viewport shows
+/// model space, so `frozen` goes with a selection in model space only.
+pub(crate) fn selectable(d: &Drawing, e: &Entity, frozen: &[String]) -> bool {
+    d.is_visible(e) && !on_frozen_layer(frozen, e)
 }
 
 /// Entities to test, in the order to test them, each with its bounds when already known.
@@ -196,15 +216,28 @@ pub(crate) fn candidates<'a>(
 /// the nearest, as AutoCAD 2024 picks (two objects under the pickbox: the one drawn later is
 /// picked, and DRAWORDER changes which).
 pub fn pick(d: &Drawing, space: &Space, p: Vec2, aperture: f64) -> Option<Handle> {
-    let ix = spatial::index(d, space);
-    pick_with(d, space, &ix, p, aperture)
+    pick_in(d, space, &[], p, aperture)
 }
 
-pub(crate) fn pick_with(d: &Drawing, space: &Space, ix: &Option<std::sync::Arc<SpatialIndex>>, p: Vec2, aperture: f64) -> Option<Handle> {
+/// [`pick`] through a layout viewport: the objects on the layers in `frozen`, the layers frozen
+/// in that viewport, are not drawn there and are not picked.
+pub fn pick_in(d: &Drawing, space: &Space, frozen: &[String], p: Vec2, aperture: f64) -> Option<Handle> {
+    let ix = spatial::index(d, space);
+    pick_with(d, space, &ix, frozen, p, aperture)
+}
+
+pub(crate) fn pick_with(
+    d: &Drawing,
+    space: &Space,
+    ix: &Option<std::sync::Arc<SpatialIndex>>,
+    frozen: &[String],
+    p: Vec2,
+    aperture: f64,
+) -> Option<Handle> {
     let probe = Bounds2::new(p, p).expand(aperture);
     // Candidates come topmost first: the first within the aperture is the one.
     for (e, known) in candidates(d, space, ix, &probe.expand(aperture), true, true)? {
-        if !selectable(d, e) {
+        if !selectable(d, e, frozen) {
             continue;
         }
         let infinite = is_infinite(e);
@@ -221,11 +254,16 @@ pub(crate) fn pick_with(d: &Drawing, space: &Space, ix: &Option<std::sync::Arc<S
 /// Every entity within `aperture` of `p`, topmost first (so the first is what [`pick`] chooses):
 /// the objects selection cycling lists.
 pub fn pick_all(d: &Drawing, space: &Space, p: Vec2, aperture: f64) -> Vec<Handle> {
+    pick_all_in(d, space, &[], p, aperture)
+}
+
+/// [`pick_all`] through a layout viewport that freezes the layers in `frozen` ([`pick_in`]).
+pub fn pick_all_in(d: &Drawing, space: &Space, frozen: &[String], p: Vec2, aperture: f64) -> Vec<Handle> {
     let ix = spatial::index(d, space);
     let probe = Bounds2::new(p, p).expand(aperture);
     let Some(cands) = candidates(d, space, &ix, &probe.expand(aperture), true, true) else { return Vec::new() };
     cands
-        .filter(|(e, known)| selectable(d, e) && (is_infinite(e) || bounds_of(d, e, *known).expand(aperture).intersects(&probe)))
+        .filter(|(e, known)| selectable(d, e, frozen) && (is_infinite(e) || bounds_of(d, e, *known).expand(aperture).intersects(&probe)))
         .filter(|(e, _)| entity_distance(d, e, p, aperture / 4.0) <= aperture)
         .map(|(e, _)| e.handle)
         .collect()
@@ -253,14 +291,27 @@ fn seg_hits_box(a: Vec2, b: Vec2, bx: &Bounds2) -> bool {
 
 /// Window selection (entirely inside) or crossing selection (inside or touching).
 pub fn select_window(d: &Drawing, space: &Space, bx: Bounds2, crossing: bool) -> Vec<Handle> {
-    let ix = spatial::index(d, space);
-    select_window_with(d, space, &ix, bx, crossing)
+    select_window_in(d, space, &[], bx, crossing)
 }
 
-pub(crate) fn select_window_with(d: &Drawing, space: &Space, ix: &Option<std::sync::Arc<SpatialIndex>>, bx: Bounds2, crossing: bool) -> Vec<Handle> {
+/// [`select_window`] through a layout viewport: the objects on the layers in `frozen`, the layers
+/// frozen in that viewport, are not drawn there and are not selected.
+pub fn select_window_in(d: &Drawing, space: &Space, frozen: &[String], bx: Bounds2, crossing: bool) -> Vec<Handle> {
+    let ix = spatial::index(d, space);
+    select_window_with(d, space, &ix, frozen, bx, crossing)
+}
+
+pub(crate) fn select_window_with(
+    d: &Drawing,
+    space: &Space,
+    ix: &Option<std::sync::Arc<SpatialIndex>>,
+    frozen: &[String],
+    bx: Bounds2,
+    crossing: bool,
+) -> Vec<Handle> {
     let Some(cands) = candidates(d, space, ix, &bx, crossing, false) else { return Vec::new() };
     let tol = window_tol(&bx);
-    cands.filter(|(e, known)| selectable(d, e) && in_window(d, e, *known, &bx, crossing, tol)).map(|(e, _)| e.handle).collect()
+    cands.filter(|(e, known)| selectable(d, e, frozen) && in_window(d, e, *known, &bx, crossing, tol)).map(|(e, _)| e.handle).collect()
 }
 
 /// The tessellation tolerance window and crossing tests use for a box.
@@ -306,11 +357,23 @@ pub(crate) fn in_window(d: &Drawing, e: &Entity, known: Option<Bounds2>, bx: &Bo
 
 /// Fence selection: entities crossed by the fence polyline.
 pub fn select_fence(d: &Drawing, space: &Space, fence: &[Vec2]) -> Vec<Handle> {
-    let ix = spatial::index(d, space);
-    select_fence_with(d, space, &ix, fence)
+    select_fence_in(d, space, &[], fence)
 }
 
-pub(crate) fn select_fence_with(d: &Drawing, space: &Space, ix: &Option<std::sync::Arc<SpatialIndex>>, fence: &[Vec2]) -> Vec<Handle> {
+/// [`select_fence`] through a layout viewport that freezes the layers in `frozen`
+/// ([`select_window_in`]).
+pub fn select_fence_in(d: &Drawing, space: &Space, frozen: &[String], fence: &[Vec2]) -> Vec<Handle> {
+    let ix = spatial::index(d, space);
+    select_fence_with(d, space, &ix, frozen, fence)
+}
+
+pub(crate) fn select_fence_with(
+    d: &Drawing,
+    space: &Space,
+    ix: &Option<std::sync::Arc<SpatialIndex>>,
+    frozen: &[String],
+    fence: &[Vec2],
+) -> Vec<Handle> {
     let fb = Bounds2::from_points(fence.iter().copied());
     let tol = (fb.width() + fb.height()).max(1e-9) / 2000.0;
     let probe = fb.expand(tol);
@@ -318,7 +381,7 @@ pub(crate) fn select_fence_with(d: &Drawing, space: &Space, ix: &Option<std::syn
     let mut out = Vec::new();
     for (e, known) in cands {
         // Infinite objects have no useful bounds; like window selection, test their geometry directly.
-        if !selectable(d, e) || (!is_infinite(e) && !bounds_of(d, e, known).intersects(&probe)) {
+        if !selectable(d, e, frozen) || (!is_infinite(e) && !bounds_of(d, e, known).intersects(&probe)) {
             continue;
         }
         let polys = hit_polylines(d, e, tol);
@@ -339,6 +402,12 @@ pub(crate) fn select_fence_with(d: &Drawing, space: &Space, ix: &Option<std::syn
 /// Window polygon selection (entities entirely inside `poly`) or crossing polygon selection
 /// (inside or crossing its edges). The polygon closes back to its first point.
 pub fn select_polygon(d: &Drawing, space: &Space, poly: &[Vec2], crossing: bool) -> Vec<Handle> {
+    select_polygon_in(d, space, &[], poly, crossing)
+}
+
+/// [`select_polygon`] through a layout viewport that freezes the layers in `frozen`
+/// ([`select_window_in`]).
+pub fn select_polygon_in(d: &Drawing, space: &Space, frozen: &[String], poly: &[Vec2], crossing: bool) -> Vec<Handle> {
     let (Some(first), true) = (poly.first(), poly.len() >= 3) else { return Vec::new() };
     let ix = spatial::index(d, space);
     let pb = Bounds2::from_points(poly.iter().copied());
@@ -349,7 +418,7 @@ pub fn select_polygon(d: &Drawing, space: &Space, poly: &[Vec2], crossing: bool)
     let mut out = Vec::new();
     for (e, known) in cands {
         let infinite = is_infinite(e);
-        if !selectable(d, e) || (infinite && !crossing) {
+        if !selectable(d, e, frozen) || (infinite && !crossing) {
             continue;
         }
         let eb = bounds_of(d, e, known);
@@ -378,9 +447,15 @@ pub fn select_polygon(d: &Drawing, space: &Space, poly: &[Vec2], crossing: bool)
 /// The visible objects in `space` of the group called `name` (any case), or `None` when the
 /// drawing has no such group.
 pub fn select_group(d: &Drawing, space: &Space, name: &str) -> Option<Vec<Handle>> {
+    select_group_in(d, space, &[], name)
+}
+
+/// [`select_group`] through a layout viewport that freezes the layers in `frozen`: the group's
+/// objects on those layers are left out.
+pub fn select_group_in(d: &Drawing, space: &Space, frozen: &[String], name: &str) -> Option<Vec<Handle>> {
     let g = d.groups.iter().find(|g| g.name.eq_ignore_ascii_case(name.trim()))?;
     let store = d.space(space)?;
-    Some(g.members.iter().copied().filter(|h| store.get(*h).is_some_and(|e| d.is_visible(e))).collect())
+    Some(g.members.iter().copied().filter(|h| store.get(*h).is_some_and(|e| selectable(d, e, frozen))).collect())
 }
 
 /// A selection mode typed at "Select objects", collecting its points before it selects.
@@ -454,14 +529,19 @@ impl SelectMode {
     }
     /// The objects the mode selects, or `None` while it has too few points.
     pub fn select(&self, d: &Drawing, space: &Space) -> Option<Vec<Handle>> {
+        self.select_in(d, space, &[])
+    }
+    /// [`SelectMode::select`] through a layout viewport: the objects on the layers in `frozen`,
+    /// the layers frozen in that viewport, are not drawn there and are not selected.
+    pub fn select_in(&self, d: &Drawing, space: &Space, frozen: &[String]) -> Option<Vec<Handle>> {
         match (self.kind, self.pts.as_slice()) {
             (SelectKind::Window | SelectKind::Crossing, [a, b, ..]) => {
-                Some(select_window(d, space, Bounds2::new(*a, *b), self.kind == SelectKind::Crossing))
+                Some(select_window_in(d, space, frozen, Bounds2::new(*a, *b), self.kind == SelectKind::Crossing))
             }
-            (SelectKind::Box, [a, b, ..]) => Some(select_window(d, space, Bounds2::new(*a, *b), b.x < a.x)),
-            (SelectKind::Fence, pts) if pts.len() >= 2 => Some(select_fence(d, space, pts)),
+            (SelectKind::Box, [a, b, ..]) => Some(select_window_in(d, space, frozen, Bounds2::new(*a, *b), b.x < a.x)),
+            (SelectKind::Fence, pts) if pts.len() >= 2 => Some(select_fence_in(d, space, frozen, pts)),
             (SelectKind::WPolygon | SelectKind::CPolygon, pts) if pts.len() >= 3 => {
-                Some(select_polygon(d, space, pts, self.kind == SelectKind::CPolygon))
+                Some(select_polygon_in(d, space, frozen, pts, self.kind == SelectKind::CPolygon))
             }
             _ => None,
         }

crates/engine/src/session/cmdline.rs

@@ -116,9 +116,26 @@ impl Session {
             };
         }
         // At "Select objects" prompts the selection modes (Previous, Last, ALL) win over a command
-        // keyword sharing the letter (HATCH's "picK internal point" against `P`).
-        let selection_mode = prompt.accept.select
-            && matches!(tt.strip_prefix('_').unwrap_or(tt).to_ascii_lowercase().as_str(), "all" | "l" | "last" | "p" | "previous");
+        // keyword sharing the letter (HATCH's "picK internal point" against `P`). A word typed with
+        // the Greek keyboard layout active is read by its keys there too: Λ is Last at COUNT's prompt,
+        // not List.
+        let selection_mode = prompt.accept.select && {
+            let word = tt.strip_prefix('_').unwrap_or(tt);
+            let keys = crate::keyboard::latin_keys(word).unwrap_or_else(|| word.to_ascii_lowercase());
+            matches!(keys.as_str(), "all" | "l" | "last" | "p" | "previous")
+        };
+        // A Greek word that is an existing name at a prompt that takes one is that name, in any case:
+        // ΣΟΛΙΔ is also the keys of Solid.
+        let existing = if matches!(prompt.picker, Some(crate::Picker::HatchPattern(_))) {
+            crate::keyboard::greek_fold(tt).and_then(|_| cmd::hatch::pattern_named(tt))
+        } else if prompt.takes_block {
+            self.greek_block_name(tt)
+        } else {
+            None
+        };
+        if let Some(name) = existing {
+            return self.input(Input::Text(name));
+        }
         // A leading underscore asks for a keyword by its English name, whatever the interface
         // language (`_M`, `_Yes`): scripts and LISP routines write them that way. (Snap
         // overrides such as `_cen` were taken above.)

crates/engine/src/session/interactive.rs

@@ -8,6 +8,39 @@ use super::{
 impl Session {
     // ---------------- interactive commands ----------------
 
+    /// Whether `name`, as typed, is a command, an alias or a LISP command: the lookups
+    /// [`Session::start`] dispatches by, so only ASCII is lower-cased and a Greek alias stays as stored.
+    fn names_a_command(&self, name: &str) -> bool {
+        let lower = name.trim_start_matches(['_', '.', '-']).to_ascii_lowercase();
+        let dashed = name.trim_start_matches(['_', '.']);
+        find_command(&cmd::resolve_alias(dashed)).is_some()
+            || find_command(&cmd::resolve_alias(&lower)).is_some()
+            || self.lisp_command(&lower).is_some()
+    }
+
+    /// The alias or LISP command that is the Greek word `name` in another case or accent (λινε for
+    /// c:ΛΙΝΕ): those lookups fold ASCII only.
+    fn greek_command_name(&self, name: &str) -> Option<String> {
+        let bare = name.trim_start_matches(['_', '.', '-']);
+        let same = crate::keyboard::same_greek_word_as(bare)?;
+        let lisp = || self.lisp_commands().into_iter().find(|c| same(c) && self.lisp_command(c).is_some());
+        cmd::file::greek_alias(bare).or_else(lisp)
+    }
+
+    /// Whether the Greek word `name` is a command of its own, which [`Session::start`] runs instead
+    /// of the Latin name its keys type.
+    pub fn greek_word_is_a_command(&self, name: &str) -> bool {
+        self.names_a_command(name) || self.greek_command_name(name).is_some()
+    }
+
+    /// The existing block that is the Greek word `word`: as spelled, else in another case or accent
+    /// (μ for Μ).
+    pub(super) fn greek_block_name(&self, word: &str) -> Option<String> {
+        let same = crate::keyboard::same_greek_word_as(word)?;
+        let blocks = &self.doc().ok()?.blocks;
+        blocks.keys().find(|k| *k == word).or_else(|| blocks.keys().find(|k| same(k))).cloned()
+    }
+
     /// Start a command by name or alias as if typed at the command line.
     pub fn start(&mut self, name: &str) -> Result<()> {
         self.last_polar = None;
@@ -17,6 +50,12 @@ impl Session {
             Some(n) => (true, n),
             None => (false, name),
         };
+        // A name typed with the Greek keyboard layout active (ΛΙΝΕ for LINE) is the Latin name's keys,
+        // unless it is a command, alias or LISP function of its own, in any case or accent.
+        let typed = name;
+        let latin =
+            crate::keyboard::latin_keys(name).filter(|_| !self.names_a_command(name)).map(|latin| self.greek_command_name(name).unwrap_or(latin));
+        let name = latin.as_deref().unwrap_or(name);
         let lower = name.trim_start_matches(['_', '.', '-']).to_ascii_lowercase();
         // A command-line form with an id of its own (-ATTEDIT) is not the command it prefixes.
         let dashed = cmd::resolve_alias(&name.trim_start_matches(['_', '.']).to_ascii_lowercase());
@@ -37,7 +76,7 @@ impl Session {
                 self.start(if transparent { "'setvar" } else { "setvar" })?;
                 return self.input(Input::Text(var));
             }
-            return Err(EngineError::UnknownCommand(name.to_string()));
+            return Err(EngineError::UnknownCommand(typed.to_string()));
         };
         if transparent && spec.transparent && self.running.is_some() {
             // Transparent commands (zoom, pan…) run without cancelling the active one.
@@ -175,17 +214,33 @@ impl Session {
             Input::Text(t) => Input::Text(t.trim().strip_prefix('_').map(str::to_string).unwrap_or(t)),
             other => other,
         };
-        if let Input::Text(t) | Input::Keyword(t) = &input
-            && let Some(m) = select::SelectMode::from_keyword(t)
+        // A selection word typed with the Greek keyboard layout active (ΑΛΛ for ALL) is looked up as its
+        // Latin keys. Only the lookup is: text that is no selection word (a block name at BEDIT's prompt,
+        // which also takes a selection) reaches the command as typed. The name of an existing block at
+        // a prompt that takes a name reaches it as stored, in whatever case it was typed: a block
+        // called Μ is that block there, not Multiple.
+        let block = match &input {
+            Input::Text(t) if prompt.accept.text => self.greek_block_name(t.trim()),
+            _ => None,
+        };
+        let is_block = block.is_some();
+        let input = block.map_or(input, Input::Text);
+        let word = match &input {
+            Input::Text(t) => Some(crate::keyboard::latin_keys(t.trim()).filter(|_| !is_block).unwrap_or_else(|| t.clone())),
+            Input::Keyword(k) => Some(k.clone()),
+            _ => None,
+        };
+        if let Some(w) = &word
+            && let Some(m) = select::SelectMode::from_keyword(w)
         {
             self.pending_window = None;
             self.select_mode = Some(m);
             return Ok(None);
         }
-        if let Input::Text(t) | Input::Keyword(t) = &input
-            && !prompt.keywords.iter().any(|k| k.eq_ignore_ascii_case(t.trim()))
+        if let Some(w) = &word
+            && !prompt.keywords.iter().any(|k| k.eq_ignore_ascii_case(w.trim()))
         {
-            match t.trim().to_ascii_lowercase().as_str() {
+            match w.trim().to_ascii_lowercase().as_str() {
                 "si" | "single" => {
                     self.select_single = true;
                     return Ok(None);
@@ -202,10 +257,10 @@ impl Session {
                 let ap = self.pixel_size() * self.settings.pickbox.max(1.0) * 1.5;
                 if let Some(pw) = self.pending_window.take() {
                     let crossing = self.window_is_crossing(pw.corner, p);
-                    let hs = select::select_window(self.doc()?, &space, Bounds2::new(pw.corner, p), crossing);
+                    let hs = select::select_window_in(self.doc()?, &space, self.viewport_frozen(), Bounds2::new(pw.corner, p), crossing);
                     return Ok(Some(Input::Pick(cmd::groups::expand(self, hs))));
                 }
-                match select::pick(self.doc()?, &space, p, ap) {
+                match select::pick_in(self.doc()?, &space, self.viewport_frozen(), p, ap) {
                     Some(h) => Ok(Some(Input::Pick(cmd::groups::expand(self, vec![h])))),
                     None => {
                         self.pending_window = Some(PendingWindow { corner: p, during_command: true });
@@ -213,14 +268,18 @@ impl Session {
                     }
                 }
             }
-            Input::Text(ref t) | Input::Keyword(ref t) => {
-                let tl = t.trim().to_ascii_lowercase();
+            Input::Text(_) | Input::Keyword(_) => {
+                let tl = word.as_deref().unwrap_or_default().trim().to_ascii_lowercase();
                 let d = self.doc()?;
                 let store = d.space(&space);
+                let frozen = self.viewport_frozen();
                 let picked = match tl.as_str() {
-                    "all" => store.map(|s| s.iter().filter(|e| d.is_visible(e)).map(|e| e.handle).collect()),
-                    "l" | "last" => store.and_then(|s| s.last()).map(|e| vec![e.handle]),
-                    "p" | "previous" => Some(self.state()?.previous_selection.clone()),
+                    "all" => store.map(|s| s.iter().filter(|e| select::selectable(d, e, frozen)).map(|e| e.handle).collect()),
+                    "l" | "last" => store.and_then(|s| select::last_in(s, frozen)).map(|h| vec![h]),
+                    "p" | "previous" => {
+                        let st = self.state()?;
+                        Some(st.drawn_in_viewport(&st.previous_selection))
+                    }
                     _ => None,
                 };
                 match picked {
@@ -241,8 +300,9 @@ impl Session {
     fn select_mode_input(&mut self, input: Input) -> Result<Option<Input>> {
         let Some(mut mode) = self.select_mode.take() else { return Ok(Some(input)) };
         if mode.kind == select::SelectKind::Group {
+            let space = self.space();
             return match input {
-                Input::Text(name) | Input::Keyword(name) => match select::select_group(self.doc()?, &self.space(), &name) {
+                Input::Text(name) | Input::Keyword(name) => match select::select_group_in(self.doc()?, &space, self.viewport_frozen(), &name) {
                     Some(hs) => Ok(Some(Input::Pick(hs))),
                     None => {
                         self.echo(format!("No group named \"{}\".", name.trim()));
@@ -262,14 +322,14 @@ impl Session {
         match input {
             Input::Point(p) => {
                 if mode.push(p) {
-                    return Ok(mode.select(self.doc()?, &self.space()).map(Input::Pick));
+                    return Ok(mode.select_in(self.doc()?, &self.space(), self.viewport_frozen()).map(Input::Pick));
                 }
             }
             Input::Keyword(k) if k == "Undo" => {
                 mode.pts.pop();
             }
             // Enter ends a fence or polygon; with too few points the mode is dropped.
-            Input::Enter => return Ok(mode.select(self.doc()?, &self.space()).map(Input::Pick)),
+            Input::Enter => return Ok(mode.select_in(self.doc()?, &self.space(), self.viewport_frozen()).map(Input::Pick)),
             Input::Cancel | Input::Pick(_) => return Ok(Some(input)),
             _ => self.echo("Invalid point."),
         }

crates/engine/src/session/picking.rs

@@ -32,9 +32,9 @@ impl Session {
         let pickadd = self.settings.pickadd;
         if let Some(pw) = self.pending_window.take() {
             let crossing = self.window_is_crossing(pw.corner, p);
-            let hs = select::select_window(self.doc()?, &space, Bounds2::new(pw.corner, p), crossing);
+            let hs = select::select_window_in(self.doc()?, &space, self.viewport_frozen(), Bounds2::new(pw.corner, p), crossing);
             let hs = cmd::groups::expand(self, hs);
-            let mut sel = if pickadd || shift { self.selection() } else { Vec::new() };
+            let mut sel = if pickadd || shift { self.stored_selection() } else { Vec::new() };
             if shift && pickadd {
                 sel.retain(|h| !hs.contains(h));
             } else {
@@ -44,7 +44,7 @@ impl Session {
             return Ok(());
         }
         let ap = self.pixel_size() * self.settings.pickbox.max(1.0) * 1.5;
-        match select::pick(self.doc()?, &space, p, ap) {
+        match select::pick_in(self.doc()?, &space, self.viewport_frozen(), p, ap) {
             Some(h) => self.idle_pick(h, shift),
             None => self.pending_window = Some(PendingWindow { corner: p, during_command: false }),
         }
@@ -56,7 +56,7 @@ impl Session {
         let pickadd = self.settings.pickadd;
         // With group selection the object's selectable groups come (or go) with it.
         let hs = cmd::groups::expand(self, vec![h]);
-        let mut sel = if pickadd || shift { self.selection() } else { Vec::new() };
+        let mut sel = if pickadd || shift { self.stored_selection() } else { Vec::new() };
         let had = sel.contains(&h);
         if shift && (pickadd || had) {
             sel.retain(|x| !hs.contains(x));
@@ -93,7 +93,7 @@ impl Session {
             return Vec::new();
         }
         let ap = self.pixel_size() * self.settings.pickbox.max(1.0) * 1.5;
-        self.doc().map(|d| select::pick_all(d, &self.space(), p, ap)).unwrap_or_default()
+        self.doc().map(|d| select::pick_all_in(d, &self.space(), self.viewport_frozen(), p, ap)).unwrap_or_default()
     }
 
     /// Whether selection cycling marks `p` with its badge (SELECTIONCYCLING 1 or 2): overlapping
@@ -155,7 +155,8 @@ impl Session {
 
     /// The object a prompt picking one object finds at `p` in `space`: the one named for that
     /// point ([`Session::input_object`]), which is none when it lies in another space, else the
-    /// object under `p` within `aperture`.
+    /// object under `p` within `aperture`. Inside an MSPACE viewport a pick in model space finds
+    /// what that viewport draws: not the objects on the layers frozen in it.
     pub fn pick_object(&self, space: &Space, p: Vec2, aperture: f64) -> Result<Option<Handle>> {
         let d = self.doc()?;
         if let Some((h, q)) = self.pick_hint
@@ -163,7 +164,9 @@ impl Session {
         {
             return Ok((d.space_of(h).as_ref() == Some(space)).then_some(h));
         }
-        Ok(select::pick(d, space, p, aperture))
+        // The viewport shows model space only: its frozen layers hide nothing on the sheet.
+        let frozen = if *space == Space::Model { self.viewport_frozen() } else { &[] };
+        Ok(select::pick_in(d, space, frozen, p, aperture))
     }
 }
 

crates/engine/src/spatial.rs

@@ -424,8 +424,8 @@ mod tests {
             for k in 0..400 {
                 let p = Vec2::new(r.r(-5.0, 105.0), r.r(-5.0, 105.0));
                 let ap = [0.05, 0.3, 1.5][k % 3];
-                let a = select::pick_with(&d, &Space::Model, &ix, p, ap);
-                let b = select::pick_with(&d, &Space::Model, &None, p, ap);
+                let a = select::pick_with(&d, &Space::Model, &ix, &[], p, ap);
+                let b = select::pick_with(&d, &Space::Model, &None, &[], p, ap);
                 assert_eq!(a, b, "seed {seed} p {p:?} ap {ap}");
                 hits += usize::from(a.is_some());
             }
@@ -444,12 +444,15 @@ mod tests {
                 let b = a + Vec2::new(r.r(-40.0, 40.0), r.r(-40.0, 40.0));
                 let bx = Bounds2::new(a, b);
                 for crossing in [false, true] {
-                    let x = select::select_window_with(&d, &Space::Model, &ix, bx, crossing);
-                    let y = select::select_window_with(&d, &Space::Model, &None, bx, crossing);
+                    let x = select::select_window_with(&d, &Space::Model, &ix, &[], bx, crossing);
+                    let y = select::select_window_with(&d, &Space::Model, &None, &[], bx, crossing);
                     assert_eq!(x, y, "seed {seed} box {bx:?} crossing {crossing}");
                 }
                 let fence: Vec<Vec2> = (0..(2 + k % 3)).map(|_| Vec2::new(r.r(0.0, 100.0), r.r(0.0, 100.0))).collect();
-                assert_eq!(select::select_fence_with(&d, &Space::Model, &ix, &fence), select::select_fence_with(&d, &Space::Model, &None, &fence));
+                assert_eq!(
+                    select::select_fence_with(&d, &Space::Model, &ix, &[], &fence),
+                    select::select_fence_with(&d, &Space::Model, &None, &[], &fence)
+                );
             }
         }
     }
@@ -484,10 +487,13 @@ mod tests {
         for (p, ap) in
             [(Vec2::new(f64::NAN, 1.0), 1.0), (Vec2::new(1.0, 1.0), f64::NAN), (Vec2::new(f64::INFINITY, 0.0), 1.0), (Vec2::new(50.0, 50.0), 1e300)]
         {
-            assert_eq!(select::pick_with(&d, &Space::Model, &ix, p, ap), select::pick_with(&d, &Space::Model, &None, p, ap));
+            assert_eq!(select::pick_with(&d, &Space::Model, &ix, &[], p, ap), select::pick_with(&d, &Space::Model, &None, &[], p, ap));
         }
         let bx = Bounds2 { min: Vec2::new(f64::NEG_INFINITY, 0.0), max: Vec2::new(f64::INFINITY, 50.0) };
-        assert_eq!(select::select_window_with(&d, &Space::Model, &ix, bx, true), select::select_window_with(&d, &Space::Model, &None, bx, true));
+        assert_eq!(
+            select::select_window_with(&d, &Space::Model, &ix, &[], bx, true),
+            select::select_window_with(&d, &Space::Model, &None, &[], bx, true)
+        );
     }
 
     #[test]

crates/engine/src/tests.rs

@@ -1551,3 +1551,13 @@ fn setvar_rejects_non_finite_text_for_real_variables() {
         }
     }
 }
+
+#[test]
+fn additional_tools_keeps_compatible_command_ids() {
+    assert_eq!(crate::cmd::resolve_alias("-blockreplace"), "blockreplace");
+    for id in ["blockreplace", "burst", "breakline", "mocoro", "txt2mtxt"] {
+        let command = crate::cmd::find_command(id).expect("existing command id");
+        assert!(command.menu.contains(&"Additional Tools"), "{id}: {:?}", command.menu);
+        assert!(!command.menu.contains(&"Express Tools"));
+    }
+}

crates/engine/tests/greek_keyboard_aliases.rs

@@ -0,0 +1,67 @@
+//! A word typed with the Greek keyboard layout that is an alias of its own (ALIASEDIT) is that
+//! alias, not the Latin name its keys type. The aliases are process-wide, so this file keeps to
+//! one test at a time.
+
+use std::sync::Mutex;
+
+use cadcraft_engine::Session;
+use cadcraft_engine::doc::EntityKind;
+use serde_json::json;
+
+/// The alias store is process-wide: each test holds this while it changes the aliases.
+static ONE_AT_A_TIME: Mutex<()> = Mutex::new(());
+
+/// A Greek word the user made an alias runs the alias's command, not the command its keys type.
+#[test]
+fn a_greek_alias_starts_its_command_not_the_latin_keys_command() {
+    let _one = ONE_AT_A_TIME.lock().unwrap_or_else(|e| e.into_inner());
+    let mut s = Session::new();
+    s.execute("aliasedit", &json!({ "clear": true })).unwrap();
+    // ΛΙΝΕ types LINE, but the user made it an alias of CIRCLE: aliases are stored as typed (only
+    // ASCII is lower-cased), and the alias wins.
+    s.execute("aliasedit", &json!({ "set": { "ΛΙΝΕ": "circle" } })).unwrap();
+    let ran = s.script(
+        "ΛΙΝΕ 0,0 5
+",
+    );
+    s.execute("aliasedit", &json!({ "clear": true })).unwrap();
+    ran.unwrap();
+    let doc = s.doc().unwrap();
+    let circles = doc.model.iter().filter(|e| matches!(e.kind, EntityKind::Circle(_))).count();
+    let lines = doc.model.iter().filter(|e| matches!(e.kind, EntityKind::Line(_))).count();
+    assert_eq!((circles, lines), (1, 0), "the alias drew the circle, LINE was not started");
+}
+
+/// The alias is found when it is typed in lower case or with an accent too.
+#[test]
+fn a_greek_alias_starts_its_command_in_any_case_or_accent() {
+    let _one = ONE_AT_A_TIME.lock().unwrap_or_else(|e| e.into_inner());
+    let mut s = Session::new();
+    s.execute("aliasedit", &json!({ "clear": true })).unwrap();
+    s.execute("aliasedit", &json!({ "set": { "ΛΙΝΕ": "circle" } })).unwrap();
+    let ran: Vec<_> = ["λινε", "λίνε"].iter().map(|typed| s.script(&format!("{typed} 0,0 5\n"))).collect();
+    s.execute("aliasedit", &json!({ "clear": true })).unwrap();
+    assert!(ran.iter().all(Result::is_ok), "{ran:?}");
+    let doc = s.doc().unwrap();
+    let circles = doc.model.iter().filter(|e| matches!(e.kind, EntityKind::Circle(_))).count();
+    let lines = doc.model.iter().filter(|e| matches!(e.kind, EntityKind::Line(_))).count();
+    assert_eq!((circles, lines), (2, 0), "the alias drew both circles, LINE was not started");
+}
+
+/// 5 000 Greek aliases and a pasted word of a million letters that is none of them: looking it up
+/// costs the word's length once, not once for every alias.
+#[test]
+fn a_long_greek_word_is_folded_once_however_many_greek_aliases_there_are() {
+    let _one = ONE_AT_A_TIME.lock().unwrap_or_else(|e| e.into_inner());
+    let mut s = Session::new();
+    s.execute("aliasedit", &json!({ "clear": true })).unwrap();
+    let set: serde_json::Map<String, serde_json::Value> = (0..5_000).map(|i| (format!("ΞΞ{i}"), json!("line"))).collect();
+    s.execute("aliasedit", &json!({ "set": set })).unwrap();
+    let word = "Ω".repeat(1_000_000);
+    let t = std::time::Instant::now();
+    let started = s.start(&word);
+    let took = t.elapsed();
+    s.execute("aliasedit", &json!({ "clear": true })).unwrap();
+    assert!(started.is_err(), "no command has those keys");
+    assert!(took.as_secs() < 5, "{took:?}");
+}

crates/engine/tests/it/greek_keyboard.rs

@@ -0,0 +1,225 @@
+//! A command or keyword typed with the Greek keyboard layout active (ΛΙΝΕ for LINE, ΘΝΔΟ for
+//! Undo) works as its Latin name: the layout types each Greek letter on the Latin key it sounds
+//! like.
+
+use cadcraft_engine::Session;
+use cadcraft_engine::doc::EntityKind;
+use serde_json::json;
+
+/// How many lines the drawing's model space holds.
+fn lines(s: &Session) -> usize {
+    s.doc().unwrap().model.iter().filter(|e| matches!(e.kind, EntityKind::Line(_))).count()
+}
+
+/// ΛΙΝΕ draws a line like LINE, in lower case and with accents too; `;ΣΑΩΕ` starts QSAVE; a
+/// Greek word that is no command's keys is reported as typed.
+#[test]
+fn greek_layout_commands_start_like_the_latin_ones() {
+    let mut s = Session::new();
+    s.script("ΛΙΝΕ 0,0 10,0\n\n").unwrap();
+    assert_eq!(lines(&s), 1, "{}", s.prompt_text());
+    // Accents the layout's dead key adds are ignored; lower case works too.
+    s.script("λίνε 0,5 10,5\n\n").unwrap();
+    assert_eq!(lines(&s), 2);
+    // The Q key types a semicolon: QSAVE is ";ΣΑΩΕ", which only starts the command (no file needed
+    // here: it reports, it never fails as an unknown command).
+    let err = s.start(";ΣΑΩΕ").map(|_| String::new()).unwrap_or_else(|e| e.to_string());
+    assert!(!err.contains("unknown command"), "{err}");
+    // A Greek word that is no command's keys is reported as typed, not as the Latin letters read from it.
+    let err = s.start("ΧΥΖ").unwrap_err().to_string();
+    assert!(err.contains("ΧΥΖ") && !err.contains("xyz"), "{err}");
+}
+
+/// A LISP command with a Greek name runs as itself, not as the command its keys type.
+#[test]
+fn a_greek_lisp_command_runs_as_itself_not_as_the_latin_keys_command() {
+    let mut s = Session::new();
+    // ΛΙΝΕ types LINE, but the routine defines a command of that Greek name: it is the command typed.
+    s.cmdline("(defun c:ΛΙΝΕ () (command \"_.CIRCLE\" '(0 0) 5) (princ))").unwrap();
+    s.cmdline("ΛΙΝΕ").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    let doc = s.doc().unwrap();
+    let circles = doc.model.iter().filter(|e| matches!(e.kind, EntityKind::Circle(_))).count();
+    assert_eq!((circles, lines(&s)), (1, 0), "the routine drew the circle, LINE was not started");
+}
+
+/// ΑΛΛ at "Select objects" selects everything, as ALL does.
+#[test]
+fn greek_layout_selection_words_select_like_the_latin_ones() {
+    let mut s = Session::new();
+    s.execute("circle", &json!({ "center": [0, 0], "radius": 5 })).unwrap();
+    s.execute("circle", &json!({ "center": [20, 0], "radius": 5 })).unwrap();
+    // ΑΛΛ is the keys A-L-L: ALL at the "Select objects" prompt.
+    s.script(
+        "ERASE ΑΛΛ
+
+",
+    )
+    .unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    assert!(s.doc().unwrap().model.is_empty(), "ΑΛΛ selected nothing");
+}
+
+/// Ν and Υ answer MIRROR's "Erase source objects?" as N and Y do.
+#[test]
+fn greek_layout_keywords_match_prompt_options() {
+    let mut s = Session::new();
+    s.execute("circle", &json!({ "center": [0, 0], "radius": 5 })).unwrap();
+    s.script("ΜΙΡΡΟΡ ALL\n\n0,0 10,0\n").unwrap();
+    // ... the last prompt asks whether to delete the sources: N (Greek layout: Ν) keeps them. Text
+    // the prompt does not know keeps them too, so what Ν is read as is checked itself.
+    let no = s.current_prompt().and_then(|p| p.match_keyword("Ν"));
+    assert_eq!(no.as_deref(), Some("No"), "{}", s.prompt_text());
+    s.script("Ν\n").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    let circles = s.doc().unwrap().model.iter().filter(|e| matches!(e.kind, EntityKind::Circle(_))).count();
+    assert_eq!(circles, 2, "the circle and its mirror image");
+
+    // Υ (the Y key) answers Yes, which erases the source: unmatched Greek text would count as No, so
+    // only a recognised keyword gives this result.
+    let mut yes = Session::new();
+    yes.execute("circle", &json!({ "center": [0, 0], "radius": 5 })).unwrap();
+    yes.script(
+        "ΜΙΡΡΟΡ ALL
+
+0,0 10,0
+Υ
+",
+    )
+    .unwrap();
+    assert!(yes.running.is_none(), "{}", yes.prompt_text());
+    let circles = yes.doc().unwrap().model.iter().filter(|e| matches!(e.kind, EntityKind::Circle(_))).count();
+    assert_eq!(circles, 1, "Υ answered Yes and the source was erased");
+}
+
+/// A Greek block name typed at BEDIT's "block name or select" opens that block: it is not read
+/// as a selection word.
+#[test]
+fn a_greek_block_name_typed_at_a_name_or_select_prompt_reaches_the_command_as_typed() {
+    let mut s = Session::new();
+    let l = s.execute("line", &json!({ "points": [[0, 0], [5, 0]] })).unwrap()["handles"][0].clone();
+    s.execute("block", &json!({ "name": "ΠΟΡΤΑ", "base": [0, 0], "handles": [l] })).unwrap();
+    // BEDIT asks for a block name or a selected reference. ΠΟΡΤΑ is also the keys P-O-R-T-A, which a
+    // selection word would be read from, but no selection word is meant here: the name is typed as it is.
+    s.start("BEDIT").unwrap();
+    s.cmdline("ΠΟΡΤΑ").unwrap();
+    let open = s.state().unwrap().block_editor().map(str::to_string);
+    assert_eq!(open.as_deref(), Some("ΠΟΡΤΑ"), "{}", s.prompt_text());
+}
+
+/// Μ is the M key, Multiple at a selection prompt; once a block has that name, typing it at
+/// BEDIT opens the block.
+#[test]
+fn a_block_named_like_a_greek_selection_word_opens_at_a_name_or_select_prompt() {
+    // The Greek capital Mu (U+039C) is the M key: Multiple at a selection prompt.
+    let mu = "\u{39c}";
+    let mut s = Session::new();
+    let l = s.execute("line", &json!({ "points": [[0, 0], [5, 0]] })).unwrap()["handles"][0].clone();
+    // With no block of that name it stays the selection word, which BEDIT's prompt waits through.
+    s.start("BEDIT").unwrap();
+    s.cmdline(mu).unwrap();
+    assert!(s.running.is_some(), "Multiple keeps the prompt: {}", s.prompt_text());
+    assert!(s.state().unwrap().block_editor().is_none());
+    s.cancel();
+    // Once a block has that name, typing it opens that block.
+    s.execute("block", &json!({ "name": mu, "base": [0, 0], "handles": [l] })).unwrap();
+    s.start("BEDIT").unwrap();
+    s.cmdline(mu).unwrap();
+    let open = s.state().unwrap().block_editor().map(str::to_string);
+    assert_eq!(open.as_deref(), Some(mu), "{}", s.prompt_text());
+}
+
+/// ΣΟΛΙΔ is the keys of Solid at HATCH's pattern prompt; once a loaded pattern has that name,
+/// typing it in any case or accent chooses that pattern.
+#[test]
+fn a_loaded_pattern_named_like_the_greek_keys_of_solid_is_that_pattern_at_the_pattern_prompt() {
+    // ΣΟΛΙΔ is the keys S-O-L-I-D: Solid at HATCH's pattern prompt, which takes no scale or angle.
+    let mut s = Session::new();
+    s.execute("rectang", &json!({ "p1": [0, 0], "p2": [10, 10] })).unwrap();
+    s.start("hatch").unwrap();
+    s.input(cadcraft_engine::Input::Keyword("Pattern".into())).unwrap();
+    s.cmdline("ΣΟΛΙΔ").unwrap();
+    assert!(!s.prompt_text().contains("scale"), "Solid: {}", s.prompt_text());
+    s.cancel();
+    // A pattern file that defines a pattern of that name: typing the name chooses that pattern, which asks its scale.
+    s.execute("hatch.patterns", &json!({ "text": "*ΣΟΛΙΔ, test\n0,0,0,0,1\n" })).unwrap();
+    let asked = ["ΣΟΛΙΔ", "σολιδ", "σολίδ"].map(|typed| {
+        s.start("hatch").unwrap();
+        s.input(cadcraft_engine::Input::Keyword("Pattern".into())).unwrap();
+        s.cmdline(typed).unwrap();
+        let asked = s.prompt_text();
+        s.cancel();
+        asked
+    });
+    s.execute("hatch.patterns", &json!({ "clear": true })).unwrap();
+    assert!(asked.iter().all(|a| a.contains("scale")), "the loaded pattern, in any spelling: {asked:?}");
+}
+
+/// A LISP command with a Greek name runs when typed in upper case, lower case or with an accent.
+#[test]
+fn a_greek_lisp_command_runs_in_any_case_or_accent() {
+    for typed in ["ΛΙΝΕ", "λινε", "λίνε"] {
+        let mut s = Session::new();
+        s.cmdline("(defun c:ΛΙΝΕ () (command \"_.CIRCLE\" '(0 0) 5) (princ))").unwrap();
+        s.cmdline(typed).unwrap();
+        let circles = s.doc().unwrap().model.iter().filter(|e| matches!(e.kind, EntityKind::Circle(_))).count();
+        assert_eq!((circles, lines(&s)), (1, 0), "{typed}: {}", s.prompt_text());
+    }
+}
+
+/// A block called Μ opens at BEDIT when its name is typed in either case.
+#[test]
+fn a_block_opens_in_any_case_or_accent_at_a_prompt_that_also_takes_a_selection() {
+    for typed in ["\u{39c}", "\u{3bc}"] {
+        let mut s = Session::new();
+        let l = s.execute("line", &json!({ "points": [[0, 0], [5, 0]] })).unwrap()["handles"][0].clone();
+        s.execute("block", &json!({ "name": "\u{39c}", "base": [0, 0], "handles": [l] })).unwrap();
+        s.start("BEDIT").unwrap();
+        s.cmdline(typed).unwrap();
+        let open = s.state().unwrap().block_editor().map(str::to_string);
+        assert_eq!(open.as_deref(), Some("\u{39c}"), "{typed}: {}", s.prompt_text());
+    }
+}
+
+/// Σ is the S key, Select at BLOCKREPLACE; once a block has that name, typing it in either case
+/// names the block.
+#[test]
+fn a_block_named_like_the_keys_of_select_is_that_block_at_blockreplace() {
+    let mut s = Session::new();
+    // Σ is the S key: the Select option of BLOCKREPLACE, while no block has that name.
+    s.start("BLOCKREPLACE").unwrap();
+    s.cmdline("Σ").unwrap();
+    assert!(s.prompt_text().contains("Select a block reference"), "{}", s.prompt_text());
+    s.cancel();
+    let l = s.execute("line", &json!({ "points": [[0, 0], [5, 0]] })).unwrap()["handles"][0].clone();
+    s.execute("block", &json!({ "name": "Σ", "base": [0, 0], "handles": [l] })).unwrap();
+    s.execute("insert", &json!({ "name": "Σ", "at": [0, 0] })).unwrap();
+    for typed in ["Σ", "σ"] {
+        s.start("BLOCKREPLACE").unwrap();
+        s.cmdline(typed).unwrap();
+        let asked = s.prompt_text();
+        s.cancel();
+        assert!(asked.contains("replacement block for Σ"), "{typed}: {asked}");
+    }
+}
+
+/// Λ is the L key. At COUNT's "Select object to count or [List/Spaces]" the Latin L is the selection
+/// word Last, not the List option: the Greek key is read the same way, and so is the whole word.
+#[test]
+fn a_greek_selection_word_wins_over_a_keyword_on_the_same_key() {
+    let answer = |typed: &str| {
+        let mut s = Session::new();
+        s.execute("circle", &json!({ "center": [0, 0], "radius": 1 })).unwrap();
+        s.execute("line", &json!({ "points": [[0, 0], [5, 0]] })).unwrap();
+        s.start("COUNT").unwrap();
+        let from = s.log.len();
+        s.cmdline(typed).unwrap();
+        s.log[from..].join("\n")
+    };
+    let last = answer("L");
+    assert!(last.contains("like the selected one"), "L counts the objects like the last one: {last}");
+    assert_ne!(last, answer("List"));
+    for typed in ["Λ", "λ", "ΛΑΣΤ"] {
+        assert_eq!(answer(typed), last, "{typed}");
+    }
+}

crates/engine/tests/it/hidden_grip_targets.rs

@@ -0,0 +1,161 @@
+//! A hidden object that is back in the selection takes no part in a grip edit: Undo, `sssetfirst`
+//! or a control call can restore it there, and the grips it shares with a visible object must not
+//! drag it along.
+
+use cadcraft_engine::Session;
+use cadcraft_engine::doc::{EntityKind, Handle};
+use cadcraft_engine::geom::Vec2;
+use serde_json::json;
+
+/// Draws a line from `a` to `b` and returns its handle.
+fn line(s: &mut Session, a: [f64; 2], b: [f64; 2]) -> Handle {
+    let r = s.execute("line", &json!({ "points": [a, b] })).unwrap();
+    Handle::parse_hex(r["handles"][0].as_str().unwrap()).unwrap()
+}
+
+/// The two ends of the line `h`.
+fn ends(s: &Session, h: Handle) -> (Vec2, Vec2) {
+    match &s.doc().unwrap().entity(h).unwrap().kind {
+        EntityKind::Line(l) => (l.a.xy(), l.b.xy()),
+        k => panic!("not a line: {k:?}"),
+    }
+}
+
+/// Two lines sharing the end (0, 0), the second one hidden, both in the selection.
+fn shared_corner() -> (Session, Handle, Handle) {
+    let mut s = Session::new();
+    let shown = line(&mut s, [0.0, 0.0], [10.0, 0.0]);
+    let hidden = line(&mut s, [0.0, 0.0], [0.0, 10.0]);
+    s.execute("hideobjects", &json!({ "handles": [hidden.hex()] })).unwrap();
+    let d = s.doc().unwrap();
+    assert!(!d.is_visible(d.entity(hidden).unwrap()), "the second line must be hidden");
+    s.set_selection(vec![shown, hidden]);
+    (s, shown, hidden)
+}
+
+/// The index of the grip of `h` at `p`.
+fn grip_at(s: &Session, h: Handle, p: Vec2) -> usize {
+    s.grips_of(h).unwrap().iter().position(|g| g.near(p, 1e-9)).unwrap()
+}
+
+/// Stretching the shared corner moves the visible line only; the hidden one stays where it was.
+#[test]
+fn a_hidden_selected_line_is_not_stretched_with_a_shared_grip() {
+    let (mut s, shown, hidden) = shared_corner();
+    let i = grip_at(&s, shown, Vec2::new(0.0, 0.0));
+    s.start_grip_edit(&[(shown, i)]).unwrap();
+    s.cmdline("3,4").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    let (start, end) = ends(&s, shown);
+    assert!(start.near(Vec2::new(3.0, 4.0), 1e-9) && end.near(Vec2::new(10.0, 0.0), 1e-9), "{start:?} {end:?}");
+    let (start, end) = ends(&s, hidden);
+    assert!(start.near(Vec2::new(0.0, 0.0), 1e-9) && end.near(Vec2::new(0.0, 10.0), 1e-9), "the hidden line moved: {start:?} {end:?}");
+}
+
+/// The Move mode of a grip edit moves the visible selection only.
+#[test]
+fn a_hidden_selected_line_is_not_moved_by_the_move_mode_of_a_grip_edit() {
+    let (mut s, shown, hidden) = shared_corner();
+    let i = grip_at(&s, shown, Vec2::new(10.0, 0.0));
+    s.start_grip_edit(&[(shown, i)]).unwrap();
+    s.cmdline("").unwrap();
+    assert!(s.prompt_text().contains("** MOVE **"), "{}", s.prompt_text());
+    s.cmdline("12,5").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    let (start, end) = ends(&s, shown);
+    assert!(start.near(Vec2::new(2.0, 5.0), 1e-9) && end.near(Vec2::new(12.0, 5.0), 1e-9), "{start:?} {end:?}");
+    let (start, end) = ends(&s, hidden);
+    assert!(start.near(Vec2::new(0.0, 0.0), 1e-9) && end.near(Vec2::new(0.0, 10.0), 1e-9), "the hidden line moved: {start:?} {end:?}");
+}
+
+/// The grip of a hidden object is never made hot, so a grip edit cannot start on it.
+#[test]
+fn the_grip_of_a_hidden_object_cannot_be_made_hot() {
+    let (mut s, _, hidden) = shared_corner();
+    let before = s.state().unwrap().doc.clone();
+    let err = s.start_grip_edit(&[(hidden, 0)]).unwrap_err().to_string();
+    assert!(err.contains("no grip"), "{err}");
+    assert!(s.running.is_none());
+    assert!(std::sync::Arc::ptr_eq(&before, &s.state().unwrap().doc), "nothing may change");
+}
+
+/// A hidden object's grip among the hot grips is left out, wherever it stands in the list: the
+/// first grip the drawing shows is the base grip, and only the visible line is stretched.
+#[test]
+fn a_hidden_grip_among_the_hot_grips_is_left_out() {
+    for hidden_first in [false, true] {
+        let (mut s, shown, hidden) = shared_corner();
+        let mut hot = vec![(shown, grip_at(&s, shown, Vec2::new(0.0, 0.0))), (hidden, grip_at(&s, hidden, Vec2::new(0.0, 10.0)))];
+        if hidden_first {
+            hot.reverse();
+        }
+        s.start_grip_edit(&hot).unwrap();
+        s.cmdline("3,4").unwrap();
+        assert!(s.running.is_none(), "{}", s.prompt_text());
+        let (start, end) = ends(&s, shown);
+        assert!(start.near(Vec2::new(3.0, 4.0), 1e-9) && end.near(Vec2::new(10.0, 0.0), 1e-9), "hidden first: {hidden_first}: {start:?} {end:?}");
+        let (start, end) = ends(&s, hidden);
+        assert!(
+            start.near(Vec2::new(0.0, 0.0), 1e-9) && end.near(Vec2::new(0.0, 10.0), 1e-9),
+            "hidden first: {hidden_first}: the hidden line moved: {start:?} {end:?}"
+        );
+    }
+}
+
+/// Only what the drawing does not show is left out: a grip of an object that does not exist is
+/// still an error, also after a good one.
+#[test]
+fn a_missing_object_among_the_hot_grips_is_still_an_error() {
+    let (mut s, shown, _) = shared_corner();
+    let i = grip_at(&s, shown, Vec2::new(0.0, 0.0));
+    let err = s.start_grip_edit(&[(shown, i), (Handle(0xFFFF), 0)]).unwrap_err().to_string();
+    assert!(err.contains("no such object"), "{err}");
+    assert!(s.running.is_none());
+}
+
+/// A selected line on a layer that is off is not shown either, and is not stretched with a
+/// shared grip.
+#[test]
+fn a_selected_line_on_a_layer_that_is_off_is_not_stretched_with_a_shared_grip() {
+    let mut s = Session::new();
+    let shown = line(&mut s, [0.0, 0.0], [10.0, 0.0]);
+    s.execute("layer.new", &json!({ "name": "Guides", "current": true })).unwrap();
+    let off = line(&mut s, [0.0, 0.0], [0.0, 10.0]);
+    s.execute("layer.current", &json!({ "name": "0" })).unwrap();
+    s.execute("layer.set", &json!({ "name": "Guides", "on": false })).unwrap();
+    let d = s.doc().unwrap();
+    assert!(!d.is_visible(d.entity(off).unwrap()), "the second line must be on a layer that is off");
+    s.set_selection(vec![shown, off]);
+    let i = grip_at(&s, shown, Vec2::new(0.0, 0.0));
+    s.start_grip_edit(&[(shown, i)]).unwrap();
+    s.cmdline("3,4").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    let (start, end) = ends(&s, shown);
+    assert!(start.near(Vec2::new(3.0, 4.0), 1e-9) && end.near(Vec2::new(10.0, 0.0), 1e-9), "{start:?} {end:?}");
+    let (start, end) = ends(&s, off);
+    assert!(
+        start.near(Vec2::new(0.0, 0.0), 1e-9) && end.near(Vec2::new(0.0, 10.0), 1e-9),
+        "the line on the layer that is off moved: {start:?} {end:?}"
+    );
+}
+
+/// The typed GRIP command finds no grip where only a hidden object has one, and at the shared
+/// corner it makes only the visible line's grip hot.
+#[test]
+fn the_typed_grip_command_finds_no_grip_of_a_hidden_object() {
+    let (mut s, shown, hidden) = shared_corner();
+    s.cmdline("grip").unwrap();
+    assert!(s.prompt_text().contains("Select grip"), "{}", s.prompt_text());
+    // Only the hidden line has a grip at (0, 10): the command says so and asks again.
+    s.cmdline("0,10").unwrap();
+    assert!(s.log.iter().any(|l| l.contains("No grip of a selected object there")), "{:?}", s.log);
+    s.cmdline("0,0").unwrap();
+    s.cmdline("").unwrap();
+    assert!(s.prompt_text().contains("** STRETCH **"), "{}", s.prompt_text());
+    s.cmdline("3,4").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    let (start, end) = ends(&s, shown);
+    assert!(start.near(Vec2::new(3.0, 4.0), 1e-9) && end.near(Vec2::new(10.0, 0.0), 1e-9), "{start:?} {end:?}");
+    let (start, end) = ends(&s, hidden);
+    assert!(start.near(Vec2::new(0.0, 0.0), 1e-9) && end.near(Vec2::new(0.0, 10.0), 1e-9), "the hidden line moved: {start:?} {end:?}");
+}

crates/engine/tests/it/lisp_corpus.rs

@@ -23,10 +23,10 @@ fn groups(d: &cadcraft_engine::doc::Drawing, e: &Entity) -> (String, Vec<(i32, V
         .into_iter()
         .map(|t| {
             let v = match t.value {
-                cadcraft_dxf::Value::Str(s) | cadcraft_dxf::Value::Hex(s) => json!(s),
-                cadcraft_dxf::Value::Real(r) => json!(r),
-                cadcraft_dxf::Value::Int(i) => json!(i),
-                cadcraft_dxf::Value::Bool(b) => json!(i32::from(b)),
+                craft_dxf::Value::Str(s) | craft_dxf::Value::Hex(s) => json!(s),
+                craft_dxf::Value::Real(r) => json!(r),
+                craft_dxf::Value::Int(i) => json!(i),
+                craft_dxf::Value::Bool(b) => json!(i32::from(b)),
             };
             (t.code, v)
         })

crates/engine/tests/it/main.rs

@@ -52,6 +52,7 @@ mod extend_polyline_arc_end;
 mod fillet_chamfer;
 mod fix_holds_grips;
 mod followups_626;
+mod greek_keyboard;
 mod grip_dim_input;
 mod grip_options;
 mod grip_selection;
@@ -62,6 +63,7 @@ mod hatch_dialog_helpers;
 mod hatch_numeric_validation;
 mod hatch_options;
 mod helix;
+mod hidden_grip_targets;
 mod inquiry_keywords;
 mod inquiry_variables;
 mod inquiry_z;
@@ -165,6 +167,7 @@ mod trim_extend_options;
 mod undo_count;
 mod undo_layout_tab;
 mod viewport_clip;
+mod viewport_frozen_selection;
 mod vplayer_prompts;
 mod vports;
 mod wipeout_grips;

crates/engine/tests/it/viewport_frozen_selection.rs

@@ -0,0 +1,783 @@
+//! Inside an MSPACE viewport an object on a layer frozen in that viewport (VPLAYER, "VP Freeze")
+//! is not drawn there, so the selections made through that viewport leave it out: picks, windows,
+//! the typed selection modes, the commands that select for themselves, and, for an object that is
+//! already selected, its grips and the commands that start from the selection. In a viewport that
+//! does not freeze the layer, in paper space and on the Model tab everything is as before.
+
+use cadcraft_engine::Session;
+use cadcraft_engine::doc::{EntityKind, Handle, Space};
+use cadcraft_engine::geom::Vec2;
+use serde_json::{Value, json};
+
+/// Draws a line from `a` to `b` on the current layer and returns its handle.
+fn line(s: &mut Session, a: [f64; 2], b: [f64; 2]) -> Handle {
+    let r = s.execute("line", &json!({ "points": [a, b] })).unwrap();
+    Handle::parse_hex(r["handles"][0].as_str().unwrap()).unwrap()
+}
+
+/// Puts `h` on the layer "Hidden", which [`viewports`] freezes in its first viewport.
+fn hide(s: &mut Session, h: Handle) {
+    if s.doc().unwrap().layer("Hidden").is_none() {
+        s.execute("layer.new", &json!({ "name": "Hidden" })).unwrap();
+    }
+    s.execute("properties.set", &json!({ "handles": [h.hex()], "layer": "Hidden" })).unwrap();
+    assert_eq!(s.doc().unwrap().entity(h).unwrap().common.layer, "Hidden");
+}
+
+/// Two viewports on Layout1: the first freezes the layer "Hidden", the second freezes nothing.
+/// The session is left in paper space.
+fn viewports(s: &mut Session) -> (String, String) {
+    if s.doc().unwrap().layer("Hidden").is_none() {
+        s.execute("layer.new", &json!({ "name": "Hidden" })).unwrap();
+    }
+    s.execute("layout.set", &json!({ "name": "Layout1" })).unwrap();
+    let r = s.execute("mview", &json!({ "count": 2, "p1": [20, 20], "p2": [220, 120] })).unwrap();
+    let (a, b) = (r["viewports"][0].as_str().unwrap().to_string(), r["viewports"][1].as_str().unwrap().to_string());
+    s.execute("vplayer", &json!({ "handles": [a], "freeze": ["Hidden"] })).unwrap();
+    (a, b)
+}
+
+/// Makes `viewport` the active MSPACE viewport.
+fn enter(s: &mut Session, viewport: &str) {
+    s.execute("mspace", &json!({ "handle": viewport })).unwrap();
+    assert_eq!(s.space(), Space::Model, "inside a viewport the edit space is model space");
+}
+
+/// What most tests draw: `shown` on layer 0 and, drawn after it and so on top of it, `hidden` on
+/// the layer "Hidden", both from (0, 0) to (10, 0); and the two viewports of [`viewports`].
+struct Sheet {
+    s: Session,
+    shown: Handle,
+    hidden: Handle,
+    /// The viewport that freezes "Hidden".
+    a: String,
+    /// The viewport that freezes nothing.
+    b: String,
+}
+
+/// The drawing of [`Sheet`], in paper space.
+fn sheet() -> Sheet {
+    let mut s = Session::new();
+    let shown = line(&mut s, [0.0, 0.0], [10.0, 0.0]);
+    let hidden = line(&mut s, [0.0, 0.0], [10.0, 0.0]);
+    hide(&mut s, hidden);
+    assert_eq!(s.doc().unwrap().entity(shown).unwrap().common.layer, "0");
+    let (a, b) = viewports(&mut s);
+    Sheet { s, shown, hidden, a, b }
+}
+
+/// The two ends of the line `h`.
+fn ends(s: &Session, h: Handle) -> (Vec2, Vec2) {
+    match &s.doc().unwrap().entity(h).unwrap().kind {
+        EntityKind::Line(l) => (l.a.xy(), l.b.xy()),
+        k => panic!("not a line: {k:?}"),
+    }
+}
+
+/// Whether the line `h` still runs from (0, 0) to (10, 0).
+fn untouched(s: &Session, h: Handle) -> bool {
+    let (a, b) = ends(s, h);
+    a.near(Vec2::new(0.0, 0.0), 1e-9) && b.near(Vec2::new(10.0, 0.0), 1e-9)
+}
+
+/// Whether the drawing still has the object `h`.
+fn exists(s: &Session, h: Handle) -> bool {
+    s.doc().unwrap().entity(h).is_some()
+}
+
+/// Every selected object, in handle order: the stored selection, which also holds the objects
+/// the active viewport does not draw ([`Session::selection`] leaves those out).
+fn selected(s: &Session) -> Vec<Handle> {
+    let mut v = s.state().unwrap().selection.clone();
+    v.sort();
+    v
+}
+
+/// Whether the line `h` was erased or no longer runs from (0, 0) to (10, 0).
+fn edited(s: &Session, h: Handle) -> bool {
+    !exists(s, h) || !untouched(s, h)
+}
+
+/// The index of the grip of `h` at the origin.
+fn origin_grip(s: &Session, h: Handle) -> usize {
+    s.grips_of(h).unwrap().iter().position(|g| g.near(Vec2::new(0.0, 0.0), 1e-9)).unwrap()
+}
+
+/// `hs` in handle order.
+fn sorted(mut hs: Vec<Handle>) -> Vec<Handle> {
+    hs.sort();
+    hs
+}
+
+/// Runs `text` as a script and ends whatever prompt it leaves open with Enter.
+fn run(s: &mut Session, text: &str) {
+    s.script(text).unwrap();
+    for _ in 0..4 {
+        if s.running.is_none() {
+            break;
+        }
+        s.cmdline("").unwrap();
+    }
+    assert!(s.running.is_none(), "`{text}` left a prompt open: {}", s.prompt_text());
+}
+
+/// The JSON `select` command replaces the selection with what `how` finds.
+fn select(s: &mut Session, how: Value) -> Vec<Handle> {
+    s.set_selection(Vec::new());
+    s.execute("select", &how).unwrap();
+    selected(s)
+}
+
+/// A pick takes the topmost object the viewport draws: the frozen line lies on top of the other
+/// one, and a pick at the same point finds the line under it. Where the layer is not frozen the
+/// pick finds the line on top, as it always did.
+#[test]
+fn a_pick_finds_the_topmost_object_the_viewport_draws() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    let at = json!({ "at": [5, 0], "aperture": 0.5 });
+    enter(&mut s, &a);
+    assert_eq!(select(&mut s, at.clone()), [shown], "the viewport freezes the layer of the line on top");
+    enter(&mut s, &b);
+    assert_eq!(select(&mut s, at.clone()), [hidden], "this viewport draws both: the one on top is picked");
+    s.execute("layout.set", &json!({ "name": "Model" })).unwrap();
+    assert_eq!(select(&mut s, at), [hidden], "the Model tab draws both");
+}
+
+/// Window, crossing and fence selection through the viewport leave the frozen line out, and take
+/// both lines through the viewport that draws both.
+#[test]
+fn a_window_a_crossing_and_a_fence_leave_out_what_the_viewport_does_not_draw() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    let ways =
+        [json!({ "window": [[-1, -1], [11, 1]] }), json!({ "window": [[4, -1], [6, 1]], "crossing": true }), json!({ "fence": [[5, -1], [5, 1]] })];
+    for how in &ways {
+        enter(&mut s, &a);
+        assert_eq!(select(&mut s, how.clone()), [shown], "{how}");
+        enter(&mut s, &b);
+        assert_eq!(select(&mut s, how.clone()), sorted(vec![shown, hidden]), "{how}");
+    }
+}
+
+/// Clicks with no command running: a click on the two lines selects the one the viewport draws,
+/// and a window dragged around them takes only that one.
+#[test]
+fn idle_clicks_and_windows_select_what_the_viewport_draws() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    enter(&mut s, &a);
+    s.idle_click(Vec2::new(5.0, 0.0), false).unwrap();
+    assert_eq!(selected(&s), [shown]);
+    s.set_selection(Vec::new());
+    // A click on nothing opens a window; the next click closes it (left to right: a window).
+    s.idle_click(Vec2::new(-1.0, -1.0), false).unwrap();
+    assert!(s.pending_window.is_some(), "the first click must be on nothing");
+    s.idle_click(Vec2::new(11.0, 1.0), false).unwrap();
+    assert_eq!(selected(&s), [shown]);
+
+    enter(&mut s, &b);
+    s.idle_click(Vec2::new(5.0, 0.0), false).unwrap();
+    assert_eq!(selected(&s), [hidden], "this viewport draws both: the one on top is picked");
+    s.set_selection(Vec::new());
+    s.idle_click(Vec2::new(-1.0, -1.0), false).unwrap();
+    s.idle_click(Vec2::new(11.0, 1.0), false).unwrap();
+    assert_eq!(selected(&s), sorted(vec![shown, hidden]));
+}
+
+/// Selection cycling lists the objects under the pick box that the viewport draws.
+#[test]
+fn selection_cycling_lists_what_the_viewport_draws() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    enter(&mut s, &a);
+    assert_eq!(s.pick_candidates(Vec2::new(5.0, 0.0)), [shown]);
+    enter(&mut s, &b);
+    assert_eq!(s.pick_candidates(Vec2::new(5.0, 0.0)), [hidden, shown], "topmost first");
+}
+
+/// Every way of answering "Select objects" leaves the frozen line out: ERASE through the
+/// viewport that freezes its layer erases the other line only, and through the other viewport
+/// both.
+#[test]
+fn the_answers_to_select_objects_leave_out_what_the_viewport_does_not_draw() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    enter(&mut s, &a);
+    s.execute("group", &json!({ "name": "PAIR", "handles": [shown.hex(), hidden.hex()] })).unwrap();
+    // Group selection off: a pick takes the object alone, so each answer is tested by itself.
+    s.settings.pickstyle = 0;
+    let answers = [
+        "5,0",
+        "-1,-1 11,1",
+        "ALL",
+        "W -1,-1 11,1",
+        "C 6,1 4,-1",
+        "BOX 6,1 4,-1",
+        "F 5,-1 5,1\n",
+        "WP -1,-1 11,-1 11,1 -1,1\n",
+        "CP 4,-1 6,-1 5,1\n",
+        "G PAIR",
+    ];
+    for answer in answers {
+        enter(&mut s, &a);
+        run(&mut s, &format!("ERASE {answer}\n"));
+        assert!(!exists(&s, shown), "`{answer}` must erase the line the viewport draws");
+        assert!(exists(&s, hidden), "`{answer}` erased a line the viewport does not draw");
+        s.execute("undo", &json!({})).unwrap();
+        assert!(exists(&s, shown) && exists(&s, hidden));
+
+        enter(&mut s, &b);
+        run(&mut s, &format!("ERASE {answer}\n"));
+        // A pick takes one object, the one on top; every other answer takes both.
+        assert_eq!((exists(&s, shown), exists(&s, hidden)), (answer == "5,0", false), "`{answer}` where both are drawn");
+        s.execute("undo", &json!({})).unwrap();
+        assert!(exists(&s, shown) && exists(&s, hidden));
+    }
+}
+
+/// With group selection on, a pick brings the members of its group that the viewport draws.
+#[test]
+fn a_pick_brings_the_group_members_the_viewport_draws() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    enter(&mut s, &a);
+    s.execute("group", &json!({ "name": "PAIR", "handles": [shown.hex(), hidden.hex()] })).unwrap();
+    s.settings.pickstyle = 1;
+    s.set_selection(Vec::new());
+    s.idle_click(Vec2::new(5.0, 0.0), false).unwrap();
+    assert_eq!(selected(&s), [shown]);
+    enter(&mut s, &b);
+    s.idle_click(Vec2::new(5.0, 0.0), false).unwrap();
+    assert_eq!(selected(&s), sorted(vec![shown, hidden]));
+}
+
+/// Select All and Select Similar take what the viewport draws.
+#[test]
+fn select_all_and_select_similar_take_what_the_viewport_draws() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    // Mode 0: any object of the same type is similar, whatever its layer.
+    let similar = json!({ "handles": [shown.hex()], "mode": 0 });
+    enter(&mut s, &a);
+    s.execute("selectall", &json!({})).unwrap();
+    assert_eq!(selected(&s), [shown]);
+    s.execute("selectsimilar", &similar).unwrap();
+    assert_eq!(selected(&s), [shown]);
+    enter(&mut s, &b);
+    s.execute("selectall", &json!({})).unwrap();
+    assert_eq!(selected(&s), sorted(vec![shown, hidden]));
+    s.execute("selectsimilar", &similar).unwrap();
+    assert_eq!(selected(&s), sorted(vec![shown, hidden]));
+}
+
+/// STRETCH selects for itself: its crossing window, polygon and fence, called with JSON or
+/// typed, and its typed All, Last and Previous, move the line the viewport draws and leave the
+/// frozen one where it was.
+#[test]
+fn stretch_moves_what_the_viewport_draws() {
+    let calls = [
+        json!({ "window": [[9, -1], [11, 1]], "delta": [0, 5] }),
+        json!({ "polygon": [[9, -1], [11, -1], [11, 1], [9, 1]], "delta": [0, 5] }),
+        json!({ "fence": [[5, -1], [5, 1]], "delta": [0, 5] }),
+    ];
+    for call in &calls {
+        let Sheet { mut s, shown, hidden, a, b } = sheet();
+        enter(&mut s, &a);
+        s.execute("stretch", call).unwrap();
+        assert!(!untouched(&s, shown), "{call}: the line the viewport draws must move");
+        assert!(untouched(&s, hidden), "{call}: a line the viewport does not draw moved: {:?}", ends(&s, hidden));
+        enter(&mut s, &b);
+        s.execute("stretch", call).unwrap();
+        assert!(!untouched(&s, hidden), "{call}: where both are drawn both move");
+    }
+    // Typed: a crossing window, named and implied, All, a pick, Last, and Previous (both lines).
+    for objects in ["C 11,1 9,-1", "11,1 9,-1", "ALL", "5,0", "L", "P"] {
+        let typed = format!("STRETCH {objects}\n\n0,0 0,5\n");
+        let Sheet { mut s, shown, hidden, a, b } = sheet();
+        enter(&mut s, &a);
+        s.remember_selection(&[shown, hidden]);
+        run(&mut s, &typed);
+        assert!(!untouched(&s, shown), "{typed:?}: the line the viewport draws must move");
+        assert!(untouched(&s, hidden), "{typed:?}: a line the viewport does not draw moved: {:?}", ends(&s, hidden));
+        enter(&mut s, &b);
+        s.remember_selection(&[shown, hidden]);
+        run(&mut s, &typed);
+        assert!(!untouched(&s, hidden), "{typed:?}: where both are drawn the one on top moves");
+    }
+}
+
+/// A multiline whose control vertex is inside STRETCH's crossing window is stretched although
+/// the window misses its drawn lines, but not when the viewport does not draw it.
+#[test]
+fn stretch_leaves_a_multiline_the_viewport_does_not_draw() {
+    /// The control vertices of the multiline `h`.
+    fn vertices(s: &Session, h: Handle) -> Vec<Vec2> {
+        match &s.doc().unwrap().entity(h).unwrap().kind {
+            EntityKind::MLine(m) => m.vertices.iter().map(|v| v.p.xy()).collect(),
+            k => panic!("not a multiline: {k:?}"),
+        }
+    }
+    let mut s = Session::new();
+    // Zero justification at scale 2: the element lines run one unit either side of the vertices.
+    let r = s.execute("mline", &json!({ "points": [[0, 0], [10, 0]], "scale": 2, "justification": "zero" })).unwrap();
+    let mline = Handle::parse_hex(r["handle"].as_str().or_else(|| r["handles"][0].as_str()).unwrap()).unwrap();
+    hide(&mut s, mline);
+    let (a, b) = viewports(&mut s);
+    let call = json!({ "window": [[9.9, -0.1], [10.1, 0.1]], "delta": [0, 5] });
+    enter(&mut s, &a);
+    s.execute("stretch", &call).unwrap();
+    assert!(vertices(&s, mline)[1].near(Vec2::new(10.0, 0.0), 1e-9), "a multiline the viewport does not draw was stretched");
+    enter(&mut s, &b);
+    s.execute("stretch", &call).unwrap();
+    assert!(vertices(&s, mline)[1].near(Vec2::new(10.0, 5.0), 1e-9), "{:?}", vertices(&s, mline));
+}
+
+/// TRIM's fence and crossing window trim the line the viewport draws and leave the frozen one.
+#[test]
+fn trim_by_fence_and_crossing_leaves_what_the_viewport_does_not_draw() {
+    for call in [json!({ "fence": [[8, -1], [8, 1]] }), json!({ "crossing": [[7.5, -1], [8.5, 1]] })] {
+        let mut s = Session::new();
+        let shown = line(&mut s, [0.0, 0.0], [10.0, 0.0]);
+        let hidden = line(&mut s, [0.0, 0.0], [10.0, 0.0]);
+        // The cutting edge, on a layer every viewport draws.
+        line(&mut s, [5.0, -5.0], [5.0, 5.0]);
+        hide(&mut s, hidden);
+        let (a, b) = viewports(&mut s);
+        enter(&mut s, &a);
+        s.execute("trim", &call).unwrap();
+        assert!(!untouched(&s, shown), "{call}: the line the viewport draws must be trimmed");
+        assert!(untouched(&s, hidden), "{call}: a line the viewport does not draw was trimmed: {:?}", ends(&s, hidden));
+        enter(&mut s, &b);
+        s.execute("trim", &call).unwrap();
+        assert!(!untouched(&s, hidden), "{call}: where both are drawn both are trimmed");
+    }
+}
+
+/// A prompt that picks one object (BREAK's "Select object") finds the one the viewport draws.
+#[test]
+fn a_prompt_for_one_object_picks_what_the_viewport_draws() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    enter(&mut s, &a);
+    run(&mut s, "BREAK 4,0 6,0\n");
+    assert!(untouched(&s, hidden), "a line the viewport does not draw was broken: {:?}", ends(&s, hidden));
+    assert!(!untouched(&s, shown), "the line the viewport draws must be broken");
+    enter(&mut s, &b);
+    run(&mut s, "BREAK 4,0 6,0\n");
+    assert!(!untouched(&s, hidden), "where both are drawn the one on top is broken");
+}
+
+/// LEADER's Copy option picks the text to copy: at a point where two texts lie, the one the
+/// viewport draws.
+#[test]
+fn leader_copies_the_text_the_viewport_draws() {
+    /// The contents of the multiline texts in model space: LEADER's copies.
+    fn copies(s: &Session) -> Vec<String> {
+        s.doc().unwrap().model.iter().filter_map(|e| if let EntityKind::MText(m) = &e.kind { Some(m.contents.clone()) } else { None }).collect()
+    }
+    let mut s = Session::new();
+    for text in ["SHOWN", "HIDDEN"] {
+        s.execute("text", &json!({ "at": [0, 0], "text": text, "height": 2.5 })).unwrap();
+    }
+    // The text drawn last lies on top.
+    let hidden = *s.doc().unwrap().model.handles().last().unwrap();
+    hide(&mut s, hidden);
+    let (a, b) = viewports(&mut s);
+    let leader = "(command \"_.LEADER\" '(20.0 20.0) '(30.0 25.0) \"\" \"\" \"_C\" '(1.0 1.0))";
+    enter(&mut s, &a);
+    s.cmdline(leader).unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    assert_eq!(copies(&s), ["SHOWN"], "the viewport freezes the layer of the text on top");
+    s.execute("undo", &json!({})).unwrap();
+    assert!(copies(&s).is_empty());
+    enter(&mut s, &b);
+    s.cmdline(leader).unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    assert_eq!(copies(&s), ["HIDDEN"], "this viewport draws both: the one on top is picked");
+}
+
+/// AutoLISP selects through the viewport too: `ssget` with a window, a crossing window, a fence,
+/// a polygon, a crossing polygon or a point leaves the frozen line out, and `entsel` picks the
+/// line the viewport draws. The sets made earlier (the implied selection, `ssgetfirst`, Previous)
+/// come without the frozen line, and Last is the last object the viewport draws.
+#[test]
+fn lisp_selects_what_the_viewport_draws() {
+    use cadcraft_engine::lisp::value::Value as Lisp;
+    /// The objects of the selection set that `code` returns (none for nil), in handle order.
+    fn set(s: &mut Session, code: &str) -> Vec<Handle> {
+        match s.lisp_eval(code, false, true, Vec::new()).unwrap() {
+            Some(Ok(Lisp::PickSet(set))) => sorted(set.items.lock().unwrap().clone()),
+            Some(Ok(Lisp::Nil)) => Vec::new(),
+            other => panic!("`{code}` returned {other:?}"),
+        }
+    }
+    /// The object `entsel` returns for a pick at (5, 0).
+    fn entsel(s: &mut Session) -> Handle {
+        s.cmdline("(setq picked (car (entsel)))").unwrap();
+        s.input(cadcraft_engine::Input::Point(Vec2::new(5.0, 0.0))).unwrap();
+        match s.lisp_var("picked") {
+            Lisp::Ename(h) => h,
+            other => panic!("entsel returned {other:?}: {}", s.prompt_text()),
+        }
+    }
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    let areas = [
+        "(ssget \"W\" '(-1 -1) '(11 1))",
+        "(ssget \"C\" '(4 -1) '(6 1))",
+        "(ssget \"F\" '((5 -1) (5 1)))",
+        "(ssget \"WP\" '((-1 -1) (11 -1) (11 1) (-1 1)))",
+        "(ssget \"CP\" '((4 -1) (6 -1) (5 1)))",
+    ];
+    enter(&mut s, &a);
+    for code in areas {
+        assert_eq!(set(&mut s, code), [shown], "{code}");
+    }
+    assert_eq!(set(&mut s, "(ssget '(5 0))"), [shown], "a point picks the object the viewport draws");
+    assert_eq!(entsel(&mut s), shown);
+    enter(&mut s, &b);
+    for code in areas {
+        assert_eq!(set(&mut s, code), sorted(vec![shown, hidden]), "{code}");
+    }
+    assert_eq!(set(&mut s, "(ssget '(5 0))"), [hidden], "this viewport draws both: the one on top is picked");
+    assert_eq!(entsel(&mut s), hidden);
+
+    let earlier = ["(ssget \"I\")", "(ssget)", "(cadr (ssgetfirst))", "(ssget \"P\")"];
+    for (viewport, expected) in [(&a, vec![shown]), (&b, sorted(vec![shown, hidden]))] {
+        enter(&mut s, viewport);
+        for code in earlier {
+            s.set_selection(vec![shown, hidden]);
+            s.remember_selection(&[shown, hidden]);
+            assert_eq!(set(&mut s, code), expected, "{code}");
+        }
+    }
+    // Last: of two lines made after everything else, the later one is on the layer the first
+    // viewport freezes, so through that viewport Last is the earlier one.
+    s.set_selection(Vec::new());
+    enter(&mut s, &b);
+    let drawn = line(&mut s, [0.0, 2.0], [10.0, 2.0]);
+    let last = line(&mut s, [0.0, 3.0], [10.0, 3.0]);
+    hide(&mut s, last);
+    assert_eq!(set(&mut s, "(ssget \"L\")"), [last]);
+    enter(&mut s, &a);
+    assert_eq!(set(&mut s, "(ssget \"L\")"), [drawn], "Last must pass over an object the viewport does not draw");
+}
+
+/// The grips of a selected object the viewport does not draw take no part in a grip edit: a
+/// shared grip stretches only the line that is drawn. Through the other viewport both stretch.
+#[test]
+fn a_selected_line_the_viewport_does_not_draw_is_not_stretched_with_a_shared_grip() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    enter(&mut s, &a);
+    s.set_selection(vec![shown, hidden]);
+    let i = origin_grip(&s, shown);
+    s.start_grip_edit(&[(shown, i)]).unwrap();
+    s.cmdline("3,4").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    assert!(ends(&s, shown).0.near(Vec2::new(3.0, 4.0), 1e-9), "{:?}", ends(&s, shown));
+    assert!(untouched(&s, hidden), "a line the viewport does not draw moved: {:?}", ends(&s, hidden));
+    // Its own grip starts no edit there.
+    let before = s.state().unwrap().doc.clone();
+    let j = origin_grip(&s, hidden);
+    assert!(s.start_grip_edit(&[(hidden, j)]).is_err());
+    assert!(s.running.is_none());
+    assert!(std::sync::Arc::ptr_eq(&before, &s.state().unwrap().doc), "nothing may change");
+
+    s.execute("undo", &json!({})).unwrap();
+    enter(&mut s, &b);
+    s.set_selection(vec![shown, hidden]);
+    s.start_grip_edit(&[(shown, i)]).unwrap();
+    s.cmdline("3,4").unwrap();
+    assert!(s.running.is_none(), "{}", s.prompt_text());
+    assert!(ends(&s, shown).0.near(Vec2::new(3.0, 4.0), 1e-9), "{:?}", ends(&s, shown));
+    assert!(ends(&s, hidden).0.near(Vec2::new(3.0, 4.0), 1e-9), "where both are drawn both stretch: {:?}", ends(&s, hidden));
+}
+
+/// A layer frozen in the viewport while its object is selected: from then on the object's grips
+/// are not there, and thawing the layer in the viewport brings them back.
+#[test]
+fn freezing_a_layer_in_the_viewport_removes_the_grips_of_a_selected_object() {
+    let Sheet { mut s, hidden, b, .. } = sheet();
+    enter(&mut s, &b);
+    s.set_selection(vec![hidden]);
+    // The typed GRIP command finds a grip of the selected line at its start.
+    let grip_there = |s: &mut Session| {
+        s.cmdline("grip").unwrap();
+        s.cmdline("0,0").unwrap();
+        let none = s.log.iter().any(|l| l.contains("No grip of a selected object there"));
+        s.input(cadcraft_engine::Input::Cancel).unwrap();
+        s.log.clear();
+        !none
+    };
+    assert!(grip_there(&mut s), "the viewport draws the line: its grip is there");
+    s.execute("vplayer", &json!({ "handles": [b], "freeze": ["Hidden"] })).unwrap();
+    s.set_selection(vec![hidden]);
+    assert!(!grip_there(&mut s), "the viewport no longer draws the line");
+    s.execute("vplayer", &json!({ "handles": [b], "thaw": ["Hidden"] })).unwrap();
+    s.set_selection(vec![hidden]);
+    assert!(grip_there(&mut s), "thawed in the viewport: the grip is back");
+}
+
+/// What the edited view shows: the frozen layer hides its model-space objects inside that
+/// viewport only, and never an object on the sheet.
+#[test]
+fn only_the_viewport_that_freezes_a_layer_hides_its_model_objects() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    // A line on the sheet, on the layer the first viewport freezes.
+    let on_sheet = line(&mut s, [1.0, 1.0], [2.0, 1.0]);
+    hide(&mut s, on_sheet);
+    assert_eq!(s.doc().unwrap().space_of(on_sheet), Some(Space::Paper("Layout1".into())));
+    let shows = |s: &Session, h: Handle| {
+        let st = s.state().unwrap();
+        st.shows(st.doc.entity(h).unwrap())
+    };
+    assert!(s.viewport_frozen().is_empty(), "paper space: no viewport is active");
+    assert!(shows(&s, hidden) && shows(&s, shown) && shows(&s, on_sheet));
+    enter(&mut s, &a);
+    assert_eq!(s.viewport_frozen(), ["Hidden".to_string()]);
+    assert!(!shows(&s, hidden), "frozen in the active viewport");
+    assert!(shows(&s, shown));
+    assert!(shows(&s, on_sheet), "the viewport draws model space: its frozen layers hide nothing on the sheet");
+    // A prompt that picks one object on the sheet while the viewport is active finds it.
+    let sheet_space = Space::Paper("Layout1".into());
+    assert_eq!(s.pick_object(&sheet_space, Vec2::new(1.5, 1.0), 0.5).unwrap(), Some(on_sheet));
+    assert_eq!(s.pick_object(&Space::Model, Vec2::new(5.0, 0.0), 0.5).unwrap(), Some(shown), "in model space the frozen line is left out");
+    enter(&mut s, &b);
+    assert!(s.viewport_frozen().is_empty());
+    assert!(shows(&s, hidden));
+    // Layer names are not case sensitive: frozen under another spelling, the line is hidden too.
+    s.execute("vplayer", &json!({ "handles": [b], "freeze": ["HIDDEN"] })).unwrap();
+    assert_eq!(s.viewport_frozen(), ["HIDDEN".to_string()]);
+    assert!(!shows(&s, hidden));
+    assert_eq!(select(&mut s, json!({ "at": [5, 0], "aperture": 0.5 })), [shown]);
+    s.execute("vplayer", &json!({ "handles": [b], "thaw": ["hidden"] })).unwrap();
+    assert!(shows(&s, hidden));
+    s.execute("layout.set", &json!({ "name": "Model" })).unwrap();
+    assert!(s.viewport_frozen().is_empty(), "the Model tab has no layout viewport");
+    assert!(shows(&s, hidden));
+}
+
+/// An object that is selected when its layer is frozen in the active viewport stays selected, but
+/// nothing that starts from the selection takes it there: a typed command with the selection
+/// made before it (PICKFIRST), a JSON command that names no objects, and Delete.
+#[test]
+fn a_command_leaves_out_a_selected_object_the_viewport_does_not_draw() {
+    /// One way of editing the selection.
+    type Edit = fn(&mut Session);
+    let edits: [(&str, Edit); 5] = [
+        ("typed ERASE", |s: &mut Session| run(s, "ERASE\n")),
+        ("typed MOVE", |s: &mut Session| run(s, "MOVE 0,0 0,5\n")),
+        ("JSON erase", |s: &mut Session| drop(s.execute("erase", &json!({})).unwrap())),
+        ("JSON move", |s: &mut Session| drop(s.execute("move", &json!({ "delta": [0, 5] })).unwrap())),
+        ("Delete", |s: &mut Session| drop(s.execute("erase.selection", &json!({})).unwrap())),
+    ];
+    for (name, edit) in edits {
+        // Where both lines are drawn, both are edited.
+        let Sheet { mut s, shown, hidden, b, .. } = sheet();
+        enter(&mut s, &b);
+        s.set_selection(vec![shown, hidden]);
+        edit(&mut s);
+        assert!(edited(&s, shown) && edited(&s, hidden), "{name}: where both are drawn both are edited");
+
+        // The layer is frozen in the active viewport while both lines are selected.
+        let Sheet { mut s, shown, hidden, b, .. } = sheet();
+        enter(&mut s, &b);
+        s.set_selection(vec![shown, hidden]);
+        s.execute("vplayer", &json!({ "handles": [b], "freeze": ["Hidden"] })).unwrap();
+        assert_eq!(selected(&s), sorted(vec![shown, hidden]), "{name}: both lines must still be selected");
+        assert_eq!(s.selection(), [shown], "{name}: the selection as the viewport has it");
+        edit(&mut s);
+        assert!(edited(&s, shown), "{name}: the line the viewport draws must be edited");
+        assert!(!edited(&s, hidden), "{name}: a line the viewport does not draw was edited: {:?}", ends(&s, hidden));
+    }
+
+    // With only that line selected there is nothing to start from.
+    let Sheet { mut s, hidden, a, b, .. } = sheet();
+    enter(&mut s, &a);
+    s.set_selection(vec![hidden]);
+    assert!(s.selection().is_empty());
+    assert!(s.execute("erase.selection", &json!({})).is_err(), "Delete must find nothing selected");
+    s.script("ERASE\n").unwrap();
+    assert!(s.running.is_some() && s.prompt_text().contains("Select objects"), "ERASE must ask for objects: {}", s.prompt_text());
+    s.input(cadcraft_engine::Input::Cancel).unwrap();
+    assert!(!edited(&s, hidden));
+    // The line is still selected, and a viewport that draws it has it again.
+    s.set_selection(vec![hidden]);
+    s.execute("vplayer", &json!({ "handles": [a], "thaw": ["Hidden"] })).unwrap();
+    assert_eq!(s.selection(), [hidden], "thawed in the viewport: selected as before");
+    s.execute("vplayer", &json!({ "handles": [a], "freeze": ["Hidden"] })).unwrap();
+    assert!(s.selection().is_empty());
+    enter(&mut s, &b);
+    s.set_selection(vec![hidden]);
+    run(&mut s, "ERASE\n");
+    assert!(!exists(&s, hidden), "where the line is drawn the selection made before ERASE is erased");
+}
+
+/// The Previous and Last options of "Select objects" take what the viewport draws: of the set a
+/// command used before, and the last object that is not frozen there.
+#[test]
+fn previous_and_last_leave_out_what_the_viewport_does_not_draw() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    for option in ["P", "L"] {
+        enter(&mut s, &a);
+        s.set_selection(Vec::new());
+        s.remember_selection(&[shown, hidden]);
+        run(&mut s, &format!("ERASE {option}\n"));
+        assert!(!exists(&s, shown), "`{option}` must erase the line the viewport draws");
+        assert!(exists(&s, hidden), "`{option}` erased a line the viewport does not draw");
+        s.execute("undo", &json!({})).unwrap();
+        assert!(exists(&s, shown) && exists(&s, hidden));
+
+        enter(&mut s, &b);
+        s.set_selection(Vec::new());
+        s.remember_selection(&[shown, hidden]);
+        run(&mut s, &format!("ERASE {option}\n"));
+        // Previous is both lines; Last is the one made last, the line on the layer "Hidden".
+        assert_eq!((exists(&s, shown), exists(&s, hidden)), (option == "L", false), "`{option}` where both are drawn");
+        s.execute("undo", &json!({})).unwrap();
+        assert!(exists(&s, shown) && exists(&s, hidden));
+    }
+}
+
+/// The JSON grip edits that cover the selection (`grip.stretch` with hot grips, and
+/// [`Session::grip_edit`]) drag the grips of the other selected objects on the same point, but
+/// not the grip of a selected line the viewport does not draw.
+#[test]
+fn the_grip_edits_that_cover_the_selection_leave_out_what_the_viewport_does_not_draw() {
+    use cadcraft_engine::grips::GripMode;
+    /// Drags grip `i` of the line `h` to (3, 4).
+    type Edit = fn(&mut Session, Handle, usize);
+    let edits: [(&str, Edit); 2] = [
+        ("grip.stretch", |s: &mut Session, h: Handle, i: usize| {
+            drop(s.execute("grip.stretch", &json!({ "grips": [[h.hex(), i]], "to": [3, 4] })).unwrap())
+        }),
+        ("grip_edit", |s: &mut Session, h: Handle, i: usize| s.grip_edit(h, i, Vec2::new(3.0, 4.0), GripMode::Stretch).unwrap()),
+    ];
+    for (name, edit) in edits {
+        for frozen in [true, false] {
+            let Sheet { mut s, shown, hidden, a, b } = sheet();
+            enter(&mut s, if frozen { &a } else { &b });
+            s.set_selection(vec![shown, hidden]);
+            let i = origin_grip(&s, shown);
+            edit(&mut s, shown, i);
+            assert!(ends(&s, shown).0.near(Vec2::new(3.0, 4.0), 1e-9), "{name}: {:?}", ends(&s, shown));
+            assert_eq!(untouched(&s, hidden), frozen, "{name}, layer frozen in the viewport: {frozen}: {:?}", ends(&s, hidden));
+        }
+    }
+}
+
+/// What the session reports as the selection is the selection as the viewport has it, while
+/// every selected object stays in the stored selection.
+#[test]
+fn the_reported_selection_leaves_out_what_the_viewport_does_not_draw() {
+    /// The handles in `list`, a JSON array of hex strings, in handle order.
+    fn handles(list: &Value) -> Vec<Handle> {
+        sorted(list.as_array().unwrap().iter().map(|h| Handle::parse_hex(h.as_str().unwrap()).unwrap()).collect())
+    }
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    for (viewport, expected) in [(&a, vec![shown]), (&b, sorted(vec![shown, hidden]))] {
+        enter(&mut s, viewport);
+        s.set_selection(vec![shown, hidden]);
+        assert_eq!(selected(&s), sorted(vec![shown, hidden]), "both lines are selected");
+        assert_eq!(sorted(s.selection()), expected);
+        assert_eq!(handles(&s.summary()["selection"]), expected);
+        let inspect = s.execute("drawing.inspect", &json!({})).unwrap();
+        assert_eq!(handles(&inspect["selection"]), expected);
+    }
+    // A selected object on the sheet is never left out, whatever its layer.
+    s.execute("pspace", &json!({})).unwrap();
+    let on_sheet = line(&mut s, [1.0, 1.0], [2.0, 1.0]);
+    hide(&mut s, on_sheet);
+    enter(&mut s, &a);
+    s.set_selection(vec![shown, hidden, on_sheet]);
+    assert_eq!(sorted(s.selection()), sorted(vec![shown, on_sheet]));
+    // Where no viewport is active nothing is left out: in paper space and on the Model tab.
+    s.execute("pspace", &json!({})).unwrap();
+    s.set_selection(vec![shown, hidden, on_sheet]);
+    assert_eq!(sorted(s.selection()), sorted(vec![shown, hidden, on_sheet]), "paper space");
+    s.execute("layout.set", &json!({ "name": "Model" })).unwrap();
+    s.set_selection(vec![shown, hidden]);
+    assert_eq!(sorted(s.selection()), sorted(vec![shown, hidden]), "the Model tab");
+}
+
+/// Adding to the selection or removing from it inside the viewport keeps a selected object the
+/// viewport does not draw: nothing drops it behind the user's back, and it counts again once its
+/// layer is thawed there.
+#[test]
+fn changing_the_selection_keeps_a_selected_object_the_viewport_does_not_draw() {
+    let Sheet { mut s, shown, hidden, b, .. } = sheet();
+    enter(&mut s, &b);
+    // A third line, on layer 0 like `shown`, away from the other two.
+    let other = line(&mut s, [0.0, 5.0], [10.0, 5.0]);
+    // Selects `hidden` where it is drawn, then freezes its layer in the active viewport.
+    let freeze = |s: &mut Session| {
+        s.execute("vplayer", &json!({ "handles": [b], "thaw": ["Hidden"] })).unwrap();
+        s.set_selection(vec![hidden]);
+        s.execute("vplayer", &json!({ "handles": [b], "freeze": ["Hidden"] })).unwrap();
+        assert_eq!(selected(s), [hidden], "the line must still be selected");
+        assert!(s.selection().is_empty(), "the viewport does not draw it");
+    };
+
+    // A click adds (PICKADD), Shift+click removes.
+    freeze(&mut s);
+    s.idle_click(Vec2::new(5.0, 5.0), false).unwrap();
+    assert_eq!(selected(&s), sorted(vec![hidden, other]), "a click dropped the selected line the viewport does not draw");
+    assert_eq!(s.selection(), [other]);
+    s.idle_click(Vec2::new(5.0, 5.0), true).unwrap();
+    assert_eq!(selected(&s), [hidden], "Shift+click must remove only the line clicked");
+
+    // A window adds.
+    freeze(&mut s);
+    s.idle_click(Vec2::new(-1.0, 4.0), false).unwrap();
+    assert!(s.pending_window.is_some(), "the first click must be on nothing");
+    s.idle_click(Vec2::new(11.0, 6.0), false).unwrap();
+    assert_eq!(selected(&s), sorted(vec![hidden, other]), "a window dropped the selected line the viewport does not draw");
+
+    // The JSON `select` with `add`, and QSELECT appending the objects on layer 0.
+    freeze(&mut s);
+    s.execute("select", &json!({ "at": [5, 5], "aperture": 0.5, "add": true })).unwrap();
+    assert_eq!(selected(&s), sorted(vec![hidden, other]), "`select` with `add`");
+    // Given nothing to select with, `select` leaves the selection as it is.
+    s.execute("select", &json!({})).unwrap();
+    assert_eq!(selected(&s), sorted(vec![hidden, other]), "`select` with nothing to select with");
+    freeze(&mut s);
+    s.execute("qselect", &json!({ "layer": "0", "mode": "append" })).unwrap();
+    assert_eq!(selected(&s), sorted(vec![shown, hidden, other]), "QSELECT appending");
+    assert_eq!(sorted(s.selection()), sorted(vec![shown, other]));
+
+    // Thawed in the viewport, the line counts as selected again.
+    s.execute("vplayer", &json!({ "handles": [b], "thaw": ["Hidden"] })).unwrap();
+    assert_eq!(sorted(s.selection()), sorted(vec![shown, hidden, other]));
+}
+
+/// [`Session::selection`] looks a few selected objects up one by one and, when there are many,
+/// passes over model space once. Both leave out the same objects and keep the order of the
+/// selection: in a drawing of some hundreds of lines whose draw order is not the order of their
+/// handles, a selection of a few lines and the selection of every line.
+#[test]
+fn a_small_and_a_large_selection_leave_out_the_same_objects() {
+    let Sheet { mut s, shown, hidden, a, b } = sheet();
+    // A line on the sheet, on the layer the first viewport freezes: no viewport hides it.
+    let on_sheet = line(&mut s, [1.0, 1.0], [2.0, 1.0]);
+    hide(&mut s, on_sheet);
+    assert!(!s.doc().unwrap().model.contains(on_sheet), "the line must be on the sheet");
+    enter(&mut s, &b);
+    let more: Vec<Handle> = (0..400).map(|i| line(&mut s, [f64::from(i), 5.0], [f64::from(i), 6.0])).collect();
+    // Every second one of them goes on the layer the first viewport freezes.
+    let frozen: Vec<String> = more.iter().step_by(2).map(|h| h.hex()).collect();
+    s.execute("properties.set", &json!({ "handles": frozen, "layer": "Hidden" })).unwrap();
+    // The frozen line made last goes to the back: it is now the first object in draw order.
+    s.execute("draworder", &json!({ "handles": [more[398].hex()], "order": "back" })).unwrap();
+    assert_eq!(s.doc().unwrap().model.iter().next().map(|e| e.handle), Some(more[398]));
+    let all: Vec<Handle> = [shown, hidden].into_iter().chain(more.iter().copied()).collect();
+    let drawn: Vec<Handle> = std::iter::once(shown).chain(more.iter().copied().skip(1).step_by(2)).collect();
+    assert_eq!(s.doc().unwrap().model.len(), all.len());
+
+    enter(&mut s, &a);
+    s.set_selection(vec![shown, hidden]);
+    assert_eq!(s.selection(), [shown], "two selected lines of some hundreds");
+    s.set_selection(vec![hidden, on_sheet, more[0], more[1]]);
+    assert_eq!(s.selection(), [on_sheet, more[1]], "a line on the sheet is never left out");
+    s.set_selection(all.clone());
+    assert_eq!(s.selection(), drawn, "every line selected");
+    assert_eq!(s.state().unwrap().selection, all, "every line must still be selected");
+
+    // The viewport that freezes nothing has them all, few or many.
+    enter(&mut s, &b);
+    s.set_selection(vec![shown, hidden]);
+    assert_eq!(s.selection(), [shown, hidden]);
+    s.set_selection(all.clone());
+    assert_eq!(s.selection(), all);
+}

crates/fonts/Cargo.toml

@@ -10,7 +10,8 @@ workspace = true
 
 [dependencies]
 cadcraft-geom = { workspace = true }
-cadcraft-dxf = { workspace = true }
+craft-dxf = { workspace = true }
+craft-shx = { workspace = true }
 skrifa = { workspace = true }
 harfrust = { workspace = true }
 unicode-bidi = { workspace = true }

crates/fonts/src/mtext.rs

@@ -293,7 +293,7 @@ pub(crate) fn unescape_codes(s: &str) -> std::borrow::Cow<'_, str> {
                 continue;
             }
         } else if n == Some('M') && plus == Some('+') && chars.get(i + 3).is_some_and(char::is_ascii_digit) && hex4(&chars, i + 4).is_some() {
-            push_literal(&mut out, cadcraft_dxf::mif_escape_at(&chars, i).unwrap_or('\u{fffd}'));
+            push_literal(&mut out, craft_dxf::mif_escape_at(&chars, i).unwrap_or('\u{fffd}'));
             i += 8;
             continue;
         }

crates/fonts/src/shx/compile.rs

@@ -1,313 +0,0 @@
-//! Shape source (`.shp`) to a compiled SHX file, as COMPILE does.
-//!
-//! A source is a list of definitions: a header line `*number,defbytes,NAME` followed by its
-//! specification bytes (on as many lines as needed, ending with 0). Numbers are decimal, or
-//! hexadecimal after a leading `0` (`012`, `08cfb`); parentheses only group; `;` starts a
-//! comment. A big font starts with `*BIGFONT nchars,nranges,first,last,…` and a Unicode font
-//! with `*UNIFONT,6,name` followed by `above,below,modes,encoding,type,0`. Shape 0 is a text
-//! font's record (`above,below,modes,0`).
-//!
-//! Operands are encoded by what they are: a subshape number takes two bytes in a Unicode font
-//! (and after `7,0` in a big font), displacements and bulges are two's complement, and an arc's
-//! direction byte (`-043`) keeps its sign in the high bit. `defbytes` is not checked: the
-//! program's own length is written.
-
-use super::ShxError;
-use super::parse::{BIGFONT, SHAPES_10, UNIFONT};
-
-/// Largest source compiled.
-const MAX_SOURCE: usize = 8 << 20;
-
-#[derive(Clone, Copy, PartialEq)]
-enum Kind {
-    Shapes,
-    Big,
-    Uni,
-}
-
-struct Shape {
-    number: u16,
-    name: String,
-    program: Vec<u8>,
-}
-
-/// A number token: value (sign included).
-fn number(tok: &str, line: usize) -> Result<i64, ShxError> {
-    let t: String = tok.chars().filter(|c| !matches!(c, '(' | ')') && !c.is_whitespace()).collect();
-    let (neg, digits) = match t.strip_prefix('-') {
-        Some(d) => (true, d),
-        None => (false, t.strip_prefix('+').unwrap_or(&t)),
-    };
-    let err = || ShxError::Source(line, format!("not a number: {tok:?}"));
-    let v = if digits.len() > 1 && digits.starts_with('0') {
-        i64::from_str_radix(digits.get(1..).unwrap_or_default(), 16).map_err(|_| err())?
-    } else {
-        digits.parse::<i64>().map_err(|_| err())?
-    };
-    if v > 0xFFFF {
-        return Err(err());
-    }
-    Ok(if neg { -v } else { v })
-}
-
-/// The comma-separated numbers of a line (comment removed, blank fields skipped).
-fn numbers(text: &str, line: usize) -> Result<Vec<i64>, ShxError> {
-    text.split(',').map(str::trim).filter(|t| !t.is_empty() && *t != "(" && *t != ")").map(|t| number(t, line)).collect()
-}
-
-/// The spec-byte encoder: walks the tokens as the reader walks the bytes.
-struct Enc<'a> {
-    toks: &'a [i64],
-    i: usize,
-    out: Vec<u8>,
-    kind: Kind,
-    line: usize,
-}
-
-impl Enc<'_> {
-    fn next(&mut self) -> Result<i64, ShxError> {
-        let v = self.toks.get(self.i).copied().ok_or_else(|| ShxError::Source(self.line, "the shape ends inside a command".into()))?;
-        self.i += 1;
-        Ok(v)
-    }
-    fn byte(&mut self) -> Result<(), ShxError> {
-        let v = self.next()?;
-        let b = u8::try_from(v).map_err(|_| ShxError::Source(self.line, format!("{v} is not a byte")))?;
-        self.out.push(b);
-        Ok(())
-    }
-    /// Two's complement −128..127.
-    fn signed(&mut self) -> Result<i64, ShxError> {
-        let v = self.next()?;
-        let b = i8::try_from(v).map_err(|_| ShxError::Source(self.line, format!("{v} is not −128..127")))?;
-        self.out.extend(b.to_le_bytes());
-        Ok(v)
-    }
-    /// Sign in the high bit (an arc's direction byte).
-    fn sign_magnitude(&mut self) -> Result<(), ShxError> {
-        let v = self.next()?;
-        let m = u8::try_from(v.unsigned_abs())
-            .ok()
-            .filter(|m| *m < 0x80)
-            .ok_or_else(|| ShxError::Source(self.line, format!("{v} is not an octant byte")))?;
-        self.out.push(if v < 0 { m | 0x80 } else { m });
-        Ok(())
-    }
-    fn word(&mut self) -> Result<(), ShxError> {
-        let v = self.next()?;
-        let w = u16::try_from(v).map_err(|_| ShxError::Source(self.line, format!("{v} is not a shape number")))?;
-        self.out.extend(w.to_be_bytes());
-        Ok(())
-    }
-
-    fn program(mut self) -> Result<Vec<u8>, ShxError> {
-        while self.i < self.toks.len() {
-            let code = self.next()?;
-            let c = u8::try_from(code).map_err(|_| ShxError::Source(self.line, format!("{code} is not a code")))?;
-            self.out.push(c);
-            match c {
-                0 => break,
-                3 | 4 => self.byte()?,
-                7 => match self.kind {
-                    Kind::Uni => self.word()?,
-                    Kind::Big => {
-                        let first = self.toks.get(self.i).copied().unwrap_or(0);
-                        if first == 0 {
-                            self.byte()?;
-                            self.word()?;
-                            for _ in 0..4 {
-                                self.byte()?;
-                            }
-                        } else {
-                            self.byte()?;
-                        }
-                    }
-                    Kind::Shapes => self.byte()?,
-                },
-                8 => {
-                    self.signed()?;
-                    self.signed()?;
-                }
-                9 => loop {
-                    let (x, y) = (self.signed()?, self.signed()?);
-                    if x == 0 && y == 0 {
-                        break;
-                    }
-                },
-                10 => {
-                    self.byte()?;
-                    self.sign_magnitude()?;
-                }
-                11 => {
-                    for _ in 0..4 {
-                        self.byte()?;
-                    }
-                    self.sign_magnitude()?;
-                }
-                12 => {
-                    for _ in 0..3 {
-                        self.signed()?;
-                    }
-                }
-                13 => loop {
-                    let (x, y) = (self.signed()?, self.signed()?);
-                    if x == 0 && y == 0 {
-                        break;
-                    }
-                    self.signed()?;
-                },
-                _ => {}
-            }
-        }
-        if self.out.last() != Some(&0) {
-            self.out.push(0);
-        }
-        Ok(self.out)
-    }
-}
-
-/// Compile shape source into an SHX file (a shape file or text font, a big font, or a Unicode
-/// font, as its first definition says).
-pub fn compile(source: &str) -> Result<Vec<u8>, ShxError> {
-    if source.len() > MAX_SOURCE {
-        return Err(ShxError::TooLarge);
-    }
-    let mut kind = Kind::Shapes;
-    let mut ranges: Vec<(u16, u16)> = Vec::new();
-    let mut uni_info: Option<(String, Vec<u8>)> = None;
-    // Definitions: header (number, name, line) and the numbers that follow it.
-    let mut defs: Vec<(i64, String, usize, Vec<i64>)> = Vec::new();
-    let mut uni_header_pending = false;
-    for (no, raw) in source.lines().enumerate() {
-        let line = no + 1;
-        let text = raw.split(';').next().unwrap_or_default().trim();
-        if text.is_empty() {
-            continue;
-        }
-        if let Some(head) = text.strip_prefix('*') {
-            let upper = head.trim_start().to_ascii_uppercase();
-            if let Some(rest) = upper.strip_prefix("BIGFONT") {
-                kind = Kind::Big;
-                let v = numbers(rest, line)?;
-                let n = usize::try_from(v.get(1).copied().unwrap_or(0)).unwrap_or(0);
-                for k in 0..n {
-                    let lo = v.get(2 + 2 * k).copied().unwrap_or(0);
-                    let hi = v.get(3 + 2 * k).copied().unwrap_or(lo);
-                    let to = |x: i64| u16::try_from(x).map_err(|_| ShxError::Source(line, "bad escape range".into()));
-                    ranges.push((to(lo)?, to(hi)?));
-                }
-                continue;
-            }
-            if upper.starts_with("UNIFONT") {
-                kind = Kind::Uni;
-                let name = head.splitn(3, ',').nth(2).unwrap_or_default().trim().to_string();
-                uni_info = Some((name, Vec::new()));
-                uni_header_pending = true;
-                continue;
-            }
-            uni_header_pending = false;
-            let mut parts = head.splitn(3, ',');
-            let num = number(parts.next().unwrap_or_default().trim(), line)?;
-            let _defbytes = parts.next();
-            let name = parts.next().unwrap_or_default().trim().to_string();
-            defs.push((num, name, line, Vec::new()));
-            continue;
-        }
-        let v = numbers(text, line)?;
-        if uni_header_pending {
-            if let Some((_, info)) = uni_info.as_mut() {
-                for x in v {
-                    info.push(u8::try_from(x).map_err(|_| ShxError::Source(line, "bad font record".into()))?);
-                }
-            }
-            continue;
-        }
-        match defs.last_mut() {
-            Some(d) => d.3.extend(v),
-            None => return Err(ShxError::Source(line, "specification bytes before any *number,defbytes,NAME line".into())),
-        }
-    }
-    let mut shapes: Vec<Shape> = Vec::new();
-    for (num, name, line, toks) in defs {
-        let number = u16::try_from(num).map_err(|_| ShxError::Source(line, format!("shape number {num} out of range")))?;
-        let program = if number == 0 {
-            // The font record: plain bytes.
-            toks.iter().map(|x| u8::try_from(*x).map_err(|_| ShxError::Source(line, "bad font record".into()))).collect::<Result<Vec<u8>, _>>()?
-        } else {
-            Enc { toks: &toks, i: 0, out: Vec::new(), kind, line }.program()?
-        };
-        if shapes.iter().any(|s| s.number == number) {
-            return Err(ShxError::Source(line, format!("shape {number} is defined twice")));
-        }
-        shapes.push(Shape { number, name, program });
-    }
-    if shapes.is_empty() {
-        return Err(ShxError::Empty);
-    }
-    shapes.sort_by_key(|s| s.number);
-    let record = |s: &Shape| -> Result<Vec<u8>, ShxError> {
-        let mut r: Vec<u8> = s.name.bytes().filter(|b| *b != 0).collect();
-        r.push(0);
-        r.extend(&s.program);
-        if r.len() > usize::from(u16::MAX) { Err(ShxError::TooLarge) } else { Ok(r) }
-    };
-    let count = u16::try_from(shapes.len()).map_err(|_| ShxError::TooLarge)?;
-    let len16 = |r: &[u8]| u16::try_from(r.len()).unwrap_or(u16::MAX);
-    let mut out = Vec::new();
-    match kind {
-        Kind::Shapes => {
-            out.extend(SHAPES_10);
-            out.extend(shapes.first().map_or(0, |s| s.number).to_le_bytes());
-            out.extend(shapes.last().map_or(0, |s| s.number).to_le_bytes());
-            out.extend(count.to_le_bytes());
-            let recs: Vec<Vec<u8>> = shapes.iter().map(record).collect::<Result<_, _>>()?;
-            for (s, r) in shapes.iter().zip(&recs) {
-                out.extend(s.number.to_le_bytes());
-                out.extend(len16(r).to_le_bytes());
-            }
-            for r in &recs {
-                out.extend(r);
-            }
-            out.extend(b"EOF");
-        }
-        Kind::Big => {
-            out.extend(BIGFONT);
-            let nranges = u16::try_from(ranges.len()).map_err(|_| ShxError::TooLarge)?;
-            out.extend(count.to_le_bytes());
-            out.extend(count.to_le_bytes());
-            out.extend(nranges.to_le_bytes());
-            for (lo, hi) in &ranges {
-                out.extend(lo.to_le_bytes());
-                out.extend(hi.to_le_bytes());
-            }
-            let recs: Vec<Vec<u8>> = shapes.iter().map(record).collect::<Result<_, _>>()?;
-            let mut off = out.len() + 8 * recs.len();
-            for (s, r) in shapes.iter().zip(&recs) {
-                out.extend(s.number.to_le_bytes());
-                out.extend(len16(r).to_le_bytes());
-                out.extend(u32::try_from(off).map_err(|_| ShxError::TooLarge)?.to_le_bytes());
-                off += r.len();
-            }
-            for r in &recs {
-                out.extend(r);
-            }
-        }
-        Kind::Uni => {
-            out.extend(UNIFONT);
-            let (name, info) = uni_info.unwrap_or_default();
-            out.extend((u32::from(count) + 1).to_le_bytes());
-            let mut rec: Vec<u8> = name.bytes().filter(|b| *b != 0).collect();
-            rec.push(0);
-            rec.extend(&info);
-            out.extend(len16(&rec).to_le_bytes());
-            out.extend(&rec);
-            for s in &shapes {
-                let r = record(s)?;
-                out.extend(s.number.to_le_bytes());
-                out.extend(len16(&r).to_le_bytes());
-                out.extend(r);
-            }
-        }
-    }
-    Ok(out)
-}

crates/fonts/src/shx/mod.rs

@@ -26,7 +26,6 @@
 //!   above, below, modes, encoding, embedding, 0) and then each shape as (number, length,
 //!   record).
 
-mod compile;
 mod parse;
 mod program;
 mod table;
@@ -39,7 +38,8 @@ use std::sync::{Arc, PoisonError, RwLock};
 
 use cadcraft_geom::Vec2;
 
-pub use compile::compile;
+use craft_shx::Record;
+pub use craft_shx::{ShxError, ShxKind, compile};
 pub use table::{
     FontProvider, add_drawing_dir, clear_registered, drawing_dirs, find, font_map, generation, installed, register, search_path, set_font_dirs,
     set_font_map, set_provider, set_search_path,
@@ -47,46 +47,6 @@ pub use table::{
 pub use text::ShxText;
 pub(crate) use text::{shape, width};
 
-/// Why a font file can't be read or a shape source can't be compiled.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum ShxError {
-    /// Not an SHX file (unknown signature).
-    NotShx,
-    /// The file ends inside its header or index.
-    Truncated,
-    /// The file is larger, or has more of something, than CADCraft reads.
-    TooLarge,
-    /// The file is well-formed but holds no shape.
-    Empty,
-    /// Shape source error: line and message.
-    Source(usize, String),
-}
-
-impl std::fmt::Display for ShxError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ShxError::NotShx => f.write_str("not an SHX shape or font file"),
-            ShxError::Truncated => f.write_str("the SHX file is truncated"),
-            ShxError::TooLarge => f.write_str("the SHX file is too large"),
-            ShxError::Empty => f.write_str("the SHX file has no shapes"),
-            ShxError::Source(line, msg) => write!(f, "line {line}: {msg}"),
-        }
-    }
-}
-
-impl std::error::Error for ShxError {}
-
-/// The kind of SHX file.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ShxKind {
-    /// A shape file or a text font with single-byte character codes (`shapes 1.0/1.1`).
-    Shapes,
-    /// A big font: double-byte character codes after an escape (lead) byte.
-    BigFont,
-    /// A Unicode font: shape numbers are Unicode code points.
-    Unifont,
-}
-
 /// A shape's program run into polylines, in font units (pen starts at the origin).
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct ShxGlyph {
@@ -96,13 +56,6 @@ pub struct ShxGlyph {
     pub advance: Vec2,
 }
 
-/// One shape record: where its name and program are in [`ShxFont::data`].
-#[derive(Clone, Copy, Debug)]
-pub(crate) struct Record {
-    name: (usize, usize),
-    program: (usize, usize),
-}
-
 /// Glyphs cached per font, keyed by (shape, vertical).
 type GlyphCache = HashMap<(u16, bool), Option<Arc<ShxGlyph>>>;
 

crates/fonts/src/shx/parse.rs

@@ -1,225 +1,26 @@
-//! Reading the compiled SHX containers (layouts in the module documentation). Every count and
-//! offset comes from the file, so each is checked against its length; records that run past
-//! the end are dropped and the rest kept.
+//! Bridge the shared bounded container reader into CADCraft's font and glyph cache.
 
-use std::collections::HashMap;
+use super::{ShxError, ShxFont};
+pub(super) use craft_shx::parse::MAX_FILE_BYTES;
+#[cfg(test)]
+pub(super) use craft_shx::parse::{BIGFONT, SHAPES_10, UNIFONT};
 use std::sync::RwLock;
 
-use super::{Record, ShxError, ShxFont, ShxKind};
-
-pub(super) const SHAPES_10: &[u8] = b"AutoCAD-86 shapes 1.0\r\n\x1a";
-pub(super) const SHAPES_11: &[u8] = b"AutoCAD-86 shapes 1.1\r\n\x1a";
-pub(super) const BIGFONT: &[u8] = b"AutoCAD-86 bigfont 1.0\r\n\x1a";
-pub(super) const UNIFONT: &[u8] = b"AutoCAD-86 unifont 1.0\r\n\x1a";
-
-/// Largest file read (the largest big fonts are a few megabytes).
-pub(super) const MAX_FILE_BYTES: usize = 32 << 20;
-/// Most escape ranges in a big font (lead bytes: at most 256).
-const MAX_RANGES: usize = 256;
-
-/// A checked little-endian reader.
-struct Rd<'a> {
-    b: &'a [u8],
-    pos: usize,
-}
-
-impl<'a> Rd<'a> {
-    fn take(&mut self, n: usize) -> Result<&'a [u8], ShxError> {
-        let end = self.pos.checked_add(n).ok_or(ShxError::Truncated)?;
-        let s = self.b.get(self.pos..end).ok_or(ShxError::Truncated)?;
-        self.pos = end;
-        Ok(s)
-    }
-    fn u16(&mut self) -> Result<u16, ShxError> {
-        match self.take(2)? {
-            [a, b] => Ok(u16::from_le_bytes([*a, *b])),
-            _ => Err(ShxError::Truncated),
-        }
-    }
-    fn u32(&mut self) -> Result<u32, ShxError> {
-        match self.take(4)? {
-            [a, b, c, d] => Ok(u32::from_le_bytes([*a, *b, *c, *d])),
-            _ => Err(ShxError::Truncated),
-        }
-    }
-}
-
-/// A font being read.
-struct Font {
-    kind: ShxKind,
-    name: String,
-    header: bool,
-    above: f64,
-    below: f64,
-    dual: bool,
-    encoding: u8,
-    char_width: f64,
-    ranges: Vec<(u16, u16)>,
-    records: HashMap<u16, Record>,
-}
-
-impl Font {
-    fn new(kind: ShxKind) -> Font {
-        Font {
-            kind,
-            name: String::new(),
-            header: false,
-            above: 0.0,
-            below: 0.0,
-            dual: false,
-            encoding: 0,
-            char_width: 0.0,
-            ranges: Vec::new(),
-            records: HashMap::new(),
-        }
-    }
-
-    /// Add the record of shape `number` at `start..end` of `data`: a NUL-terminated name, then
-    /// the program. Shape 0 is the font record. A record without a name terminator is dropped;
-    /// the first record of a number wins.
-    fn record(&mut self, data: &[u8], number: u16, start: usize, end: usize) {
-        let Some(bytes) = data.get(start..end) else { return };
-        let Some(nul) = bytes.iter().position(|b| *b == 0) else { return };
-        let name = (start, start + nul);
-        let program = (start + nul + 1, end);
-        if number == 0 {
-            if !self.header {
-                self.font_record(data.get(program.0..program.1).unwrap_or_default(), data.get(name.0..name.1).unwrap_or_default());
-            }
-            return;
-        }
-        self.records.entry(number).or_insert(Record { name, program });
-    }
-
-    /// The font record: above, below, modes (and for a unifont encoding and embedding); an
-    /// extended big font's is character height, 0, modes, character width.
-    fn font_record(&mut self, info: &[u8], name: &[u8]) {
-        self.header = true;
-        self.name = name.iter().take(255).map(|c| char::from(*c)).collect();
-        let byte = |i: usize| info.get(i).copied().unwrap_or(0);
-        self.above = f64::from(byte(0));
-        self.below = f64::from(byte(1));
-        self.dual = byte(2) == 2;
-        if self.kind == ShxKind::Unifont {
-            self.encoding = byte(3);
-        }
-        if self.kind == ShxKind::BigFont && info.len() >= 5 && byte(1) == 0 {
-            // Extended: height, 0, modes, width, 0.
-            self.below = 0.0;
-            self.char_width = f64::from(byte(3));
-        }
-    }
-
-    fn finish(self, data: Vec<u8>) -> Result<ShxFont, ShxError> {
-        if self.records.is_empty() {
-            return Err(ShxError::Empty);
-        }
-        Ok(ShxFont {
-            kind: self.kind,
-            name: self.name,
-            header: self.header,
-            above: self.above,
-            below: self.below,
-            dual: self.dual,
-            encoding: self.encoding,
-            char_width: if self.char_width > 0.0 { self.char_width } else { self.above },
-            ranges: self.ranges,
-            data,
-            records: self.records,
-            cache: RwLock::default(),
-            hebrew: std::sync::OnceLock::new(),
-        })
-    }
-}
-
 pub(super) fn parse(bytes: &[u8]) -> Result<ShxFont, ShxError> {
-    if bytes.len() > MAX_FILE_BYTES {
-        return Err(ShxError::TooLarge);
-    }
-    if bytes.starts_with(SHAPES_10) || bytes.starts_with(SHAPES_11) {
-        shapes(bytes)
-    } else if bytes.starts_with(BIGFONT) {
-        bigfont(bytes)
-    } else if bytes.starts_with(UNIFONT) {
-        unifont(bytes)
-    } else {
-        Err(ShxError::NotShx)
-    }
-}
-
-fn shapes(bytes: &[u8]) -> Result<ShxFont, ShxError> {
-    let mut r = Rd { b: bytes, pos: SHAPES_10.len() };
-    let _first = r.u16()?;
-    let _last = r.u16()?;
-    let count = usize::from(r.u16()?);
-    // The whole index must be there before anything is read from it.
-    let index = r.take(count.checked_mul(4).ok_or(ShxError::TooLarge)?)?;
-    let mut f = Font::new(ShxKind::Shapes);
-    let mut pos = r.pos;
-    for [a, b, c, d] in index.as_chunks::<4>().0 {
-        let (number, len) = (u16::from_le_bytes([*a, *b]), usize::from(u16::from_le_bytes([*c, *d])));
-        let Some(end) = pos.checked_add(len).filter(|e| *e <= bytes.len()) else { break };
-        f.record(bytes, number, pos, end);
-        pos = end;
-    }
-    f.finish(bytes.to_vec())
-}
-
-fn bigfont(bytes: &[u8]) -> Result<ShxFont, ShxError> {
-    let mut r = Rd { b: bytes, pos: BIGFONT.len() };
-    let index_size = usize::from(r.u16()?);
-    let count = usize::from(r.u16()?);
-    let nranges = usize::from(r.u16()?);
-    if nranges > MAX_RANGES {
-        return Err(ShxError::TooLarge);
-    }
-    let mut f = Font::new(ShxKind::BigFont);
-    for _ in 0..nranges {
-        let (lo, hi) = (r.u16()?, r.u16()?);
-        f.ranges.push((lo.min(hi), lo.max(hi)));
-    }
-    // The index has `count` entries of 8 bytes; a file whose count doesn't fit but whose index
-    // size does is read by that.
-    let fits = |n: usize| n.checked_mul(8).and_then(|l| r.pos.checked_add(l)).is_some_and(|e| e <= bytes.len());
-    let n = if fits(count) {
-        count
-    } else if fits(index_size) {
-        index_size
-    } else {
-        return Err(ShxError::Truncated);
-    };
-    let index = r.take(n.checked_mul(8).ok_or(ShxError::TooLarge)?)?;
-    for [a, b, c, d, o0, o1, o2, o3] in index.as_chunks::<8>().0 {
-        let number = u16::from_le_bytes([*a, *b]);
-        let len = usize::from(u16::from_le_bytes([*c, *d]));
-        let Ok(off) = usize::try_from(u32::from_le_bytes([*o0, *o1, *o2, *o3])) else { continue };
-        if len == 0 {
-            continue;
-        }
-        let Some(end) = off.checked_add(len).filter(|e| *e <= bytes.len()) else { continue };
-        f.record(bytes, number, off, end);
-    }
-    f.finish(bytes.to_vec())
-}
-
-fn unifont(bytes: &[u8]) -> Result<ShxFont, ShxError> {
-    let mut r = Rd { b: bytes, pos: UNIFONT.len() };
-    let count = r.u32()?;
-    let info_len = usize::from(r.u16()?);
-    let info = r.take(info_len)?;
-    let mut f = Font::new(ShxKind::Unifont);
-    let nul = info.iter().position(|b| *b == 0).unwrap_or(info.len());
-    f.font_record(info.get(nul.saturating_add(1)..).unwrap_or_default(), info.get(..nul).unwrap_or_default());
-    // `count` includes the font record; never trusted beyond the data that is there.
-    let mut left = count.saturating_sub(1);
-    while left > 0 {
-        left -= 1;
-        let Ok(number) = r.u16() else { break };
-        let Ok(len) = r.u16().map(usize::from) else { break };
-        let start = r.pos;
-        let Some(end) = start.checked_add(len).filter(|e| *e <= bytes.len()) else { break };
-        r.pos = end;
-        f.record(bytes, number, start, end);
-    }
-    f.finish(bytes.to_vec())
+    let font = craft_shx::parse::parse(bytes)?;
+    Ok(ShxFont {
+        kind: font.kind,
+        name: font.name,
+        header: font.header,
+        above: font.above,
+        below: font.below,
+        dual: font.dual,
+        encoding: font.encoding,
+        char_width: font.char_width,
+        ranges: font.ranges,
+        data: font.data,
+        records: font.records,
+        cache: RwLock::default(),
+        hebrew: std::sync::OnceLock::new(),
+    })
 }

crates/io/Cargo.toml

@@ -12,8 +12,8 @@ workspace = true
 cadcraft-geom = { workspace = true }
 cadcraft-color = { workspace = true }
 cadcraft-doc = { workspace = true }
-cadcraft-dxf = { workspace = true }
-cadcraft-dwg = { workspace = true }
+craft-dxf = { workspace = true }
+craft-dwg = { workspace = true }
 cadcraft-render = { workspace = true }
 cadcraft-fonts = { workspace = true }
 thiserror = { workspace = true }
@@ -29,7 +29,7 @@ tiny-skia = { workspace = true }
 # Reads plotted PDFs back.
 craft-pdf = { workspace = true, features = ["read"] }
 
-# Inspect DWG output only where cadcraft-dwg builds its native bridge. An unconditional
+# Inspect DWG output only where craft-dwg builds its native bridge. An unconditional
 # dev-dependency also builds acadrust during --all-targets, breaking FreeBSD aarch64 (#2526).
 [target.'cfg(not(any(target_arch = "wasm32", all(target_os = "freebsd", target_arch = "aarch64"))))'.dev-dependencies]
 acadrust = "0.6.6"

crates/io/src/dxf_ext.rs

@@ -13,8 +13,8 @@ use std::collections::HashMap;
 
 use cadcraft_color::Color;
 use cadcraft_doc::{ArrayParams, AssocSnap, Constraint, DimAssoc, DimStyle, Handle, LayerState, Parametric, PlotStyleTable};
-use cadcraft_dxf::{Tag, Version};
 use cadcraft_render::Arrowhead;
+use craft_dxf::{Tag, Version};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 

crates/io/src/dxf_image.rs

@@ -8,8 +8,8 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
 use cadcraft_doc::{Drawing, EntityKind, EntityStore, Handle, Image};
-use cadcraft_dxf::{Section, Tag};
 use cadcraft_geom::{Vec2, Vec3};
+use craft_dxf::{Section, Tag};
 
 /// Most clip boundary vertices kept per image (hostile files).
 const MAX_CLIP: usize = 100_000;

crates/io/src/dxf_mleader.rs

@@ -13,8 +13,8 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
 use cadcraft_doc::{Attrib, Drawing, Entity, EntityKind, Handle, Insert, MLeader, MLeaderStyle, MText};
-use cadcraft_dxf::Tag;
 use cadcraft_geom::Vec3;
+use craft_dxf::Tag;
 
 /// Most leader roots (landings) read per multileader.
 const MAX_ROOTS: usize = 256;

crates/io/src/dxf_mline.rs

@@ -12,8 +12,8 @@ use cadcraft_doc::{
     Drawing, Entity, EntityKind, EntityStore, MAX_MLINE_CUTS, MAX_MLINE_ELEMENTS, MAX_MLINE_VERTICES, MLine, MLineCaps, MLineCut, MLineElement,
     MLineJust, MLineStyle, MLineVertex, STANDARD_MLINE_STYLE,
 };
-use cadcraft_dxf::{Section, Tag};
 use cadcraft_geom::{Vec2, Vec3};
+use craft_dxf::{Section, Tag};
 
 /// Most groups 41 kept per element and vertex (start, then break pairs).
 const MAX_PARAMS: usize = 2 * MAX_MLINE_CUTS + 2;

crates/io/src/dxf_raw.rs

@@ -18,7 +18,7 @@ use std::sync::Arc;
 
 use cadcraft_doc::foreign::{Foreign, ForeignExtra, ForeignKey, ForeignObject, class_group, class_index, class_number};
 use cadcraft_doc::{Drawing, Entity, EntityKind, Handle, RawTag, Unknown};
-use cadcraft_dxf::{Section, Tag};
+use craft_dxf::{Section, Tag};
 
 /// Named object dictionary entries CADCraft writes itself from its model (plus every key that
 /// starts with `CADCRAFT`): they are read into the model, not kept raw. A change that starts
@@ -71,7 +71,7 @@ fn raw(t: &Tag) -> RawTag {
 /// A kept group with the value type its code has (so binary output encodes it right); text that
 /// doesn't parse as that type stays text.
 fn tag(r: &RawTag) -> Tag {
-    use cadcraft_dxf::{Kind, Value, kind_of};
+    use craft_dxf::{Kind, Value, kind_of};
     let v = r.value.trim();
     let value = match kind_of(r.code) {
         Kind::Real => v.parse::<f64>().ok().filter(|x| x.is_finite()).map(Value::Real),

crates/io/src/dxf_read.rs

@@ -9,8 +9,8 @@ use cadcraft_doc::{
     Linetype, Lineweight, LwPolyline, MAX_FRAME_CHARS, MLeaderStyle, MText, MultilineAttrib, NamedView, PageSetup, Point, Polyline3d, RawTag,
     RayLine, Solid, Table, TableCell, Text, TextStyle, Tolerance, Transparency, Ucs, Unknown, VAlign, Viewport, VportConfig, VportTile, Wipeout,
 };
-use cadcraft_dxf::{Tag, records, sections};
 use cadcraft_geom::{PolyVertex, Spline, Vec2, Vec3};
+use craft_dxf::{Tag, records, sections};
 
 use crate::{IoError, Result};
 
@@ -84,7 +84,7 @@ type LayoutDef = (String, u32, String, PageSetup, Option<(Vec2, Vec2)>);
 
 /// Import DXF sections while sharing one materialized-table-cell budget across blocks and entity sections.
 fn read_budgeted(bytes: &[u8], mut table_cells_left: usize) -> Result<Drawing> {
-    let tags = cadcraft_dxf::parse(bytes).map_err(|e| IoError::Format(e.to_string()))?;
+    let tags = craft_dxf::parse(bytes).map_err(|e| IoError::Format(e.to_string()))?;
     let secs = sections(&tags);
     if secs.is_empty() {
         return Err(IoError::Format("no sections found".into()));

crates/io/src/dxf_read/entities.rs

@@ -420,7 +420,7 @@ pub(super) fn acad_table(tags: &[Tag], table_cells_left: &mut usize) -> Table {
 
 /// The plot style names of a file: the entries of the `ACAD_PLOTSTYLENAME` dictionary of the
 /// named object dictionary (the first object), by placeholder handle.
-pub(super) fn plot_style_names(secs: &[cadcraft_dxf::Section]) -> HashMap<String, String> {
+pub(super) fn plot_style_names(secs: &[craft_dxf::Section]) -> HashMap<String, String> {
     let mut out = HashMap::new();
     let Some(objects) = secs.iter().find(|s| s.name == "OBJECTS") else { return out };
     let recs = records(&objects.tags);

crates/io/src/dxf_read/mtext_dxf.rs

@@ -6,7 +6,7 @@
 //! `^2` in `10^2` as a control character.
 
 use cadcraft_doc::{MText, MTextColumnType, MTextColumns};
-use cadcraft_dxf::Tag;
+use craft_dxf::Tag;
 
 /// Upper bound on column heights read from a file.
 const MAX_COLUMNS: usize = 1_000;

crates/io/src/dxf_read/tables.rs

@@ -33,9 +33,9 @@ pub(super) fn header(tags: &[Tag], d: &mut Drawing) {
                 [x, y, z] if x.code == 10 => HVal::Point(Vec3::new(x.f64(), y.f64(), z.f64())),
                 [x, y] if x.code == 10 => HVal::Point(Vec3::new(x.f64(), y.f64(), 0.0)),
                 [v] => match &v.value {
-                    cadcraft_dxf::Value::Real(r) => HVal::Real(*r),
-                    cadcraft_dxf::Value::Int(n) => HVal::Int(*n),
-                    cadcraft_dxf::Value::Bool(b) => HVal::Int(i64::from(*b)),
+                    craft_dxf::Value::Real(r) => HVal::Real(*r),
+                    craft_dxf::Value::Int(n) => HVal::Int(*n),
+                    craft_dxf::Value::Bool(b) => HVal::Int(i64::from(*b)),
                     other => HVal::Str(other.as_str()),
                 },
                 _ => continue,

crates/io/src/dxf_region.rs

@@ -6,8 +6,8 @@
 //! kept as unknown objects.
 
 use cadcraft_doc::{EntityKind, HatchLoop, LwPolyline, MAX_REGION_LOOPS, Region};
-use cadcraft_dxf::Tag;
 use cadcraft_geom::{PolyVertex, Vec2};
+use craft_dxf::Tag;
 
 use crate::dxf_ext::{APP, xdata, xdata_list};
 

crates/io/src/dxf_table.rs

@@ -9,7 +9,7 @@
 
 use cadcraft_color::Color;
 use cadcraft_doc::{CellBorder, CellStyle, DataLink, Lineweight, MAX_CELL_STYLES, MAX_TABLE_PARTS, Table, TableBreak, TableStyle};
-use cadcraft_dxf::Tag;
+use craft_dxf::Tag;
 use serde::{Deserialize, Serialize};
 
 use crate::dxf_ext::{APP, xdata};

crates/io/src/dxf_write.rs

@@ -11,8 +11,8 @@ use cadcraft_doc::{
     HVal, Handle, Hatch, Insert, Layout, Leader, Line, Lineweight, LwPolyline, MLeader, MLeaderStyle, MText, PageSetup, Point, Solid, Space, Table,
     TableStyle, Text, Transparency, VAlign, VportConfig, VportTile,
 };
-use cadcraft_dxf::{Tag, Version};
 use cadcraft_geom::{Bounds2, Vec2, Vec3};
+use craft_dxf::{Tag, Version};
 
 use crate::dxf_ext::{self, DimVal, K};
 
@@ -111,7 +111,7 @@ impl W {
 /// Write a drawing as ASCII DXF.
 /// The drawing as R2000 ASCII DXF.
 pub fn write(d: &Drawing) -> String {
-    cadcraft_dxf::write_ascii(&tags(d, Version::R2000))
+    craft_dxf::write_ascii(&tags(d, Version::R2000))
 }
 
 /// The drawing's DXF tags, declaring `version` in `$ACADVER`.
@@ -124,7 +124,7 @@ pub fn tags(d: &Drawing, version: Version) -> Vec<Tag> {
 pub(crate) fn dwg_bridge(d: &Drawing, dwg: Version) -> String {
     let mut tags = tags_for(d, Version::R2000, dwg, false);
     bridge_markers(&mut tags);
-    cadcraft_dxf::write_ascii(&tags)
+    craft_dxf::write_ascii(&tags)
 }
 
 /// Proxy type names and lookup-parameter subclass names must match the bridge reader's spelling.

crates/io/src/dxf_write/entity.rs

@@ -344,7 +344,10 @@ fn write_text_entity(w: &mut W, d: &Drawing, e: &Entity, owner: &str, paper: boo
 fn write_insert_entity(w: &mut W, d: &Drawing, e: &Entity, owner: &str, paper: bool, cx: &Ctx) {
     if let EntityKind::Insert(i) = &e.kind {
         w.s(0, "INSERT");
-        common(w, e, owner, paper, "AcDbBlockReference");
+        // A reference repeated in rows or columns (MINSERT, groups 70/71) is an AcDbMInsertBlock;
+        // readers that go by the marker draw only the first copy of an AcDbBlockReference.
+        let array = i.cols > 1 || i.rows > 1;
+        common(w, e, owner, paper, if array { "AcDbMInsertBlock" } else { "AcDbBlockReference" });
         if !i.attribs.is_empty() {
             w.i(66, 1);
         }
@@ -354,7 +357,7 @@ fn write_insert_entity(w: &mut W, d: &Drawing, e: &Entity, owner: &str, paper: b
         w.f(42, i.scale.y);
         w.f(43, i.scale.z);
         w.f(50, i.rotation.to_degrees());
-        if i.cols > 1 || i.rows > 1 {
+        if array {
             w.i(70, i64::from(i.cols));
             w.i(71, i64::from(i.rows));
             w.f(44, i.col_spacing);

crates/io/src/dxf_write/header.rs

@@ -144,6 +144,6 @@ pub(super) fn header_vars(w: &mut W, d: &Drawing) {
 /// from 2007 (UTF-8 text), `ANSI_1252`.
 pub(crate) fn code_page(d: &Drawing, version: Version) -> String {
     let read = d.header.get("DWGCODEPAGE").and_then(HVal::as_str).map(str::trim).unwrap_or_default();
-    let known = read.is_ascii() && read.len() <= 32 && cadcraft_dxf::decode_code_page(b"", read).is_some();
+    let known = read.is_ascii() && read.len() <= 32 && craft_dxf::decode_code_page(b"", read).is_some();
     if version < Version::R2007 && known { read.to_string() } else { "ANSI_1252".into() }
 }

crates/io/src/lib.rs

@@ -31,7 +31,7 @@ use cadcraft_geom::Bounds2;
 use std::path::{Path, PathBuf};
 
 pub use cadcraft_doc::Format;
-pub use cadcraft_dxf::Version;
+pub use craft_dxf::Version;
 pub use dxf_read::entity_from_groups;
 pub use dxf_write::entity_groups;
 pub use pdf::{PdfOptions, pdf, plot};
@@ -61,11 +61,24 @@ pub enum IoError {
 
 pub type Result<T> = std::result::Result<T, IoError>;
 
-/// How a program runs the DWG reader and writer in a child process (`cadcraft_dwg::worker`).
+/// Restore CADCraft's public diagnostics after the shared byte bridge supplies generic wording.
+fn cadcraft_dwg_message(message: &str) -> String {
+    message
+        .replace("accepted by this bridge", "CADCraft opens")
+        .replace("types this bridge can't preserve", "types CADCraft doesn't keep")
+        .replace("this bridge writes", "CADCraft writes")
+        .replace("accepted for DWG conversion", "CADCraft converts to DWG")
+}
+
+fn dwg_error(message: String) -> IoError {
+    IoError::Format(cadcraft_dwg_message(&message))
+}
+
+/// How a program runs the DWG reader and writer in a child process (`craft_dwg::worker`).
 pub mod dwg_worker {
-    pub use cadcraft_dwg::{WORKER_ARG, serve_if_asked, use_own_worker};
+    pub use craft_dwg::{WORKER_ARG, serve_if_asked, use_own_worker};
     #[cfg(all(not(target_arch = "wasm32"), not(all(target_os = "freebsd", target_arch = "aarch64"))))]
-    pub use cadcraft_dwg::{crash_worker_for_test, use_worker};
+    pub use craft_dwg::{crash_worker_for_test, use_worker};
 }
 
 fn ext(name: impl AsRef<Path>) -> String {
@@ -81,10 +94,10 @@ pub fn read(bytes: &[u8], name: impl AsRef<Path>) -> Result<Drawing> {
 /// [`read`], also returning the DXF rendition a DWG was read through (`None` for other files),
 /// which the round-trip harness counts.
 pub(crate) fn read_source(bytes: &[u8], name: &Path) -> Result<(Drawing, Option<Vec<u8>>)> {
-    if cadcraft_dwg::is_dwg(bytes) {
-        let (dxf, notes) = cadcraft_dwg::decode(bytes, cadcraft_dwg::Limits::DEFAULT).map_err(IoError::Format)?;
+    if craft_dwg::is_dwg(bytes) {
+        let (dxf, notes) = craft_dwg::decode(bytes, craft_dwg::Limits::DEFAULT).map_err(dwg_error)?;
         let mut d = dxf_read::read(&dxf).map_err(|e| IoError::Format(format!("{e} (in the DXF converted from this DWG)")))?;
-        d.read_notes = notes;
+        d.read_notes = notes.into_iter().map(|note| cadcraft_dwg_message(&note)).collect();
         return Ok((d, Some(dxf)));
     }
     let d = match (Format::from_path(name), ext(name).as_str()) {
@@ -114,10 +127,10 @@ pub fn write_with(d: &Drawing, name: impl AsRef<Path>, opts: &SaveOptions) -> Re
             // Before 2007 the text is in the code page the header declares.
             let code_page = dxf_write::code_page(d, version);
             Ok(match (opts.binary, version.utf8()) {
-                (true, true) => cadcraft_dxf::write_binary(&tags, true),
-                (true, false) => cadcraft_dxf::write_binary_in(&tags, &code_page),
-                (false, true) => cadcraft_dxf::write_ascii_as(&tags, true).into_bytes(),
-                (false, false) => cadcraft_dxf::write_ascii_in(&tags, &code_page),
+                (true, true) => craft_dxf::write_binary(&tags, true),
+                (true, false) => craft_dxf::write_binary_in(&tags, &code_page),
+                (false, true) => craft_dxf::write_ascii_as(&tags, true).into_bytes(),
+                (false, false) => craft_dxf::write_ascii_in(&tags, &code_page),
             })
         }
         // The DWG bridge reads our R2000 DXF and writes the DWG at the version asked for. Without
@@ -132,21 +145,21 @@ pub fn write_with(d: &Drawing, name: impl AsRef<Path>, opts: &SaveOptions) -> Re
 /// [`write_with`], also returning what the file leaves out of the drawing: for a DWG, how many
 /// records of each DXF type the DWG writer can't write (other programs' custom entities and
 /// objects); for other formats, nothing.
-pub fn write_noted(d: &Drawing, name: impl AsRef<Path>, opts: &SaveOptions) -> Result<(Vec<u8>, cadcraft_dwg::Unwritten)> {
+pub fn write_noted(d: &Drawing, name: impl AsRef<Path>, opts: &SaveOptions) -> Result<(Vec<u8>, craft_dwg::Unwritten)> {
     let name = name.as_ref();
     if matches!(Format::from_path(name), Some(Format::Dwg)) && !opts.binary {
         return write_dwg(d, opts.version.unwrap_or_else(|| save_version(d).max(Version::R2004)));
     }
-    write_with(d, name, opts).map(|b| (b, cadcraft_dwg::Unwritten::new()))
+    write_with(d, name, opts).map(|b| (b, craft_dwg::Unwritten::new()))
 }
 
 /// The DWG bridge reads our R2000 DXF and writes the DWG at `version`, in the DWG worker when
 /// there is one. The objects CADCraft keeps without modelling them are still in the groups of the
 /// file they came from (`Foreign::version`, not `$ACADVER`, which SAVEAS changes), and the bridge
 /// reads them as that version.
-fn write_dwg(d: &Drawing, version: Version) -> Result<(Vec<u8>, cadcraft_dwg::Unwritten)> {
+fn write_dwg(d: &Drawing, version: Version) -> Result<(Vec<u8>, craft_dwg::Unwritten)> {
     let bridge = dxf_write::dwg_bridge(d, version);
-    cadcraft_dwg::encode_kept_noted(bridge.as_bytes(), version.code(), d.foreign.version.as_deref()).map_err(IoError::Format)
+    craft_dwg::encode_kept_noted(bridge.as_bytes(), version.code(), d.foreign.version.as_deref()).map_err(dwg_error)
 }
 
 /// Like [`write`], but image formats (PNG, SVG, PDF) show `window` (a model-space rectangle in

crates/io/src/roundtrip/census.rs

@@ -39,7 +39,7 @@ fn bump(m: &mut BTreeMap<String, usize>, k: &str) {
 
 /// A layout's own paper-space viewport (VIEWPORT with ID 1, group 69): part of the layout, not
 /// an entity of its own for CADCraft.
-fn is_overall_viewport(t: &str, g: &[cadcraft_dxf::Tag]) -> bool {
+fn is_overall_viewport(t: &str, g: &[craft_dxf::Tag]) -> bool {
     t == "VIEWPORT" && g.iter().any(|x| x.code == 69 && x.i64() == 1)
 }
 
@@ -50,14 +50,14 @@ fn is_space_block(name: &str) -> bool {
 
 /// Count what a DXF file (ASCII or binary) holds; `None` when it can't be parsed.
 pub fn census(dxf: &[u8]) -> Option<Census> {
-    let tags = cadcraft_dxf::parse(dxf).ok()?;
+    let tags = craft_dxf::parse(dxf).ok()?;
     let mut c = Census::default();
     // Blocks CADCraft generates (tables' blocks, standard arrowheads nothing inserts) are left out
     // on read and rebuilt on save: counted apart.
     let mut table_blocks: HashSet<String> = HashSet::new();
     let mut inserted: HashSet<String> = HashSet::new();
     let mut blocks: Vec<(String, BTreeMap<String, usize>)> = Vec::new();
-    let mut note_refs = |t: &str, g: &[cadcraft_dxf::Tag]| {
+    let mut note_refs = |t: &str, g: &[craft_dxf::Tag]| {
         let name = || g.iter().find(|x| x.code == 2).map(|x| x.str().trim().to_ascii_uppercase());
         match t {
             "ACAD_TABLE" => table_blocks.extend(name()),
@@ -65,8 +65,8 @@ pub fn census(dxf: &[u8]) -> Option<Census> {
             _ => {}
         }
     };
-    for s in cadcraft_dxf::sections(&tags) {
-        let records = cadcraft_dxf::records(&s.tags);
+    for s in craft_dxf::sections(&tags) {
+        let records = craft_dxf::records(&s.tags);
         match s.name.trim().to_ascii_uppercase().as_str() {
             "ENTITIES" => {
                 for (t, g) in &records {
@@ -82,7 +82,7 @@ pub fn census(dxf: &[u8]) -> Option<Census> {
                     note_refs(t, g);
                     match t.as_str() {
                         "BLOCK" => {
-                            let name = g.iter().find(|x| x.code == 2).map(cadcraft_dxf::Tag::str).unwrap_or_default();
+                            let name = g.iter().find(|x| x.code == 2).map(craft_dxf::Tag::str).unwrap_or_default();
                             space = is_space_block(&name);
                             if !space {
                                 blocks.push((name.trim().to_ascii_uppercase(), BTreeMap::new()));

crates/io/src/roundtrip/corpus.rs

@@ -36,7 +36,7 @@ impl Format {
     }
     /// The format of a file's bytes: DWG by its magic, otherwise DXF.
     pub fn of(bytes: &[u8]) -> Format {
-        if cadcraft_dwg::is_dwg(bytes) { Format::Dwg } else { Format::Dxf }
+        if craft_dwg::is_dwg(bytes) { Format::Dwg } else { Format::Dxf }
     }
     fn other(self) -> Format {
         match self {
@@ -279,7 +279,7 @@ pub fn check_bytes(bytes: &[u8], rel: &str, opts: &CorpusOptions) -> FileReport
     let format = Format::of(bytes);
     let mut f = FileReport { path: rel.to_string(), format: Some(format), bytes: bytes.len() as u64, ..FileReport::default() };
     if format == Format::Dwg {
-        f.version = cadcraft_dwg::version(bytes).unwrap_or_default();
+        f.version = craft_dwg::version(bytes).unwrap_or_default();
     }
     let start = Instant::now();
     let name = format!("source.{}", format.ext());

crates/io/src/tests.rs

@@ -797,7 +797,7 @@ fn landscape_media_keeps_its_size_order_and_rotation() {
         assert_eq!(p.paper, media);
 
         let dwg = write(&d, "t.dwg").unwrap();
-        let back = String::from_utf8_lossy(&cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).into_owned();
+        let back = String::from_utf8_lossy(&craft_dwg::dwg_to_dxf(&dwg).unwrap()).into_owned();
         assert_eq!(plot_paper_groups(&back, "Layout1"), (420.0, 297.0, rotation), "DWG, landscape {landscape}");
         let r = read(&dwg, "t.dwg").unwrap();
         let p = &r.layout("Layout1").unwrap().page;
@@ -844,7 +844,7 @@ fn a_files_own_paper_groups_are_written_back() {
         assert_eq!((p.width_mm, p.height_mm, p.landscape), (pw, ph, landscape), "{media} {groups:?} read");
         assert_eq!(plot_paper_groups(&write_dxf(&r), "Layout1"), groups, "{media} {groups:?} DXF");
         let dwg = write(&r, "t.dwg").unwrap();
-        let back = String::from_utf8_lossy(&cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).into_owned();
+        let back = String::from_utf8_lossy(&craft_dwg::dwg_to_dxf(&dwg).unwrap()).into_owned();
         assert_eq!(plot_paper_groups(&back, "Layout1"), groups, "{media} {groups:?} DWG");
         let r = read(&dwg, "t.dwg").unwrap();
         assert_eq!(plot_paper_groups(&write_dxf(&r), "Layout1"), groups, "{media} {groups:?} DWG read and saved again");
@@ -1234,7 +1234,7 @@ fn viewport_frozen_layers_survive_dwg() {
     let back = read(&dwg, "t.dwg").unwrap();
     assert_eq!(viewport_frozen(&back, 2), vec!["Walls".to_string(), "A B".to_string()]);
     // The DWG holds them in group 331, what AutoCAD reads.
-    let p = pairs(&String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap());
+    let p = pairs(&String::from_utf8(craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap());
     assert_eq!(frozen_331(&p), [layer_handle(&p, "Walls"), layer_handle(&p, "A B")]);
 }
 
@@ -1376,8 +1376,8 @@ fn generated_arrowhead_blocks_are_not_kept_as_user_blocks() {
     for (_, name) in crate::dxf_ext::ARROWS.iter().filter(|(k, _)| *k != cadcraft_render::Arrowhead::ClosedFilled) {
         assert!(dxf.contains(&format!("\r\n{name}\r\n")), "{name} is written");
     }
-    let dwg = cadcraft_dwg::dxf_to_dwg(dxf.as_bytes()).unwrap();
-    let from_dwg = read_dxf(&cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
+    let dwg = craft_dwg::dxf_to_dwg(dxf.as_bytes()).unwrap();
+    let from_dwg = read_dxf(&craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
     for (back, what) in [(read_dxf(dxf.as_bytes()).unwrap(), "DXF"), (from_dwg, "DWG")] {
         assert!(back.blocks.keys().all(|k| !k.starts_with('_')), "{what}: {:?}", back.blocks.keys().collect::<Vec<_>>());
         assert!(roundtrip(&back).blocks.keys().all(|k| !k.starts_with('_')), "{what}: second save");
@@ -1408,8 +1408,8 @@ fn file_arrowhead_blocks_with_standard_names_are_kept() {
     d.dim_styles.push(DimStyle { name: "Dots".into(), arrow_block1: "_Dot".into(), arrow_block2: "_DotSmall".into(), ..DimStyle::default() });
     let kinds = |d: &Drawing, name: &str| d.block(name).map(|b| b.entities.iter().map(|e| e.kind.clone()).collect::<Vec<_>>()).unwrap_or_default();
     let dxf = write_dxf(&d);
-    let dwg = cadcraft_dwg::dxf_to_dwg(dxf.as_bytes()).unwrap();
-    let from_dwg = read_dxf(&cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
+    let dwg = craft_dwg::dxf_to_dwg(dxf.as_bytes()).unwrap();
+    let from_dwg = read_dxf(&craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
     for (back, what) in [(read_dxf(dxf.as_bytes()).unwrap(), "DXF"), (from_dwg, "DWG")] {
         for name in ["_Dot", "_DotSmall"] {
             assert_eq!(kinds(&back, name), kinds(&d, name), "{what}: {name}");
@@ -1479,8 +1479,8 @@ fn many_entities(n: usize) -> Drawing {
 #[cfg(not(target_arch = "wasm32"))]
 fn ac1024_dwg(n: usize) -> Vec<u8> {
     let dxf = write_dxf(&many_entities(n)).replacen("AC1015", "AC1024", 1);
-    let dwg = cadcraft_dwg::dxf_to_dwg(dxf.as_bytes()).unwrap();
-    assert_eq!(cadcraft_dwg::version(&dwg).as_deref(), Some("AC1024"));
+    let dwg = craft_dwg::dxf_to_dwg(dxf.as_bytes()).unwrap();
+    assert_eq!(craft_dwg::version(&dwg).as_deref(), Some("AC1024"));
     dwg
 }
 
@@ -1492,8 +1492,8 @@ fn ac1024_dwg(n: usize) -> Vec<u8> {
 fn ac1024_dwg_with_many_entities_opens() {
     let n = 30_000;
     let dwg = ac1024_dwg(n);
-    let dxf = cadcraft_dwg::dwg_to_dxf(&dwg).unwrap();
-    let tags = cadcraft_dxf::parse(&dxf).unwrap().len();
+    let dxf = craft_dwg::dwg_to_dxf(&dwg).unwrap();
+    let tags = craft_dxf::parse(&dxf).unwrap().len();
     assert!(dxf.len() < dwg.len() * 20, "DXF {} bytes from {} DWG bytes", dxf.len(), dwg.len());
     assert!(tags < dwg.len(), "{tags} group codes from {} DWG bytes", dwg.len());
     let d = read(&dwg, "big.dwg").unwrap();
@@ -1509,23 +1509,43 @@ fn ac1024_dwg_with_many_entities_opens() {
 #[test]
 fn oversized_dwg_and_dxf_are_rejected_early() {
     let dwg = ac1024_dwg(3000);
-    let full = cadcraft_dwg::dwg_to_dxf(&dwg).unwrap().len();
+    let full = craft_dwg::dwg_to_dxf(&dwg).unwrap().len();
     assert!(full > 400_000, "{full}");
-    let limits = cadcraft_dwg::Limits { max_dxf_bytes: 300_000, ..cadcraft_dwg::Limits::DEFAULT };
-    let e = cadcraft_dwg::dwg_to_dxf_with(&dwg, limits).unwrap_err();
+    let limits = craft_dwg::Limits { max_dxf_bytes: 300_000, ..craft_dwg::Limits::DEFAULT };
+    let e = craft_dwg::dwg_to_dxf_with(&dwg, limits).unwrap_err();
     assert!(e.starts_with("DWG: converting this 0."), "{e}");
     assert!(e.contains("MB file produced more than 0.3 MB of drawing data (the limit)"), "{e}");
 
-    let limits = cadcraft_dwg::Limits { max_dwg_bytes: 100_000, ..cadcraft_dwg::Limits::DEFAULT };
-    let e = cadcraft_dwg::dwg_to_dxf_with(&dwg, limits).unwrap_err();
-    assert!(e.starts_with("DWG: the file is 0.") && e.ends_with("MB, larger than the 0.1 MB CADCraft opens"), "{e}");
+    let limits = craft_dwg::Limits { max_dwg_bytes: 100_000, ..craft_dwg::Limits::DEFAULT };
+    let e = craft_dwg::dwg_to_dxf_with(&dwg, limits).unwrap_err();
+    assert!(e.starts_with("DWG: the file is 0.") && e.ends_with("MB, larger than the 0.1 MB accepted by this bridge"), "{e}");
 
     // Lines that aren't even group codes: the size is reported before anything is parsed.
     let text = "not a group code\nx\n".repeat(60);
-    let e = cadcraft_dxf::parse_with_limit(text.as_bytes(), 50).unwrap_err();
+    let e = craft_dxf::parse_with_limit(text.as_bytes(), 50).unwrap_err();
     assert_eq!(e.to_string(), "drawing too large: 60 DXF group codes, more than the 50 CADCraft reads (set CADCRAFT_MAX_DXF_TAGS to read more)");
 }
 
+#[test]
+fn shared_dwg_diagnostics_keep_cadcraft_vocabulary() {
+    assert_eq!(
+        cadcraft_dwg_message("DWG: the file is 0.1 MB, larger than the 0.1 MB accepted by this bridge"),
+        "DWG: the file is 0.1 MB, larger than the 0.1 MB CADCraft opens"
+    );
+    assert_eq!(
+        cadcraft_dwg_message("DWG: 2 objects of types this bridge can't preserve were left out (FOO × 2)"),
+        "DWG: 2 objects of types CADCraft doesn't keep were left out (FOO × 2)"
+    );
+    assert_eq!(
+        cadcraft_dwg_message("DWG version `AC1015` can't be written (this bridge writes AC1018+)"),
+        "DWG version `AC1015` can't be written (CADCraft writes AC1018+)"
+    );
+    assert_eq!(
+        cadcraft_dwg_message("DXF: the input is 1024 MB, larger than the 1024 MB accepted for DWG conversion"),
+        "DXF: the input is 1024 MB, larger than the 1024 MB CADCraft converts to DWG"
+    );
+}
+
 /// Issue #800: one unreadable object record doesn't fail the whole DWG. The reader skips it, the
 /// rest opens, and the drawing's read notes say how many records were left out and of which
 /// types, so a partial read never passes for a complete one. A complete read has no notes.
@@ -1618,7 +1638,7 @@ fn dimension_associativity_roundtrips() {
 
     // Without CADCraft's xdata (a file from another writer), the standard DIMASSOC objects
     // still give the extension-line links.
-    let tags = cadcraft_dxf::parse(text.as_bytes()).unwrap();
+    let tags = craft_dxf::parse(text.as_bytes()).unwrap();
     let mut stripped = Vec::new();
     let mut skipping = false;
     for t in tags {
@@ -1631,7 +1651,7 @@ fn dimension_associativity_roundtrips() {
             stripped.push(t);
         }
     }
-    let foreign = read_dxf(cadcraft_dxf::write_ascii(&stripped).as_bytes()).unwrap();
+    let foreign = read_dxf(craft_dxf::write_ascii(&stripped).as_bytes()).unwrap();
     assert_eq!(assoc_of(&foreign, hl), lin.assoc);
     let fa = assoc_of(&foreign, ha);
     assert_eq!(fa.len(), 2);
@@ -1707,7 +1727,7 @@ fn polyline_vertex_dimensions_round_trip_by_segment() {
     ];
     let hp = d.add(&Space::Model, c(), EntityKind::Dimension(on_pl.clone())).unwrap();
     let text = write_dxf(&d);
-    let tags = cadcraft_dxf::parse(text.as_bytes()).unwrap();
+    let tags = craft_dxf::parse(text.as_bytes()).unwrap();
     // Each reference to the polyline: (72, 73, 91).
     let refs: Vec<(i64, i64, i64)> = tags
         .iter()
@@ -1736,13 +1756,13 @@ fn polyline_vertex_dimensions_round_trip_by_segment() {
             in_ref = t.str() == "AcDbOsnapPointRef";
         }
         if in_ref && matches!(t.code, 10 | 20) {
-            t = cadcraft_dxf::Tag::new(t.code, cadcraft_dxf::Value::Real(0.0));
+            t = craft_dxf::Tag::new(t.code, craft_dxf::Value::Real(0.0));
         }
         if !skipping {
             stripped.push(t);
         }
     }
-    let foreign = read_dxf(cadcraft_dxf::write_ascii(&stripped).as_bytes()).unwrap();
+    let foreign = read_dxf(craft_dxf::write_ascii(&stripped).as_bytes()).unwrap();
     match &foreign.entity(hp).unwrap().kind {
         EntityKind::Dimension(x) => assert_eq!(x.assoc, on_pl.assoc),
         _ => panic!(),
@@ -2051,7 +2071,7 @@ fn non_ascii_text_is_escaped_for_r2000_and_roundtrips() {
     let d = intl_sample();
     let text = write_dxf(&d);
     assert!(text.is_ascii(), "an AC1015 DXF must not contain UTF-8 bytes");
-    let tags = cadcraft_dxf::parse(text.as_bytes()).unwrap();
+    let tags = craft_dxf::parse(text.as_bytes()).unwrap();
     let header = |name: &str| tags.windows(2).find(|w| w[0].code == 9 && w[0].str() == name).map(|w| w[1].str());
     assert_eq!(header("$ACADVER").as_deref(), Some("AC1015"));
     assert_eq!(header("$DWGCODEPAGE").as_deref(), Some("ANSI_1252"));
@@ -2336,8 +2356,8 @@ fn arc_length_dimension_keeps_its_kind_and_centre_on_roundtrip() {
         _ => panic!("not a dimension"),
     }
     // And through DWG.
-    let dwg = cadcraft_dwg::dxf_to_dwg(text.as_bytes()).unwrap();
-    let back = read_dxf(&cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
+    let dwg = craft_dwg::dxf_to_dwg(text.as_bytes()).unwrap();
+    let back = read_dxf(&craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
     let dims: Vec<_> = back.model.iter().filter_map(|e| if let EntityKind::Dimension(x) = &e.kind { Some(x.clone()) } else { None }).collect();
     assert_eq!(dims.len(), 1);
     assert!(matches!(dims[0].kind, DimKind::ArcLength), "{:?}", dims[0].kind);
@@ -3568,7 +3588,7 @@ fn proxies_keep_their_class_in_dwg() {
 fn a_proxy_whose_class_is_unknown_is_left_out_of_the_dwg() {
     use acadrust::entities::{EntityType, ExtendedEntityData};
     use acadrust::objects::ObjectType;
-    let dwg = cadcraft_dwg::dxf_to_dwg_as(&proxy_file(), "AC1032").unwrap();
+    let dwg = craft_dwg::dxf_to_dwg_as(&proxy_file(), "AC1032").unwrap();
     let doc = acadrust::DwgReader::from_stream(std::io::Cursor::new(dwg)).read().unwrap();
     let class_of = |id: i32| doc.classes.iter().find(|c| i32::from(c.class_number) == id).map(|c| c.dxf_name.clone());
     let mut objects: Vec<Option<String>> = doc
@@ -3599,11 +3619,11 @@ fn a_proxy_whose_class_is_unknown_is_left_out_of_the_dwg() {
 #[cfg(not(target_arch = "wasm32"))]
 #[test]
 fn a_proxy_left_out_of_the_dwg_is_counted_as_unwritten() {
-    let (_, unwritten) = cadcraft_dwg::dxf_to_dwg_noted(&proxy_file(), "AC1032").unwrap();
+    let (_, unwritten) = craft_dwg::dxf_to_dwg_noted(&proxy_file(), "AC1032").unwrap();
     assert_eq!(unwritten, [("ACAD_PROXY_OBJECT".to_string(), 1)].into_iter().collect());
     let d = read(&proxy_file(), "p.dxf").unwrap();
     let binary = write_with(&d, "p.dxf", &SaveOptions { version: Some(Version::R2018), binary: true }).unwrap();
-    let (_, unwritten) = cadcraft_dwg::dxf_to_dwg_noted(&binary, "AC1032").unwrap();
+    let (_, unwritten) = craft_dwg::dxf_to_dwg_noted(&binary, "AC1032").unwrap();
     // CADCraft's own save already left the stray proxy out; the binary DXF's other three go.
     assert_eq!(unwritten, [("ACAD_PROXY_ENTITY".to_string(), 1), ("ACAD_PROXY_OBJECT".to_string(), 2)].into_iter().collect());
 }
@@ -3620,7 +3640,7 @@ fn a_binary_dxf_leaves_its_proxies_out_of_the_dwg() {
     let d = read(&proxy_file(), "p.dxf").unwrap();
     let binary = write_with(&d, "p.dxf", &SaveOptions { version: Some(Version::R2018), binary: true }).unwrap();
     assert!(binary.starts_with(b"AutoCAD Binary DXF"));
-    let dwg = cadcraft_dwg::dxf_to_dwg_as(&binary, "AC1032").unwrap();
+    let dwg = craft_dwg::dxf_to_dwg_as(&binary, "AC1032").unwrap();
     let doc = acadrust::DwgReader::from_stream(std::io::Cursor::new(dwg)).read().unwrap();
     let proxies = doc.objects.values().filter(|o| matches!(o, ObjectType::ProxyObject(_))).count()
         + doc.entities().filter(|e| matches!(e, EntityType::Extended(x) if matches!(x.data, ExtendedEntityData::Proxy(_)))).count();

crates/io/tests/dimassoc_angular_radial.rs

@@ -285,7 +285,7 @@ fn standard_dimassoc_associates_in_dxf_and_dwg() {
     let back = read_dxf(plain.as_bytes()).unwrap();
     assert_standard_assoc(&c, &back, "DXF");
 
-    let dwg = cadcraft_dwg::dxf_to_dwg_as(plain.as_bytes(), Version::R2018.code()).unwrap();
+    let dwg = craft_dwg::dxf_to_dwg_as(plain.as_bytes(), Version::R2018.code()).unwrap();
     let back = read(&dwg, "case.dwg").unwrap();
     assert_standard_assoc(&c, &back, "DWG");
 }

crates/io/tests/dwg_required_dictionaries.rs

@@ -92,7 +92,7 @@ fn an_ac1018_dwg_gets_the_variable_dictionary_autocad_always_writes() {
 #[test]
 fn the_dictionary_keeps_the_drawings_dimassoc_and_hidetext() {
     let dxf = "0\nSECTION\n2\nHEADER\n9\n$ACADVER\n1\nAC1015\n9\n$DIMASSOC\n70\n1\n9\n$HIDETEXT\n70\n0\n0\nENDSEC\n0\nEOF\n";
-    let dwg = cadcraft_dwg::dxf_to_dwg_as(dxf.as_bytes(), "AC1018").expect("write the DWG");
+    let dwg = craft_dwg::dxf_to_dwg_as(dxf.as_bytes(), "AC1018").expect("write the DWG");
     let doc = read_dwg(&dwg);
     let vars = variable_dictionary(&doc).expect("AC1018 DWG: the named object dictionary has an AcDbVariableDictionary");
     assert_eq!(value(&vars, "DIMASSOC"), Some("1"), "DIMASSOC in {vars:?}");
@@ -107,7 +107,7 @@ fn the_dictionary_keeps_the_drawings_dimassoc_and_hidetext() {
 #[test]
 fn impossible_header_values_fall_back_to_the_defaults() {
     let dxf = "0\nSECTION\n2\nHEADER\n9\n$ACADVER\n1\nAC1015\n9\n$DIMASSOC\n70\n9\n9\n$HIDETEXT\n70\n7\n0\nENDSEC\n0\nEOF\n";
-    let dwg = cadcraft_dwg::dxf_to_dwg_as(dxf.as_bytes(), "AC1018").expect("write the DWG");
+    let dwg = craft_dwg::dxf_to_dwg_as(dxf.as_bytes(), "AC1018").expect("write the DWG");
     let doc = read_dwg(&dwg);
     let vars = variable_dictionary(&doc).expect("AC1018 DWG: the named object dictionary has an AcDbVariableDictionary");
     assert_eq!(value(&vars, "DIMASSOC"), Some("2"), "DIMASSOC in {vars:?}");
@@ -139,7 +139,7 @@ fn a_variable_dictionary_the_drawing_has_is_left_alone() {
     assert!(source.set_drawing_variable("CMLEADERSTYLE", "Notes"));
     let dxf = acadrust::DxfWriter::new(&source).write_to_vec().expect("write a DXF with the dictionary");
 
-    let dwg = cadcraft_dwg::dxf_to_dwg_as(&dxf, "AC1018").expect("write the DWG");
+    let dwg = craft_dwg::dxf_to_dwg_as(&dxf, "AC1018").expect("write the DWG");
     let doc = read_dwg(&dwg);
     let vars = variable_dictionary(&doc).expect("the drawing's dictionary is kept");
     assert_eq!(vars.len(), 1, "{vars:?}");

crates/io/tests/hard_owned_objects_kept.rs

@@ -173,16 +173,16 @@ fn cyclic_hard_owners_with_a_live_holder_stay_kept() {
         let bytes = write(&drawing, name).unwrap();
         drawing = read(&bytes, name).unwrap();
         let text = write_dxf(&drawing);
-        let tags = cadcraft_dxf::parse(text.as_bytes()).unwrap();
-        let objects = cadcraft_dxf::sections(&tags).into_iter().find(|s| s.name == "OBJECTS").unwrap();
-        let records = cadcraft_dxf::records(&objects.tags);
+        let tags = craft_dxf::parse(text.as_bytes()).unwrap();
+        let objects = craft_dxf::sections(&tags).into_iter().find(|s| s.name == "OBJECTS").unwrap();
+        let records = craft_dxf::records(&objects.tags);
         let record = |label: &str| records.iter().find(|(_, tags)| tags.iter().any(|t| t.code == 1 && t.str() == label)).unwrap().1.clone();
         let first = record("first");
         let second = record("second");
         let holder = record("holder");
         let child = record("child");
         assert!(!records.iter().any(|(_, tags)| tags.iter().any(|t| t.code == 1 && t.str() == "stray")), "{name}");
-        let handle = |tags: &[cadcraft_dxf::Tag]| tags.iter().find(|t| t.code == 5).unwrap().str();
+        let handle = |tags: &[craft_dxf::Tag]| tags.iter().find(|t| t.code == 5).unwrap().str();
         assert!(first.iter().any(|t| t.code == 360 && t.str() == handle(&second)), "{name}");
         assert!(second.iter().any(|t| t.code == 360 && t.str() == handle(&first)), "{name}");
         assert!(first.iter().any(|t| t.code == 360 && t.str() == handle(&child)), "{name}");

crates/io/tests/it/acad_interop.rs

@@ -155,7 +155,7 @@ fn a_rotated_linear_dimension_stores_its_projected_length() {
         Vec3::new(-40.0, 105.0, 0.0),
     );
     let dwg = write_with(&d, "case.dwg", &SaveOptions { version: Some(Version::R2018), binary: false }).unwrap();
-    let dxf = String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
+    let dxf = String::from_utf8(craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
     let t = tags(&dxf);
     let dim = t.iter().position(|(c, v)| *c == 0 && v == "DIMENSION").unwrap();
     let m: f64 = t[dim..].iter().find(|(c, _)| *c == 42).unwrap().1.parse().unwrap();
@@ -242,7 +242,7 @@ fn justified_text_made_here_writes_its_baseline_start_for_every_justification()
 /// Group 42 of a dimension in the DXF AutoCAD reads from `d`'s DWG.
 fn stored_measurement(d: &Drawing) -> f64 {
     let dwg = write_with(d, "case.dwg", &SaveOptions { version: Some(Version::R2018), binary: false }).unwrap();
-    let dxf = String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
+    let dxf = String::from_utf8(craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
     let t = tags(&dxf);
     let dim = t.iter().position(|(c, v)| *c == 0 && v == "DIMENSION").unwrap();
     t[dim..].iter().find(|(c, _)| *c == 42).unwrap().1.parse().unwrap()

crates/io/tests/it/acis_data_store.rs

@@ -93,7 +93,7 @@ fn dwg_keeps_the_solids_geometry() {
     let d = cadcraft_io::read_dxf(dxf().as_bytes()).unwrap();
     let dwg = cadcraft_io::write(&d, "x.dwg").unwrap();
     // The DWG read back (as the bridge's DXF) binds the same bytes to both solids.
-    let back = String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
+    let back = String::from_utf8(craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
     let mut got = asm_data(&back);
     got.sort();
     assert_eq!(got, vec![("2A".to_string(), SAB_HEX.to_string()), ("2B".to_string(), SAB_HEX.to_string())]);

crates/io/tests/it/codepages.rs

@@ -248,7 +248,7 @@ fn hostile_multibyte_never_panics() {
 #[test]
 fn pre_2007_dwg_text_decodes_through_the_bridge() {
     let dxf = ascii_dxf("AC1015", "ANSI_1251", b"\xD1\xEB\xEE\xE9", b"\xC1\xEB\xEE\xEA", b"\xCF\xF0\xE8\xE2\xE5\xF2");
-    let dwg = cadcraft_dwg::dxf_to_dwg(&dxf).unwrap();
+    let dwg = craft_dwg::dxf_to_dwg(&dxf).unwrap();
     let d = cadcraft_io::read(&dwg, "x.dwg").unwrap();
     assert_eq!(names(&d), ("Слой".into(), "Блок".into(), "Привет".into()));
 }

crates/io/tests/it/drafting_spacing.rs

@@ -1,8 +1,8 @@
 //! Snap/grid spacing uses legacy HEADER variables and the current *ACTIVE VPORT (#607).
 
 use cadcraft_doc::{Drawing, HVal};
-use cadcraft_dxf::{Tag, records, sections};
 use cadcraft_geom::{Vec2, Vec3};
+use craft_dxf::{Tag, records, sections};
 
 fn header(snap: Vec2, grid: Vec2) -> Vec<Tag> {
     let mut tags = Vec::new();
@@ -24,7 +24,7 @@ fn read(header: &[Tag], vports: &[Vec<Tag>]) -> Drawing {
         tags.extend_from_slice(vp);
     }
     tags.extend([Tag::s(0, "ENDTAB"), Tag::s(0, "ENDSEC"), Tag::s(0, "EOF")]);
-    cadcraft_io::read_dxf(cadcraft_dxf::write_ascii(&tags).as_bytes()).unwrap()
+    cadcraft_io::read_dxf(craft_dxf::write_ascii(&tags).as_bytes()).unwrap()
 }
 
 fn assert_units(d: &Drawing, snap: Vec2, grid: Vec2) {
@@ -43,7 +43,7 @@ fn writes_spacing_to_header_and_active_vport_and_roundtrips() {
     d.header.set("SNAPUNIT", HVal::Point(snap.to3(0.0)));
     d.header.set("GRIDUNIT", HVal::Point(grid.to3(0.0)));
     let text = cadcraft_io::write_dxf(&d);
-    let tags = cadcraft_dxf::parse_ascii(&text).unwrap();
+    let tags = craft_dxf::parse_ascii(&text).unwrap();
     let sections = sections(&tags);
     let header = &sections.iter().find(|s| s.name == "HEADER").unwrap().tags;
     for (name, unit) in [("$SNAPUNIT", snap), ("$GRIDUNIT", grid)] {

crates/io/tests/it/dwg_roundtrip_losses.rs

@@ -71,7 +71,7 @@ fn dwg_keeps_true_colours_and_transparency() {
     );
 
     let dwg = cadcraft_io::write(&d, "x.dwg").unwrap();
-    assert_eq!(cadcraft_dwg::version(&dwg).as_deref(), Some("AC1032"));
+    assert_eq!(craft_dwg::version(&dwg).as_deref(), Some("AC1032"));
     let header = records(&cadcraft_io::write_dxf(&d), "SECTION");
     assert_eq!(header.first().and_then(|h| group(h, "1")), Some("AC1015"), "the DXF stays R2000");
 

crates/io/tests/it/dxf_versions.rs

@@ -62,7 +62,7 @@ fn opts(version: Version, binary: bool) -> SaveOptions {
 }
 
 fn acadver(bytes: &[u8]) -> String {
-    let tags = cadcraft_dxf::parse(bytes).unwrap();
+    let tags = craft_dxf::parse(bytes).unwrap();
     tags.windows(2).find(|w| w[0].code == 9 && w[0].str() == "$ACADVER").map(|w| w[1].str()).unwrap_or_default()
 }
 
@@ -85,7 +85,7 @@ fn dxf_at_every_version_reads_back_the_same() {
             let bytes = write_with(&d, "x.dxf", &opts(v, binary)).unwrap();
             let what = format!("{v} binary={binary}");
             assert_eq!(acadver(&bytes), v.code(), "{what}");
-            assert_eq!(cadcraft_dxf::is_binary(&bytes), binary, "{what}");
+            assert_eq!(craft_dxf::is_binary(&bytes), binary, "{what}");
             let raw = bytes.windows("图号".len()).any(|w| w == "图号".as_bytes());
             assert_eq!(raw, v.utf8(), "{what}: UTF-8 text from 2007, the code page before");
             if !v.utf8() {
@@ -109,11 +109,11 @@ fn class_records_follow_the_version() {
     let d = sample();
     for v in Version::ALL {
         for binary in [false, true] {
-            let tags = cadcraft_dxf::parse(&write_with(&d, "x.dxf", &opts(v, binary)).unwrap()).unwrap();
-            let classes: Vec<Vec<i32>> = cadcraft_dxf::sections(&tags)
+            let tags = craft_dxf::parse(&write_with(&d, "x.dxf", &opts(v, binary)).unwrap()).unwrap();
+            let classes: Vec<Vec<i32>> = craft_dxf::sections(&tags)
                 .into_iter()
                 .filter(|s| s.name == "CLASSES")
-                .flat_map(|s| cadcraft_dxf::records(&s.tags))
+                .flat_map(|s| craft_dxf::records(&s.tags))
                 .filter(|(kind, _)| kind == "CLASS")
                 .map(|(_, t)| t.iter().map(|x| x.code).collect())
                 .collect();
@@ -134,7 +134,7 @@ fn r2000_ascii_is_unchanged() {
     let saved = write_with(&d, "x.dxf", &opts(Version::R2000, false)).unwrap();
     let escaped = write_dxf(&d);
     assert_ne!(saved, escaped.as_bytes(), "Café is written in ANSI_1252");
-    assert_eq!(cadcraft_dxf::parse(&saved).unwrap(), cadcraft_dxf::parse(escaped.as_bytes()).unwrap());
+    assert_eq!(craft_dxf::parse(&saved).unwrap(), craft_dxf::parse(escaped.as_bytes()).unwrap());
 }
 
 /// Without a version asked for: 2018 for a new drawing, otherwise the file's own version (the
@@ -166,7 +166,7 @@ fn dwg_at_every_version_reads_back() {
     let d = sample();
     for v in Version::ALL {
         let dwg = write_with(&d, "x.dwg", &opts(v, false)).unwrap();
-        assert_eq!(cadcraft_dwg::version(&dwg).as_deref(), Some(v.code()), "{v}");
+        assert_eq!(craft_dwg::version(&dwg).as_deref(), Some(v.code()), "{v}");
         let back = read(&dwg, "x.dwg").unwrap();
         assert_eq!(save_version(&back), v, "{v}");
         assert_eq!(back.model.len(), d.model.len(), "{v}");
@@ -187,6 +187,6 @@ fn dwg_at_every_version_reads_back() {
 #[test]
 fn dwg_default_is_at_least_2004() {
     let from_r2000 = read(write_dxf(&sample()).as_bytes(), "x.dxf").unwrap();
-    assert_eq!(cadcraft_dwg::version(&write(&from_r2000, "x.dwg").unwrap()).as_deref(), Some("AC1018"));
-    assert_eq!(cadcraft_dwg::version(&write(&sample(), "x.dwg").unwrap()).as_deref(), Some("AC1032"));
+    assert_eq!(craft_dwg::version(&write(&from_r2000, "x.dwg").unwrap()).as_deref(), Some("AC1018"));
+    assert_eq!(craft_dwg::version(&write(&sample(), "x.dwg").unwrap()).as_deref(), Some("AC1032"));
 }

crates/io/tests/it/dynblock_read.rs

@@ -104,7 +104,7 @@ fn with_scale_action() -> String {
 
 /// A scale action goes through CADCraft's own DWG save (the bridge DXF, then acadrust) whole:
 /// the DWG holds it with its connections, and it reads back as the same action. AutoCAD refused
-/// such DWGs while acadrust left out the byte after its connections (cadcraft-dwg's
+/// such DWGs while acadrust left out the byte after its connections (craft-dwg's
 /// `scale_actions_keep_the_byte_autocad_reads_after_their_connections` covers the byte).
 #[cfg(not(any(target_arch = "wasm32", all(target_os = "freebsd", target_arch = "aarch64"))))]
 #[test]

crates/io/tests/it/helix_roundtrip.rs

@@ -4,8 +4,8 @@
 //! don't panic.
 
 use cadcraft_doc::{Common, Drawing, EntityKind, Helix, HelixConstrain, Space};
-use cadcraft_dxf::{Tag, records, sections};
 use cadcraft_geom::Vec3;
+use craft_dxf::{Tag, records, sections};
 
 fn helices(d: &Drawing) -> Vec<Helix> {
     d.model
@@ -65,7 +65,7 @@ fn helix_survives_save_and_reopen() {
     assert_eq!(back.model.iter().next().unwrap().common.layer, "Springs");
 
     // The file: a spline whose last control point is the helix's end, the helix data, a CLASS.
-    let tags = cadcraft_dxf::parse(saved.as_bytes()).unwrap();
+    let tags = craft_dxf::parse(saved.as_bytes()).unwrap();
     let secs = sections(&tags);
     let recs = |name: &str| records(&secs.iter().find(|s| s.name == name).unwrap().tags);
     let ents = recs("ENTITIES");

crates/io/tests/it/leader_vertex_elevation.rs

@@ -2,9 +2,9 @@
 
 use cadcraft_color::Color;
 use cadcraft_doc::{Common, DimStyle, Drawing, EntityKind, Handle, Leader, Lineweight, Space};
-use cadcraft_dxf::Tag;
 use cadcraft_geom::Vec3;
 use cadcraft_io::{SaveOptions, Version, read, write_with};
+use craft_dxf::Tag;
 
 type TestResult<T = ()> = Result<T, Box<dyn std::error::Error>>;
 
@@ -93,7 +93,7 @@ fn missing_z_defaults_only_the_corresponding_vertex() -> TestResult {
             expected.push(Vec3::new(p.x, p.y, if has_z { p.z } else { 0.0 }));
         }
         tags.extend([Tag::s(0, "ENDSEC"), Tag::s(0, "EOF")]);
-        let dxf = cadcraft_dxf::write_ascii(&tags);
+        let dxf = craft_dxf::write_ascii(&tags);
         let d = read(dxf.as_bytes(), "missing-z.dxf")?;
         let e = d.entity(Handle(0x10)).ok_or("LEADER missing")?;
         let EntityKind::Leader(l) = &e.kind else { return Err("expected LEADER".into()) };

crates/io/tests/it/main.rs

@@ -37,6 +37,7 @@ mod layout_plot_window;
 mod leader_vertex_elevation;
 #[cfg(not(target_arch = "wasm32"))]
 mod low_handseed;
+mod minsert_marker;
 mod mleader_content;
 mod mleader_roundtrip;
 mod mline_roundtrip;

crates/io/tests/it/minsert_marker.rs

@@ -0,0 +1,78 @@
+//! A block reference repeated in rows or columns (MINSERT) is written with the subclass marker
+//! `AcDbMInsertBlock`, as AutoCAD writes it; other readers (BricsCAD) draw only the first copy of
+//! an array marked `AcDbBlockReference`. A plain INSERT keeps `AcDbBlockReference` (#3127).
+
+use std::sync::Arc;
+
+use cadcraft_doc::{Block, Common, Drawing, Entity, EntityKind, Insert, Line, Space};
+use cadcraft_geom::Vec3;
+
+fn drawing(refs: &[Insert]) -> Drawing {
+    let mut d = Drawing::new_metric();
+    let mut block = Block::new("MP");
+    block.entities.push(Entity::new(d.new_handle(), EntityKind::Line(Line { a: Vec3::ZERO, b: Vec3::new(2.5, 5.0, 0.0) })));
+    d.blocks.insert(block.name.clone(), Arc::new(block));
+    for r in refs {
+        d.add(&Space::Model, Common::default(), EntityKind::Insert(r.clone())).unwrap();
+    }
+    d
+}
+
+/// The subclass markers (group 100) of each INSERT record in the DXF text, in file order.
+fn insert_markers(text: &str) -> Vec<Vec<String>> {
+    let lines: Vec<&str> = text.lines().map(str::trim).collect();
+    let pairs: Vec<(&str, &str)> = lines.chunks(2).filter_map(|c| Some((*c.first()?, *c.get(1)?))).collect();
+    let mut out = Vec::new();
+    let mut cur: Option<Vec<String>> = None;
+    for (code, value) in pairs {
+        if code == "0" {
+            out.extend(cur.take());
+            if value == "INSERT" {
+                cur = Some(Vec::new());
+            }
+        } else if code == "100"
+            && let Some(m) = cur.as_mut()
+        {
+            m.push(value.to_string());
+        }
+    }
+    out.extend(cur);
+    out
+}
+
+fn inserts(d: &Drawing) -> Vec<Insert> {
+    d.model.iter().filter_map(|e| if let EntityKind::Insert(i) = &e.kind { Some(i.clone()) } else { None }).collect()
+}
+
+#[test]
+fn minsert_is_written_with_the_minsert_marker() {
+    let columns = Insert { block: "MP".into(), cols: 6, col_spacing: 2.5, ..Insert::default() };
+    let rows = Insert { block: "MP".into(), insert: Vec3::new(0.0, 20.0, 0.0), rows: 3, row_spacing: 5.0, ..Insert::default() };
+    let text = cadcraft_io::write_dxf(&drawing(&[columns, rows]));
+    let markers = insert_markers(&text);
+    assert_eq!(markers.len(), 2, "{markers:?}");
+    for m in &markers {
+        assert_eq!(m, &["AcDbEntity", "AcDbMInsertBlock"], "an arrayed reference is an AcDbMInsertBlock");
+    }
+}
+
+#[test]
+fn plain_insert_keeps_the_block_reference_marker() {
+    let plain = Insert { block: "MP".into(), insert: Vec3::new(30.0, 0.0, 0.0), ..Insert::default() };
+    let text = cadcraft_io::write_dxf(&drawing(&[plain]));
+    assert_eq!(insert_markers(&text), [["AcDbEntity", "AcDbBlockReference"]]);
+}
+
+#[test]
+fn minsert_array_reads_back_from_its_own_dxf() {
+    let refs = [
+        Insert { block: "MP".into(), cols: 6, col_spacing: 2.5, ..Insert::default() },
+        Insert { block: "MP".into(), insert: Vec3::new(0.0, 20.0, 0.0), cols: 2, rows: 3, col_spacing: 4.0, row_spacing: 5.0, ..Insert::default() },
+        Insert { block: "MP".into(), insert: Vec3::new(30.0, 0.0, 0.0), ..Insert::default() },
+    ];
+    let text = cadcraft_io::write_dxf(&drawing(&refs));
+    let back = inserts(&cadcraft_io::read_dxf(text.as_bytes()).unwrap());
+    let got: Vec<_> = back.iter().map(|i| (i.block.as_str(), i.insert, i.cols, i.rows, i.col_spacing, i.row_spacing)).collect();
+    let want: Vec<_> = refs.iter().map(|i| (i.block.as_str(), i.insert, i.cols, i.rows, i.col_spacing, i.row_spacing)).collect();
+    assert_eq!(got, want);
+}

crates/io/tests/it/mline_roundtrip.rs

@@ -5,8 +5,8 @@
 
 use cadcraft_color::Color;
 use cadcraft_doc::{Common, Drawing, EntityKind, MLine, MLineCaps, MLineCut, MLineElement, MLineJust, MLineStyle, Space};
-use cadcraft_dxf::{Tag, records, sections};
 use cadcraft_geom::Vec2;
+use craft_dxf::{Tag, records, sections};
 
 fn mlines(d: &Drawing) -> Vec<MLine> {
     d.model
@@ -84,7 +84,7 @@ fn mlines_and_styles_survive_save_and_reopen() {
     assert_eq!(back.header.f64("CMLSCALE", 0.0), 2.5);
 
     // The file links up as the DXF Reference describes.
-    let tags = cadcraft_dxf::parse(saved.as_bytes()).unwrap();
+    let tags = craft_dxf::parse(saved.as_bytes()).unwrap();
     let secs = sections(&tags);
     let recs = |name: &str| records(&secs.iter().find(|s| s.name == name).unwrap().tags);
     let val = |t: &[Tag], c: i32| t.iter().find(|g| g.code == c).map(Tag::str).unwrap_or_default();

crates/io/tests/it/model_layout_plot_type.rs

@@ -59,7 +59,7 @@ fn model_layout_plots_extents_fitted_and_layouts_their_sheet() {
 fn model_layout_plot_type_survives_the_dwg_bridge() {
     let dwg = cadcraft_io::write(&drawing(), "x.dwg").unwrap();
     // What the DWG holds, as the bridge's own DXF.
-    let dxf = String::from_utf8_lossy(&cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).to_string();
+    let dxf = String::from_utf8_lossy(&craft_dwg::dwg_to_dxf(&dwg).unwrap()).to_string();
     let p = plots(&dxf);
     let model = p.iter().find(|(n, _, _)| n.eq_ignore_ascii_case("Model")).unwrap();
     assert_eq!(model.1, Some(1), "{p:?}");

crates/io/tests/it/mtext_caret_spaces.rs

@@ -82,7 +82,7 @@ fn dwg_mtext_caret_spaces_round_trip() -> TestResult {
         let mut d = original.clone();
         for pass in 1..=2 {
             let bytes = write_with(&d, "carets.dwg", &SaveOptions { version: Some(version), binary: false })?;
-            assert_eq!(cadcraft_dwg::version(&bytes).as_deref(), Some(version.code()));
+            assert_eq!(craft_dwg::version(&bytes).as_deref(), Some(version.code()));
             // Inspect the stored DWG text before its DXF rendition: a compensating reader
             // must not hide corruption on save. This uses the same codec, not an external oracle.
             let native = acadrust::DwgReader::from_stream(std::io::Cursor::new(&bytes)).read()?;
@@ -93,7 +93,7 @@ fn dwg_mtext_caret_spaces_round_trip() -> TestResult {
                 });
                 assert_eq!(text, Some(contents), "native DWG {version:?}, pass={pass}, {handle:?}");
             }
-            let dxf = cadcraft_dwg::dwg_to_dxf(&bytes)?;
+            let dxf = craft_dwg::dwg_to_dxf(&bytes)?;
             let converted = read(&dxf, "bridge.dxf")?;
             assert_contents(&converted, &expected, &format!("DWG bridge DXF {version:?}, pass={pass}"))?;
             d = read(&bytes, "carets.dwg")?;
@@ -112,7 +112,7 @@ fn bridge_caret_space_is_escaped_once_in_each_direction() -> TestResult {
     let native = acadrust::DxfReader::from_reader(std::io::Cursor::new(dxf.into_bytes()))?.read()?;
     assert!(native.entities().any(|e| matches!(e, acadrust::EntityType::MText(t) if t.value == "^ C")));
     let dwg = write_with(&d, "carets.dwg", &SaveOptions { version: Some(Version::R2018), binary: false })?;
-    let returned = String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg)?)?;
+    let returned = String::from_utf8(craft_dwg::dwg_to_dxf(&dwg)?)?;
     assert!(returned.contains("  1\r\n^  C\r\n"), "the return bridge must encode the separator independently of authored whitespace");
     Ok(())
 }

crates/io/tests/it/mtext_columns_roundtrip.rs

@@ -2,9 +2,9 @@
 //! 75/76/78/79/48/49/50, tabs as `^I`, carets as `^ `.
 
 use cadcraft_doc::{Common, Drawing, EntityKind, MText, MTextColumnType, MTextColumns, Space};
-use cadcraft_dxf::Tag;
 use cadcraft_geom::Vec3;
 use cadcraft_io::{SaveOptions, Version, entity_from_groups, read_dxf, write_dxf, write_with};
+use craft_dxf::Tag;
 
 fn mtext(contents: &str, rotation: f64, columns: Option<MTextColumns>) -> MText {
     MText {
@@ -246,8 +246,8 @@ fn markers_inside_an_application_group_do_not_end_the_entity_groups() {
 
 // ---- #2248: R2018 embedded column object ----
 
-fn embedded_tags(count: i64, width: f64, gutter: f64, heights: &[f64]) -> Vec<cadcraft_dxf::Tag> {
-    use cadcraft_dxf::Tag;
+fn embedded_tags(count: i64, width: f64, gutter: f64, heights: &[f64]) -> Vec<craft_dxf::Tag> {
+    use craft_dxf::Tag;
     let mut v = vec![
         Tag::s(8, "0"),
         Tag::f(10, 10.0),
@@ -281,7 +281,7 @@ fn embedded_tags(count: i64, width: f64, gutter: f64, heights: &[f64]) -> Vec<ca
     v
 }
 
-fn mtext_from_groups(tags: &[cadcraft_dxf::Tag]) -> (Common, MText) {
+fn mtext_from_groups(tags: &[craft_dxf::Tag]) -> (Common, MText) {
     let Some((common, EntityKind::MText(t))) = entity_from_groups("MTEXT", tags) else { panic!("MTEXT was not read") };
     (common, t)
 }
@@ -322,7 +322,7 @@ fn embedded_column_height_is_the_entitys_defined_height() {
     // As ezdxf and AutoCAD write static columns: the height in the entity's 46, none in the object.
     let mut tags = embedded_tags(3, 12.5, 2.5, &[]);
     let at = tags.iter().position(|t| t.code == 101).unwrap();
-    tags.insert(at, cadcraft_dxf::Tag::f(46, 20.0));
+    tags.insert(at, craft_dxf::Tag::f(46, 20.0));
     let (_, t) = mtext_from_groups(&tags);
     assert_eq!(t.columns.map(|c| c.height), Some(20.0));
 }
@@ -355,10 +355,10 @@ fn dynamic_auto_height_embedded_count_comes_from_the_total_width() {
     let at = tags.iter().position(|t| t.code == 101).unwrap();
     for t in &mut tags[at..] {
         *t = match t.code {
-            42 => cadcraft_dxf::Tag::f(42, 175.0),
-            71 => cadcraft_dxf::Tag::i(71, 2),
-            72 => cadcraft_dxf::Tag::i(72, 0),
-            73 => cadcraft_dxf::Tag::i(73, 1),
+            42 => craft_dxf::Tag::f(42, 175.0),
+            71 => craft_dxf::Tag::i(71, 2),
+            72 => craft_dxf::Tag::i(72, 0),
+            73 => craft_dxf::Tag::i(73, 1),
             _ => t.clone(),
         };
     }
@@ -373,13 +373,13 @@ fn dynamic_auto_height_count_comes_from_the_widths_when_72_is_zero() {
     // A dynamic auto-height object stores 0 in 72; the count is implied by the total width
     // (42 = n * 44 + (n - 1) * 45): (175 + 12.5) / (50 + 12.5) = 3.
     let mut tags = embedded_tags(0, 50.0, 12.5, &[]);
-    let mut set = |code: i32, v: cadcraft_dxf::Tag| {
+    let mut set = |code: i32, v: craft_dxf::Tag| {
         let at = tags.iter().rposition(|t| t.code == code).unwrap();
         tags[at] = v;
     };
-    set(71, cadcraft_dxf::Tag::i(71, 2));
-    set(73, cadcraft_dxf::Tag::i(73, 1));
-    set(42, cadcraft_dxf::Tag::f(42, 175.0));
+    set(71, craft_dxf::Tag::i(71, 2));
+    set(73, craft_dxf::Tag::i(73, 1));
+    set(42, craft_dxf::Tag::f(42, 175.0));
     let (_, t) = mtext_from_groups(&tags);
     let c = t.columns.expect("columns");
     assert_eq!((c.kind, c.auto_height, c.count), (MTextColumnType::Dynamic, true, 3));
@@ -392,10 +392,10 @@ fn embedded_column_width_wins_over_the_entitys_width() {
     // what the R2018 object gets back (#2467 review).
     let mut tags = embedded_tags(3, 50.0, 12.5, &[20.0, 20.0, 20.0]);
     let own_41 = tags.iter().position(|t| t.code == 41).unwrap();
-    tags[own_41] = cadcraft_dxf::Tag::f(41, 175.0);
+    tags[own_41] = craft_dxf::Tag::f(41, 175.0);
     for code in [40, 42] {
         let at = tags.iter().rposition(|t| t.code == code).unwrap();
-        tags[at] = cadcraft_dxf::Tag::f(code, 175.0);
+        tags[at] = craft_dxf::Tag::f(code, 175.0);
     }
     let (_, t) = mtext_from_groups(&tags);
     assert_eq!(t.width, 50.0, "the column width, not the total");

crates/io/tests/it/ole2frame_roundtrip.rs

@@ -90,7 +90,7 @@ fn dwg_keeps_ole_objects() {
     assert_eq!(ole(&d), 1);
 
     let dwg = cadcraft_io::write(&d, "x.dwg").unwrap();
-    let back = String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
+    let back = String::from_utf8(craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap();
     let got = frames(&back);
     assert_eq!(got.len(), 1, "{got:?}");
     assert_kept(&got[0]);
@@ -99,14 +99,14 @@ fn dwg_keeps_ole_objects() {
     let again = cadcraft_io::read(&dwg, "x.dwg").unwrap();
     assert_eq!(ole(&again), 1);
     let dwg = cadcraft_io::write(&again, "x.dwg").unwrap();
-    let got = frames(&String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap());
+    let got = frames(&String::from_utf8(craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap());
     assert_eq!(got.len(), 1, "{got:?}");
     assert_kept(&got[0]);
 
     // Older DWG versions keep it the same way.
     for version in [cadcraft_io::Version::R2000, cadcraft_io::Version::R2010] {
         let dwg = cadcraft_io::write_with(&d, "x.dwg", &cadcraft_io::SaveOptions { version: Some(version), binary: false }).unwrap();
-        let got = frames(&String::from_utf8(cadcraft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap());
+        let got = frames(&String::from_utf8(craft_dwg::dwg_to_dxf(&dwg).unwrap()).unwrap());
         assert_eq!(got.len(), 1, "{version:?}: {got:?}");
         assert_kept(&got[0]);
     }