From 611eb9f5a92ea70c3a19ea964d521232184f8649 Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 08:44:31 +0200
Subject: [PATCH 01/13] fonts: port complex-text shaping to harfrust 0.14

---
 crates/fonts/src/complex.rs | 47 ++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/crates/fonts/src/complex.rs b/crates/fonts/src/complex.rs
index 6193f3f80..1d76f813e 100644
--- a/crates/fonts/src/complex.rs
+++ b/crates/fonts/src/complex.rs
@@ -8,6 +8,7 @@
 
 use std::ops::Range;
 use std::panic::{AssertUnwindSafe, catch_unwind};
+use std::sync::Arc;
 
 use cadcraft_geom::Vec2;
 
@@ -182,28 +183,31 @@ struct Glyph {
 /// Shape characters `r` of `cs` (one direction, one face) into glyphs in display order.
 fn shape_run(face: &Face, cs: &[char], r: Range<usize>, rtl: bool) -> Vec<Glyph> {
     let run = cs.get(r.clone()).unwrap_or_default();
-    let Ok(font) = harfrust::FontRef::from_index(&face.bytes, face.index) else { return Vec::new() };
-    let data = harfrust::ShaperData::new(&font);
-    let shaper = data.shaper(&font).build();
-    let mut buf = harfrust::UnicodeBuffer::new();
+    // Shares the face's bytes instead of copying them.
+    let bytes: Arc<dyn AsRef<[u8]> + Send + Sync> = face.bytes.clone();
+    let Some(font) = harfrust::Font::new(bytes, face.index) else { return Vec::new() };
+    let shaper = harfrust::ShaperFont::new(&font);
+    let mut buf = harfrust::Buffer::new();
     let arabic = run.iter().any(|c| matches!(*c, '\u{0600}'..='\u{08FF}'));
     if arabic && !face.has_joining_features() {
         for (c, i) in bidi::presentation_forms(run, |p| face.has_glyph(p)) {
-            buf.add(c, u32::try_from(r.start + i).unwrap_or(u32::MAX));
+            buf.push(u32::from(c), u32::try_from(r.start + i).unwrap_or(u32::MAX));
         }
     } else {
         for (i, c) in run.iter().enumerate() {
-            buf.add(*c, u32::try_from(r.start + i).unwrap_or(u32::MAX));
+            buf.push(u32::from(*c), u32::try_from(r.start + i).unwrap_or(u32::MAX));
         }
     }
     buf.set_direction(if rtl { harfrust::Direction::RightToLeft } else { harfrust::Direction::LeftToRight });
     buf.guess_segment_properties();
-    let shaped = shaper.shape(buf, harfrust::ShapeOptions::new());
-    let k = 1000.0 / f64::from(shaper.units_per_em().max(1));
-    shaped
-        .glyph_infos()
+    // Without a plan, shaping fails only on an already shaped buffer or an unset direction.
+    if harfrust::shape(&shaper, &mut buf, harfrust::ShapeOptions::new()).is_err() {
+        return Vec::new();
+    }
+    let k = 1000.0 / f64::from(font.units_per_em().max(1));
+    buf.glyph_infos()
         .iter()
-        .zip(shaped.glyph_positions())
+        .zip(buf.glyph_positions())
         .map(|(gi, gp)| Glyph {
             gid: gi.glyph_id,
             cluster: usize::try_from(gi.cluster).unwrap_or(usize::MAX),
@@ -291,6 +295,27 @@ mod tests {
         assert!((crate::line_width("قیمت 25 تومان", 1.0, 1.0) - sh.width).abs() < 1e-9);
     }
 
+    #[test]
+    fn devanagari_run_is_reordered_with_line_clusters_and_advances_per_1000_em() {
+        use skrifa::MetadataProvider;
+        use skrifa::instance::{LocationRef, Size};
+        let Some(face) = ttf::fallback_for('\u{0915}') else { return };
+        let Some(ka) = nominal(&face, '\u{0915}') else { return };
+        // "कि" after two other characters of the line: the vowel sign i is drawn before the
+        // consonant (Indic reordering, which needs the script the shaper guesses from the text),
+        // both glyphs carry the cluster of the consonant's index in the line, not in the run.
+        let cs: Vec<char> = "ab\u{0915}\u{093F}".chars().collect();
+        let gs = shape_run(&face, &cs, 2..4, false);
+        let gids: Vec<u32> = gs.iter().map(|g| g.gid).collect();
+        assert_eq!(gids.len(), 2, "{gids:?}");
+        assert!(gids.first() != Some(&ka) && gids.last() == Some(&ka), "vowel sign before ka: {gids:?}");
+        assert!(gs.iter().all(|g| g.cluster == 2), "{:?}", gs.iter().map(|g| g.cluster).collect::<Vec<_>>());
+        // Advances come out at 1000 units per em, whatever the font's own em.
+        let hmtx = face.font().and_then(|f| f.glyph_metrics(Size::new(1000.0), LocationRef::default()).advance_width(skrifa::GlyphId::new(ka)));
+        let adv = gs.last().map(|g| g.advance);
+        assert!(matches!((adv, hmtx), (Some(a), Some(h)) if (a - f64::from(h)).abs() < 1e-3), "{adv:?} vs {hmtx:?}");
+    }
+
     #[test]
     fn hostile_rtl_lines_never_panic() {
         for s in ["\u{202E}%%u\u{05D0}%%", "\u{2067}\u{0644}\u{0627}\u{2069}%%o", "\u{064E}\u{064E}\u{05D0}", "\u{05D0}\u{E000}\u{10FFFF}"] {

From e61e328edb1e08a3f3f767dc9391e6abc716331a Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 08:50:32 +0200
Subject: [PATCH 02/13] io: read SVG element and attribute names with quick-xml
 0.42

---
 crates/io/src/svg_read.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/io/src/svg_read.rs b/crates/io/src/svg_read.rs
index 1d150fc8b..4b2892c3d 100644
--- a/crates/io/src/svg_read.rs
+++ b/crates/io/src/svg_read.rs
@@ -207,15 +207,15 @@ impl Parser {
             match reader.read_event().map_err(parse_err)? {
                 Event::Start(e) => {
                     let name = e.name();
-                    self.on_start(name.as_ref(), &e)?;
+                    self.on_start(name.into_inner().as_bytes(), &e)?;
                 }
                 Event::Empty(e) => {
                     let name = e.name();
-                    self.on_element(name.as_ref(), &e)?;
+                    self.on_element(name.into_inner().as_bytes(), &e)?;
                 }
                 Event::End(e) => {
                     let name = e.name();
-                    self.on_end(name.as_ref());
+                    self.on_end(name.into_inner().as_bytes());
                 }
                 Event::Eof => break,
                 _ => {}
@@ -578,7 +578,7 @@ fn hidden(e: &BytesStart) -> bool {
 
 fn attr(e: &BytesStart, name: &[u8]) -> Option<String> {
     for a in e.attributes().flatten() {
-        if a.key.as_ref() == name {
+        if a.key.into_inner().as_bytes() == name {
             return a.normalized_value(XmlVersion::Explicit1_0).ok().map(|v| v.into_owned());
         }
     }

From f344cf4460be9916958c97639d8a1d1833e03c03 Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 08:50:32 +0200
Subject: [PATCH 03/13] engine: pass the query envelope by value to rstar 0.13

---
 crates/engine/src/spatial.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/engine/src/spatial.rs b/crates/engine/src/spatial.rs
index 98999b71f..ca15bd4c4 100644
--- a/crates/engine/src/spatial.rs
+++ b/crates/engine/src/spatial.rs
@@ -208,7 +208,7 @@ impl SpatialIndex {
         let pad = (b.width() + b.height()) * 1e-9 + (b.min.x.abs() + b.min.y.abs() + b.max.x.abs() + b.max.y.abs()) * 1e-12 + 1e-300;
         let env = AABB::from_corners([b.min.x - pad, b.min.y - pad], [b.max.x + pad, b.max.y + pad]);
         let mut out: Vec<u32> =
-            self.tree.locate_in_envelope_intersecting(&env).filter_map(|it| self.offsets.get(&it.data.0).map(|off| off + it.data.1)).collect();
+            self.tree.locate_in_envelope_intersecting(env).filter_map(|it| self.offsets.get(&it.data.0).map(|off| off + it.data.1)).collect();
         if with_infinite {
             out.extend_from_slice(&self.infinite);
         }

From 5648a06ac438c54fff1392f17d57448e83e31817 Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 09:14:51 +0200
Subject: [PATCH 04/13] Hold the egui crates at 0.36 until craft-ui moves to
 0.37 (craft-libs#199)

---
 Cargo.lock | 489 ++++++++++++++++++++---------------------------------
 Cargo.toml |   8 +-
 2 files changed, 192 insertions(+), 305 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f1bf96a72..e5076e82e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,11 +13,11 @@ dependencies = [
  "byteorder",
  "encoding_rs",
  "flate2",
- "foldhash 0.2.0",
+ "foldhash",
  "indexmap",
  "itoa",
  "memmap2",
- "nom 7.1.3",
+ "nom",
  "oem_cp",
  "once_cell",
  "rayon",
@@ -31,15 +31,6 @@ name = "accesskit"
 version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
-dependencies = [
- "uuid",
-]
-
-[[package]]
-name = "accesskit"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad442f58ee04714aaa0ba0a2768c1ea1935b29507bb22ddece8cbbc76db02932"
 dependencies = [
  "enumn",
  "serde",
@@ -48,51 +39,57 @@ dependencies = [
 
 [[package]]
 name = "accesskit_atspi_common"
-version = "0.21.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c182f9c282ac9c5638d876d551d15e5f7d397ec263349a0c6a2b61595dd5e4"
+checksum = "1e8c61bee90b42a772d39d06a740207dc71a4e780004ace1db8d99fb1baaa954"
 dependencies = [
- "accesskit 0.25.1",
- "accesskit_consumer",
+ "accesskit",
+ "accesskit_consumer 0.36.0",
  "atspi-common",
- "phf 0.14.0",
+ "phf 0.13.1",
  "serde",
  "zvariant",
 ]
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.39.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a45e2bb300bea6d5f33a82c3e051c3ddc6f41c209750f68a0acbe991a284344"
+checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10"
 dependencies = [
- "accesskit 0.25.1",
- "hashbrown 0.17.1",
+ "accesskit",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
-name = "accesskit_ios"
-version = "0.2.1"
+name = "accesskit_consumer"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28e539d64b27fd4c14de8f78ada8f7c944c092f52f7e49fb63316507a57f6937"
+checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
 dependencies = [
- "accesskit 0.25.1",
- "accesskit_consumer",
- "hashbrown 0.17.1",
- "objc2 0.5.3",
- "objc2-foundation 0.2.2",
- "objc2-ui-kit 0.2.2",
+ "accesskit",
+ "hashbrown 0.16.1",
+]
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245"
+dependencies = [
+ "accesskit",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.27.1"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5701624bf6a11efb6d4c8e922bf44126ed96250e5faa9a7a0468c979635839a4"
+checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
 dependencies = [
- "accesskit 0.25.1",
- "accesskit_consumer",
- "hashbrown 0.17.1",
+ "accesskit",
+ "accesskit_consumer 0.38.0",
+ "hashbrown 0.16.1",
  "objc2 0.5.3",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
@@ -100,11 +97,11 @@ dependencies = [
 
 [[package]]
 name = "accesskit_unix"
-version = "0.24.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202f24df034a7476d07b7f74284de84f6d62aabd858dbe7ee9cad3b7ad6f8f9d"
+checksum = "b016ca8db0ea0ea2ceff29a9d6240391492d960716aa471967c00e8cc8cb197c"
 dependencies = [
- "accesskit 0.25.1",
+ "accesskit",
  "accesskit_atspi_common",
  "async-channel",
  "async-executor",
@@ -118,13 +115,13 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.35.1"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce63f35d6bdcf59f26b76b3379063f738e6412cef46999cc772d46aa3de35adb"
+checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21"
 dependencies = [
- "accesskit 0.25.1",
- "accesskit_consumer",
- "hashbrown 0.17.1",
+ "accesskit",
+ "accesskit_consumer 0.35.0",
+ "hashbrown 0.16.1",
  "static_assertions",
  "windows",
  "windows-core",
@@ -132,12 +129,11 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.34.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee96dd150375c05912d8a473f98c2fb155fb3234fac88292d396548a2460fa77"
+checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313"
 dependencies = [
- "accesskit 0.25.1",
- "accesskit_ios",
+ "accesskit",
  "accesskit_macos",
  "accesskit_unix",
  "accesskit_windows",
@@ -228,7 +224,6 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "windows-sys 0.61.2",
- "wl-clipboard-rs",
  "x11rb",
 ]
 
@@ -560,7 +555,7 @@ dependencies = [
  "cadcraft-ui-egui",
  "chrono",
  "eframe",
- "egui 0.37.0",
+ "egui",
  "hidapi",
  "log",
  "muda",
@@ -725,7 +720,7 @@ dependencies = [
  "cadcraft-render",
  "chrono",
  "craft-ui",
- "egui 0.37.0",
+ "egui",
  "egui-wgpu",
  "egui_kittest",
  "image",
@@ -744,7 +739,7 @@ dependencies = [
  "cadcraft-io",
  "cadcraft-ui-egui",
  "eframe",
- "egui 0.37.0",
+ "egui",
  "log",
  "serde_json",
  "wasm-bindgen",
@@ -766,18 +761,42 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "calloop"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43b32313e937c8721c9d17ee9bf60699a6402b4b7c2cb6ac1bee0ffcaa4b4e5e"
+dependencies = [
+ "bitflags 2.13.2",
+ "polling",
+ "rustix 1.1.5",
+ "tracing",
+]
+
 [[package]]
 name = "calloop-wayland-source"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
 dependencies = [
- "calloop",
+ "calloop 0.13.0",
  "rustix 0.38.44",
  "wayland-backend",
  "wayland-client",
 ]
 
+[[package]]
+name = "calloop-wayland-source"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
+dependencies = [
+ "calloop 0.14.5",
+ "rustix 1.1.5",
+ "wayland-backend",
+ "wayland-client",
+]
+
 [[package]]
 name = "cc"
 version = "1.6.0"
@@ -934,7 +953,7 @@ name = "craft-ui"
 version = "0.1.0"
 source = "git+https://github.com/storytold/craft-libs?rev=5c874d51eeb3de70e735c8ce87a59a7dedd47675#5c874d51eeb3de70e735c8ce87a59a7dedd47675"
 dependencies = [
- "egui 0.36.2",
+ "egui",
  "serde",
 ]
 
@@ -1070,31 +1089,22 @@ name = "ecolor"
 version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0656a7530b9e2841ee7a5f983965bdd9840c32f4012f759cfd44b912cced6b34"
-dependencies = [
- "emath 0.36.2",
-]
-
-[[package]]
-name = "ecolor"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31bcbef0d4263a63eb32c4834e5d711613035ce1333468e107d928923e21e6e2"
 dependencies = [
  "bytemuck",
- "emath 0.37.0",
+ "emath",
  "serde",
 ]
 
 [[package]]
 name = "eframe"
-version = "0.37.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c5642501a65ca657d05f00c643a5c14ff2346cb3818032bfe23d58e1f8e5f84"
+checksum = "55ad41fac6e3149abb4866e93df37dbd33baa95db525c3368c944584e95a5dc2"
 dependencies = [
  "ahash",
  "bytemuck",
  "document-features",
- "egui 0.37.0",
+ "egui",
  "egui-wgpu",
  "egui-winit",
  "egui_glow",
@@ -1112,7 +1122,6 @@ dependencies = [
  "profiling",
  "raw-window-handle",
  "ron",
- "send_wrapper",
  "serde",
  "static_assertions",
  "wasm-bindgen",
@@ -1129,31 +1138,11 @@ version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc938cc27cd911415e1e4d151bc56ff9df063d8db081374e87aeb805ea74b2ba"
 dependencies = [
- "accesskit 0.24.1",
+ "accesskit",
  "ahash",
  "bitflags 2.13.2",
- "emath 0.36.2",
- "epaint 0.36.2",
- "itertools",
- "log",
- "nohash-hasher",
- "profiling",
- "smallvec",
- "unicode-segmentation",
- "web-sys",
-]
-
-[[package]]
-name = "egui"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec9144f49b7a28b5f395d3147e325b4fe3e77ba686eac11d1bdf0a7da3f375f"
-dependencies = [
- "accesskit 0.25.1",
- "ahash",
- "bitflags 2.13.2",
- "emath 0.37.0",
- "epaint 0.37.0",
+ "emath",
+ "epaint",
  "itertools",
  "log",
  "nohash-hasher",
@@ -1167,15 +1156,15 @@ dependencies = [
 
 [[package]]
 name = "egui-wgpu"
-version = "0.37.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0309cbe1febed48af5b974e4bcc424b35e9664863a4d402697147b57a488c864"
+checksum = "5cef1f6d1bba40b09a4d0d62cb822b81030922cfbf65c5373398c3a3caafc5bd"
 dependencies = [
  "ahash",
  "bytemuck",
  "document-features",
- "egui 0.37.0",
- "epaint 0.37.0",
+ "egui",
+ "epaint",
  "log",
  "profiling",
  "thiserror 2.0.21",
@@ -1187,37 +1176,35 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.37.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e449f4c4a2a60c7ccb4ba7fa4078417bfe1f9ddc03b5e05ce75748e33a70de"
+checksum = "98466000559d66ba4db786a30448b01483946add4188e7f10f522a27b4fb89cc"
 dependencies = [
  "accesskit_winit",
  "arboard",
- "block2 0.6.2",
  "bytemuck",
- "egui 0.37.0",
+ "egui",
  "log",
  "objc2 0.6.5",
- "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "objc2-ui-kit 0.3.2",
  "profiling",
  "raw-window-handle",
  "serde",
+ "smithay-clipboard",
  "web-time",
  "webbrowser",
- "windows-sys 0.61.2",
  "winit",
 ]
 
 [[package]]
 name = "egui_glow"
-version = "0.37.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9275ca5cc35a6b7c94e0e8cedf22542f66cb0cf45ed8ab2657c78ff49fec7268"
+checksum = "606ed4167daf341e5753d703285c4c1d562324b2c07aa8f405cd7d066fe58f3b"
 dependencies = [
  "bytemuck",
- "egui 0.37.0",
+ "egui",
  "glow",
  "log",
  "profiling",
@@ -1226,13 +1213,13 @@ dependencies = [
 
 [[package]]
 name = "egui_kittest"
-version = "0.37.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0979c2e37860fcf13a2bea77508607f067a9a6a84ba9bd47b5e298582fb59b86"
+checksum = "5eb3f3effb2726fee23449293e67acbf6cc6ce35525b1722bd5743bb348114d5"
 dependencies = [
  "dify",
  "eframe",
- "egui 0.37.0",
+ "egui",
  "egui-wgpu",
  "image",
  "kittest",
@@ -1256,12 +1243,6 @@ name = "emath"
 version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52c8d4141cf0f60fb2f7aefaf352d3ffa5171ef0ab09731c64391801e95e48f1"
-
-[[package]]
-name = "emath"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e73ce90f54750be8672c02be0743fe47530e6f251e066f0ee2869b59eb297af5"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1324,34 +1305,11 @@ name = "epaint"
 version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0ec0308dc23130fc1a7d4623a8534c2ed069c6dc84e258ee4f3de99615aa1a3"
-dependencies = [
- "ahash",
- "ecolor 0.36.2",
- "emath 0.36.2",
- "font-types",
- "harfrust 0.12.0",
- "log",
- "nohash-hasher",
- "parking_lot",
- "profiling",
- "self_cell",
- "skrifa 0.44.0",
- "smallvec",
- "unicode-general-category",
- "unicode-segmentation",
- "vello_cpu 0.1.0",
-]
-
-[[package]]
-name = "epaint"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97bac86ae3dde93fc3951e790951caea739ff39a6c89d909cdaf1d9278dbb1bd"
 dependencies = [
  "ahash",
  "bytemuck",
- "ecolor 0.37.0",
- "emath 0.37.0",
+ "ecolor",
+ "emath",
  "epaint_default_fonts",
  "font-types",
  "harfrust 0.12.0",
@@ -1364,16 +1322,15 @@ dependencies = [
  "skrifa 0.44.0",
  "smallvec",
  "unicode-general-category",
- "unicode-properties",
  "unicode-segmentation",
- "vello_cpu 0.2.0",
+ "vello_cpu",
 ]
 
 [[package]]
 name = "epaint_default_fonts"
-version = "0.37.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfc1cc505827f4c23eedc297975a0fd038268d41293f389dd8ff3b574aefab19"
+checksum = "773fa9c96dd0dbef887e39d0ed6177f141cce4d68e6041df77570aa3702dfa13"
 
 [[package]]
 name = "equivalent"
@@ -1459,12 +1416,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
 
-[[package]]
-name = "fixedbitset"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
-
 [[package]]
 name = "flate2"
 version = "1.1.10"
@@ -1482,12 +1433,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
 
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
 [[package]]
 name = "foldhash"
 version = "0.2.0"
@@ -1655,29 +1600,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a"
 dependencies = [
  "bytemuck",
- "foldhash 0.2.0",
+ "foldhash",
  "hashbrown 0.17.1",
  "log",
  "peniko",
  "skrifa 0.44.0",
  "smallvec",
- "vello_common 0.1.0",
-]
-
-[[package]]
-name = "glifo"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be"
-dependencies = [
- "bytemuck",
- "foldhash 0.2.0",
- "hashbrown 0.17.1",
- "log",
- "peniko",
- "skrifa 0.44.0",
- "smallvec",
- "vello_common 0.2.0",
+ "vello_common",
 ]
 
 [[package]]
@@ -1826,15 +1755,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash 0.1.5",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
@@ -1843,7 +1763,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
  "allocator-api2",
  "equivalent",
- "foldhash 0.2.0",
+ "foldhash",
 ]
 
 [[package]]
@@ -1852,7 +1772,7 @@ version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
- "foldhash 0.2.0",
+ "foldhash",
 ]
 
 [[package]]
@@ -2164,12 +2084,12 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kittest"
-version = "0.5.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb81a721ba76aa095b7f45deb180504f786904e56ca4b8e141f66eb89a78b75"
+checksum = "90ceaa75eb0036a32b6b9833962eb18137449e9817e2e586006471925b727fd5"
 dependencies = [
- "accesskit 0.25.1",
- "accesskit_consumer",
+ "accesskit",
+ "accesskit_consumer 0.35.0",
 ]
 
 [[package]]
@@ -2481,15 +2401,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nom"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2887,16 +2798,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "os_pipe"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2945,17 +2846,6 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
-[[package]]
-name = "petgraph"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
-dependencies = [
- "fixedbitset",
- "hashbrown 0.15.5",
- "indexmap",
-]
-
 [[package]]
 name = "phf"
 version = "0.11.3"
@@ -2967,33 +2857,33 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.14.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
  "phf_macros",
- "phf_shared 0.14.0",
+ "phf_shared 0.13.1",
  "serde",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.14.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
  "fastrand",
- "phf_shared 0.14.0",
+ "phf_shared 0.13.1",
 ]
 
 [[package]]
 name = "phf_macros"
-version = "0.14.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
  "phf_generator",
- "phf_shared 0.14.0",
+ "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
  "syn 2.0.119",
@@ -3010,9 +2900,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.14.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 dependencies = [
  "siphasher",
 ]
@@ -3281,7 +3171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4edc8db0d972de88e53a085b1f01fb3fbdae7bb0cb7a0ce2b2f8285a412fe3ef"
 dependencies = [
  "bytemuck",
- "foldhash 0.2.0",
+ "foldhash",
  "font-types",
  "once_cell",
  "yoke",
@@ -3464,12 +3354,6 @@ version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
-[[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
-
 [[package]]
 name = "serde"
 version = "1.0.229"
@@ -3628,8 +3512,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
  "bitflags 2.13.2",
- "calloop",
- "calloop-wayland-source",
+ "calloop 0.13.0",
+ "calloop-wayland-source 0.3.0",
  "cursor-icon",
  "libc",
  "log",
@@ -3646,6 +3530,44 @@ dependencies = [
  "xkeysym",
 ]
 
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
+dependencies = [
+ "bitflags 2.13.2",
+ "calloop 0.14.5",
+ "calloop-wayland-source 0.4.1",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2",
+ "rustix 1.1.5",
+ "thiserror 2.0.21",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-experimental",
+ "wayland-protocols-misc",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
+]
+
+[[package]]
+name = "smithay-clipboard"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71704c03f739f7745053bde45fa203a46c58d25bc5c4efba1d9a60e9dba81226"
+dependencies = [
+ "libc",
+ "smithay-client-toolkit 0.20.0",
+ "wayland-backend",
+]
+
 [[package]]
 name = "smol_str"
 version = "0.2.2"
@@ -3902,6 +3824,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -3927,17 +3850,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tree_magic_mini"
-version = "3.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
-dependencies = [
- "memchr",
- "nom 8.0.0",
- "petgraph",
-]
-
 [[package]]
 name = "type-map"
 version = "0.5.1"
@@ -3982,12 +3894,6 @@ version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
 
-[[package]]
-name = "unicode-properties"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.13.3"
@@ -4044,21 +3950,6 @@ dependencies = [
  "thiserror 2.0.21",
 ]
 
-[[package]]
-name = "vello_common"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb2141a2bca6e6d598e471fd4d1d7eed8e020aad6a28187edda07f091a325dd"
-dependencies = [
- "bytemuck",
- "fearless_simd",
- "guillotiere",
- "log",
- "peniko",
- "smallvec",
- "thiserror 2.0.21",
-]
-
 [[package]]
 name = "vello_cpu"
 version = "0.1.0"
@@ -4066,21 +3957,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea"
 dependencies = [
  "bytemuck",
- "glifo 0.2.0",
+ "glifo",
  "hashbrown 0.17.1",
- "vello_common 0.1.0",
-]
-
-[[package]]
-name = "vello_cpu"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace506ca414548966fcf3c283be94eb1cad8254de488791ee698bf438b0890a9"
-dependencies = [
- "bytemuck",
- "glifo 0.3.0",
- "hashbrown 0.17.1",
- "vello_common 0.2.0",
+ "vello_common",
 ]
 
 [[package]]
@@ -4224,6 +4103,32 @@ dependencies = [
  "wayland-scanner",
 ]
 
+[[package]]
+name = "wayland-protocols-experimental"
+version = "20250721.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
+dependencies = [
+ "bitflags 2.13.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-misc"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
+dependencies = [
+ "bitflags 2.13.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
 [[package]]
 name = "wayland-protocols-plasma"
 version = "0.3.12"
@@ -4720,7 +4625,7 @@ dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
  "bytemuck",
- "calloop",
+ "calloop 0.13.0",
  "cfg_aliases",
  "concurrent-queue",
  "core-foundation",
@@ -4741,7 +4646,7 @@ dependencies = [
  "raw-window-handle",
  "redox_syscall 0.4.1",
  "rustix 0.38.44",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
  "smol_str",
  "tracing",
  "unicode-segmentation",
@@ -4784,24 +4689,6 @@ version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
-[[package]]
-name = "wl-clipboard-rs"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d7888ccd4896447b2d14d3a9350a85df2aeb6f181e2e7a31349d104ac46cac1"
-dependencies = [
- "libc",
- "log",
- "os_pipe",
- "rustix 1.1.5",
- "thiserror 2.0.21",
- "tree_magic_mini",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "wayland-protocols-wlr",
-]
-
 [[package]]
 name = "writeable"
 version = "0.6.4"
diff --git a/Cargo.toml b/Cargo.toml
index 958318b38..a0aea6574 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,10 +51,10 @@ quick-xml = "0.42"
 
 # ui
 craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5c874d51eeb3de70e735c8ce87a59a7dedd47675", features = ["serde"] }
-egui = "0.37"
-egui_kittest = "0.37"
-eframe = { version = "0.37", default-features = false }
-egui-wgpu = "0.37"
+egui = "0.36"
+egui_kittest = "0.36"
+eframe = { version = "0.36", default-features = false }
+egui-wgpu = "0.36"
 rfd = "0.17"
 arboard = { version = "3.6", default-features = false }
 

From 9621dcbd9442606f640e489d664733c85a3e5679 Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 09:30:10 +0200
Subject: [PATCH 05/13] dwg: drop the dimension bit-0 inversion that acadrust
 0.6.5 now does itself

---
 crates/dwg/src/lib.rs | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/crates/dwg/src/lib.rs b/crates/dwg/src/lib.rs
index 273229247..f8a48f2a0 100644
--- a/crates/dwg/src/lib.rs
+++ b/crates/dwg/src/lib.rs
@@ -107,7 +107,6 @@ mod native {
         current_style_names(&mut doc);
         table_merges(&mut doc);
         table_style_rows(&mut doc, false);
-        dimension_flags(&mut doc, false);
         let orphans = drop_orphaned_dgn_components(&mut doc);
         if orphans > 0 {
             let (s, were) = if orphans == 1 { ("", "was") } else { ("s", "were") };
@@ -291,24 +290,14 @@ mod native {
         }
     }
 
-    /// The DWG dimension flags byte. Its bit 0 is the opposite of DXF group 70's bit 128 (set: the
-    /// text is at its default position) and its bit 1 is group 70's bit 32 (ODA DWG
-    /// specification, common dimension data), while acadrust 0.6.4 reads and writes bit 0 as
-    /// `text_user_positioned` itself and keeps no bit 32 from DXF. Without this, every dimension
-    /// of a DWG CADCraft writes is user-positioned for AutoCAD (#1094), and every dimension of an
-    /// AutoCAD DWG is read as user-positioned. `to_dwg` sets the fields up for the writer:
-    /// bit 32 as CADCraft's DXF writer always sets it, and bit 0 through the inverted field;
-    /// otherwise the field is read from bit 0 after a DWG is read.
-    fn dimension_flags(doc: &mut acadrust::CadDocument, to_dwg: bool) {
+    /// The DWG dimension flags byte. Its bit 1 is DXF group 70's bit 32 (ODA DWG specification,
+    /// common dimension data), which acadrust keeps no copy of from DXF: it is set here as
+    /// CADCraft's DXF writer always sets it (#1094). Bit 0, the opposite of group 70's bit 128,
+    /// acadrust 0.6.5 reads and writes itself.
+    fn dimension_flags(doc: &mut acadrust::CadDocument) {
         for e in doc.entities_mut() {
             let acadrust::entities::EntityType::Dimension(d) = e else { continue };
-            let b = d.base_mut();
-            if to_dwg {
-                b.dwg_flags_byte |= 0x02;
-                b.text_user_positioned = !b.text_user_positioned;
-            } else {
-                b.text_user_positioned = b.dwg_flags_byte & 0x01 == 0;
-            }
+            d.base_mut().dwg_flags_byte |= 0x02;
         }
     }
 
@@ -549,7 +538,7 @@ mod native {
         }
         other_layout_owners(&mut doc);
         table_style_rows(&mut doc, true);
-        dimension_flags(&mut doc, true);
+        dimension_flags(&mut doc);
         drop_unwritable(&mut doc);
         current_dimstyle(&mut doc);
         current_text_style(&mut doc);

From 51db2d52e417578159bdbd0c1820e2d7a905ba2a Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 09:49:38 +0200
Subject: [PATCH 06/13] dependabot: leave the egui crates at 0.36 until
 craft-ui moves to 0.37 (craft-libs#199)

---
 .github/dependabot.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2c4b8cb1a..093325ba7 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,6 +14,17 @@ updates:
           - "*"
     commit-message:
       prefix: "chore(deps)"
+    # craft-ui is still on egui 0.36, and two eguis in the graph don't build (#1990). Remove this
+    # once craft-ui moves to egui 0.37 (storytold/craft-libs#199).
+    ignore:
+      - dependency-name: "egui"
+        versions: [">=0.37"]
+      - dependency-name: "eframe"
+        versions: [">=0.37"]
+      - dependency-name: "egui-wgpu"
+        versions: [">=0.37"]
+      - dependency-name: "egui_kittest"
+        versions: [">=0.37"]
 
   # Maintain GitHub Actions workflows
   - package-ecosystem: "github-actions"

From 251fddb658a606cd950573fe576bd9894f41c429 Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 09:49:38 +0200
Subject: [PATCH 07/13] fonts: harfrust comment names both versions; the
 advance check skips fonts at 1000 per em

---
 Cargo.toml                  | 4 ++--
 crates/fonts/src/complex.rs | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a0aea6574..cabb8a06c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,8 +40,8 @@ rayon = "1"
 tiny-skia = { version = "0.12", default-features = false, features = ["std", "simd", "png-format"] }
 lyon_tessellation = "1.0.22"
 skrifa = "0.48"
-# Text shaping (OpenType GSUB/GPOS, HarfBuzz port on read-fonts; the version egui's epaint uses)
-# and the Unicode Bidirectional Algorithm for right-to-left drawing text.
+# Text shaping (OpenType GSUB/GPOS, HarfBuzz port on read-fonts; egui's epaint is still on 0.12,
+# so the graph has both) and the Unicode Bidirectional Algorithm for right-to-left drawing text.
 harfrust = "0.14"
 unicode-bidi = "0.3.18"
 image = { version = "0.25", default-features = false, features = ["png", "jpeg"] }
diff --git a/crates/fonts/src/complex.rs b/crates/fonts/src/complex.rs
index 1d76f813e..dafabdc7c 100644
--- a/crates/fonts/src/complex.rs
+++ b/crates/fonts/src/complex.rs
@@ -310,8 +310,13 @@ mod tests {
         assert_eq!(gids.len(), 2, "{gids:?}");
         assert!(gids.first() != Some(&ka) && gids.last() == Some(&ka), "vowel sign before ka: {gids:?}");
         assert!(gs.iter().all(|g| g.cluster == 2), "{:?}", gs.iter().map(|g| g.cluster).collect::<Vec<_>>());
-        // Advances come out at 1000 units per em, whatever the font's own em.
-        let hmtx = face.font().and_then(|f| f.glyph_metrics(Size::new(1000.0), LocationRef::default()).advance_width(skrifa::GlyphId::new(ka)));
+        // Advances come out at 1000 units per em, whatever the font's own em. A font that is
+        // already at 1000 per em could not tell a missing scale apart, so it checks nothing here.
+        let Some(font) = face.font() else { return };
+        if font.metrics(Size::unscaled(), LocationRef::default()).units_per_em == 1000 {
+            return;
+        }
+        let hmtx = font.glyph_metrics(Size::new(1000.0), LocationRef::default()).advance_width(skrifa::GlyphId::new(ka));
         let adv = gs.last().map(|g| g.advance);
         assert!(matches!((adv, hmtx), (Some(a), Some(h)) if (a - f64::from(h)).abs() < 1e-3), "{adv:?} vs {hmtx:?}");
     }

From 8ad9a3ce158a983c5aa4146a5503ddca81bb54f5 Mon Sep 17 00:00:00 2001
From: Marco Arnulfo <marcoarnulfo1@gmail.com>
Date: Fri, 23 Oct 2026 14:54:19 +0200
Subject: [PATCH 08/13] dwg: require acadrust 0.6.5, the first version that
 inverts dimension bit 0 itself

---
 crates/dwg/Cargo.toml | 2 +-
 crates/io/Cargo.toml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/dwg/Cargo.toml b/crates/dwg/Cargo.toml
index 398df0a35..a409e5b90 100644
--- a/crates/dwg/Cargo.toml
+++ b/crates/dwg/Cargo.toml
@@ -10,4 +10,4 @@ workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 # MPL-2.0: used as an unmodified dependency only (see plan/adr/0001 and NOTICE).
-acadrust = "0.6.4"
+acadrust = "0.6.5"
diff --git a/crates/io/Cargo.toml b/crates/io/Cargo.toml
index b056603c1..395ec4966 100644
--- a/crates/io/Cargo.toml
+++ b/crates/io/Cargo.toml
@@ -24,5 +24,5 @@ quick-xml = { workspace = true }
 
 [dev-dependencies]
 # Reads CADCraft's DWG output as written (tests only; the same version as cadcraft-dwg's).
-acadrust = "0.6.4"
+acadrust = "0.6.5"
 tiny-skia = { workspace = true }

From 78decf80f79ead81870e4826c51b765779d90aef Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Fri, 23 Oct 2026 11:16:34 -0400
Subject: [PATCH 09/13] web: allow browser zoom in the viewport meta
 (SonarCloud Web:S7926) (#1974)

user-scalable=no stops people with low vision from zooming the page. The
canvas keeps its own pinch/pan handling: eframe already prevent_default()s
touch and gesture events on the canvas, so dropping the flag only restores
browser zoom (and accessibility zoom) outside of the app's gestures.
---
 apps/cadcraft-web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/cadcraft-web/index.html b/apps/cadcraft-web/index.html
index c8e2e9603..6cd4ab971 100644
--- a/apps/cadcraft-web/index.html
+++ b/apps/cadcraft-web/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>CADCraft</title>
   <link data-trunk rel="rust" data-bin="cadcraft-web" data-wasm-opt="z" data-weak-refs />
   <style>

From f043540d13dac03ce895a96c78a8349f3e40bd5b Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Fri, 23 Oct 2026 11:16:40 -0400
Subject: [PATCH 10/13] packaging: use [[ ]] tests, named locals and explicit
 returns in shell scripts (SonarCloud S7688/S7679/S7682) (#1972)

All flagged scripts run under bash (shebang or '# shellcheck shell=bash'), so
[[ ]] is safe. Positional parameters in helper functions are copied into named
locals, and helper functions end with a bare 'return', which keeps the exit
status of the last command (no behaviour change, notably for sha256 under
pipefail). packaging/linux/postinst.sh is POSIX sh and is left alone.
---
 packaging/env.sh                  | 19 ++++++++++++-------
 packaging/icons.sh                |  5 ++++-
 packaging/linux/flatpak-bundle.sh |  8 ++++----
 packaging/linux/package.sh        | 18 +++++++++---------
 packaging/macos/import-cert.sh    |  6 +++---
 packaging/macos/package.sh        | 22 +++++++++++-----------
 packaging/web/package.sh          |  4 ++--
 7 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/packaging/env.sh b/packaging/env.sh
index e70334801..ab01ce4c5 100644
--- a/packaging/env.sh
+++ b/packaging/env.sh
@@ -19,10 +19,11 @@ workspace_version() {
     /^\[/ { in_pkg = ($0 == "[workspace.package]") ; next }
     in_pkg && $1 == "version" { gsub(/[" ]/, "", $3); print $3; exit }
   ' "$ROOT/Cargo.toml"
+  return
 }
 
 VERSION="${CADCRAFT_VERSION:-$(workspace_version)}"
-if [ -z "$VERSION" ]; then
+if [[ -z "$VERSION" ]]; then
   echo "error: could not read [workspace.package] version from $ROOT/Cargo.toml" >&2
   exit 1
 fi
@@ -32,7 +33,7 @@ DIST="${DIST:-$ROOT/dist/release}"
 mkdir -p "$DIST"
 export DIST
 
-if [ -z "${CADCRAFT_BUILD_SHA:-}" ]; then
+if [[ -z "${CADCRAFT_BUILD_SHA:-}" ]]; then
   CADCRAFT_BUILD_SHA="$(git -C "$ROOT" rev-parse HEAD 2>/dev/null || true)"
 fi
 export CADCRAFT_BUILD_SHA
@@ -41,29 +42,33 @@ export CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-$ROOT/target}"
 
 # Emit a GitHub Actions warning (plain stderr outside Actions).
 warn() {
-  if [ -n "${GITHUB_ACTIONS:-}" ]; then echo "::warning::$*"; else echo "warning: $*" >&2; fi
+  if [[ -n "${GITHUB_ACTIONS:-}" ]]; then echo "::warning::$*"; else echo "warning: $*" >&2; fi
+  return
 }
 
 # Copy licence and readme files that exist into a package directory.
 copy_docs() {
   local dest="$1" f
   for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT; do
-    if [ -f "$ROOT/$f" ]; then cp "$ROOT/$f" "$dest/"; fi
+    if [[ -f "$ROOT/$f" ]]; then cp "$ROOT/$f" "$dest/"; fi
   done
   copy_font_licences "$dest"
+  return
 }
 
 # Builds made with craft-fonts (CRAFT_FONTS_DIR, set by the release workflow) embed its fonts, so
 # the package carries their licences as OFL-<family-dir>.txt. Nothing without CRAFT_FONTS_DIR.
 copy_font_licences() {
   local dest="$1" f
-  [ -n "${CRAFT_FONTS_DIR:-}" ] || return 0
+  [[ -n "${CRAFT_FONTS_DIR:-}" ]] || return 0
   for f in "$CRAFT_FONTS_DIR"/fonts/*/OFL.txt; do
-    if [ -f "$f" ]; then cp "$f" "$dest/OFL-$(basename "$(dirname "$f")").txt"; fi
+    if [[ -f "$f" ]]; then cp "$f" "$dest/OFL-$(basename "$(dirname "$f")").txt"; fi
   done
 }
 
 # Portable SHA-256 of a file (prints just the hash).
 sha256() {
-  if command -v sha256sum >/dev/null; then sha256sum "$1" | cut -d' ' -f1; else shasum -a 256 "$1" | cut -d' ' -f1; fi
+  local file="$1"
+  if command -v sha256sum >/dev/null; then sha256sum "$file" | cut -d' ' -f1; else shasum -a 256 "$file" | cut -d' ' -f1; fi
+  return
 }
diff --git a/packaging/icons.sh b/packaging/icons.sh
index 3cb8ea733..d19aa44d4 100755
--- a/packaging/icons.sh
+++ b/packaging/icons.sh
@@ -12,7 +12,10 @@ TMP="$(mktemp -d)"
 trap 'rm -rf "$TMP"' EXIT
 command -v sips >/dev/null || { echo "error: sips not found (macOS only)" >&2; exit 1; }
 
-resize() { sips -s format png -z "$2" "$2" "$1" --out "$3" >/dev/null; }
+resize() {
+  local src="$1" size="$2" out="$3"
+  sips -s format png -z "$size" "$size" "$src" --out "$out" >/dev/null
+}
 
 for s in 16 24 32 48 64 128 256 512; do
   mkdir -p "$DIR/hicolor/${s}x${s}/apps"
diff --git a/packaging/linux/flatpak-bundle.sh b/packaging/linux/flatpak-bundle.sh
index 9baccf92c..5154fe076 100755
--- a/packaging/linux/flatpak-bundle.sh
+++ b/packaging/linux/flatpak-bundle.sh
@@ -21,7 +21,7 @@ FLATHUB=https://dl.flathub.org/repo/flathub.flatpakrepo
 
 TEST=1
 TARBALL=""
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --no-test) TEST=0; shift ;;
     -h | --help) sed -n '2,14p' "$0"; exit 0 ;;
@@ -38,7 +38,7 @@ case "$ARCH" in
 esac
 BASENAME="cadcraft-$VERSION-linux-$ARCH"
 TARBALL="${TARBALL:-$DIST/$BASENAME.tar.gz}"
-[ -f "$TARBALL" ] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }
+[[ -f "$TARBALL" ]] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }
 for tool in flatpak flatpak-builder; do
   command -v "$tool" >/dev/null || { echo "error: $tool not found (apt install flatpak flatpak-builder librsvg2-common)" >&2; exit 1; }
 done
@@ -49,7 +49,7 @@ WORK="$CARGO_TARGET_DIR/flatpak-bundle"
 rm -rf "$WORK"
 mkdir -p "$WORK/stage"
 tar -xzf "$TARBALL" -C "$WORK/stage" --strip-components=1
-[ -x "$WORK/stage/bin/cadcraft" ] || { echo "error: $TARBALL has no bin/cadcraft" >&2; exit 1; }
+[[ -x "$WORK/stage/bin/cadcraft" ]] || { echo "error: $TARBALL has no bin/cadcraft" >&2; exit 1; }
 cp "$HERE/flatpak/$APP_ID.bundle.yml" "$WORK/$APP_ID.yml"
 
 flatpak remote-add --user --if-not-exists flathub "$FLATHUB"
@@ -62,7 +62,7 @@ OUT="$DIST/$BASENAME.flatpak"
 flatpak build-bundle --runtime-repo="$FLATHUB" "$WORK/repo" "$OUT" "$APP_ID" stable
 echo "wrote $OUT"
 
-if [ "$TEST" = 1 ]; then
+if [[ "$TEST" = 1 ]]; then
   flatpak install --user -y --noninteractive --reinstall "$OUT"
   flatpak info --user "$APP_ID"
   flatpak run --command=cadcraft-cli "$APP_ID" --version
diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh
index d6fa10b9d..36b69cecb 100755
--- a/packaging/linux/package.sh
+++ b/packaging/linux/package.sh
@@ -21,7 +21,7 @@ APP_ID=ai.storyteller.cadcraft
 
 SKIP_BUILD=0
 FORMATS="appimage deb rpm tar"
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --skip-build) SKIP_BUILD=1; shift ;;
     --formats) FORMATS="$2"; shift 2 ;;
@@ -44,8 +44,8 @@ BASENAME="cadcraft-$VERSION-linux-$ARCH"
 
 echo "==> CADCraft $VERSION for Linux $ARCH ($FORMATS)"
 
-if [ "$SKIP_BUILD" = 0 ]; then
-  if [ -n "${CROSS_TARGET:-}" ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
+  if [[ -n "${CROSS_TARGET:-}" ]]; then
     (cd "$ROOT" && cargo build --release --locked -p cadcraft -p cadcraft-cli --target "$CROSS_TARGET")
   else
     (cd "$ROOT" && cargo build --release --locked -p cadcraft -p cadcraft-cli)
@@ -77,7 +77,7 @@ if command -v appstreamcli >/dev/null; then
   appstreamcli validate --no-net --explain "$STAGE/usr/share/metainfo/$APP_ID.metainfo.xml"
 fi
 
-has() { case " $FORMATS " in *" $1 "*) return 0 ;; *) return 1 ;; esac; }
+has() { local format="$1"; case " $FORMATS " in *" $format "*) return 0 ;; *) return 1 ;; esac; }
 
 # ---- .tar.gz ------------------------------------------------------------------------------------
 if has tar; then
@@ -110,9 +110,9 @@ if has appimage; then
   ln -s "$APP_ID.png" "$APPDIR/.DirIcon"
 
   TOOL="${APPIMAGETOOL:-$(command -v appimagetool || true)}"
-  if [ -z "$TOOL" ]; then
+  if [[ -z "$TOOL" ]]; then
     TOOL="$CARGO_TARGET_DIR/appimagetool-$ARCH.AppImage"
-    if [ ! -x "$TOOL" ]; then
+    if [[ ! -x "$TOOL" ]]; then
       curl --proto '=https' -fsSL -o "$TOOL" "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$ARCH.AppImage"
       chmod +x "$TOOL"
     fi
@@ -135,16 +135,16 @@ if has appimage; then
   # package) appimagetool also writes the .zsync, into its working directory, hence the cd.
   (cd "$DIST" && ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream -u "$UPDATE_INFO" "$APPDIR" "$OUT")
   echo "wrote $OUT"
-  if [ -s "$OUT.zsync" ]; then
+  if [[ -s "$OUT.zsync" ]]; then
     echo "wrote $OUT.zsync"
   else
     warn "zsyncmake not found, so $OUT.zsync was not written; AppImage delta updates need it"
   fi
 fi
 
-if [ -z "${CROSS_TARGET:-}" ]; then
+if [[ -z "${CROSS_TARGET:-}" ]]; then
   "$STAGE/usr/bin/cadcraft-cli" --version
-elif [ -n "${EMULATOR:-}" ]; then
+elif [[ -n "${EMULATOR:-}" ]]; then
   "$EMULATOR" "$STAGE/usr/bin/cadcraft-cli" --version
 fi
 echo "==> done"
diff --git a/packaging/macos/import-cert.sh b/packaging/macos/import-cert.sh
index 16bb38b52..b1fa71435 100755
--- a/packaging/macos/import-cert.sh
+++ b/packaging/macos/import-cert.sh
@@ -12,7 +12,7 @@ umask 077
 # shellcheck source=../env.sh
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
 
-if [ -z "${APPLE_CERTIFICATE:-}" ]; then
+if [[ -z "${APPLE_CERTIFICATE:-}" ]]; then
   warn "APPLE_CERTIFICATE is not set: macOS builds will be ad-hoc signed and not notarized"
   exit 0
 fi
@@ -41,13 +41,13 @@ security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KC_PASS"
 security list-keychains -d user -s "$KEYCHAIN" $(security list-keychains -d user | tr -d '"')
 
 IDENTITY="$(security find-identity -v -p codesigning "$KEYCHAIN" | awk '/Developer ID Application/ { print $2; exit }')"
-if [ -z "$IDENTITY" ]; then
+if [[ -z "$IDENTITY" ]]; then
   security find-identity -v -p codesigning "$KEYCHAIN" >&2
   echo "error: no 'Developer ID Application' identity in APPLE_CERTIFICATE" >&2
   exit 1
 fi
 echo "Imported signing identity $IDENTITY"
-if [ -n "${GITHUB_ENV:-}" ]; then
+if [[ -n "${GITHUB_ENV:-}" ]]; then
   { echo "MACOS_SIGN_IDENTITY=$IDENTITY"; echo "MACOS_KEYCHAIN=$KEYCHAIN"; } >>"$GITHUB_ENV"
 else
   echo "MACOS_SIGN_IDENTITY=$IDENTITY"
diff --git a/packaging/macos/package.sh b/packaging/macos/package.sh
index 203dc20dc..fd626fbf4 100755
--- a/packaging/macos/package.sh
+++ b/packaging/macos/package.sh
@@ -19,7 +19,7 @@ HERE="$ROOT/packaging/macos"
 
 ARCH=universal
 SKIP_BUILD=0
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --arch) ARCH="$2"; shift 2 ;;
     --skip-build) SKIP_BUILD=1; shift ;;
@@ -44,9 +44,9 @@ DMG="$DIST/cadcraft-$VERSION-macos-$ARCH.dmg"
 CLI_ZIP="$DIST/cadcraft-cli-$VERSION-macos-$ARCH.zip"
 
 NOTARIZE=0
-if [ "$IDENTITY" = "-" ]; then
+if [[ "$IDENTITY" = "-" ]]; then
   warn "macOS: ad-hoc signing (no MACOS_SIGN_IDENTITY); artifacts are not notarized"
-elif [ -n "${APPLE_ID:-}" ] && [ -n "${APPLE_PASSWORD:-}" ] && [ -n "${APPLE_TEAM_ID:-}" ]; then
+elif [[ -n "${APPLE_ID:-}" ]] && [[ -n "${APPLE_PASSWORD:-}" ]] && [[ -n "${APPLE_TEAM_ID:-}" ]]; then
   NOTARIZE=1
 else
   warn "macOS: APPLE_ID / APPLE_PASSWORD / APPLE_TEAM_ID incomplete; signed but not notarized"
@@ -55,7 +55,7 @@ fi
 echo "==> CADCraft $VERSION for macOS ($ARCH), identity: $IDENTITY, notarize: $NOTARIZE"
 
 # ---- build -------------------------------------------------------------------------------------
-if [ "$SKIP_BUILD" = 0 ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
   args=()
   for t in "${TARGETS[@]}"; do args+=(--target "$t"); done
   (cd "$ROOT" && cargo build --release --locked -p cadcraft -p cadcraft-cli "${args[@]}")
@@ -74,9 +74,9 @@ done
 sign() {
   # Hardened runtime + secure timestamp for a real identity; ad-hoc can't be timestamped.
   local ts=(--timestamp)
-  [ "$IDENTITY" = "-" ] && ts=(--timestamp=none)
+  [[ "$IDENTITY" = "-" ]] && ts=(--timestamp=none)
   local kc=()
-  [ -n "${MACOS_KEYCHAIN:-}" ] && kc=(--keychain "$MACOS_KEYCHAIN")
+  [[ -n "${MACOS_KEYCHAIN:-}" ]] && kc=(--keychain "$MACOS_KEYCHAIN")
   codesign --force --sign "$IDENTITY" ${kc[@]+"${kc[@]}"} "${ts[@]}" "$@"
 }
 
@@ -88,8 +88,8 @@ notarize() {
   echo "$out"
   id="$(printf '%s' "$out" | plutil -extract id raw -o - - 2>/dev/null || true)"
   status="$(printf '%s' "$out" | plutil -extract status raw -o - - 2>/dev/null || true)"
-  if [ "$status" != "Accepted" ]; then
-    if [ -n "$id" ]; then
+  if [[ "$status" != "Accepted" ]]; then
+    if [[ -n "$id" ]]; then
       xcrun notarytool log "$id" --apple-id "$APPLE_ID" --password "$APPLE_PASSWORD" --team-id "$APPLE_TEAM_ID" || true
     fi
     echo "error: notarization of $(basename "$file") failed (status: ${status:-unknown})" >&2
@@ -117,7 +117,7 @@ sign --options runtime --entitlements "$HERE/entitlements.plist" "$APP/Contents/
 sign --options runtime --entitlements "$HERE/entitlements.plist" "$APP"
 codesign --verify --strict --deep --verbose=2 "$APP"
 
-if [ "$NOTARIZE" = 1 ]; then
+if [[ "$NOTARIZE" = 1 ]]; then
   ditto -c -k --keepParent "$APP" "$WORK/CADCraft-notarize.zip"
   notarize "$WORK/CADCraft-notarize.zip"
   xcrun stapler staple "$APP"
@@ -144,7 +144,7 @@ hdiutil convert "$WORK/raw.dmg" -format UDZO -imagekey zlib-level=9 -o "$DMG"
 rm -f "$WORK/raw.dmg"
 sign "$DMG"
 codesign --verify --strict --verbose=2 "$DMG"
-if [ "$NOTARIZE" = 1 ]; then
+if [[ "$NOTARIZE" = 1 ]]; then
   notarize "$DMG"
   xcrun stapler staple "$DMG"
   xcrun stapler validate "$DMG"
@@ -162,7 +162,7 @@ codesign --verify --strict --verbose=2 "$CLI_DIR/cadcraft-cli"
 rm -f "$CLI_ZIP"
 ditto -c -k --keepParent "$CLI_DIR" "$CLI_ZIP"
 # A bare Mach-O can't carry a stapled ticket; Gatekeeper looks the notarization up online.
-if [ "$NOTARIZE" = 1 ]; then notarize "$CLI_ZIP"; fi
+if [[ "$NOTARIZE" = 1 ]]; then notarize "$CLI_ZIP"; fi
 
 "$WORK/bin/cadcraft-cli" --version
 echo "==> done"
diff --git a/packaging/web/package.sh b/packaging/web/package.sh
index 7caa88ed0..6091bf5ee 100755
--- a/packaging/web/package.sh
+++ b/packaging/web/package.sh
@@ -11,13 +11,13 @@ set -euo pipefail
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
 HERE="$ROOT/packaging/web"
 
-if [ "${1:-}" != "--skip-build" ]; then
+if [[ "${1:-}" != "--skip-build" ]]; then
   command -v trunk >/dev/null || { echo "error: trunk not found (cargo install trunk --locked)" >&2; exit 1; }
   (cd "$ROOT/apps/cadcraft-web" && trunk build --release)
 fi
 
 SITE="$ROOT/dist/web"
-[ -f "$SITE/index.html" ] || { echo "error: $SITE/index.html missing; run without --skip-build" >&2; exit 1; }
+[[ -f "$SITE/index.html" ]] || { echo "error: $SITE/index.html missing; run without --skip-build" >&2; exit 1; }
 # Paths must be relative so the site works under any prefix (public_url = "./" in Trunk.toml).
 if grep -Eq '(src|href)="/[^/]' "$SITE/index.html"; then
   echo "error: $SITE/index.html has root-absolute URLs; it would break when served from a sub-path" >&2

From 9cf115e808b9a76a0bdf742c72e51ead251c3eb1 Mon Sep 17 00:00:00 2001
From: aiongg <67543387+aiongg@users.noreply.github.com>
Date: Fri, 23 Oct 2026 13:34:26 -0400
Subject: [PATCH 11/13] CI: one test binary per crate, nextest, line tables
 only (#1989)

* Build: line tables only in dev, no debug info for dependencies

* Tests: one integration-test binary per crate

Each crate's tests/*.rs becomes a module of tests/it/main.rs. Files that
install process-wide state (the file io hooks, user aliases, SAVETIME and
SAVEFILEPATH, user linetype and pattern files, registered fonts) stay their
own test binaries.

* xtask ci: nextest, tests without examples, one wasm check call
---
 Cargo.toml                                    |   2 +
 apps/cadcraft-cli/tests/{ => it}/cli.rs       |   0
 .../tests/{ => it}/drafting_spacing.rs        |   0
 apps/cadcraft-cli/tests/{ => it}/help.rs      |   0
 apps/cadcraft-cli/tests/it/main.rs            |   6 +
 .../tests/{ => it}/mcp_connect.rs             |   0
 .../tests/{ => it}/skipped_records.rs         |   0
 .../tests/{ => it}/undrawn_entities.rs        |   0
 crates/doc/tests/{ => it}/lin_pat_parse.rs    |   0
 crates/doc/tests/it/main.rs                   |   2 +
 .../doc/tests/{ => it}/sub_segment_alias.rs   |   0
 crates/engine/tests/{ => it}/angle_prompts.rs |   0
 .../engine/tests/{ => it}/angle_settings.rs   |   0
 .../engine/tests/{ => it}/annotate_options.rs |   0
 crates/engine/tests/{ => it}/annotative.rs    |   0
 .../tests/{ => it}/arc_ctrl_direction.rs      |   0
 .../engine/tests/{ => it}/array_commands.rs   |   0
 crates/engine/tests/{ => it}/assoc_array.rs   |   0
 .../engine/tests/{ => it}/attdisp_attsync.rs  |   0
 .../engine/tests/{ => it}/attedit_prompts.rs  |   0
 crates/engine/tests/{ => it}/attrib_modes.rs  |   0
 crates/engine/tests/{ => it}/attrib_props.rs  |   0
 .../engine/tests/{ => it}/attribute_tools.rs  |   0
 crates/engine/tests/{ => it}/block_keep.rs    |   0
 .../engine/tests/{ => it}/block_redefine.rs   |   0
 .../tests/{ => it}/break_closed_polyline.rs   |   0
 .../{ => it}/break_join_locked_layers.rs      |   0
 crates/engine/tests/{ => it}/break_keeps_z.rs |   0
 crates/engine/tests/{ => it}/burst.rs         |   0
 .../tests/{ => it}/constraint_geometry.rs     |   0
 .../engine/tests/{ => it}/constraint_infer.rs |   0
 crates/engine/tests/{ => it}/count.rs         |   0
 crates/engine/tests/{ => it}/dash_block.rs    |   0
 .../engine/tests/{ => it}/data_extraction.rs  |   0
 .../tests/{ => it}/dim_baseline_spacing.rs    |   0
 crates/engine/tests/{ => it}/dim_chain.rs     |   0
 crates/engine/tests/{ => it}/dim_commands.rs  |   0
 .../engine/tests/{ => it}/dim_explode_text.rs |   0
 .../engine/tests/{ => it}/dim_properties.rs   |   0
 .../tests/{ => it}/dim_radial_inside.rs       |   0
 .../tests/{ => it}/dim_radial_outside.rs      |   0
 crates/engine/tests/{ => it}/dim_vars.rs      |   0
 .../engine/tests/{ => it}/dimtedit_prompts.rs |   0
 .../engine/tests/{ => it}/drafting_spacing.rs |   0
 crates/engine/tests/{ => it}/draw_prompts.rs  |   0
 crates/engine/tests/{ => it}/draworder.rs     |   0
 crates/engine/tests/{ => it}/dyn_input.rs     |   0
 .../tests/{ => it}/dynamic_block_data.rs      |   0
 crates/engine/tests/{ => it}/dynamic_grips.rs |   2 +-
 .../engine/tests/{ => it}/fillet_chamfer.rs   |   0
 .../engine/tests/{ => it}/fix_holds_grips.rs  |   0
 crates/engine/tests/{ => it}/followups_626.rs |   0
 .../engine/tests/{ => it}/grip_dim_input.rs   |   0
 crates/engine/tests/{ => it}/grip_options.rs  |   0
 .../engine/tests/{ => it}/grip_selection.rs   |   0
 .../engine/tests/{ => it}/group_selection.rs  |   0
 crates/engine/tests/{ => it}/groups.rs        |   0
 crates/engine/tests/{ => it}/hatch_assoc.rs   |   0
 .../tests/{ => it}/hatch_dialog_helpers.rs    |   0
 .../{ => it}/hatch_numeric_validation.rs      |   0
 crates/engine/tests/{ => it}/hatch_options.rs |   0
 crates/engine/tests/{ => it}/helix.rs         |   0
 .../engine/tests/{ => it}/inquiry_keywords.rs |   0
 crates/engine/tests/{ => it}/inquiry_z.rs     |   0
 .../engine/tests/{ => it}/insert_prompts.rs   |   0
 crates/engine/tests/{ => it}/isometric.rs     |   0
 crates/engine/tests/{ => it}/join_close.rs    |   0
 .../tests/{ => it}/json_param_validation.rs   |   0
 crates/engine/tests/{ => it}/layer_cmdline.rs |   0
 .../tests/{ => it}/layer_merge_delete.rs      |   0
 crates/engine/tests/{ => it}/layoff_repeat.rs |   0
 .../engine/tests/{ => it}/layout_prompts.rs   |   0
 crates/engine/tests/{ => it}/lisp_corpus.rs   |   1 -
 crates/engine/tests/it/main.rs                | 143 ++++++++++++++++++
 .../tests/{ => it}/malformed_handles.rs       |   0
 crates/engine/tests/{ => it}/matchprop.rs     |   0
 .../{ => it}/measure_distance_snapping.rs     |   0
 .../engine/tests/{ => it}/metric_linetypes.rs |   0
 .../engine/tests/{ => it}/mleader_content.rs  |   0
 .../engine/tests/{ => it}/mleader_remember.rs |   0
 crates/engine/tests/{ => it}/mline.rs         |   0
 crates/engine/tests/{ => it}/mocoro.rs        |   0
 crates/engine/tests/{ => it}/modify_curves.rs |   0
 crates/engine/tests/{ => it}/mtext_columns.rs |   0
 crates/engine/tests/{ => it}/mtext_options.rs |   0
 .../tests/{ => it}/multiline_attributes.rs    |   0
 crates/engine/tests/{ => it}/named_views.rs   |   0
 .../engine/tests/{ => it}/non_finite_edits.rs |   0
 .../tests/{ => it}/offset_closed_spline.rs    |   0
 .../tests/{ => it}/offset_ellipse_side.rs     |   0
 crates/engine/tests/{ => it}/offset_move.rs   |   0
 .../engine/tests/{ => it}/options_profile.rs  |   0
 crates/engine/tests/{ => it}/overkill.rs      |   0
 .../tests/{ => it}/parallel_display_list.rs   |   0
 .../engine/tests/{ => it}/pedit_splinedit.rs  |   0
 crates/engine/tests/{ => it}/pick_text.rs     |   0
 crates/engine/tests/{ => it}/pickdrag.rs      |   0
 .../tests/{ => it}/pline_arc_xline_options.rs |   0
 crates/engine/tests/{ => it}/plot_styles.rs   |   0
 .../engine/tests/{ => it}/point_modifiers.rs  |   0
 .../tests/{ => it}/post_command_passes.rs     |   0
 .../engine/tests/{ => it}/prompt_keywords.rs  |   0
 .../tests/{ => it}/props_bad_lineweight.rs    |   0
 .../{ => it}/props_insert_scale_attribs.rs    |   0
 .../tests/{ => it}/purge_mlinestyles.rs       |   0
 crates/engine/tests/{ => it}/purge_prompts.rs |   0
 crates/engine/tests/{ => it}/qdim.rs          |   0
 crates/engine/tests/{ => it}/qdim_modes.rs    |   0
 .../engine/tests/{ => it}/query_entities.rs   |   0
 crates/engine/tests/{ => it}/quickcalc.rs     |   0
 .../engine/tests/{ => it}/recent_commands.rs  |   0
 crates/engine/tests/{ => it}/rectang_ortho.rs |   0
 crates/engine/tests/{ => it}/refedit.rs       |   0
 crates/engine/tests/{ => it}/region.rs        |   0
 .../engine/tests/{ => it}/rename_cmdline.rs   |   0
 .../engine/tests/{ => it}/rotate_reference.rs |   0
 .../engine/tests/{ => it}/select_keywords.rs  |   0
 .../engine/tests/{ => it}/select_similar.rs   |   0
 .../{ => it}/select_underscore_keywords.rs    |   0
 .../tests/{ => it}/selection_cycling.rs       |   0
 .../engine/tests/{ => it}/selection_modes.rs  |   0
 .../engine/tests/{ => it}/setvar_coverage.rs  |   0
 crates/engine/tests/{ => it}/shapes.rs        |   0
 .../engine/tests/{ => it}/snap_annotations.rs |   0
 crates/engine/tests/{ => it}/snap_blocks.rs   |   0
 crates/engine/tests/{ => it}/snap_curves.rs   |   0
 .../{ => it}/snap_intersections_aperture.rs   |   0
 crates/engine/tests/{ => it}/snap_nearest.rs  |   0
 .../engine/tests/{ => it}/snap_overrides.rs   |   0
 crates/engine/tests/{ => it}/snap_tracking.rs |   0
 crates/engine/tests/{ => it}/snaps_more.rs    |   0
 .../engine/tests/{ => it}/space_is_enter.rs   |   0
 crates/engine/tests/{ => it}/spline_degree.rs |   0
 .../engine/tests/{ => it}/spline_options.rs   |   0
 crates/engine/tests/{ => it}/stretch.rs       |   0
 .../engine/tests/{ => it}/stretch_select.rs   |   0
 .../engine/tests/{ => it}/table_formulas.rs   |   0
 crates/engine/tests/{ => it}/table_styles.rs  |   0
 crates/engine/tests/{ => it}/temp_tracking.rs |   0
 crates/engine/tests/{ => it}/text_commands.rs |   0
 .../tests/{ => it}/text_left_justify.rs       |   0
 crates/engine/tests/{ => it}/tolerance.rs     |   0
 crates/engine/tests/{ => it}/transparent.rs   |   0
 .../tests/{ => it}/trim_closed_polyline.rs    |   0
 .../tests/{ => it}/trim_extend_options.rs     |   0
 crates/engine/tests/{ => it}/undo_count.rs    |   0
 .../engine/tests/{ => it}/undo_layout_tab.rs  |   0
 crates/engine/tests/{ => it}/viewport_clip.rs |   0
 .../engine/tests/{ => it}/vplayer_prompts.rs  |   0
 crates/engine/tests/{ => it}/vports.rs        |   0
 .../tests/{ => it}/xdata_follows_entity.rs    |   0
 crates/engine/tests/{ => it}/zoom_keywords.rs |   0
 crates/engine/tests/{ => it}/zoom_viewport.rs |   0
 .../tests/{ => it}/zoom_window_ortho.rs       |   0
 crates/io/tests/{ => it}/acad_interop.rs      |   0
 crates/io/tests/{ => it}/acis_data_store.rs   |   1 -
 crates/io/tests/{ => it}/angle_header.rs      |   0
 .../io/tests/{ => it}/annotative_roundtrip.rs |   0
 .../tests/{ => it}/assoc_array_roundtrip.rs   |   0
 crates/io/tests/{ => it}/attrib_modes.rs      |   0
 crates/io/tests/{ => it}/attrib_props.rs      |   0
 crates/io/tests/{ => it}/block_expansion.rs   |   0
 crates/io/tests/{ => it}/closed_spline.rs     |   0
 crates/io/tests/{ => it}/codepages.rs         |   0
 .../{ => it}/dim_block_resave_roundtrip.rs    |   0
 crates/io/tests/{ => it}/dim_block_text.rs    |   0
 .../io/tests/{ => it}/dim_marks_roundtrip.rs  |   0
 .../tests/{ => it}/dimstyle_vars_roundtrip.rs |   0
 crates/io/tests/{ => it}/drafting_spacing.rs  |   0
 crates/io/tests/{ => it}/dwg_header_vars.rs   |   1 -
 crates/io/tests/{ => it}/dwg_layout_owner.rs  |   0
 .../io/tests/{ => it}/dwg_roundtrip_losses.rs |   1 -
 crates/io/tests/{ => it}/dwt_template.rs      |   0
 crates/io/tests/{ => it}/dxf_versions.rs      |   0
 crates/io/tests/{ => it}/dynblock_read.rs     |   2 +-
 .../tests/{ => it}/entity_props_roundtrip.rs  |   0
 crates/io/tests/{ => it}/followups_626.rs     |   0
 crates/io/tests/{ => it}/groups_roundtrip.rs  |   0
 .../tests/{ => it}/hatch_assoc_roundtrip.rs   |   0
 crates/io/tests/{ => it}/hatch_pattern_def.rs |   0
 crates/io/tests/{ => it}/helix_roundtrip.rs   |   0
 .../io/tests/{ => it}/layout_paper_units.rs   |   0
 .../io/tests/{ => it}/layout_plot_window.rs   |   0
 crates/io/tests/{ => it}/low_handseed.rs      |   1 -
 crates/io/tests/it/main.rs                    |  67 ++++++++
 crates/io/tests/{ => it}/mleader_content.rs   |   0
 crates/io/tests/{ => it}/mleader_roundtrip.rs |   0
 crates/io/tests/{ => it}/mline_roundtrip.rs   |   0
 .../tests/{ => it}/model_layout_plot_type.rs  |   1 -
 .../tests/{ => it}/mtext_columns_roundtrip.rs |   0
 .../tests/{ => it}/mtext_embedded_object.rs   |   0
 .../io/tests/{ => it}/mtext_line_spacing.rs   |   0
 .../io/tests/{ => it}/multiline_attributes.rs |   0
 crates/io/tests/{ => it}/paperview_marker.rs  |   0
 .../{ => it}/passthrough_image_roundtrip.rs   |   0
 crates/io/tests/{ => it}/pdf_followups.rs     |   0
 crates/io/tests/{ => it}/pdf_layers.rs        |   0
 crates/io/tests/{ => it}/plot_layout_scale.rs |   0
 .../io/tests/{ => it}/plot_model_png_scale.rs |   0
 crates/io/tests/{ => it}/plot_styles.rs       |   0
 crates/io/tests/{ => it}/region_roundtrip.rs  |   0
 crates/io/tests/{ => it}/roundtrip_audit.rs   |   0
 crates/io/tests/{ => it}/skipped_records.rs   |   0
 crates/io/tests/{ => it}/sortents.rs          |   0
 crates/io/tests/{ => it}/spline_fit_data.rs   |   0
 .../tests/{ => it}/split_entities_section.rs  |   0
 crates/io/tests/{ => it}/style_typeface.rs    |   0
 crates/io/tests/{ => it}/svg_arc_budget.rs    |   0
 crates/io/tests/{ => it}/svg_tiny_extents.rs  |   0
 .../{ => it}/table_cellstyle_roundtrip.rs     |   0
 .../{ => it}/tables_objects_roundtrip.rs      |   0
 crates/io/tests/{ => it}/text_left_justify.rs |   0
 .../io/tests/{ => it}/tolerance_roundtrip.rs  |   0
 .../tests/{ => it}/user_lin_pat_roundtrip.rs  |   0
 .../tests/{ => it}/view_tables_roundtrip.rs   |   0
 .../tests/{ => it}/viewport_clip_roundtrip.rs |   0
 crates/io/tests/{ => it}/xref_roundtrip.rs    |   0
 crates/mcp/tests/{ => it}/cmdline_key.rs      |   2 +-
 crates/mcp/tests/{ => it}/cmdline_parity.rs   |   2 +-
 crates/mcp/tests/{ => it}/control_methods.rs  |   4 +-
 crates/mcp/tests/it/main.rs                   |   3 +
 crates/render/tests/{ => it}/aci7_display.rs  |   0
 .../tests/{ => it}/annotative_viewport.rs     |   0
 .../tests/{ => it}/dim_angular_centre.rs      |   0
 .../tests/{ => it}/dim_post_tolerance.rs      |   0
 .../render/tests/{ => it}/dim_text_format.rs  |   0
 crates/render/tests/{ => it}/hatch_fill.rs    |   0
 crates/render/tests/{ => it}/linetype_text.rs |   0
 crates/render/tests/{ => it}/lwdefault.rs     |   0
 crates/render/tests/it/main.rs                |  17 +++
 .../render/tests/{ => it}/plot_line_styles.rs |   0
 crates/render/tests/{ => it}/plot_styles.rs   |   0
 crates/render/tests/{ => it}/point_style.rs   |   0
 crates/render/tests/{ => it}/psltscale.rs     |   0
 crates/render/tests/{ => it}/raster_points.rs |   0
 crates/render/tests/{ => it}/render_props.rs  |   0
 .../tests/{ => it}/viewport_frozen_layer.rs   |   0
 .../tests/{ => it}/wide_pline_linetype.rs     |   0
 crates/render/tests/{ => it}/wipeout_mask.rs  |   0
 crates/ui-egui/src/control.rs                 |   2 +-
 .../tests/{ => it}/animation_effects.rs       |   0
 .../ui-egui/tests/{ => it}/chrome_geometry.rs |   0
 crates/ui-egui/tests/{ => it}/context_menu.rs |   0
 .../ui-egui/tests/{ => it}/context_menus.rs   |   0
 .../ui-egui/tests/{ => it}/control_cmdline.rs |   2 +-
 .../tests/{ => it}/control_cmdline_key.rs     |   2 +-
 .../ui-egui/tests/{ => it}/control_methods.rs |   2 +-
 .../ui-egui/tests/{ => it}/dialog_dispatch.rs |   0
 .../tests/{ => it}/docking_workflows.rs       |   0
 .../{ => it}/drafting_polar_increment.rs      |   0
 .../tests/{ => it}/drafting_spacing.rs        |   0
 .../ui-egui/tests/{ => it}/file_tab_titles.rs |   0
 .../tests/{ => it}/gpu_viewport_stencil.rs    |   0
 .../tests/{ => it}/hidden_command_line.rs     |   0
 crates/ui-egui/tests/{ => it}/lisp_files.rs   |   0
 crates/ui-egui/tests/it/main.rs               |  34 +++++
 .../{ => it}/measure_distance_snapping.rs     |   0
 .../ui-egui/tests/{ => it}/menubar_hover.rs   |   0
 .../tests/{ => it}/mspace_viewport_view.rs    |   0
 .../ui-egui/tests/{ => it}/options_dialog.rs  |   0
 .../tests/{ => it}/parameters_rename.rs       |   0
 crates/ui-egui/tests/{ => it}/pickdrag.rs     |   0
 .../tests/{ => it}/properties_units.rs        |   0
 crates/ui-egui/tests/{ => it}/rapid_clicks.rs |   0
 .../tests/{ => it}/selection_cycling.rs       |   0
 .../ui-egui/tests/{ => it}/shared_controls.rs |   0
 .../ui-egui/tests/{ => it}/shortcut_menus.rs  |   0
 .../tests/{ => it}/status_bar_toggles.rs      |   0
 .../ui-egui/tests/{ => it}/style_dialogs.rs   |   0
 .../ui-egui/tests/{ => it}/system_cursor.rs   |   0
 .../tests/{ => it}/text_double_click.rs       |   0
 .../ui-egui/tests/{ => it}/toolsets_gear.rs   |   0
 .../tests/{ => it}/toolsets_parametric.rs     |   0
 .../viewport_double_click_selection.rs        |   0
 .../ui-egui/tests/{ => it}/workspace_focus.rs |   0
 docs/autolisp.md                              |   2 +-
 xtask/src/main.rs                             |  52 ++++---
 277 files changed, 317 insertions(+), 37 deletions(-)
 rename apps/cadcraft-cli/tests/{ => it}/cli.rs (100%)
 rename apps/cadcraft-cli/tests/{ => it}/drafting_spacing.rs (100%)
 rename apps/cadcraft-cli/tests/{ => it}/help.rs (100%)
 create mode 100644 apps/cadcraft-cli/tests/it/main.rs
 rename apps/cadcraft-cli/tests/{ => it}/mcp_connect.rs (100%)
 rename apps/cadcraft-cli/tests/{ => it}/skipped_records.rs (100%)
 rename apps/cadcraft-cli/tests/{ => it}/undrawn_entities.rs (100%)
 rename crates/doc/tests/{ => it}/lin_pat_parse.rs (100%)
 create mode 100644 crates/doc/tests/it/main.rs
 rename crates/doc/tests/{ => it}/sub_segment_alias.rs (100%)
 rename crates/engine/tests/{ => it}/angle_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/angle_settings.rs (100%)
 rename crates/engine/tests/{ => it}/annotate_options.rs (100%)
 rename crates/engine/tests/{ => it}/annotative.rs (100%)
 rename crates/engine/tests/{ => it}/arc_ctrl_direction.rs (100%)
 rename crates/engine/tests/{ => it}/array_commands.rs (100%)
 rename crates/engine/tests/{ => it}/assoc_array.rs (100%)
 rename crates/engine/tests/{ => it}/attdisp_attsync.rs (100%)
 rename crates/engine/tests/{ => it}/attedit_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/attrib_modes.rs (100%)
 rename crates/engine/tests/{ => it}/attrib_props.rs (100%)
 rename crates/engine/tests/{ => it}/attribute_tools.rs (100%)
 rename crates/engine/tests/{ => it}/block_keep.rs (100%)
 rename crates/engine/tests/{ => it}/block_redefine.rs (100%)
 rename crates/engine/tests/{ => it}/break_closed_polyline.rs (100%)
 rename crates/engine/tests/{ => it}/break_join_locked_layers.rs (100%)
 rename crates/engine/tests/{ => it}/break_keeps_z.rs (100%)
 rename crates/engine/tests/{ => it}/burst.rs (100%)
 rename crates/engine/tests/{ => it}/constraint_geometry.rs (100%)
 rename crates/engine/tests/{ => it}/constraint_infer.rs (100%)
 rename crates/engine/tests/{ => it}/count.rs (100%)
 rename crates/engine/tests/{ => it}/dash_block.rs (100%)
 rename crates/engine/tests/{ => it}/data_extraction.rs (100%)
 rename crates/engine/tests/{ => it}/dim_baseline_spacing.rs (100%)
 rename crates/engine/tests/{ => it}/dim_chain.rs (100%)
 rename crates/engine/tests/{ => it}/dim_commands.rs (100%)
 rename crates/engine/tests/{ => it}/dim_explode_text.rs (100%)
 rename crates/engine/tests/{ => it}/dim_properties.rs (100%)
 rename crates/engine/tests/{ => it}/dim_radial_inside.rs (100%)
 rename crates/engine/tests/{ => it}/dim_radial_outside.rs (100%)
 rename crates/engine/tests/{ => it}/dim_vars.rs (100%)
 rename crates/engine/tests/{ => it}/dimtedit_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/drafting_spacing.rs (100%)
 rename crates/engine/tests/{ => it}/draw_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/draworder.rs (100%)
 rename crates/engine/tests/{ => it}/dyn_input.rs (100%)
 rename crates/engine/tests/{ => it}/dynamic_block_data.rs (100%)
 rename crates/engine/tests/{ => it}/dynamic_grips.rs (99%)
 rename crates/engine/tests/{ => it}/fillet_chamfer.rs (100%)
 rename crates/engine/tests/{ => it}/fix_holds_grips.rs (100%)
 rename crates/engine/tests/{ => it}/followups_626.rs (100%)
 rename crates/engine/tests/{ => it}/grip_dim_input.rs (100%)
 rename crates/engine/tests/{ => it}/grip_options.rs (100%)
 rename crates/engine/tests/{ => it}/grip_selection.rs (100%)
 rename crates/engine/tests/{ => it}/group_selection.rs (100%)
 rename crates/engine/tests/{ => it}/groups.rs (100%)
 rename crates/engine/tests/{ => it}/hatch_assoc.rs (100%)
 rename crates/engine/tests/{ => it}/hatch_dialog_helpers.rs (100%)
 rename crates/engine/tests/{ => it}/hatch_numeric_validation.rs (100%)
 rename crates/engine/tests/{ => it}/hatch_options.rs (100%)
 rename crates/engine/tests/{ => it}/helix.rs (100%)
 rename crates/engine/tests/{ => it}/inquiry_keywords.rs (100%)
 rename crates/engine/tests/{ => it}/inquiry_z.rs (100%)
 rename crates/engine/tests/{ => it}/insert_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/isometric.rs (100%)
 rename crates/engine/tests/{ => it}/join_close.rs (100%)
 rename crates/engine/tests/{ => it}/json_param_validation.rs (100%)
 rename crates/engine/tests/{ => it}/layer_cmdline.rs (100%)
 rename crates/engine/tests/{ => it}/layer_merge_delete.rs (100%)
 rename crates/engine/tests/{ => it}/layoff_repeat.rs (100%)
 rename crates/engine/tests/{ => it}/layout_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/lisp_corpus.rs (99%)
 create mode 100644 crates/engine/tests/it/main.rs
 rename crates/engine/tests/{ => it}/malformed_handles.rs (100%)
 rename crates/engine/tests/{ => it}/matchprop.rs (100%)
 rename crates/engine/tests/{ => it}/measure_distance_snapping.rs (100%)
 rename crates/engine/tests/{ => it}/metric_linetypes.rs (100%)
 rename crates/engine/tests/{ => it}/mleader_content.rs (100%)
 rename crates/engine/tests/{ => it}/mleader_remember.rs (100%)
 rename crates/engine/tests/{ => it}/mline.rs (100%)
 rename crates/engine/tests/{ => it}/mocoro.rs (100%)
 rename crates/engine/tests/{ => it}/modify_curves.rs (100%)
 rename crates/engine/tests/{ => it}/mtext_columns.rs (100%)
 rename crates/engine/tests/{ => it}/mtext_options.rs (100%)
 rename crates/engine/tests/{ => it}/multiline_attributes.rs (100%)
 rename crates/engine/tests/{ => it}/named_views.rs (100%)
 rename crates/engine/tests/{ => it}/non_finite_edits.rs (100%)
 rename crates/engine/tests/{ => it}/offset_closed_spline.rs (100%)
 rename crates/engine/tests/{ => it}/offset_ellipse_side.rs (100%)
 rename crates/engine/tests/{ => it}/offset_move.rs (100%)
 rename crates/engine/tests/{ => it}/options_profile.rs (100%)
 rename crates/engine/tests/{ => it}/overkill.rs (100%)
 rename crates/engine/tests/{ => it}/parallel_display_list.rs (100%)
 rename crates/engine/tests/{ => it}/pedit_splinedit.rs (100%)
 rename crates/engine/tests/{ => it}/pick_text.rs (100%)
 rename crates/engine/tests/{ => it}/pickdrag.rs (100%)
 rename crates/engine/tests/{ => it}/pline_arc_xline_options.rs (100%)
 rename crates/engine/tests/{ => it}/plot_styles.rs (100%)
 rename crates/engine/tests/{ => it}/point_modifiers.rs (100%)
 rename crates/engine/tests/{ => it}/post_command_passes.rs (100%)
 rename crates/engine/tests/{ => it}/prompt_keywords.rs (100%)
 rename crates/engine/tests/{ => it}/props_bad_lineweight.rs (100%)
 rename crates/engine/tests/{ => it}/props_insert_scale_attribs.rs (100%)
 rename crates/engine/tests/{ => it}/purge_mlinestyles.rs (100%)
 rename crates/engine/tests/{ => it}/purge_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/qdim.rs (100%)
 rename crates/engine/tests/{ => it}/qdim_modes.rs (100%)
 rename crates/engine/tests/{ => it}/query_entities.rs (100%)
 rename crates/engine/tests/{ => it}/quickcalc.rs (100%)
 rename crates/engine/tests/{ => it}/recent_commands.rs (100%)
 rename crates/engine/tests/{ => it}/rectang_ortho.rs (100%)
 rename crates/engine/tests/{ => it}/refedit.rs (100%)
 rename crates/engine/tests/{ => it}/region.rs (100%)
 rename crates/engine/tests/{ => it}/rename_cmdline.rs (100%)
 rename crates/engine/tests/{ => it}/rotate_reference.rs (100%)
 rename crates/engine/tests/{ => it}/select_keywords.rs (100%)
 rename crates/engine/tests/{ => it}/select_similar.rs (100%)
 rename crates/engine/tests/{ => it}/select_underscore_keywords.rs (100%)
 rename crates/engine/tests/{ => it}/selection_cycling.rs (100%)
 rename crates/engine/tests/{ => it}/selection_modes.rs (100%)
 rename crates/engine/tests/{ => it}/setvar_coverage.rs (100%)
 rename crates/engine/tests/{ => it}/shapes.rs (100%)
 rename crates/engine/tests/{ => it}/snap_annotations.rs (100%)
 rename crates/engine/tests/{ => it}/snap_blocks.rs (100%)
 rename crates/engine/tests/{ => it}/snap_curves.rs (100%)
 rename crates/engine/tests/{ => it}/snap_intersections_aperture.rs (100%)
 rename crates/engine/tests/{ => it}/snap_nearest.rs (100%)
 rename crates/engine/tests/{ => it}/snap_overrides.rs (100%)
 rename crates/engine/tests/{ => it}/snap_tracking.rs (100%)
 rename crates/engine/tests/{ => it}/snaps_more.rs (100%)
 rename crates/engine/tests/{ => it}/space_is_enter.rs (100%)
 rename crates/engine/tests/{ => it}/spline_degree.rs (100%)
 rename crates/engine/tests/{ => it}/spline_options.rs (100%)
 rename crates/engine/tests/{ => it}/stretch.rs (100%)
 rename crates/engine/tests/{ => it}/stretch_select.rs (100%)
 rename crates/engine/tests/{ => it}/table_formulas.rs (100%)
 rename crates/engine/tests/{ => it}/table_styles.rs (100%)
 rename crates/engine/tests/{ => it}/temp_tracking.rs (100%)
 rename crates/engine/tests/{ => it}/text_commands.rs (100%)
 rename crates/engine/tests/{ => it}/text_left_justify.rs (100%)
 rename crates/engine/tests/{ => it}/tolerance.rs (100%)
 rename crates/engine/tests/{ => it}/transparent.rs (100%)
 rename crates/engine/tests/{ => it}/trim_closed_polyline.rs (100%)
 rename crates/engine/tests/{ => it}/trim_extend_options.rs (100%)
 rename crates/engine/tests/{ => it}/undo_count.rs (100%)
 rename crates/engine/tests/{ => it}/undo_layout_tab.rs (100%)
 rename crates/engine/tests/{ => it}/viewport_clip.rs (100%)
 rename crates/engine/tests/{ => it}/vplayer_prompts.rs (100%)
 rename crates/engine/tests/{ => it}/vports.rs (100%)
 rename crates/engine/tests/{ => it}/xdata_follows_entity.rs (100%)
 rename crates/engine/tests/{ => it}/zoom_keywords.rs (100%)
 rename crates/engine/tests/{ => it}/zoom_viewport.rs (100%)
 rename crates/engine/tests/{ => it}/zoom_window_ortho.rs (100%)
 rename crates/io/tests/{ => it}/acad_interop.rs (100%)
 rename crates/io/tests/{ => it}/acis_data_store.rs (99%)
 rename crates/io/tests/{ => it}/angle_header.rs (100%)
 rename crates/io/tests/{ => it}/annotative_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/assoc_array_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/attrib_modes.rs (100%)
 rename crates/io/tests/{ => it}/attrib_props.rs (100%)
 rename crates/io/tests/{ => it}/block_expansion.rs (100%)
 rename crates/io/tests/{ => it}/closed_spline.rs (100%)
 rename crates/io/tests/{ => it}/codepages.rs (100%)
 rename crates/io/tests/{ => it}/dim_block_resave_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/dim_block_text.rs (100%)
 rename crates/io/tests/{ => it}/dim_marks_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/dimstyle_vars_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/drafting_spacing.rs (100%)
 rename crates/io/tests/{ => it}/dwg_header_vars.rs (98%)
 rename crates/io/tests/{ => it}/dwg_layout_owner.rs (100%)
 rename crates/io/tests/{ => it}/dwg_roundtrip_losses.rs (99%)
 rename crates/io/tests/{ => it}/dwt_template.rs (100%)
 rename crates/io/tests/{ => it}/dxf_versions.rs (100%)
 rename crates/io/tests/{ => it}/dynblock_read.rs (99%)
 rename crates/io/tests/{ => it}/entity_props_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/followups_626.rs (100%)
 rename crates/io/tests/{ => it}/groups_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/hatch_assoc_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/hatch_pattern_def.rs (100%)
 rename crates/io/tests/{ => it}/helix_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/layout_paper_units.rs (100%)
 rename crates/io/tests/{ => it}/layout_plot_window.rs (100%)
 rename crates/io/tests/{ => it}/low_handseed.rs (98%)
 create mode 100644 crates/io/tests/it/main.rs
 rename crates/io/tests/{ => it}/mleader_content.rs (100%)
 rename crates/io/tests/{ => it}/mleader_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/mline_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/model_layout_plot_type.rs (98%)
 rename crates/io/tests/{ => it}/mtext_columns_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/mtext_embedded_object.rs (100%)
 rename crates/io/tests/{ => it}/mtext_line_spacing.rs (100%)
 rename crates/io/tests/{ => it}/multiline_attributes.rs (100%)
 rename crates/io/tests/{ => it}/paperview_marker.rs (100%)
 rename crates/io/tests/{ => it}/passthrough_image_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/pdf_followups.rs (100%)
 rename crates/io/tests/{ => it}/pdf_layers.rs (100%)
 rename crates/io/tests/{ => it}/plot_layout_scale.rs (100%)
 rename crates/io/tests/{ => it}/plot_model_png_scale.rs (100%)
 rename crates/io/tests/{ => it}/plot_styles.rs (100%)
 rename crates/io/tests/{ => it}/region_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/roundtrip_audit.rs (100%)
 rename crates/io/tests/{ => it}/skipped_records.rs (100%)
 rename crates/io/tests/{ => it}/sortents.rs (100%)
 rename crates/io/tests/{ => it}/spline_fit_data.rs (100%)
 rename crates/io/tests/{ => it}/split_entities_section.rs (100%)
 rename crates/io/tests/{ => it}/style_typeface.rs (100%)
 rename crates/io/tests/{ => it}/svg_arc_budget.rs (100%)
 rename crates/io/tests/{ => it}/svg_tiny_extents.rs (100%)
 rename crates/io/tests/{ => it}/table_cellstyle_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/tables_objects_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/text_left_justify.rs (100%)
 rename crates/io/tests/{ => it}/tolerance_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/user_lin_pat_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/view_tables_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/viewport_clip_roundtrip.rs (100%)
 rename crates/io/tests/{ => it}/xref_roundtrip.rs (100%)
 rename crates/mcp/tests/{ => it}/cmdline_key.rs (94%)
 rename crates/mcp/tests/{ => it}/cmdline_parity.rs (97%)
 rename crates/mcp/tests/{ => it}/control_methods.rs (94%)
 create mode 100644 crates/mcp/tests/it/main.rs
 rename crates/render/tests/{ => it}/aci7_display.rs (100%)
 rename crates/render/tests/{ => it}/annotative_viewport.rs (100%)
 rename crates/render/tests/{ => it}/dim_angular_centre.rs (100%)
 rename crates/render/tests/{ => it}/dim_post_tolerance.rs (100%)
 rename crates/render/tests/{ => it}/dim_text_format.rs (100%)
 rename crates/render/tests/{ => it}/hatch_fill.rs (100%)
 rename crates/render/tests/{ => it}/linetype_text.rs (100%)
 rename crates/render/tests/{ => it}/lwdefault.rs (100%)
 create mode 100644 crates/render/tests/it/main.rs
 rename crates/render/tests/{ => it}/plot_line_styles.rs (100%)
 rename crates/render/tests/{ => it}/plot_styles.rs (100%)
 rename crates/render/tests/{ => it}/point_style.rs (100%)
 rename crates/render/tests/{ => it}/psltscale.rs (100%)
 rename crates/render/tests/{ => it}/raster_points.rs (100%)
 rename crates/render/tests/{ => it}/render_props.rs (100%)
 rename crates/render/tests/{ => it}/viewport_frozen_layer.rs (100%)
 rename crates/render/tests/{ => it}/wide_pline_linetype.rs (100%)
 rename crates/render/tests/{ => it}/wipeout_mask.rs (100%)
 rename crates/ui-egui/tests/{ => it}/animation_effects.rs (100%)
 rename crates/ui-egui/tests/{ => it}/chrome_geometry.rs (100%)
 rename crates/ui-egui/tests/{ => it}/context_menu.rs (100%)
 rename crates/ui-egui/tests/{ => it}/context_menus.rs (100%)
 rename crates/ui-egui/tests/{ => it}/control_cmdline.rs (98%)
 rename crates/ui-egui/tests/{ => it}/control_cmdline_key.rs (95%)
 rename crates/ui-egui/tests/{ => it}/control_methods.rs (97%)
 rename crates/ui-egui/tests/{ => it}/dialog_dispatch.rs (100%)
 rename crates/ui-egui/tests/{ => it}/docking_workflows.rs (100%)
 rename crates/ui-egui/tests/{ => it}/drafting_polar_increment.rs (100%)
 rename crates/ui-egui/tests/{ => it}/drafting_spacing.rs (100%)
 rename crates/ui-egui/tests/{ => it}/file_tab_titles.rs (100%)
 rename crates/ui-egui/tests/{ => it}/gpu_viewport_stencil.rs (100%)
 rename crates/ui-egui/tests/{ => it}/hidden_command_line.rs (100%)
 rename crates/ui-egui/tests/{ => it}/lisp_files.rs (100%)
 create mode 100644 crates/ui-egui/tests/it/main.rs
 rename crates/ui-egui/tests/{ => it}/measure_distance_snapping.rs (100%)
 rename crates/ui-egui/tests/{ => it}/menubar_hover.rs (100%)
 rename crates/ui-egui/tests/{ => it}/mspace_viewport_view.rs (100%)
 rename crates/ui-egui/tests/{ => it}/options_dialog.rs (100%)
 rename crates/ui-egui/tests/{ => it}/parameters_rename.rs (100%)
 rename crates/ui-egui/tests/{ => it}/pickdrag.rs (100%)
 rename crates/ui-egui/tests/{ => it}/properties_units.rs (100%)
 rename crates/ui-egui/tests/{ => it}/rapid_clicks.rs (100%)
 rename crates/ui-egui/tests/{ => it}/selection_cycling.rs (100%)
 rename crates/ui-egui/tests/{ => it}/shared_controls.rs (100%)
 rename crates/ui-egui/tests/{ => it}/shortcut_menus.rs (100%)
 rename crates/ui-egui/tests/{ => it}/status_bar_toggles.rs (100%)
 rename crates/ui-egui/tests/{ => it}/style_dialogs.rs (100%)
 rename crates/ui-egui/tests/{ => it}/system_cursor.rs (100%)
 rename crates/ui-egui/tests/{ => it}/text_double_click.rs (100%)
 rename crates/ui-egui/tests/{ => it}/toolsets_gear.rs (100%)
 rename crates/ui-egui/tests/{ => it}/toolsets_parametric.rs (100%)
 rename crates/ui-egui/tests/{ => it}/viewport_double_click_selection.rs (100%)
 rename crates/ui-egui/tests/{ => it}/workspace_focus.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index cabb8a06c..6e1afaa06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,9 +69,11 @@ type_complexity = "allow"
 
 [profile.dev.package."*"]
 opt-level = 2
+debug = false
 
 [profile.dev]
 opt-level = 1
+debug = "line-tables-only"
 
 [profile.release]
 opt-level = 3
diff --git a/apps/cadcraft-cli/tests/cli.rs b/apps/cadcraft-cli/tests/it/cli.rs
similarity index 100%
rename from apps/cadcraft-cli/tests/cli.rs
rename to apps/cadcraft-cli/tests/it/cli.rs
diff --git a/apps/cadcraft-cli/tests/drafting_spacing.rs b/apps/cadcraft-cli/tests/it/drafting_spacing.rs
similarity index 100%
rename from apps/cadcraft-cli/tests/drafting_spacing.rs
rename to apps/cadcraft-cli/tests/it/drafting_spacing.rs
diff --git a/apps/cadcraft-cli/tests/help.rs b/apps/cadcraft-cli/tests/it/help.rs
similarity index 100%
rename from apps/cadcraft-cli/tests/help.rs
rename to apps/cadcraft-cli/tests/it/help.rs
diff --git a/apps/cadcraft-cli/tests/it/main.rs b/apps/cadcraft-cli/tests/it/main.rs
new file mode 100644
index 000000000..efd49c7dd
--- /dev/null
+++ b/apps/cadcraft-cli/tests/it/main.rs
@@ -0,0 +1,6 @@
+mod cli;
+mod drafting_spacing;
+mod help;
+mod mcp_connect;
+mod skipped_records;
+mod undrawn_entities;
diff --git a/apps/cadcraft-cli/tests/mcp_connect.rs b/apps/cadcraft-cli/tests/it/mcp_connect.rs
similarity index 100%
rename from apps/cadcraft-cli/tests/mcp_connect.rs
rename to apps/cadcraft-cli/tests/it/mcp_connect.rs
diff --git a/apps/cadcraft-cli/tests/skipped_records.rs b/apps/cadcraft-cli/tests/it/skipped_records.rs
similarity index 100%
rename from apps/cadcraft-cli/tests/skipped_records.rs
rename to apps/cadcraft-cli/tests/it/skipped_records.rs
diff --git a/apps/cadcraft-cli/tests/undrawn_entities.rs b/apps/cadcraft-cli/tests/it/undrawn_entities.rs
similarity index 100%
rename from apps/cadcraft-cli/tests/undrawn_entities.rs
rename to apps/cadcraft-cli/tests/it/undrawn_entities.rs
diff --git a/crates/doc/tests/lin_pat_parse.rs b/crates/doc/tests/it/lin_pat_parse.rs
similarity index 100%
rename from crates/doc/tests/lin_pat_parse.rs
rename to crates/doc/tests/it/lin_pat_parse.rs
diff --git a/crates/doc/tests/it/main.rs b/crates/doc/tests/it/main.rs
new file mode 100644
index 000000000..dcad121df
--- /dev/null
+++ b/crates/doc/tests/it/main.rs
@@ -0,0 +1,2 @@
+mod lin_pat_parse;
+mod sub_segment_alias;
diff --git a/crates/doc/tests/sub_segment_alias.rs b/crates/doc/tests/it/sub_segment_alias.rs
similarity index 100%
rename from crates/doc/tests/sub_segment_alias.rs
rename to crates/doc/tests/it/sub_segment_alias.rs
diff --git a/crates/engine/tests/angle_prompts.rs b/crates/engine/tests/it/angle_prompts.rs
similarity index 100%
rename from crates/engine/tests/angle_prompts.rs
rename to crates/engine/tests/it/angle_prompts.rs
diff --git a/crates/engine/tests/angle_settings.rs b/crates/engine/tests/it/angle_settings.rs
similarity index 100%
rename from crates/engine/tests/angle_settings.rs
rename to crates/engine/tests/it/angle_settings.rs
diff --git a/crates/engine/tests/annotate_options.rs b/crates/engine/tests/it/annotate_options.rs
similarity index 100%
rename from crates/engine/tests/annotate_options.rs
rename to crates/engine/tests/it/annotate_options.rs
diff --git a/crates/engine/tests/annotative.rs b/crates/engine/tests/it/annotative.rs
similarity index 100%
rename from crates/engine/tests/annotative.rs
rename to crates/engine/tests/it/annotative.rs
diff --git a/crates/engine/tests/arc_ctrl_direction.rs b/crates/engine/tests/it/arc_ctrl_direction.rs
similarity index 100%
rename from crates/engine/tests/arc_ctrl_direction.rs
rename to crates/engine/tests/it/arc_ctrl_direction.rs
diff --git a/crates/engine/tests/array_commands.rs b/crates/engine/tests/it/array_commands.rs
similarity index 100%
rename from crates/engine/tests/array_commands.rs
rename to crates/engine/tests/it/array_commands.rs
diff --git a/crates/engine/tests/assoc_array.rs b/crates/engine/tests/it/assoc_array.rs
similarity index 100%
rename from crates/engine/tests/assoc_array.rs
rename to crates/engine/tests/it/assoc_array.rs
diff --git a/crates/engine/tests/attdisp_attsync.rs b/crates/engine/tests/it/attdisp_attsync.rs
similarity index 100%
rename from crates/engine/tests/attdisp_attsync.rs
rename to crates/engine/tests/it/attdisp_attsync.rs
diff --git a/crates/engine/tests/attedit_prompts.rs b/crates/engine/tests/it/attedit_prompts.rs
similarity index 100%
rename from crates/engine/tests/attedit_prompts.rs
rename to crates/engine/tests/it/attedit_prompts.rs
diff --git a/crates/engine/tests/attrib_modes.rs b/crates/engine/tests/it/attrib_modes.rs
similarity index 100%
rename from crates/engine/tests/attrib_modes.rs
rename to crates/engine/tests/it/attrib_modes.rs
diff --git a/crates/engine/tests/attrib_props.rs b/crates/engine/tests/it/attrib_props.rs
similarity index 100%
rename from crates/engine/tests/attrib_props.rs
rename to crates/engine/tests/it/attrib_props.rs
diff --git a/crates/engine/tests/attribute_tools.rs b/crates/engine/tests/it/attribute_tools.rs
similarity index 100%
rename from crates/engine/tests/attribute_tools.rs
rename to crates/engine/tests/it/attribute_tools.rs
diff --git a/crates/engine/tests/block_keep.rs b/crates/engine/tests/it/block_keep.rs
similarity index 100%
rename from crates/engine/tests/block_keep.rs
rename to crates/engine/tests/it/block_keep.rs
diff --git a/crates/engine/tests/block_redefine.rs b/crates/engine/tests/it/block_redefine.rs
similarity index 100%
rename from crates/engine/tests/block_redefine.rs
rename to crates/engine/tests/it/block_redefine.rs
diff --git a/crates/engine/tests/break_closed_polyline.rs b/crates/engine/tests/it/break_closed_polyline.rs
similarity index 100%
rename from crates/engine/tests/break_closed_polyline.rs
rename to crates/engine/tests/it/break_closed_polyline.rs
diff --git a/crates/engine/tests/break_join_locked_layers.rs b/crates/engine/tests/it/break_join_locked_layers.rs
similarity index 100%
rename from crates/engine/tests/break_join_locked_layers.rs
rename to crates/engine/tests/it/break_join_locked_layers.rs
diff --git a/crates/engine/tests/break_keeps_z.rs b/crates/engine/tests/it/break_keeps_z.rs
similarity index 100%
rename from crates/engine/tests/break_keeps_z.rs
rename to crates/engine/tests/it/break_keeps_z.rs
diff --git a/crates/engine/tests/burst.rs b/crates/engine/tests/it/burst.rs
similarity index 100%
rename from crates/engine/tests/burst.rs
rename to crates/engine/tests/it/burst.rs
diff --git a/crates/engine/tests/constraint_geometry.rs b/crates/engine/tests/it/constraint_geometry.rs
similarity index 100%
rename from crates/engine/tests/constraint_geometry.rs
rename to crates/engine/tests/it/constraint_geometry.rs
diff --git a/crates/engine/tests/constraint_infer.rs b/crates/engine/tests/it/constraint_infer.rs
similarity index 100%
rename from crates/engine/tests/constraint_infer.rs
rename to crates/engine/tests/it/constraint_infer.rs
diff --git a/crates/engine/tests/count.rs b/crates/engine/tests/it/count.rs
similarity index 100%
rename from crates/engine/tests/count.rs
rename to crates/engine/tests/it/count.rs
diff --git a/crates/engine/tests/dash_block.rs b/crates/engine/tests/it/dash_block.rs
similarity index 100%
rename from crates/engine/tests/dash_block.rs
rename to crates/engine/tests/it/dash_block.rs
diff --git a/crates/engine/tests/data_extraction.rs b/crates/engine/tests/it/data_extraction.rs
similarity index 100%
rename from crates/engine/tests/data_extraction.rs
rename to crates/engine/tests/it/data_extraction.rs
diff --git a/crates/engine/tests/dim_baseline_spacing.rs b/crates/engine/tests/it/dim_baseline_spacing.rs
similarity index 100%
rename from crates/engine/tests/dim_baseline_spacing.rs
rename to crates/engine/tests/it/dim_baseline_spacing.rs
diff --git a/crates/engine/tests/dim_chain.rs b/crates/engine/tests/it/dim_chain.rs
similarity index 100%
rename from crates/engine/tests/dim_chain.rs
rename to crates/engine/tests/it/dim_chain.rs
diff --git a/crates/engine/tests/dim_commands.rs b/crates/engine/tests/it/dim_commands.rs
similarity index 100%
rename from crates/engine/tests/dim_commands.rs
rename to crates/engine/tests/it/dim_commands.rs
diff --git a/crates/engine/tests/dim_explode_text.rs b/crates/engine/tests/it/dim_explode_text.rs
similarity index 100%
rename from crates/engine/tests/dim_explode_text.rs
rename to crates/engine/tests/it/dim_explode_text.rs
diff --git a/crates/engine/tests/dim_properties.rs b/crates/engine/tests/it/dim_properties.rs
similarity index 100%
rename from crates/engine/tests/dim_properties.rs
rename to crates/engine/tests/it/dim_properties.rs
diff --git a/crates/engine/tests/dim_radial_inside.rs b/crates/engine/tests/it/dim_radial_inside.rs
similarity index 100%
rename from crates/engine/tests/dim_radial_inside.rs
rename to crates/engine/tests/it/dim_radial_inside.rs
diff --git a/crates/engine/tests/dim_radial_outside.rs b/crates/engine/tests/it/dim_radial_outside.rs
similarity index 100%
rename from crates/engine/tests/dim_radial_outside.rs
rename to crates/engine/tests/it/dim_radial_outside.rs
diff --git a/crates/engine/tests/dim_vars.rs b/crates/engine/tests/it/dim_vars.rs
similarity index 100%
rename from crates/engine/tests/dim_vars.rs
rename to crates/engine/tests/it/dim_vars.rs
diff --git a/crates/engine/tests/dimtedit_prompts.rs b/crates/engine/tests/it/dimtedit_prompts.rs
similarity index 100%
rename from crates/engine/tests/dimtedit_prompts.rs
rename to crates/engine/tests/it/dimtedit_prompts.rs
diff --git a/crates/engine/tests/drafting_spacing.rs b/crates/engine/tests/it/drafting_spacing.rs
similarity index 100%
rename from crates/engine/tests/drafting_spacing.rs
rename to crates/engine/tests/it/drafting_spacing.rs
diff --git a/crates/engine/tests/draw_prompts.rs b/crates/engine/tests/it/draw_prompts.rs
similarity index 100%
rename from crates/engine/tests/draw_prompts.rs
rename to crates/engine/tests/it/draw_prompts.rs
diff --git a/crates/engine/tests/draworder.rs b/crates/engine/tests/it/draworder.rs
similarity index 100%
rename from crates/engine/tests/draworder.rs
rename to crates/engine/tests/it/draworder.rs
diff --git a/crates/engine/tests/dyn_input.rs b/crates/engine/tests/it/dyn_input.rs
similarity index 100%
rename from crates/engine/tests/dyn_input.rs
rename to crates/engine/tests/it/dyn_input.rs
diff --git a/crates/engine/tests/dynamic_block_data.rs b/crates/engine/tests/it/dynamic_block_data.rs
similarity index 100%
rename from crates/engine/tests/dynamic_block_data.rs
rename to crates/engine/tests/it/dynamic_block_data.rs
diff --git a/crates/engine/tests/dynamic_grips.rs b/crates/engine/tests/it/dynamic_grips.rs
similarity index 99%
rename from crates/engine/tests/dynamic_grips.rs
rename to crates/engine/tests/it/dynamic_grips.rs
index 42cfaba0d..75ed1b787 100644
--- a/crates/engine/tests/dynamic_grips.rs
+++ b/crates/engine/tests/it/dynamic_grips.rs
@@ -29,7 +29,7 @@ fn session() -> (Session, Handle) {
 /// As [`session`], with the fixture's text changed by `edit` first.
 fn session_with(edit: impl Fn(String) -> String) -> (Session, Handle) {
     let grip = "0 BLOCKLINEARGRIP\n5 68\n330 61\n100 AcDbEvalExpr\n90 9\n98 33\n99 232\n100 AcDbBlockElement\n300 End Grip\n98 33\n99 232\n1071 0\n";
-    let src = include_str!("../../io/tests/data/dynblock_door.txt")
+    let src = include_str!("../../../io/tests/data/dynblock_door.txt")
         .replace("\r\n", "\n")
         .replace("170 4\n91 0\n91 0\n", "170 4\n91 8\n91 9\n")
         .replace("1030 0\n93 0\n170 0\n171 0\n100 AcDbBlockVisibilityParameter", "1030 0\n93 10\n170 0\n171 0\n100 AcDbBlockVisibilityParameter")
diff --git a/crates/engine/tests/fillet_chamfer.rs b/crates/engine/tests/it/fillet_chamfer.rs
similarity index 100%
rename from crates/engine/tests/fillet_chamfer.rs
rename to crates/engine/tests/it/fillet_chamfer.rs
diff --git a/crates/engine/tests/fix_holds_grips.rs b/crates/engine/tests/it/fix_holds_grips.rs
similarity index 100%
rename from crates/engine/tests/fix_holds_grips.rs
rename to crates/engine/tests/it/fix_holds_grips.rs
diff --git a/crates/engine/tests/followups_626.rs b/crates/engine/tests/it/followups_626.rs
similarity index 100%
rename from crates/engine/tests/followups_626.rs
rename to crates/engine/tests/it/followups_626.rs
diff --git a/crates/engine/tests/grip_dim_input.rs b/crates/engine/tests/it/grip_dim_input.rs
similarity index 100%
rename from crates/engine/tests/grip_dim_input.rs
rename to crates/engine/tests/it/grip_dim_input.rs
diff --git a/crates/engine/tests/grip_options.rs b/crates/engine/tests/it/grip_options.rs
similarity index 100%
rename from crates/engine/tests/grip_options.rs
rename to crates/engine/tests/it/grip_options.rs
diff --git a/crates/engine/tests/grip_selection.rs b/crates/engine/tests/it/grip_selection.rs
similarity index 100%
rename from crates/engine/tests/grip_selection.rs
rename to crates/engine/tests/it/grip_selection.rs
diff --git a/crates/engine/tests/group_selection.rs b/crates/engine/tests/it/group_selection.rs
similarity index 100%
rename from crates/engine/tests/group_selection.rs
rename to crates/engine/tests/it/group_selection.rs
diff --git a/crates/engine/tests/groups.rs b/crates/engine/tests/it/groups.rs
similarity index 100%
rename from crates/engine/tests/groups.rs
rename to crates/engine/tests/it/groups.rs
diff --git a/crates/engine/tests/hatch_assoc.rs b/crates/engine/tests/it/hatch_assoc.rs
similarity index 100%
rename from crates/engine/tests/hatch_assoc.rs
rename to crates/engine/tests/it/hatch_assoc.rs
diff --git a/crates/engine/tests/hatch_dialog_helpers.rs b/crates/engine/tests/it/hatch_dialog_helpers.rs
similarity index 100%
rename from crates/engine/tests/hatch_dialog_helpers.rs
rename to crates/engine/tests/it/hatch_dialog_helpers.rs
diff --git a/crates/engine/tests/hatch_numeric_validation.rs b/crates/engine/tests/it/hatch_numeric_validation.rs
similarity index 100%
rename from crates/engine/tests/hatch_numeric_validation.rs
rename to crates/engine/tests/it/hatch_numeric_validation.rs
diff --git a/crates/engine/tests/hatch_options.rs b/crates/engine/tests/it/hatch_options.rs
similarity index 100%
rename from crates/engine/tests/hatch_options.rs
rename to crates/engine/tests/it/hatch_options.rs
diff --git a/crates/engine/tests/helix.rs b/crates/engine/tests/it/helix.rs
similarity index 100%
rename from crates/engine/tests/helix.rs
rename to crates/engine/tests/it/helix.rs
diff --git a/crates/engine/tests/inquiry_keywords.rs b/crates/engine/tests/it/inquiry_keywords.rs
similarity index 100%
rename from crates/engine/tests/inquiry_keywords.rs
rename to crates/engine/tests/it/inquiry_keywords.rs
diff --git a/crates/engine/tests/inquiry_z.rs b/crates/engine/tests/it/inquiry_z.rs
similarity index 100%
rename from crates/engine/tests/inquiry_z.rs
rename to crates/engine/tests/it/inquiry_z.rs
diff --git a/crates/engine/tests/insert_prompts.rs b/crates/engine/tests/it/insert_prompts.rs
similarity index 100%
rename from crates/engine/tests/insert_prompts.rs
rename to crates/engine/tests/it/insert_prompts.rs
diff --git a/crates/engine/tests/isometric.rs b/crates/engine/tests/it/isometric.rs
similarity index 100%
rename from crates/engine/tests/isometric.rs
rename to crates/engine/tests/it/isometric.rs
diff --git a/crates/engine/tests/join_close.rs b/crates/engine/tests/it/join_close.rs
similarity index 100%
rename from crates/engine/tests/join_close.rs
rename to crates/engine/tests/it/join_close.rs
diff --git a/crates/engine/tests/json_param_validation.rs b/crates/engine/tests/it/json_param_validation.rs
similarity index 100%
rename from crates/engine/tests/json_param_validation.rs
rename to crates/engine/tests/it/json_param_validation.rs
diff --git a/crates/engine/tests/layer_cmdline.rs b/crates/engine/tests/it/layer_cmdline.rs
similarity index 100%
rename from crates/engine/tests/layer_cmdline.rs
rename to crates/engine/tests/it/layer_cmdline.rs
diff --git a/crates/engine/tests/layer_merge_delete.rs b/crates/engine/tests/it/layer_merge_delete.rs
similarity index 100%
rename from crates/engine/tests/layer_merge_delete.rs
rename to crates/engine/tests/it/layer_merge_delete.rs
diff --git a/crates/engine/tests/layoff_repeat.rs b/crates/engine/tests/it/layoff_repeat.rs
similarity index 100%
rename from crates/engine/tests/layoff_repeat.rs
rename to crates/engine/tests/it/layoff_repeat.rs
diff --git a/crates/engine/tests/layout_prompts.rs b/crates/engine/tests/it/layout_prompts.rs
similarity index 100%
rename from crates/engine/tests/layout_prompts.rs
rename to crates/engine/tests/it/layout_prompts.rs
diff --git a/crates/engine/tests/lisp_corpus.rs b/crates/engine/tests/it/lisp_corpus.rs
similarity index 99%
rename from crates/engine/tests/lisp_corpus.rs
rename to crates/engine/tests/it/lisp_corpus.rs
index 09f9ea04a..06838e3c3 100644
--- a/crates/engine/tests/lisp_corpus.rs
+++ b/crates/engine/tests/it/lisp_corpus.rs
@@ -2,7 +2,6 @@
 //! leave exactly the expected entities, layers and printed text. The corpus lives in its own
 //! repository; point `CADCRAFT_LISP_CORPUS` at its `cases` directory (or the repository) to run
 //! it. Without it the test only says so.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use std::path::{Path, PathBuf};
 
diff --git a/crates/engine/tests/it/main.rs b/crates/engine/tests/it/main.rs
new file mode 100644
index 000000000..b6e088a13
--- /dev/null
+++ b/crates/engine/tests/it/main.rs
@@ -0,0 +1,143 @@
+mod angle_prompts;
+mod angle_settings;
+mod annotate_options;
+mod annotative;
+mod arc_ctrl_direction;
+mod array_commands;
+mod assoc_array;
+mod attdisp_attsync;
+mod attedit_prompts;
+mod attrib_modes;
+mod attrib_props;
+mod attribute_tools;
+mod block_keep;
+mod block_redefine;
+mod break_closed_polyline;
+mod break_join_locked_layers;
+mod break_keeps_z;
+mod burst;
+mod constraint_geometry;
+mod constraint_infer;
+mod count;
+mod dash_block;
+mod data_extraction;
+mod dim_baseline_spacing;
+mod dim_chain;
+mod dim_commands;
+mod dim_explode_text;
+mod dim_properties;
+mod dim_radial_inside;
+mod dim_radial_outside;
+mod dim_vars;
+mod dimtedit_prompts;
+mod drafting_spacing;
+mod draw_prompts;
+mod draworder;
+mod dyn_input;
+mod dynamic_block_data;
+mod dynamic_grips;
+mod fillet_chamfer;
+mod fix_holds_grips;
+mod followups_626;
+mod grip_dim_input;
+mod grip_options;
+mod grip_selection;
+mod group_selection;
+mod groups;
+mod hatch_assoc;
+mod hatch_dialog_helpers;
+mod hatch_numeric_validation;
+mod hatch_options;
+mod helix;
+mod inquiry_keywords;
+mod inquiry_z;
+mod insert_prompts;
+mod isometric;
+mod join_close;
+mod json_param_validation;
+mod layer_cmdline;
+mod layer_merge_delete;
+mod layoff_repeat;
+mod layout_prompts;
+#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
+mod lisp_corpus;
+mod malformed_handles;
+mod matchprop;
+mod measure_distance_snapping;
+mod metric_linetypes;
+mod mleader_content;
+mod mleader_remember;
+mod mline;
+mod mocoro;
+mod modify_curves;
+mod mtext_columns;
+mod mtext_options;
+mod multiline_attributes;
+mod named_views;
+mod non_finite_edits;
+mod offset_closed_spline;
+mod offset_ellipse_side;
+mod offset_move;
+mod options_profile;
+mod overkill;
+mod parallel_display_list;
+mod pedit_splinedit;
+mod pick_text;
+mod pickdrag;
+mod pline_arc_xline_options;
+mod plot_styles;
+mod point_modifiers;
+mod post_command_passes;
+mod prompt_keywords;
+mod props_bad_lineweight;
+mod props_insert_scale_attribs;
+mod purge_mlinestyles;
+mod purge_prompts;
+mod qdim;
+mod qdim_modes;
+mod query_entities;
+mod quickcalc;
+mod recent_commands;
+mod rectang_ortho;
+mod refedit;
+mod region;
+mod rename_cmdline;
+mod rotate_reference;
+mod select_keywords;
+mod select_similar;
+mod select_underscore_keywords;
+mod selection_cycling;
+mod selection_modes;
+mod setvar_coverage;
+mod shapes;
+mod snap_annotations;
+mod snap_blocks;
+mod snap_curves;
+mod snap_intersections_aperture;
+mod snap_nearest;
+mod snap_overrides;
+mod snap_tracking;
+mod snaps_more;
+mod space_is_enter;
+mod spline_degree;
+mod spline_options;
+mod stretch;
+mod stretch_select;
+mod table_formulas;
+mod table_styles;
+mod temp_tracking;
+mod text_commands;
+mod text_left_justify;
+mod tolerance;
+mod transparent;
+mod trim_closed_polyline;
+mod trim_extend_options;
+mod undo_count;
+mod undo_layout_tab;
+mod viewport_clip;
+mod vplayer_prompts;
+mod vports;
+mod xdata_follows_entity;
+mod zoom_keywords;
+mod zoom_viewport;
+mod zoom_window_ortho;
diff --git a/crates/engine/tests/malformed_handles.rs b/crates/engine/tests/it/malformed_handles.rs
similarity index 100%
rename from crates/engine/tests/malformed_handles.rs
rename to crates/engine/tests/it/malformed_handles.rs
diff --git a/crates/engine/tests/matchprop.rs b/crates/engine/tests/it/matchprop.rs
similarity index 100%
rename from crates/engine/tests/matchprop.rs
rename to crates/engine/tests/it/matchprop.rs
diff --git a/crates/engine/tests/measure_distance_snapping.rs b/crates/engine/tests/it/measure_distance_snapping.rs
similarity index 100%
rename from crates/engine/tests/measure_distance_snapping.rs
rename to crates/engine/tests/it/measure_distance_snapping.rs
diff --git a/crates/engine/tests/metric_linetypes.rs b/crates/engine/tests/it/metric_linetypes.rs
similarity index 100%
rename from crates/engine/tests/metric_linetypes.rs
rename to crates/engine/tests/it/metric_linetypes.rs
diff --git a/crates/engine/tests/mleader_content.rs b/crates/engine/tests/it/mleader_content.rs
similarity index 100%
rename from crates/engine/tests/mleader_content.rs
rename to crates/engine/tests/it/mleader_content.rs
diff --git a/crates/engine/tests/mleader_remember.rs b/crates/engine/tests/it/mleader_remember.rs
similarity index 100%
rename from crates/engine/tests/mleader_remember.rs
rename to crates/engine/tests/it/mleader_remember.rs
diff --git a/crates/engine/tests/mline.rs b/crates/engine/tests/it/mline.rs
similarity index 100%
rename from crates/engine/tests/mline.rs
rename to crates/engine/tests/it/mline.rs
diff --git a/crates/engine/tests/mocoro.rs b/crates/engine/tests/it/mocoro.rs
similarity index 100%
rename from crates/engine/tests/mocoro.rs
rename to crates/engine/tests/it/mocoro.rs
diff --git a/crates/engine/tests/modify_curves.rs b/crates/engine/tests/it/modify_curves.rs
similarity index 100%
rename from crates/engine/tests/modify_curves.rs
rename to crates/engine/tests/it/modify_curves.rs
diff --git a/crates/engine/tests/mtext_columns.rs b/crates/engine/tests/it/mtext_columns.rs
similarity index 100%
rename from crates/engine/tests/mtext_columns.rs
rename to crates/engine/tests/it/mtext_columns.rs
diff --git a/crates/engine/tests/mtext_options.rs b/crates/engine/tests/it/mtext_options.rs
similarity index 100%
rename from crates/engine/tests/mtext_options.rs
rename to crates/engine/tests/it/mtext_options.rs
diff --git a/crates/engine/tests/multiline_attributes.rs b/crates/engine/tests/it/multiline_attributes.rs
similarity index 100%
rename from crates/engine/tests/multiline_attributes.rs
rename to crates/engine/tests/it/multiline_attributes.rs
diff --git a/crates/engine/tests/named_views.rs b/crates/engine/tests/it/named_views.rs
similarity index 100%
rename from crates/engine/tests/named_views.rs
rename to crates/engine/tests/it/named_views.rs
diff --git a/crates/engine/tests/non_finite_edits.rs b/crates/engine/tests/it/non_finite_edits.rs
similarity index 100%
rename from crates/engine/tests/non_finite_edits.rs
rename to crates/engine/tests/it/non_finite_edits.rs
diff --git a/crates/engine/tests/offset_closed_spline.rs b/crates/engine/tests/it/offset_closed_spline.rs
similarity index 100%
rename from crates/engine/tests/offset_closed_spline.rs
rename to crates/engine/tests/it/offset_closed_spline.rs
diff --git a/crates/engine/tests/offset_ellipse_side.rs b/crates/engine/tests/it/offset_ellipse_side.rs
similarity index 100%
rename from crates/engine/tests/offset_ellipse_side.rs
rename to crates/engine/tests/it/offset_ellipse_side.rs
diff --git a/crates/engine/tests/offset_move.rs b/crates/engine/tests/it/offset_move.rs
similarity index 100%
rename from crates/engine/tests/offset_move.rs
rename to crates/engine/tests/it/offset_move.rs
diff --git a/crates/engine/tests/options_profile.rs b/crates/engine/tests/it/options_profile.rs
similarity index 100%
rename from crates/engine/tests/options_profile.rs
rename to crates/engine/tests/it/options_profile.rs
diff --git a/crates/engine/tests/overkill.rs b/crates/engine/tests/it/overkill.rs
similarity index 100%
rename from crates/engine/tests/overkill.rs
rename to crates/engine/tests/it/overkill.rs
diff --git a/crates/engine/tests/parallel_display_list.rs b/crates/engine/tests/it/parallel_display_list.rs
similarity index 100%
rename from crates/engine/tests/parallel_display_list.rs
rename to crates/engine/tests/it/parallel_display_list.rs
diff --git a/crates/engine/tests/pedit_splinedit.rs b/crates/engine/tests/it/pedit_splinedit.rs
similarity index 100%
rename from crates/engine/tests/pedit_splinedit.rs
rename to crates/engine/tests/it/pedit_splinedit.rs
diff --git a/crates/engine/tests/pick_text.rs b/crates/engine/tests/it/pick_text.rs
similarity index 100%
rename from crates/engine/tests/pick_text.rs
rename to crates/engine/tests/it/pick_text.rs
diff --git a/crates/engine/tests/pickdrag.rs b/crates/engine/tests/it/pickdrag.rs
similarity index 100%
rename from crates/engine/tests/pickdrag.rs
rename to crates/engine/tests/it/pickdrag.rs
diff --git a/crates/engine/tests/pline_arc_xline_options.rs b/crates/engine/tests/it/pline_arc_xline_options.rs
similarity index 100%
rename from crates/engine/tests/pline_arc_xline_options.rs
rename to crates/engine/tests/it/pline_arc_xline_options.rs
diff --git a/crates/engine/tests/plot_styles.rs b/crates/engine/tests/it/plot_styles.rs
similarity index 100%
rename from crates/engine/tests/plot_styles.rs
rename to crates/engine/tests/it/plot_styles.rs
diff --git a/crates/engine/tests/point_modifiers.rs b/crates/engine/tests/it/point_modifiers.rs
similarity index 100%
rename from crates/engine/tests/point_modifiers.rs
rename to crates/engine/tests/it/point_modifiers.rs
diff --git a/crates/engine/tests/post_command_passes.rs b/crates/engine/tests/it/post_command_passes.rs
similarity index 100%
rename from crates/engine/tests/post_command_passes.rs
rename to crates/engine/tests/it/post_command_passes.rs
diff --git a/crates/engine/tests/prompt_keywords.rs b/crates/engine/tests/it/prompt_keywords.rs
similarity index 100%
rename from crates/engine/tests/prompt_keywords.rs
rename to crates/engine/tests/it/prompt_keywords.rs
diff --git a/crates/engine/tests/props_bad_lineweight.rs b/crates/engine/tests/it/props_bad_lineweight.rs
similarity index 100%
rename from crates/engine/tests/props_bad_lineweight.rs
rename to crates/engine/tests/it/props_bad_lineweight.rs
diff --git a/crates/engine/tests/props_insert_scale_attribs.rs b/crates/engine/tests/it/props_insert_scale_attribs.rs
similarity index 100%
rename from crates/engine/tests/props_insert_scale_attribs.rs
rename to crates/engine/tests/it/props_insert_scale_attribs.rs
diff --git a/crates/engine/tests/purge_mlinestyles.rs b/crates/engine/tests/it/purge_mlinestyles.rs
similarity index 100%
rename from crates/engine/tests/purge_mlinestyles.rs
rename to crates/engine/tests/it/purge_mlinestyles.rs
diff --git a/crates/engine/tests/purge_prompts.rs b/crates/engine/tests/it/purge_prompts.rs
similarity index 100%
rename from crates/engine/tests/purge_prompts.rs
rename to crates/engine/tests/it/purge_prompts.rs
diff --git a/crates/engine/tests/qdim.rs b/crates/engine/tests/it/qdim.rs
similarity index 100%
rename from crates/engine/tests/qdim.rs
rename to crates/engine/tests/it/qdim.rs
diff --git a/crates/engine/tests/qdim_modes.rs b/crates/engine/tests/it/qdim_modes.rs
similarity index 100%
rename from crates/engine/tests/qdim_modes.rs
rename to crates/engine/tests/it/qdim_modes.rs
diff --git a/crates/engine/tests/query_entities.rs b/crates/engine/tests/it/query_entities.rs
similarity index 100%
rename from crates/engine/tests/query_entities.rs
rename to crates/engine/tests/it/query_entities.rs
diff --git a/crates/engine/tests/quickcalc.rs b/crates/engine/tests/it/quickcalc.rs
similarity index 100%
rename from crates/engine/tests/quickcalc.rs
rename to crates/engine/tests/it/quickcalc.rs
diff --git a/crates/engine/tests/recent_commands.rs b/crates/engine/tests/it/recent_commands.rs
similarity index 100%
rename from crates/engine/tests/recent_commands.rs
rename to crates/engine/tests/it/recent_commands.rs
diff --git a/crates/engine/tests/rectang_ortho.rs b/crates/engine/tests/it/rectang_ortho.rs
similarity index 100%
rename from crates/engine/tests/rectang_ortho.rs
rename to crates/engine/tests/it/rectang_ortho.rs
diff --git a/crates/engine/tests/refedit.rs b/crates/engine/tests/it/refedit.rs
similarity index 100%
rename from crates/engine/tests/refedit.rs
rename to crates/engine/tests/it/refedit.rs
diff --git a/crates/engine/tests/region.rs b/crates/engine/tests/it/region.rs
similarity index 100%
rename from crates/engine/tests/region.rs
rename to crates/engine/tests/it/region.rs
diff --git a/crates/engine/tests/rename_cmdline.rs b/crates/engine/tests/it/rename_cmdline.rs
similarity index 100%
rename from crates/engine/tests/rename_cmdline.rs
rename to crates/engine/tests/it/rename_cmdline.rs
diff --git a/crates/engine/tests/rotate_reference.rs b/crates/engine/tests/it/rotate_reference.rs
similarity index 100%
rename from crates/engine/tests/rotate_reference.rs
rename to crates/engine/tests/it/rotate_reference.rs
diff --git a/crates/engine/tests/select_keywords.rs b/crates/engine/tests/it/select_keywords.rs
similarity index 100%
rename from crates/engine/tests/select_keywords.rs
rename to crates/engine/tests/it/select_keywords.rs
diff --git a/crates/engine/tests/select_similar.rs b/crates/engine/tests/it/select_similar.rs
similarity index 100%
rename from crates/engine/tests/select_similar.rs
rename to crates/engine/tests/it/select_similar.rs
diff --git a/crates/engine/tests/select_underscore_keywords.rs b/crates/engine/tests/it/select_underscore_keywords.rs
similarity index 100%
rename from crates/engine/tests/select_underscore_keywords.rs
rename to crates/engine/tests/it/select_underscore_keywords.rs
diff --git a/crates/engine/tests/selection_cycling.rs b/crates/engine/tests/it/selection_cycling.rs
similarity index 100%
rename from crates/engine/tests/selection_cycling.rs
rename to crates/engine/tests/it/selection_cycling.rs
diff --git a/crates/engine/tests/selection_modes.rs b/crates/engine/tests/it/selection_modes.rs
similarity index 100%
rename from crates/engine/tests/selection_modes.rs
rename to crates/engine/tests/it/selection_modes.rs
diff --git a/crates/engine/tests/setvar_coverage.rs b/crates/engine/tests/it/setvar_coverage.rs
similarity index 100%
rename from crates/engine/tests/setvar_coverage.rs
rename to crates/engine/tests/it/setvar_coverage.rs
diff --git a/crates/engine/tests/shapes.rs b/crates/engine/tests/it/shapes.rs
similarity index 100%
rename from crates/engine/tests/shapes.rs
rename to crates/engine/tests/it/shapes.rs
diff --git a/crates/engine/tests/snap_annotations.rs b/crates/engine/tests/it/snap_annotations.rs
similarity index 100%
rename from crates/engine/tests/snap_annotations.rs
rename to crates/engine/tests/it/snap_annotations.rs
diff --git a/crates/engine/tests/snap_blocks.rs b/crates/engine/tests/it/snap_blocks.rs
similarity index 100%
rename from crates/engine/tests/snap_blocks.rs
rename to crates/engine/tests/it/snap_blocks.rs
diff --git a/crates/engine/tests/snap_curves.rs b/crates/engine/tests/it/snap_curves.rs
similarity index 100%
rename from crates/engine/tests/snap_curves.rs
rename to crates/engine/tests/it/snap_curves.rs
diff --git a/crates/engine/tests/snap_intersections_aperture.rs b/crates/engine/tests/it/snap_intersections_aperture.rs
similarity index 100%
rename from crates/engine/tests/snap_intersections_aperture.rs
rename to crates/engine/tests/it/snap_intersections_aperture.rs
diff --git a/crates/engine/tests/snap_nearest.rs b/crates/engine/tests/it/snap_nearest.rs
similarity index 100%
rename from crates/engine/tests/snap_nearest.rs
rename to crates/engine/tests/it/snap_nearest.rs
diff --git a/crates/engine/tests/snap_overrides.rs b/crates/engine/tests/it/snap_overrides.rs
similarity index 100%
rename from crates/engine/tests/snap_overrides.rs
rename to crates/engine/tests/it/snap_overrides.rs
diff --git a/crates/engine/tests/snap_tracking.rs b/crates/engine/tests/it/snap_tracking.rs
similarity index 100%
rename from crates/engine/tests/snap_tracking.rs
rename to crates/engine/tests/it/snap_tracking.rs
diff --git a/crates/engine/tests/snaps_more.rs b/crates/engine/tests/it/snaps_more.rs
similarity index 100%
rename from crates/engine/tests/snaps_more.rs
rename to crates/engine/tests/it/snaps_more.rs
diff --git a/crates/engine/tests/space_is_enter.rs b/crates/engine/tests/it/space_is_enter.rs
similarity index 100%
rename from crates/engine/tests/space_is_enter.rs
rename to crates/engine/tests/it/space_is_enter.rs
diff --git a/crates/engine/tests/spline_degree.rs b/crates/engine/tests/it/spline_degree.rs
similarity index 100%
rename from crates/engine/tests/spline_degree.rs
rename to crates/engine/tests/it/spline_degree.rs
diff --git a/crates/engine/tests/spline_options.rs b/crates/engine/tests/it/spline_options.rs
similarity index 100%
rename from crates/engine/tests/spline_options.rs
rename to crates/engine/tests/it/spline_options.rs
diff --git a/crates/engine/tests/stretch.rs b/crates/engine/tests/it/stretch.rs
similarity index 100%
rename from crates/engine/tests/stretch.rs
rename to crates/engine/tests/it/stretch.rs
diff --git a/crates/engine/tests/stretch_select.rs b/crates/engine/tests/it/stretch_select.rs
similarity index 100%
rename from crates/engine/tests/stretch_select.rs
rename to crates/engine/tests/it/stretch_select.rs
diff --git a/crates/engine/tests/table_formulas.rs b/crates/engine/tests/it/table_formulas.rs
similarity index 100%
rename from crates/engine/tests/table_formulas.rs
rename to crates/engine/tests/it/table_formulas.rs
diff --git a/crates/engine/tests/table_styles.rs b/crates/engine/tests/it/table_styles.rs
similarity index 100%
rename from crates/engine/tests/table_styles.rs
rename to crates/engine/tests/it/table_styles.rs
diff --git a/crates/engine/tests/temp_tracking.rs b/crates/engine/tests/it/temp_tracking.rs
similarity index 100%
rename from crates/engine/tests/temp_tracking.rs
rename to crates/engine/tests/it/temp_tracking.rs
diff --git a/crates/engine/tests/text_commands.rs b/crates/engine/tests/it/text_commands.rs
similarity index 100%
rename from crates/engine/tests/text_commands.rs
rename to crates/engine/tests/it/text_commands.rs
diff --git a/crates/engine/tests/text_left_justify.rs b/crates/engine/tests/it/text_left_justify.rs
similarity index 100%
rename from crates/engine/tests/text_left_justify.rs
rename to crates/engine/tests/it/text_left_justify.rs
diff --git a/crates/engine/tests/tolerance.rs b/crates/engine/tests/it/tolerance.rs
similarity index 100%
rename from crates/engine/tests/tolerance.rs
rename to crates/engine/tests/it/tolerance.rs
diff --git a/crates/engine/tests/transparent.rs b/crates/engine/tests/it/transparent.rs
similarity index 100%
rename from crates/engine/tests/transparent.rs
rename to crates/engine/tests/it/transparent.rs
diff --git a/crates/engine/tests/trim_closed_polyline.rs b/crates/engine/tests/it/trim_closed_polyline.rs
similarity index 100%
rename from crates/engine/tests/trim_closed_polyline.rs
rename to crates/engine/tests/it/trim_closed_polyline.rs
diff --git a/crates/engine/tests/trim_extend_options.rs b/crates/engine/tests/it/trim_extend_options.rs
similarity index 100%
rename from crates/engine/tests/trim_extend_options.rs
rename to crates/engine/tests/it/trim_extend_options.rs
diff --git a/crates/engine/tests/undo_count.rs b/crates/engine/tests/it/undo_count.rs
similarity index 100%
rename from crates/engine/tests/undo_count.rs
rename to crates/engine/tests/it/undo_count.rs
diff --git a/crates/engine/tests/undo_layout_tab.rs b/crates/engine/tests/it/undo_layout_tab.rs
similarity index 100%
rename from crates/engine/tests/undo_layout_tab.rs
rename to crates/engine/tests/it/undo_layout_tab.rs
diff --git a/crates/engine/tests/viewport_clip.rs b/crates/engine/tests/it/viewport_clip.rs
similarity index 100%
rename from crates/engine/tests/viewport_clip.rs
rename to crates/engine/tests/it/viewport_clip.rs
diff --git a/crates/engine/tests/vplayer_prompts.rs b/crates/engine/tests/it/vplayer_prompts.rs
similarity index 100%
rename from crates/engine/tests/vplayer_prompts.rs
rename to crates/engine/tests/it/vplayer_prompts.rs
diff --git a/crates/engine/tests/vports.rs b/crates/engine/tests/it/vports.rs
similarity index 100%
rename from crates/engine/tests/vports.rs
rename to crates/engine/tests/it/vports.rs
diff --git a/crates/engine/tests/xdata_follows_entity.rs b/crates/engine/tests/it/xdata_follows_entity.rs
similarity index 100%
rename from crates/engine/tests/xdata_follows_entity.rs
rename to crates/engine/tests/it/xdata_follows_entity.rs
diff --git a/crates/engine/tests/zoom_keywords.rs b/crates/engine/tests/it/zoom_keywords.rs
similarity index 100%
rename from crates/engine/tests/zoom_keywords.rs
rename to crates/engine/tests/it/zoom_keywords.rs
diff --git a/crates/engine/tests/zoom_viewport.rs b/crates/engine/tests/it/zoom_viewport.rs
similarity index 100%
rename from crates/engine/tests/zoom_viewport.rs
rename to crates/engine/tests/it/zoom_viewport.rs
diff --git a/crates/engine/tests/zoom_window_ortho.rs b/crates/engine/tests/it/zoom_window_ortho.rs
similarity index 100%
rename from crates/engine/tests/zoom_window_ortho.rs
rename to crates/engine/tests/it/zoom_window_ortho.rs
diff --git a/crates/io/tests/acad_interop.rs b/crates/io/tests/it/acad_interop.rs
similarity index 100%
rename from crates/io/tests/acad_interop.rs
rename to crates/io/tests/it/acad_interop.rs
diff --git a/crates/io/tests/acis_data_store.rs b/crates/io/tests/it/acis_data_store.rs
similarity index 99%
rename from crates/io/tests/acis_data_store.rs
rename to crates/io/tests/it/acis_data_store.rs
index 137b31f2a..74b9809ce 100644
--- a/crates/io/tests/acis_data_store.rs
+++ b/crates/io/tests/it/acis_data_store.rs
@@ -2,7 +2,6 @@
 //! don't carry it themselves: it lives in the file's data store section (ACDSDATA), one record per
 //! entity bound by a 320 handle. CADCraft doesn't model solids, so it keeps the section as read and
 //! writes it back (and the DWG bridge reads it), without the records of deleted entities.
-#![cfg(not(target_arch = "wasm32"))]
 
 use cadcraft_doc::EntityKind;
 
diff --git a/crates/io/tests/angle_header.rs b/crates/io/tests/it/angle_header.rs
similarity index 100%
rename from crates/io/tests/angle_header.rs
rename to crates/io/tests/it/angle_header.rs
diff --git a/crates/io/tests/annotative_roundtrip.rs b/crates/io/tests/it/annotative_roundtrip.rs
similarity index 100%
rename from crates/io/tests/annotative_roundtrip.rs
rename to crates/io/tests/it/annotative_roundtrip.rs
diff --git a/crates/io/tests/assoc_array_roundtrip.rs b/crates/io/tests/it/assoc_array_roundtrip.rs
similarity index 100%
rename from crates/io/tests/assoc_array_roundtrip.rs
rename to crates/io/tests/it/assoc_array_roundtrip.rs
diff --git a/crates/io/tests/attrib_modes.rs b/crates/io/tests/it/attrib_modes.rs
similarity index 100%
rename from crates/io/tests/attrib_modes.rs
rename to crates/io/tests/it/attrib_modes.rs
diff --git a/crates/io/tests/attrib_props.rs b/crates/io/tests/it/attrib_props.rs
similarity index 100%
rename from crates/io/tests/attrib_props.rs
rename to crates/io/tests/it/attrib_props.rs
diff --git a/crates/io/tests/block_expansion.rs b/crates/io/tests/it/block_expansion.rs
similarity index 100%
rename from crates/io/tests/block_expansion.rs
rename to crates/io/tests/it/block_expansion.rs
diff --git a/crates/io/tests/closed_spline.rs b/crates/io/tests/it/closed_spline.rs
similarity index 100%
rename from crates/io/tests/closed_spline.rs
rename to crates/io/tests/it/closed_spline.rs
diff --git a/crates/io/tests/codepages.rs b/crates/io/tests/it/codepages.rs
similarity index 100%
rename from crates/io/tests/codepages.rs
rename to crates/io/tests/it/codepages.rs
diff --git a/crates/io/tests/dim_block_resave_roundtrip.rs b/crates/io/tests/it/dim_block_resave_roundtrip.rs
similarity index 100%
rename from crates/io/tests/dim_block_resave_roundtrip.rs
rename to crates/io/tests/it/dim_block_resave_roundtrip.rs
diff --git a/crates/io/tests/dim_block_text.rs b/crates/io/tests/it/dim_block_text.rs
similarity index 100%
rename from crates/io/tests/dim_block_text.rs
rename to crates/io/tests/it/dim_block_text.rs
diff --git a/crates/io/tests/dim_marks_roundtrip.rs b/crates/io/tests/it/dim_marks_roundtrip.rs
similarity index 100%
rename from crates/io/tests/dim_marks_roundtrip.rs
rename to crates/io/tests/it/dim_marks_roundtrip.rs
diff --git a/crates/io/tests/dimstyle_vars_roundtrip.rs b/crates/io/tests/it/dimstyle_vars_roundtrip.rs
similarity index 100%
rename from crates/io/tests/dimstyle_vars_roundtrip.rs
rename to crates/io/tests/it/dimstyle_vars_roundtrip.rs
diff --git a/crates/io/tests/drafting_spacing.rs b/crates/io/tests/it/drafting_spacing.rs
similarity index 100%
rename from crates/io/tests/drafting_spacing.rs
rename to crates/io/tests/it/drafting_spacing.rs
diff --git a/crates/io/tests/dwg_header_vars.rs b/crates/io/tests/it/dwg_header_vars.rs
similarity index 98%
rename from crates/io/tests/dwg_header_vars.rs
rename to crates/io/tests/it/dwg_header_vars.rs
index 178a5d274..d1850278f 100644
--- a/crates/io/tests/dwg_header_vars.rs
+++ b/crates/io/tests/it/dwg_header_vars.rs
@@ -1,7 +1,6 @@
 //! Unit, angle and drafting settings in the drawing header survive saving as DXF or DWG and
 //! reopening. The DWG bridge converts with acadrust, whose DXF writer leaves some header
 //! variables out; the snap grid's origin and rotation live in the `*ACTIVE` VPORT record.
-#![cfg(not(target_arch = "wasm32"))]
 
 use cadcraft_doc::{Drawing, HVal};
 use cadcraft_geom::Vec3;
diff --git a/crates/io/tests/dwg_layout_owner.rs b/crates/io/tests/it/dwg_layout_owner.rs
similarity index 100%
rename from crates/io/tests/dwg_layout_owner.rs
rename to crates/io/tests/it/dwg_layout_owner.rs
diff --git a/crates/io/tests/dwg_roundtrip_losses.rs b/crates/io/tests/it/dwg_roundtrip_losses.rs
similarity index 99%
rename from crates/io/tests/dwg_roundtrip_losses.rs
rename to crates/io/tests/it/dwg_roundtrip_losses.rs
index 813ae6593..c0852eff1 100644
--- a/crates/io/tests/dwg_roundtrip_losses.rs
+++ b/crates/io/tests/it/dwg_roundtrip_losses.rs
@@ -1,6 +1,5 @@
 //! Data that used to be lost only when a drawing is saved as DWG and reopened (the DWG bridge
 //! converts our DXF with acadrust), and the paper-space viewport the DXF writer adds for it.
-#![cfg(not(target_arch = "wasm32"))]
 
 use cadcraft_color::{Color, Rgb};
 use cadcraft_doc::*;
diff --git a/crates/io/tests/dwt_template.rs b/crates/io/tests/it/dwt_template.rs
similarity index 100%
rename from crates/io/tests/dwt_template.rs
rename to crates/io/tests/it/dwt_template.rs
diff --git a/crates/io/tests/dxf_versions.rs b/crates/io/tests/it/dxf_versions.rs
similarity index 100%
rename from crates/io/tests/dxf_versions.rs
rename to crates/io/tests/it/dxf_versions.rs
diff --git a/crates/io/tests/dynblock_read.rs b/crates/io/tests/it/dynblock_read.rs
similarity index 99%
rename from crates/io/tests/dynblock_read.rs
rename to crates/io/tests/it/dynblock_read.rs
index 3d7569d3d..d265f9e70 100644
--- a/crates/io/tests/dynblock_read.rs
+++ b/crates/io/tests/it/dynblock_read.rs
@@ -22,7 +22,7 @@ fn dxf(src: &str) -> String {
 /// The DOOR drawing as `code value` lines (shared with the engine's dynamic grip tests), with
 /// LF line ends whatever a checkout gave the file.
 fn fixture() -> String {
-    include_str!("data/dynblock_door.txt").replace("\r\n", "\n")
+    include_str!("../data/dynblock_door.txt").replace("\r\n", "\n")
 }
 
 fn h(hex: &str) -> Handle {
diff --git a/crates/io/tests/entity_props_roundtrip.rs b/crates/io/tests/it/entity_props_roundtrip.rs
similarity index 100%
rename from crates/io/tests/entity_props_roundtrip.rs
rename to crates/io/tests/it/entity_props_roundtrip.rs
diff --git a/crates/io/tests/followups_626.rs b/crates/io/tests/it/followups_626.rs
similarity index 100%
rename from crates/io/tests/followups_626.rs
rename to crates/io/tests/it/followups_626.rs
diff --git a/crates/io/tests/groups_roundtrip.rs b/crates/io/tests/it/groups_roundtrip.rs
similarity index 100%
rename from crates/io/tests/groups_roundtrip.rs
rename to crates/io/tests/it/groups_roundtrip.rs
diff --git a/crates/io/tests/hatch_assoc_roundtrip.rs b/crates/io/tests/it/hatch_assoc_roundtrip.rs
similarity index 100%
rename from crates/io/tests/hatch_assoc_roundtrip.rs
rename to crates/io/tests/it/hatch_assoc_roundtrip.rs
diff --git a/crates/io/tests/hatch_pattern_def.rs b/crates/io/tests/it/hatch_pattern_def.rs
similarity index 100%
rename from crates/io/tests/hatch_pattern_def.rs
rename to crates/io/tests/it/hatch_pattern_def.rs
diff --git a/crates/io/tests/helix_roundtrip.rs b/crates/io/tests/it/helix_roundtrip.rs
similarity index 100%
rename from crates/io/tests/helix_roundtrip.rs
rename to crates/io/tests/it/helix_roundtrip.rs
diff --git a/crates/io/tests/layout_paper_units.rs b/crates/io/tests/it/layout_paper_units.rs
similarity index 100%
rename from crates/io/tests/layout_paper_units.rs
rename to crates/io/tests/it/layout_paper_units.rs
diff --git a/crates/io/tests/layout_plot_window.rs b/crates/io/tests/it/layout_plot_window.rs
similarity index 100%
rename from crates/io/tests/layout_plot_window.rs
rename to crates/io/tests/it/layout_plot_window.rs
diff --git a/crates/io/tests/low_handseed.rs b/crates/io/tests/it/low_handseed.rs
similarity index 98%
rename from crates/io/tests/low_handseed.rs
rename to crates/io/tests/it/low_handseed.rs
index 6b7a9e09c..fbc1a77b6 100644
--- a/crates/io/tests/low_handseed.rs
+++ b/crates/io/tests/it/low_handseed.rs
@@ -1,7 +1,6 @@
 //! Another program's file can name a $HANDSEED below handles it uses. Entities CADCraft makes
 //! while reading (the faces a polyface mesh becomes) must not take handles that records further
 //! on still have: a DWG keeps one object per handle, so the duplicates were lost on save.
-#![cfg(not(target_arch = "wasm32"))]
 
 use std::collections::HashSet;
 
diff --git a/crates/io/tests/it/main.rs b/crates/io/tests/it/main.rs
new file mode 100644
index 000000000..1b1462ae5
--- /dev/null
+++ b/crates/io/tests/it/main.rs
@@ -0,0 +1,67 @@
+mod acad_interop;
+#[cfg(not(target_arch = "wasm32"))]
+mod acis_data_store;
+mod angle_header;
+mod annotative_roundtrip;
+mod assoc_array_roundtrip;
+mod attrib_modes;
+mod attrib_props;
+mod block_expansion;
+mod closed_spline;
+mod codepages;
+mod dim_block_resave_roundtrip;
+mod dim_block_text;
+mod dim_marks_roundtrip;
+mod dimstyle_vars_roundtrip;
+mod drafting_spacing;
+#[cfg(not(target_arch = "wasm32"))]
+mod dwg_header_vars;
+mod dwg_layout_owner;
+#[cfg(not(target_arch = "wasm32"))]
+mod dwg_roundtrip_losses;
+mod dwt_template;
+mod dxf_versions;
+mod dynblock_read;
+mod entity_props_roundtrip;
+mod followups_626;
+mod groups_roundtrip;
+mod hatch_assoc_roundtrip;
+mod hatch_pattern_def;
+mod helix_roundtrip;
+mod layout_paper_units;
+mod layout_plot_window;
+#[cfg(not(target_arch = "wasm32"))]
+mod low_handseed;
+mod mleader_content;
+mod mleader_roundtrip;
+mod mline_roundtrip;
+#[cfg(not(target_arch = "wasm32"))]
+mod model_layout_plot_type;
+mod mtext_columns_roundtrip;
+mod mtext_embedded_object;
+mod mtext_line_spacing;
+mod multiline_attributes;
+mod paperview_marker;
+mod passthrough_image_roundtrip;
+mod pdf_followups;
+mod pdf_layers;
+mod plot_layout_scale;
+mod plot_model_png_scale;
+mod plot_styles;
+mod region_roundtrip;
+mod roundtrip_audit;
+mod skipped_records;
+mod sortents;
+mod spline_fit_data;
+mod split_entities_section;
+mod style_typeface;
+mod svg_arc_budget;
+mod svg_tiny_extents;
+mod table_cellstyle_roundtrip;
+mod tables_objects_roundtrip;
+mod text_left_justify;
+mod tolerance_roundtrip;
+mod user_lin_pat_roundtrip;
+mod view_tables_roundtrip;
+mod viewport_clip_roundtrip;
+mod xref_roundtrip;
diff --git a/crates/io/tests/mleader_content.rs b/crates/io/tests/it/mleader_content.rs
similarity index 100%
rename from crates/io/tests/mleader_content.rs
rename to crates/io/tests/it/mleader_content.rs
diff --git a/crates/io/tests/mleader_roundtrip.rs b/crates/io/tests/it/mleader_roundtrip.rs
similarity index 100%
rename from crates/io/tests/mleader_roundtrip.rs
rename to crates/io/tests/it/mleader_roundtrip.rs
diff --git a/crates/io/tests/mline_roundtrip.rs b/crates/io/tests/it/mline_roundtrip.rs
similarity index 100%
rename from crates/io/tests/mline_roundtrip.rs
rename to crates/io/tests/it/mline_roundtrip.rs
diff --git a/crates/io/tests/model_layout_plot_type.rs b/crates/io/tests/it/model_layout_plot_type.rs
similarity index 98%
rename from crates/io/tests/model_layout_plot_type.rs
rename to crates/io/tests/it/model_layout_plot_type.rs
index 3de6380e5..55c6d62a8 100644
--- a/crates/io/tests/model_layout_plot_type.rs
+++ b/crates/io/tests/it/model_layout_plot_type.rs
@@ -2,7 +2,6 @@
 //! fitted to the paper. Plot type 5 ("Layout information", DXF Reference, PLOTSETTINGS group 74)
 //! means nothing for model space; another program's Plot dialog then showed no plot area and no
 //! scale for Model.
-#![cfg(not(target_arch = "wasm32"))]
 
 use cadcraft_doc::*;
 use cadcraft_geom::Vec3;
diff --git a/crates/io/tests/mtext_columns_roundtrip.rs b/crates/io/tests/it/mtext_columns_roundtrip.rs
similarity index 100%
rename from crates/io/tests/mtext_columns_roundtrip.rs
rename to crates/io/tests/it/mtext_columns_roundtrip.rs
diff --git a/crates/io/tests/mtext_embedded_object.rs b/crates/io/tests/it/mtext_embedded_object.rs
similarity index 100%
rename from crates/io/tests/mtext_embedded_object.rs
rename to crates/io/tests/it/mtext_embedded_object.rs
diff --git a/crates/io/tests/mtext_line_spacing.rs b/crates/io/tests/it/mtext_line_spacing.rs
similarity index 100%
rename from crates/io/tests/mtext_line_spacing.rs
rename to crates/io/tests/it/mtext_line_spacing.rs
diff --git a/crates/io/tests/multiline_attributes.rs b/crates/io/tests/it/multiline_attributes.rs
similarity index 100%
rename from crates/io/tests/multiline_attributes.rs
rename to crates/io/tests/it/multiline_attributes.rs
diff --git a/crates/io/tests/paperview_marker.rs b/crates/io/tests/it/paperview_marker.rs
similarity index 100%
rename from crates/io/tests/paperview_marker.rs
rename to crates/io/tests/it/paperview_marker.rs
diff --git a/crates/io/tests/passthrough_image_roundtrip.rs b/crates/io/tests/it/passthrough_image_roundtrip.rs
similarity index 100%
rename from crates/io/tests/passthrough_image_roundtrip.rs
rename to crates/io/tests/it/passthrough_image_roundtrip.rs
diff --git a/crates/io/tests/pdf_followups.rs b/crates/io/tests/it/pdf_followups.rs
similarity index 100%
rename from crates/io/tests/pdf_followups.rs
rename to crates/io/tests/it/pdf_followups.rs
diff --git a/crates/io/tests/pdf_layers.rs b/crates/io/tests/it/pdf_layers.rs
similarity index 100%
rename from crates/io/tests/pdf_layers.rs
rename to crates/io/tests/it/pdf_layers.rs
diff --git a/crates/io/tests/plot_layout_scale.rs b/crates/io/tests/it/plot_layout_scale.rs
similarity index 100%
rename from crates/io/tests/plot_layout_scale.rs
rename to crates/io/tests/it/plot_layout_scale.rs
diff --git a/crates/io/tests/plot_model_png_scale.rs b/crates/io/tests/it/plot_model_png_scale.rs
similarity index 100%
rename from crates/io/tests/plot_model_png_scale.rs
rename to crates/io/tests/it/plot_model_png_scale.rs
diff --git a/crates/io/tests/plot_styles.rs b/crates/io/tests/it/plot_styles.rs
similarity index 100%
rename from crates/io/tests/plot_styles.rs
rename to crates/io/tests/it/plot_styles.rs
diff --git a/crates/io/tests/region_roundtrip.rs b/crates/io/tests/it/region_roundtrip.rs
similarity index 100%
rename from crates/io/tests/region_roundtrip.rs
rename to crates/io/tests/it/region_roundtrip.rs
diff --git a/crates/io/tests/roundtrip_audit.rs b/crates/io/tests/it/roundtrip_audit.rs
similarity index 100%
rename from crates/io/tests/roundtrip_audit.rs
rename to crates/io/tests/it/roundtrip_audit.rs
diff --git a/crates/io/tests/skipped_records.rs b/crates/io/tests/it/skipped_records.rs
similarity index 100%
rename from crates/io/tests/skipped_records.rs
rename to crates/io/tests/it/skipped_records.rs
diff --git a/crates/io/tests/sortents.rs b/crates/io/tests/it/sortents.rs
similarity index 100%
rename from crates/io/tests/sortents.rs
rename to crates/io/tests/it/sortents.rs
diff --git a/crates/io/tests/spline_fit_data.rs b/crates/io/tests/it/spline_fit_data.rs
similarity index 100%
rename from crates/io/tests/spline_fit_data.rs
rename to crates/io/tests/it/spline_fit_data.rs
diff --git a/crates/io/tests/split_entities_section.rs b/crates/io/tests/it/split_entities_section.rs
similarity index 100%
rename from crates/io/tests/split_entities_section.rs
rename to crates/io/tests/it/split_entities_section.rs
diff --git a/crates/io/tests/style_typeface.rs b/crates/io/tests/it/style_typeface.rs
similarity index 100%
rename from crates/io/tests/style_typeface.rs
rename to crates/io/tests/it/style_typeface.rs
diff --git a/crates/io/tests/svg_arc_budget.rs b/crates/io/tests/it/svg_arc_budget.rs
similarity index 100%
rename from crates/io/tests/svg_arc_budget.rs
rename to crates/io/tests/it/svg_arc_budget.rs
diff --git a/crates/io/tests/svg_tiny_extents.rs b/crates/io/tests/it/svg_tiny_extents.rs
similarity index 100%
rename from crates/io/tests/svg_tiny_extents.rs
rename to crates/io/tests/it/svg_tiny_extents.rs
diff --git a/crates/io/tests/table_cellstyle_roundtrip.rs b/crates/io/tests/it/table_cellstyle_roundtrip.rs
similarity index 100%
rename from crates/io/tests/table_cellstyle_roundtrip.rs
rename to crates/io/tests/it/table_cellstyle_roundtrip.rs
diff --git a/crates/io/tests/tables_objects_roundtrip.rs b/crates/io/tests/it/tables_objects_roundtrip.rs
similarity index 100%
rename from crates/io/tests/tables_objects_roundtrip.rs
rename to crates/io/tests/it/tables_objects_roundtrip.rs
diff --git a/crates/io/tests/text_left_justify.rs b/crates/io/tests/it/text_left_justify.rs
similarity index 100%
rename from crates/io/tests/text_left_justify.rs
rename to crates/io/tests/it/text_left_justify.rs
diff --git a/crates/io/tests/tolerance_roundtrip.rs b/crates/io/tests/it/tolerance_roundtrip.rs
similarity index 100%
rename from crates/io/tests/tolerance_roundtrip.rs
rename to crates/io/tests/it/tolerance_roundtrip.rs
diff --git a/crates/io/tests/user_lin_pat_roundtrip.rs b/crates/io/tests/it/user_lin_pat_roundtrip.rs
similarity index 100%
rename from crates/io/tests/user_lin_pat_roundtrip.rs
rename to crates/io/tests/it/user_lin_pat_roundtrip.rs
diff --git a/crates/io/tests/view_tables_roundtrip.rs b/crates/io/tests/it/view_tables_roundtrip.rs
similarity index 100%
rename from crates/io/tests/view_tables_roundtrip.rs
rename to crates/io/tests/it/view_tables_roundtrip.rs
diff --git a/crates/io/tests/viewport_clip_roundtrip.rs b/crates/io/tests/it/viewport_clip_roundtrip.rs
similarity index 100%
rename from crates/io/tests/viewport_clip_roundtrip.rs
rename to crates/io/tests/it/viewport_clip_roundtrip.rs
diff --git a/crates/io/tests/xref_roundtrip.rs b/crates/io/tests/it/xref_roundtrip.rs
similarity index 100%
rename from crates/io/tests/xref_roundtrip.rs
rename to crates/io/tests/it/xref_roundtrip.rs
diff --git a/crates/mcp/tests/cmdline_key.rs b/crates/mcp/tests/it/cmdline_key.rs
similarity index 94%
rename from crates/mcp/tests/cmdline_key.rs
rename to crates/mcp/tests/it/cmdline_key.rs
index 77486e665..0f074beb2 100644
--- a/crates/mcp/tests/cmdline_key.rs
+++ b/crates/mcp/tests/it/cmdline_key.rs
@@ -1,5 +1,5 @@
 //! The headless backend answers `cmdline.key` like `cmdline.input` and like the app's control
-//! channel (`crates/ui-egui/tests/control_cmdline_key.rs`): a refused Enter is echoed and reported
+//! channel (`crates/ui-egui/tests/it/control_cmdline_key.rs`): a refused Enter is echoed and reported
 //! in `error`, and the call itself succeeds.
 
 use cadcraft_mcp::{Backend, Headless};
diff --git a/crates/mcp/tests/cmdline_parity.rs b/crates/mcp/tests/it/cmdline_parity.rs
similarity index 97%
rename from crates/mcp/tests/cmdline_parity.rs
rename to crates/mcp/tests/it/cmdline_parity.rs
index deaaa29fe..27209b570 100644
--- a/crates/mcp/tests/cmdline_parity.rs
+++ b/crates/mcp/tests/it/cmdline_parity.rs
@@ -1,5 +1,5 @@
 //! The headless backend answers `cmdline.input` and `app.open` with the same reply shape as the
-//! app's control channel (`cadcraft_ui_egui::control`, tested in `crates/ui-egui/tests/control_cmdline.rs`).
+//! app's control channel (`cadcraft_ui_egui::control`, tested in `crates/ui-egui/tests/it/control_cmdline.rs`).
 
 use cadcraft_mcp::{Backend, Headless};
 use serde_json::{Value, json};
diff --git a/crates/mcp/tests/control_methods.rs b/crates/mcp/tests/it/control_methods.rs
similarity index 94%
rename from crates/mcp/tests/control_methods.rs
rename to crates/mcp/tests/it/control_methods.rs
index da2727f13..f2f1ce037 100644
--- a/crates/mcp/tests/control_methods.rs
+++ b/crates/mcp/tests/it/control_methods.rs
@@ -1,5 +1,5 @@
 //! The headless backend's `control.methods` lists the methods it answers, all of them documented
-//! in `docs/control-protocol.md` (the app's list is tested in `crates/ui-egui/tests/control_methods.rs`).
+//! in `docs/control-protocol.md` (the app's list is tested in `crates/ui-egui/tests/it/control_methods.rs`).
 
 use std::collections::BTreeSet;
 
@@ -7,7 +7,7 @@ use cadcraft_mcp::{Backend, Headless};
 use serde_json::json;
 
 fn documented() -> BTreeSet<String> {
-    let doc = include_str!("../../../docs/control-protocol.md");
+    let doc = include_str!("../../../../docs/control-protocol.md");
     let table = doc.lines().skip_while(|l| !l.starts_with("| Method |")).skip(2).take_while(|l| l.starts_with('|'));
     table.filter_map(|l| l.split('|').nth(1)).flat_map(|cell| cell.split('`').skip(1).step_by(2).map(str::to_string).collect::<Vec<_>>()).collect()
 }
diff --git a/crates/mcp/tests/it/main.rs b/crates/mcp/tests/it/main.rs
new file mode 100644
index 000000000..850725748
--- /dev/null
+++ b/crates/mcp/tests/it/main.rs
@@ -0,0 +1,3 @@
+mod cmdline_key;
+mod cmdline_parity;
+mod control_methods;
diff --git a/crates/render/tests/aci7_display.rs b/crates/render/tests/it/aci7_display.rs
similarity index 100%
rename from crates/render/tests/aci7_display.rs
rename to crates/render/tests/it/aci7_display.rs
diff --git a/crates/render/tests/annotative_viewport.rs b/crates/render/tests/it/annotative_viewport.rs
similarity index 100%
rename from crates/render/tests/annotative_viewport.rs
rename to crates/render/tests/it/annotative_viewport.rs
diff --git a/crates/render/tests/dim_angular_centre.rs b/crates/render/tests/it/dim_angular_centre.rs
similarity index 100%
rename from crates/render/tests/dim_angular_centre.rs
rename to crates/render/tests/it/dim_angular_centre.rs
diff --git a/crates/render/tests/dim_post_tolerance.rs b/crates/render/tests/it/dim_post_tolerance.rs
similarity index 100%
rename from crates/render/tests/dim_post_tolerance.rs
rename to crates/render/tests/it/dim_post_tolerance.rs
diff --git a/crates/render/tests/dim_text_format.rs b/crates/render/tests/it/dim_text_format.rs
similarity index 100%
rename from crates/render/tests/dim_text_format.rs
rename to crates/render/tests/it/dim_text_format.rs
diff --git a/crates/render/tests/hatch_fill.rs b/crates/render/tests/it/hatch_fill.rs
similarity index 100%
rename from crates/render/tests/hatch_fill.rs
rename to crates/render/tests/it/hatch_fill.rs
diff --git a/crates/render/tests/linetype_text.rs b/crates/render/tests/it/linetype_text.rs
similarity index 100%
rename from crates/render/tests/linetype_text.rs
rename to crates/render/tests/it/linetype_text.rs
diff --git a/crates/render/tests/lwdefault.rs b/crates/render/tests/it/lwdefault.rs
similarity index 100%
rename from crates/render/tests/lwdefault.rs
rename to crates/render/tests/it/lwdefault.rs
diff --git a/crates/render/tests/it/main.rs b/crates/render/tests/it/main.rs
new file mode 100644
index 000000000..7469173d0
--- /dev/null
+++ b/crates/render/tests/it/main.rs
@@ -0,0 +1,17 @@
+mod aci7_display;
+mod annotative_viewport;
+mod dim_angular_centre;
+mod dim_post_tolerance;
+mod dim_text_format;
+mod hatch_fill;
+mod linetype_text;
+mod lwdefault;
+mod plot_line_styles;
+mod plot_styles;
+mod point_style;
+mod psltscale;
+mod raster_points;
+mod render_props;
+mod viewport_frozen_layer;
+mod wide_pline_linetype;
+mod wipeout_mask;
diff --git a/crates/render/tests/plot_line_styles.rs b/crates/render/tests/it/plot_line_styles.rs
similarity index 100%
rename from crates/render/tests/plot_line_styles.rs
rename to crates/render/tests/it/plot_line_styles.rs
diff --git a/crates/render/tests/plot_styles.rs b/crates/render/tests/it/plot_styles.rs
similarity index 100%
rename from crates/render/tests/plot_styles.rs
rename to crates/render/tests/it/plot_styles.rs
diff --git a/crates/render/tests/point_style.rs b/crates/render/tests/it/point_style.rs
similarity index 100%
rename from crates/render/tests/point_style.rs
rename to crates/render/tests/it/point_style.rs
diff --git a/crates/render/tests/psltscale.rs b/crates/render/tests/it/psltscale.rs
similarity index 100%
rename from crates/render/tests/psltscale.rs
rename to crates/render/tests/it/psltscale.rs
diff --git a/crates/render/tests/raster_points.rs b/crates/render/tests/it/raster_points.rs
similarity index 100%
rename from crates/render/tests/raster_points.rs
rename to crates/render/tests/it/raster_points.rs
diff --git a/crates/render/tests/render_props.rs b/crates/render/tests/it/render_props.rs
similarity index 100%
rename from crates/render/tests/render_props.rs
rename to crates/render/tests/it/render_props.rs
diff --git a/crates/render/tests/viewport_frozen_layer.rs b/crates/render/tests/it/viewport_frozen_layer.rs
similarity index 100%
rename from crates/render/tests/viewport_frozen_layer.rs
rename to crates/render/tests/it/viewport_frozen_layer.rs
diff --git a/crates/render/tests/wide_pline_linetype.rs b/crates/render/tests/it/wide_pline_linetype.rs
similarity index 100%
rename from crates/render/tests/wide_pline_linetype.rs
rename to crates/render/tests/it/wide_pline_linetype.rs
diff --git a/crates/render/tests/wipeout_mask.rs b/crates/render/tests/it/wipeout_mask.rs
similarity index 100%
rename from crates/render/tests/wipeout_mask.rs
rename to crates/render/tests/it/wipeout_mask.rs
diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs
index 03a35212f..bc6d23ef5 100644
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@ -187,7 +187,7 @@ fn wrap(r: Result<Value, String>) -> Outcome {
 }
 
 /// What `control.methods` replies: method, params, description. Keep in step with `handle` and the
-/// table in `docs/control-protocol.md` (`tests/control_methods.rs` checks the table).
+/// table in `docs/control-protocol.md` (`tests/it/control_methods.rs` checks the table).
 const METHODS: &[(&str, &str, &str)] = &[
     ("cmdline.input", "{text}", "Type a line at the command line exactly like a user (commands, prompts, keywords; empty = Enter)."),
     ("cmdline.script", "{text}", "Run a multi-line script, like a .scr file."),
diff --git a/crates/ui-egui/tests/animation_effects.rs b/crates/ui-egui/tests/it/animation_effects.rs
similarity index 100%
rename from crates/ui-egui/tests/animation_effects.rs
rename to crates/ui-egui/tests/it/animation_effects.rs
diff --git a/crates/ui-egui/tests/chrome_geometry.rs b/crates/ui-egui/tests/it/chrome_geometry.rs
similarity index 100%
rename from crates/ui-egui/tests/chrome_geometry.rs
rename to crates/ui-egui/tests/it/chrome_geometry.rs
diff --git a/crates/ui-egui/tests/context_menu.rs b/crates/ui-egui/tests/it/context_menu.rs
similarity index 100%
rename from crates/ui-egui/tests/context_menu.rs
rename to crates/ui-egui/tests/it/context_menu.rs
diff --git a/crates/ui-egui/tests/context_menus.rs b/crates/ui-egui/tests/it/context_menus.rs
similarity index 100%
rename from crates/ui-egui/tests/context_menus.rs
rename to crates/ui-egui/tests/it/context_menus.rs
diff --git a/crates/ui-egui/tests/control_cmdline.rs b/crates/ui-egui/tests/it/control_cmdline.rs
similarity index 98%
rename from crates/ui-egui/tests/control_cmdline.rs
rename to crates/ui-egui/tests/it/control_cmdline.rs
index 0c723cf15..34a3f8cbe 100644
--- a/crates/ui-egui/tests/control_cmdline.rs
+++ b/crates/ui-egui/tests/it/control_cmdline.rs
@@ -1,5 +1,5 @@
 //! The app's control channel answers `cmdline.input` and `app.open` with the same reply shape as
-//! the headless MCP backend (`cadcraft_mcp::Headless`, tested in `crates/mcp/tests/cmdline_parity.rs`).
+//! the headless MCP backend (`cadcraft_mcp::Headless`, tested in `crates/mcp/tests/it/cmdline_parity.rs`).
 
 use cadcraft_engine::Session;
 use cadcraft_ui_egui::control::{ControlRequest, Outcome, handle};
diff --git a/crates/ui-egui/tests/control_cmdline_key.rs b/crates/ui-egui/tests/it/control_cmdline_key.rs
similarity index 95%
rename from crates/ui-egui/tests/control_cmdline_key.rs
rename to crates/ui-egui/tests/it/control_cmdline_key.rs
index de02816d7..b3858ffa0 100644
--- a/crates/ui-egui/tests/control_cmdline_key.rs
+++ b/crates/ui-egui/tests/it/control_cmdline_key.rs
@@ -1,5 +1,5 @@
 //! The app's control channel answers `cmdline.key` like `cmdline.input` and like the headless MCP
-//! backend (`crates/mcp/tests/cmdline_key.rs`): a refused Enter is echoed and reported in `error`.
+//! backend (`crates/mcp/tests/it/cmdline_key.rs`): a refused Enter is echoed and reported in `error`.
 
 use cadcraft_engine::Session;
 use cadcraft_ui_egui::control::{ControlRequest, Outcome, handle};
diff --git a/crates/ui-egui/tests/control_methods.rs b/crates/ui-egui/tests/it/control_methods.rs
similarity index 97%
rename from crates/ui-egui/tests/control_methods.rs
rename to crates/ui-egui/tests/it/control_methods.rs
index 36495657f..741d49b86 100644
--- a/crates/ui-egui/tests/control_methods.rs
+++ b/crates/ui-egui/tests/it/control_methods.rs
@@ -22,7 +22,7 @@ fn app() -> CadApp {
 
 /// The method names in the first column of the doc's method table.
 fn documented() -> BTreeSet<String> {
-    let doc = include_str!("../../../docs/control-protocol.md");
+    let doc = include_str!("../../../../docs/control-protocol.md");
     let table = doc.lines().skip_while(|l| !l.starts_with("| Method |")).skip(2).take_while(|l| l.starts_with('|'));
     table.filter_map(|l| l.split('|').nth(1)).flat_map(|cell| cell.split('`').skip(1).step_by(2).map(str::to_string).collect::<Vec<_>>()).collect()
 }
diff --git a/crates/ui-egui/tests/dialog_dispatch.rs b/crates/ui-egui/tests/it/dialog_dispatch.rs
similarity index 100%
rename from crates/ui-egui/tests/dialog_dispatch.rs
rename to crates/ui-egui/tests/it/dialog_dispatch.rs
diff --git a/crates/ui-egui/tests/docking_workflows.rs b/crates/ui-egui/tests/it/docking_workflows.rs
similarity index 100%
rename from crates/ui-egui/tests/docking_workflows.rs
rename to crates/ui-egui/tests/it/docking_workflows.rs
diff --git a/crates/ui-egui/tests/drafting_polar_increment.rs b/crates/ui-egui/tests/it/drafting_polar_increment.rs
similarity index 100%
rename from crates/ui-egui/tests/drafting_polar_increment.rs
rename to crates/ui-egui/tests/it/drafting_polar_increment.rs
diff --git a/crates/ui-egui/tests/drafting_spacing.rs b/crates/ui-egui/tests/it/drafting_spacing.rs
similarity index 100%
rename from crates/ui-egui/tests/drafting_spacing.rs
rename to crates/ui-egui/tests/it/drafting_spacing.rs
diff --git a/crates/ui-egui/tests/file_tab_titles.rs b/crates/ui-egui/tests/it/file_tab_titles.rs
similarity index 100%
rename from crates/ui-egui/tests/file_tab_titles.rs
rename to crates/ui-egui/tests/it/file_tab_titles.rs
diff --git a/crates/ui-egui/tests/gpu_viewport_stencil.rs b/crates/ui-egui/tests/it/gpu_viewport_stencil.rs
similarity index 100%
rename from crates/ui-egui/tests/gpu_viewport_stencil.rs
rename to crates/ui-egui/tests/it/gpu_viewport_stencil.rs
diff --git a/crates/ui-egui/tests/hidden_command_line.rs b/crates/ui-egui/tests/it/hidden_command_line.rs
similarity index 100%
rename from crates/ui-egui/tests/hidden_command_line.rs
rename to crates/ui-egui/tests/it/hidden_command_line.rs
diff --git a/crates/ui-egui/tests/lisp_files.rs b/crates/ui-egui/tests/it/lisp_files.rs
similarity index 100%
rename from crates/ui-egui/tests/lisp_files.rs
rename to crates/ui-egui/tests/it/lisp_files.rs
diff --git a/crates/ui-egui/tests/it/main.rs b/crates/ui-egui/tests/it/main.rs
new file mode 100644
index 000000000..2e2451579
--- /dev/null
+++ b/crates/ui-egui/tests/it/main.rs
@@ -0,0 +1,34 @@
+mod animation_effects;
+mod chrome_geometry;
+mod context_menu;
+mod context_menus;
+mod control_cmdline;
+mod control_cmdline_key;
+mod control_methods;
+mod dialog_dispatch;
+mod docking_workflows;
+mod drafting_polar_increment;
+mod drafting_spacing;
+mod file_tab_titles;
+mod gpu_viewport_stencil;
+mod hidden_command_line;
+mod lisp_files;
+mod measure_distance_snapping;
+mod menubar_hover;
+mod mspace_viewport_view;
+mod options_dialog;
+mod parameters_rename;
+mod pickdrag;
+mod properties_units;
+mod rapid_clicks;
+mod selection_cycling;
+mod shared_controls;
+mod shortcut_menus;
+mod status_bar_toggles;
+mod style_dialogs;
+mod system_cursor;
+mod text_double_click;
+mod toolsets_gear;
+mod toolsets_parametric;
+mod viewport_double_click_selection;
+mod workspace_focus;
diff --git a/crates/ui-egui/tests/measure_distance_snapping.rs b/crates/ui-egui/tests/it/measure_distance_snapping.rs
similarity index 100%
rename from crates/ui-egui/tests/measure_distance_snapping.rs
rename to crates/ui-egui/tests/it/measure_distance_snapping.rs
diff --git a/crates/ui-egui/tests/menubar_hover.rs b/crates/ui-egui/tests/it/menubar_hover.rs
similarity index 100%
rename from crates/ui-egui/tests/menubar_hover.rs
rename to crates/ui-egui/tests/it/menubar_hover.rs
diff --git a/crates/ui-egui/tests/mspace_viewport_view.rs b/crates/ui-egui/tests/it/mspace_viewport_view.rs
similarity index 100%
rename from crates/ui-egui/tests/mspace_viewport_view.rs
rename to crates/ui-egui/tests/it/mspace_viewport_view.rs
diff --git a/crates/ui-egui/tests/options_dialog.rs b/crates/ui-egui/tests/it/options_dialog.rs
similarity index 100%
rename from crates/ui-egui/tests/options_dialog.rs
rename to crates/ui-egui/tests/it/options_dialog.rs
diff --git a/crates/ui-egui/tests/parameters_rename.rs b/crates/ui-egui/tests/it/parameters_rename.rs
similarity index 100%
rename from crates/ui-egui/tests/parameters_rename.rs
rename to crates/ui-egui/tests/it/parameters_rename.rs
diff --git a/crates/ui-egui/tests/pickdrag.rs b/crates/ui-egui/tests/it/pickdrag.rs
similarity index 100%
rename from crates/ui-egui/tests/pickdrag.rs
rename to crates/ui-egui/tests/it/pickdrag.rs
diff --git a/crates/ui-egui/tests/properties_units.rs b/crates/ui-egui/tests/it/properties_units.rs
similarity index 100%
rename from crates/ui-egui/tests/properties_units.rs
rename to crates/ui-egui/tests/it/properties_units.rs
diff --git a/crates/ui-egui/tests/rapid_clicks.rs b/crates/ui-egui/tests/it/rapid_clicks.rs
similarity index 100%
rename from crates/ui-egui/tests/rapid_clicks.rs
rename to crates/ui-egui/tests/it/rapid_clicks.rs
diff --git a/crates/ui-egui/tests/selection_cycling.rs b/crates/ui-egui/tests/it/selection_cycling.rs
similarity index 100%
rename from crates/ui-egui/tests/selection_cycling.rs
rename to crates/ui-egui/tests/it/selection_cycling.rs
diff --git a/crates/ui-egui/tests/shared_controls.rs b/crates/ui-egui/tests/it/shared_controls.rs
similarity index 100%
rename from crates/ui-egui/tests/shared_controls.rs
rename to crates/ui-egui/tests/it/shared_controls.rs
diff --git a/crates/ui-egui/tests/shortcut_menus.rs b/crates/ui-egui/tests/it/shortcut_menus.rs
similarity index 100%
rename from crates/ui-egui/tests/shortcut_menus.rs
rename to crates/ui-egui/tests/it/shortcut_menus.rs
diff --git a/crates/ui-egui/tests/status_bar_toggles.rs b/crates/ui-egui/tests/it/status_bar_toggles.rs
similarity index 100%
rename from crates/ui-egui/tests/status_bar_toggles.rs
rename to crates/ui-egui/tests/it/status_bar_toggles.rs
diff --git a/crates/ui-egui/tests/style_dialogs.rs b/crates/ui-egui/tests/it/style_dialogs.rs
similarity index 100%
rename from crates/ui-egui/tests/style_dialogs.rs
rename to crates/ui-egui/tests/it/style_dialogs.rs
diff --git a/crates/ui-egui/tests/system_cursor.rs b/crates/ui-egui/tests/it/system_cursor.rs
similarity index 100%
rename from crates/ui-egui/tests/system_cursor.rs
rename to crates/ui-egui/tests/it/system_cursor.rs
diff --git a/crates/ui-egui/tests/text_double_click.rs b/crates/ui-egui/tests/it/text_double_click.rs
similarity index 100%
rename from crates/ui-egui/tests/text_double_click.rs
rename to crates/ui-egui/tests/it/text_double_click.rs
diff --git a/crates/ui-egui/tests/toolsets_gear.rs b/crates/ui-egui/tests/it/toolsets_gear.rs
similarity index 100%
rename from crates/ui-egui/tests/toolsets_gear.rs
rename to crates/ui-egui/tests/it/toolsets_gear.rs
diff --git a/crates/ui-egui/tests/toolsets_parametric.rs b/crates/ui-egui/tests/it/toolsets_parametric.rs
similarity index 100%
rename from crates/ui-egui/tests/toolsets_parametric.rs
rename to crates/ui-egui/tests/it/toolsets_parametric.rs
diff --git a/crates/ui-egui/tests/viewport_double_click_selection.rs b/crates/ui-egui/tests/it/viewport_double_click_selection.rs
similarity index 100%
rename from crates/ui-egui/tests/viewport_double_click_selection.rs
rename to crates/ui-egui/tests/it/viewport_double_click_selection.rs
diff --git a/crates/ui-egui/tests/workspace_focus.rs b/crates/ui-egui/tests/it/workspace_focus.rs
similarity index 100%
rename from crates/ui-egui/tests/workspace_focus.rs
rename to crates/ui-egui/tests/it/workspace_focus.rs
diff --git a/docs/autolisp.md b/docs/autolisp.md
index e26702c2c..910fc2787 100644
--- a/docs/autolisp.md
+++ b/docs/autolisp.md
@@ -85,5 +85,5 @@ filters take radians too.
 ## Testing against the corpus
 
 The AutoLISP conformance corpus (#648) lives in its own repository. Point `CADCRAFT_LISP_CORPUS`
-at it and run `cargo test -p cadcraft-engine --test lisp_corpus`; without the variable the test
+at it and run `cargo test -p cadcraft-engine --test it lisp_corpus::`; without the variable the test
 says it was skipped.
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index c72bc0767..5387d1619 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -20,6 +20,7 @@ commands:
   assets          check that every icon/image/font/asset is attributed in ATTRIBUTION.md
   layers          enforce the crate dependency layering (plan/architecture.md §3)
   wasm            cargo check --target wasm32-unknown-unknown for the wasm-safe crates
+  test            cargo nextest run (cargo test without nextest) plus the doctests
   ci              fmt --check, clippy -D warnings, test, assets, layers, wasm (stops at first failure)
   corpus [--download]
                   show where test corpora live; --download fetches PngSuite into corpus/pngsuite
@@ -36,6 +37,7 @@ fn main() -> ExitCode {
         Some("assets") => assets::run(&root()),
         Some("layers") => cmd_layers(),
         Some("wasm") => cmd_wasm(),
+        Some("test") => cmd_test(),
         Some("ci") => cmd_ci(),
         Some("corpus") => cmd_corpus(rest.contains(&"--download")),
         Some("stats") => stats::run(&root(), rest.contains(&"--exact")),
@@ -133,19 +135,36 @@ fn wasm_set() -> Result<Vec<String>, String> {
 
 fn cmd_wasm() -> Result<(), String> {
     let set = wasm_set()?;
-    let mut results = Vec::new();
+    let mut c = cargo();
+    c.args(["check", "--target", "wasm32-unknown-unknown", "--keep-going"]);
     for pkg in &set {
-        let mut c = cargo();
-        c.args(["check", "--target", "wasm32-unknown-unknown", "-p", pkg]);
-        let ok = run(c, &format!("cargo check --target wasm32-unknown-unknown -p {pkg}")).is_ok();
-        results.push((pkg.clone(), ok));
+        c.args(["-p", pkg]);
     }
-    println!("\nwasm32-unknown-unknown check:");
-    for (p, ok) in &results {
-        println!("  {:<6} {p}", if *ok { "ok" } else { "FAIL" });
+    run(c, &format!("cargo check --target wasm32-unknown-unknown --keep-going ({} crates)", set.len())).map_err(|e| format!("wasm check failed: {e}"))
+}
+
+/// Whether `cargo nextest` is installed.
+fn has_nextest() -> bool {
+    let mut c = cargo();
+    c.args(["nextest", "--version"]).stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null());
+    c.status().is_ok_and(|s| s.success())
+}
+
+/// Unit and integration tests (examples are not built) with nextest, or `cargo test` when
+/// nextest is missing, then the doctests, which nextest does not run.
+fn cmd_test() -> Result<(), String> {
+    let mut c = cargo();
+    if has_nextest() {
+        c.args(["nextest", "run", "--workspace", "--lib", "--bins", "--tests"]);
+        run(c, "cargo nextest run --workspace --lib --bins --tests")?;
+    } else {
+        eprintln!("note: cargo-nextest is not installed (cargo install cargo-nextest --locked); running cargo test");
+        c.args(["test", "--workspace", "--lib", "--bins", "--tests"]);
+        run(c, "cargo test --workspace --lib --bins --tests")?;
     }
-    let failed = results.iter().filter(|r| !r.1).count();
-    if failed == 0 { Ok(()) } else { Err(format!("{failed} crate(s) failed the wasm check")) }
+    let mut c = cargo();
+    c.args(["test", "--workspace", "--doc"]);
+    run(c, "cargo test --workspace --doc")
 }
 
 fn cmd_ci() -> Result<(), String> {
@@ -163,18 +182,11 @@ fn cmd_ci() -> Result<(), String> {
             "clippy",
             Box::new(|| {
                 let mut c = cargo();
-                c.args(["clippy", "--workspace", "--all-targets", "--", "-D", "warnings"]);
-                run(c, "cargo clippy --workspace --all-targets -- -D warnings")
-            }),
-        ),
-        (
-            "test",
-            Box::new(|| {
-                let mut c = cargo();
-                c.args(["test", "--workspace"]);
-                run(c, "cargo test --workspace")
+                c.args(["clippy", "--workspace", "--all-targets", "--keep-going", "--", "-D", "warnings"]);
+                run(c, "cargo clippy --workspace --all-targets --keep-going -- -D warnings")
             }),
         ),
+        ("test", Box::new(cmd_test)),
         ("assets", Box::new(|| assets::run(&root()))),
         ("layers", Box::new(cmd_layers)),
         ("wasm", Box::new(cmd_wasm)),

From 37150774c6d614776e049ade4c474fec8c0ef32e Mon Sep 17 00:00:00 2001
From: aiongg <67543387+aiongg@users.noreply.github.com>
Date: Fri, 23 Oct 2026 13:56:16 -0400
Subject: [PATCH 12/13] CI: run the gate through craft-common-actions' shared
 gate.yml; FreeBSD nightly and on release (#1987)

ci.yml is new: it calls the shared workflow (cached apt packages, nextest, main-only cache saves, Cargo.lock check). FreeBSD and Windows ARM64 run nightly and on pushes to release instead of on pull requests. Depends on storytold/craft-common-actions#69.
---
 .github/workflows/ci.yml            | 30 +++++++++++++++++++++++++++++
 .github/workflows/freebsd.yml       |  3 +++
 .github/workflows/windows-arm64.yml |  6 ++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..64c13bb23
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,30 @@
+name: CI
+
+# Quality gates for every push to main and every pull request (`cargo xtask ci`), through the
+# suite's shared gate workflow in craft-common-actions.
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+# A newer push to a PR branch cancels its older run; every push to main runs to the end.
+concurrency:
+  group: ci-${{ github.event_name == 'pull_request' && github.ref || github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  gate:
+    # Tracks @main so suite-wide CI fixes reach every app without a PR in each repository.
+    uses: storytold/craft-common-actions/.github/workflows/gate.yml@main
+    with:
+      # Same craft-fonts commit as release.yml.
+      craft-fonts-ref: 3d9ab3a132ed0eff457e424226a435a901da30d3
+      timeout-minutes: 90
+      packages: >-
+        pkg-config libxkbcommon-dev libwayland-dev libx11-dev libxcb1-dev libxcursor-dev
+        libxrandr-dev libxi-dev libfontconfig1-dev libfreetype-dev mesa-vulkan-drivers
+        libgl1-mesa-dev
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index e7a607181..11d44fca4 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -2,6 +2,9 @@
 # (GitHub has no FreeBSD runners). GPU tests skip themselves when the VM has no adapter.
 name: FreeBSD
 
+# The VM build is slow, so it runs nightly on main and on pushes to `release`, not on every pull
+# request: a drifted dependency still shows up within a day, and always before a release ships.
+# PRs that change the FreeBSD workflow or packaging itself still run it.
 on:
   push:
     branches: [release]
diff --git a/.github/workflows/windows-arm64.yml b/.github/workflows/windows-arm64.yml
index 86c724a69..f7bb0996e 100644
--- a/.github/workflows/windows-arm64.yml
+++ b/.github/workflows/windows-arm64.yml
@@ -3,15 +3,17 @@
 # binaries are ARM64, run the CLI natively, and uninstall.
 name: Windows ARM64
 
+# Nightly on main and on pushes to `release` (dependency and runner-image drift shows up within a
+# day, and always before a release ships), and on PRs that change the Windows packaging itself.
 on:
+  schedule:
+    - cron: "3 5 * * *"
   push:
     branches: [release]
   pull_request:
     paths:
       - .github/workflows/windows-arm64.yml
       - packaging/windows/**
-  schedule:
-    - cron: "41 3 * * 1"
   workflow_dispatch:
 
 concurrency:

From dd1f0531ac553b2c614dd1bc7d80406c3d29d767 Mon Sep 17 00:00:00 2001
From: aiongg <67543387+aiongg@users.noreply.github.com>
Date: Fri, 23 Oct 2026 15:40:12 -0400
Subject: [PATCH 13/13] i18n: missing translations never fail; cargo xtask i18n
 reports them (#2013)

---
 crates/ui-egui/src/i18n/tests.rs          | 1099 ++++-----------------
 crates/ui-egui/src/options/mod.rs         |   16 -
 crates/ui-egui/tests/it/context_menus.rs  |   31 -
 crates/ui-egui/tests/it/shortcut_menus.rs |   12 +-
 docs/localization.md                      |   16 +-
 xtask/src/main.rs                         |   17 +-
 6 files changed, 229 insertions(+), 962 deletions(-)

diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs
index bbbcded39..7044017d3 100644
--- a/crates/ui-egui/src/i18n/tests.rs
+++ b/crates/ui-egui/src/i18n/tests.rs
@@ -9,6 +9,11 @@ fn placeholders(text: &str) -> BTreeSet<&str> {
     text.split('{').skip(1).filter_map(|s| s.split_once('}').map(|(key, _)| key)).collect()
 }
 
+/// Languages with a catalog (every one but English).
+fn translated() -> impl Iterator<Item = &'static Language> {
+    LANGUAGES.iter().filter(|l| !l.source.is_empty())
+}
+
 #[test]
 fn catalog_is_valid_and_preserves_placeholders_and_ellipses() {
     for language in &LANGUAGES {
@@ -27,32 +32,30 @@ fn catalog_is_valid_and_preserves_placeholders_and_ellipses() {
                 }
             }
         }
+        assert_eq!(tr(language.code, "a future untranslated label"), "a future untranslated label");
     }
     let (parsed, errors) = parse("broken\n\tOpen\tВідкрити\n\tOpen\tВідкрити\n\tEmpty\t\n");
     assert_eq!(parsed.len(), 1);
     assert_eq!(errors.len(), 3);
-    assert_eq!(tr("uk", "a future untranslated label"), "a future untranslated label");
     assert_eq!(tr("unknown", "Open"), "Open");
 }
 
-/// Ukrainian is the reference translation and must cover everything. Other languages fall back
-/// to English for what they don't cover yet; their gaps are reported, not enforced, so adding a
-/// command doesn't require a row in every language.
-const REQUIRED: &[&str] = &["uk"];
-const REPORTED: &[&str] = &["pt-BR", "de", "es", "cs", "ru", "fr", "zh", "it", "ko", "sv", "ar", "hu", "tr", "el"];
-
-fn check(language: &str, what: &str, missing: Vec<String>) {
-    if REQUIRED.contains(&language) {
-        assert!(missing.is_empty(), "{language}: missing {what}: {missing:?}");
-    } else if !missing.is_empty() {
-        eprintln!("{language}: {} {what} fall back to English: {missing:?}", missing.len());
-    }
-}
-
+/// What each language shows in English for now. Missing translations never fail a build:
+/// `cargo xtask i18n`, a step of `cargo xtask ci`, runs this to print the list.
 #[test]
-fn translations_cover_commands_menus_tools_and_snap_labels() {
-    for language in REQUIRED.iter().chain(REPORTED) {
-        check(language, "translations", missing_commands_menus_tools_and_snap_labels(language));
+#[ignore = "a report, printed by `cargo xtask i18n`"]
+fn translation_gaps() {
+    for language in translated() {
+        let mut missing: BTreeSet<String> = missing_commands_menus_tools_and_snap_labels(language.code).into_iter().collect();
+        missing.extend(missing_marked_ui_literals(language.code));
+        if missing.is_empty() {
+            println!("{}: nothing missing", language.code);
+            continue;
+        }
+        println!("{}: {} strings fall back to English", language.code, missing.len());
+        for source in &missing {
+            println!("  {source}");
+        }
     }
 }
 
@@ -78,13 +81,6 @@ fn missing_commands_menus_tools_and_snap_labels(language: &str) -> Vec<String> {
     sources.into_iter().filter(|s| !s.is_empty() && !catalog.contains_key(&("", *s))).map(str::to_string).collect()
 }
 
-#[test]
-fn every_marked_ui_literal_has_a_translation() {
-    for language in REQUIRED.iter().chain(REPORTED) {
-        check(language, "UI translations", missing_marked_ui_literals(language).into_iter().collect());
-    }
-}
-
 fn missing_marked_ui_literals(language: &str) -> BTreeSet<String> {
     let catalog = catalog(language).unwrap();
     let sources = [
@@ -155,27 +151,38 @@ fn locale_and_saved_preference_resolution() {
     for (tag, code) in [("ru", "ru"), ("ru-RU", "ru"), ("ru_RU.UTF-8", "ru"), ("fr", "fr"), ("fr-FR", "fr"), ("fr_CA.UTF-8", "fr")] {
         assert_eq!(locale_language(tag), Some(code), "{tag}");
     }
-    for tag in ["ua", "ukulele", "pl-PL", "", "garbage", "💙"] {
-        assert_eq!(locale_language(tag), None, "{tag}");
-    }
     for tag in ["pt", "pt-BR", "pt_BR.UTF-8", "PT-br", "pt-PT"] {
         assert_eq!(locale_language(tag), Some("pt-BR"), "{tag}");
     }
-    assert_eq!(locale_language("ptolemy"), None);
-    assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), "pt-BR".into()]), "pt-BR");
-    assert_eq!(Preference::Auto.resolve(&["fr-FR".into(), "pt-BR".into()]), "fr");
     for tag in ["es", "es-ES", "es_MX.UTF-8", "ES-ar"] {
         assert_eq!(locale_language(tag), Some("es"), "{tag}");
     }
+    for (code, tags) in [
+        ("cs", &["cs", "cs-CZ", "cs_CZ.UTF-8", "CS-cz", " cs-CZ ", "cs_CZ@euro"][..]),
+        ("it", &["it", "it-IT", "it_IT.UTF-8", "IT-ch", " it-CH ", "it_IT@euro"]),
+        ("ko", &["ko", "ko-KR", "ko_KR.UTF-8", "KO-kr", " ko-KR ", "ko_KR@euro"]),
+        ("sv", &["sv", "sv-SE", "sv_SE.UTF-8", "SV-se", " sv-SE ", "sv-FI"]),
+        ("hu", &["hu", "hu-HU", "hu_HU.UTF-8", "HU-hu", " hu-HU "]),
+        ("tr", &["tr", "tr-TR", "tr_TR.UTF-8", "TR-tr", " tr-TR ", "tr-CY"]),
+        ("el", &["el", "el-GR", "el_GR.UTF-8", "EL-cy"]),
+        ("zh", &["zh", "zh-CN"]),
+    ] {
+        for tag in tags {
+            assert_eq!(locale_language(tag), Some(code), "{tag}");
+        }
+    }
+    // Look-alike codes, three-letter codes and endonyms pick nothing: `se` is Northern Sami.
+    let look_alikes = ["ua", "ukulele", "pl-PL", "", "garbage", "💙", "ptolemy", "cz", "csharp", "csomething", "italic"];
+    let others = ["kr", "korean", "kotlin", "se", "swe", "svenska", "hun", "magyar", "tur", "türkçe", "elvish"];
+    for tag in look_alikes.into_iter().chain(others) {
+        assert_eq!(locale_language(tag), None, "{tag}");
+    }
+    assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), "pt-BR".into()]), "pt-BR");
+    assert_eq!(Preference::Auto.resolve(&["fr-FR".into(), "pt-BR".into()]), "fr");
     assert_eq!(Preference::Auto.resolve(&["es-ES".into(), "pt-BR".into()]), "es");
-    assert_eq!(Preference::parse("es"), Some(Preference::Spanish));
-    assert_eq!(Preference::BrazilianPortuguese.resolve(&["uk-UA".into()]), "pt-BR");
-    assert_eq!(Preference::parse("pt-BR"), Some(Preference::BrazilianPortuguese));
     let locales = vec!["pl-PL".into(), "uk-UA".into(), "en-US".into()];
     assert_eq!(Preference::Auto.resolve(&locales), "uk");
     assert_eq!(Preference::English.resolve(&locales), "en");
-    assert_eq!(Preference::German.resolve(&locales), "de");
-    assert_eq!(Preference::Auto.resolve(&["de-DE".into(), "en-US".into()]), "de");
     assert_eq!(Preference::Auto.resolve(&["en-US".into(), "uk-UA".into()]), "en");
     assert_eq!(Preference::Auto.resolve(&[]), "en");
     assert_eq!(Preference::restore(None), Preference::Auto);
@@ -183,122 +190,83 @@ fn locale_and_saved_preference_resolution() {
     for preference in Preference::ALL {
         assert_eq!(Preference::restore(Some(preference.code())), preference);
         let saved = serde_json::to_string(&preference).unwrap();
+        assert_eq!(saved, format!("\"{}\"", preference.code()));
         assert_eq!(serde_json::from_str::<Preference>(&saved).unwrap(), preference);
+        if preference == Preference::Auto {
+            continue;
+        }
+        assert_eq!(Preference::parse(preference.code()), Some(preference));
+        // A chosen language wins over the system's; Auto takes the first system language there is.
+        assert_eq!(preference.resolve(&["uk-UA".into()]), preference.code());
+        if preference != Preference::English {
+            assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), preference.code().into(), "en-US".into()]), preference.code());
+        }
+        // Saved with the host's other preferences; a bad saved value keeps the current choice.
+        let mut a = CadApp::new(Session::new(), Services::default());
+        a.ui.interface_language = preference;
+        let mut b = CadApp::new(Session::new(), Services::default());
+        b.load_prefs(&a.prefs_json());
+        assert_eq!(b.ui.interface_language, preference);
+        b.load_prefs(r#"{"interfaceLanguage":"klingon"}"#);
+        assert_eq!(b.ui.interface_language, preference);
     }
     assert!(serde_json::from_str::<Preference>("\"unsupported\"").is_err());
     assert_eq!(serde_json::from_value::<crate::UiState>(json!({})).unwrap().interface_language, Preference::Auto);
-    // Saved with the host's other preferences; a bad saved value keeps the current choice.
-    let mut a = CadApp::new(Session::new(), Services::default());
-    a.ui.interface_language = Preference::Ukrainian;
-    let mut b = CadApp::new(Session::new(), Services::default());
-    b.load_prefs(&a.prefs_json());
-    assert_eq!(b.ui.interface_language, Preference::Ukrainian);
-    b.load_prefs(r#"{"interfaceLanguage":"klingon"}"#);
-    assert_eq!(b.ui.interface_language, Preference::Ukrainian);
 }
 
 #[test]
-fn plural_forms_and_templates_preserve_inserted_user_data() {
-    with_language("uk", || {
-        for (n, form) in [
-            (0, 2),
-            (1, 0),
-            (2, 1),
-            (4, 1),
-            (5, 2),
-            (11, 2),
-            (12, 2),
-            (14, 2),
-            (21, 0),
-            (22, 1),
-            (25, 2),
-            (101, 0),
-            (111, 2),
-            (114, 2),
-            (u64::MAX, 2),
-        ] {
-            assert_eq!(plural_uk(n), form, "{n}");
+fn plural_rules_pick_the_cldr_form() {
+    let uk = [0, 1, 2, 4, 5, 11, 12, 14, 21, 22, 25, 101, 111, 114, u64::MAX].map(plural_uk);
+    assert_eq!(uk, [2, 0, 1, 1, 2, 2, 2, 2, 0, 1, 2, 0, 2, 2, 2]);
+    assert_eq!([0, 1, 2, 5, 21, u64::MAX].map(plural_pt), [0, 0, 1, 1, 1, 1]);
+    assert_eq!([0, 1, 2, 4, 5, 11, 21, 22, 25, u64::MAX].map(plural_cs), [2, 0, 1, 1, 2, 2, 2, 2, 2, 2]);
+    for language in &LANGUAGES {
+        for n in [0, 1, 2, 3, 5, 11, 21, 22, 101, 111, u64::MAX] {
+            assert!((language.plural)(n) < language.plural_forms, "{}: {n}", language.code);
         }
-        assert_eq!(count(1, "{n} contributor", "{n} contributors"), "1 учасник");
-        assert_eq!(count(22, "{n} contributor", "{n} contributors"), "22 учасники");
-        assert_eq!(count(11, "{n} contributor", "{n} contributors"), "11 учасників");
-        assert_eq!(format("Current: {color}", &[("color", "{n} Open".into())]), "Поточний: {n} Open");
-        assert_eq!(format("{b}/{a}", &[("a", "А".into()), ("b", "Б".into())]), "Б/А");
-    });
-    assert_eq!(t("Layers"), "Layers");
-    with_language("de", || {
-        assert_eq!(t("Layers"), "Layer");
-        assert_eq!(count(1, "{n} contributor", "{n} contributors"), "1 Mitwirkender");
-        assert_eq!(count(2, "{n} contributor", "{n} contributors"), "2 Mitwirkende");
-        assert_eq!(count(11, "{n} contributor", "{n} contributors"), "11 Mitwirkende");
-    });
-    with_language("uk", || {
-        assert_eq!(t("Layers"), "Шари");
-        with_language("en", || assert_eq!(t("Layers"), "Layers"));
-        assert_eq!(t("Layers"), "Шари");
-    });
-    assert_eq!(count(2, "{n} contributor", "{n} contributors"), "2 contributors");
-}
-
-#[test]
-fn brazilian_portuguese_plurals_and_accents() {
-    for (n, form) in [(0, 0), (1, 0), (2, 1), (5, 1), (21, 1), (u64::MAX, 1)] {
-        assert_eq!(plural_pt(n), form, "{n}");
     }
-    with_language("pt-BR", || {
-        assert_eq!(count(1, "{n} contributor", "{n} contributors"), "1 colaborador");
-        assert_eq!(count(3, "{n} contributor", "{n} contributors"), "3 colaboradores");
-        assert_eq!(t("Layers"), "Camadas");
-        assert_eq!(t("Dimension"), "Cota");
-        assert_eq!(format("Height: {height}", &[("height", "{n}".into())]), "Altura: {n}");
-    });
-    assert_eq!(count(2, "{n} contributor", "{n} contributors"), "2 contributors");
 }
 
 #[test]
-fn live_switch_to_brazilian_portuguese_translates_the_shell() {
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.in_window_menu = true;
-    let ctx = egui::Context::default();
-    app.logic(&ctx);
-    app.start("line");
-    app.run("ui.language", json!({"lang":"pt-BR"})).unwrap();
-    let text = render(&mut app, &ctx);
-    assert!(text.contains("Propriedades"), "{text}");
-    assert!(text.contains("Arquivo"), "{text}");
-    assert_eq!(app.language(), "pt-BR");
-    assert_eq!(t("Properties"), "Properties", "language must not leak out of the render scope");
-    app.run("ui.language", json!({"lang":"en"})).unwrap();
-    assert!(render(&mut app, &ctx).contains("Properties"));
+fn counts_and_templates_follow_each_catalog_and_keep_inserted_text() {
+    for language in &LANGUAGES {
+        with_language(language.code, || {
+            for (one, other) in [("{n} contributor", "{n} contributors"), ("{n} commit", "{n} commits")] {
+                for n in [0, 1, 2, 3, 5, 11, 21, 22, 101, u64::MAX] {
+                    let form =
+                        catalog(language.code).and_then(|c| c.get(&("@plural", one))).and_then(|forms| forms.split('|').nth((language.plural)(n)));
+                    let expected = form.unwrap_or(if n == 1 { one } else { other }).replace("{n}", &n.to_string());
+                    assert_eq!(count(n, one, other), expected, "{}: {n}", language.code);
+                }
+            }
+            // Inserted values are never looked up or substituted again.
+            assert_eq!(format("Current: {color}", &[("color", "{n} Open".into())]), t("Current: {color}").replace("{color}", "{n} Open"));
+            assert_eq!(format("{b}/{a}", &[("a", "А".into()), ("b", "Б".into())]), "Б/А");
+        });
+    }
+    with_language("uk", || {
+        let layers = t("Layers");
+        with_language("en", || assert_eq!(t("Layers"), "Layers"));
+        assert_eq!(t("Layers"), layers);
+    });
+    assert_eq!(t("Layers"), "Layers", "language must not leak out of a render scope");
+    assert_eq!(count(2, "{n} contributor", "{n} contributors"), "2 contributors");
 }
 
 #[test]
 fn the_wcs_pill_draws_its_arrow_instead_of_a_glyph_a_font_may_lack() {
     // #1541: "WCS ⌄" showed a box where the UI font had no "⌄"; the chevron is now drawn as
     // lines, so no catalog and no language paints the glyph.
-    for (name, catalog) in [
-        ("ar", include_str!("ar.tsv")),
-        ("cs", include_str!("cs.tsv")),
-        ("de", include_str!("de.tsv")),
-        ("es", include_str!("es.tsv")),
-        ("fr", include_str!("fr.tsv")),
-        ("it", include_str!("it.tsv")),
-        ("ko", include_str!("ko.tsv")),
-        ("pt_br", include_str!("pt_br.tsv")),
-        ("ru", include_str!("ru.tsv")),
-        ("sv", include_str!("sv.tsv")),
-        ("uk", include_str!("uk.tsv")),
-        ("zh", include_str!("zh.tsv")),
-    ] {
-        assert!(!catalog.contains('\u{2304}'), "{name}.tsv still has the \u{2304} glyph");
-    }
     let ctx = egui::Context::default();
     let mut app = CadApp::new(Session::new(), Services::default());
-    for (lang, label) in [("en", "WCS"), ("de", "WKS"), ("ru", "МСК")] {
-        app.run("ui.language", json!({ "lang": lang })).unwrap();
+    for language in &LANGUAGES {
+        assert!(!language.source.contains('\u{2304}'), "{}.tsv still has the \u{2304} glyph", language.code);
+        app.run("ui.language", json!({ "lang": language.code })).unwrap();
+        app.logic(&ctx);
+        let label = tr(app.language(), "WCS");
         let text = render(&mut app, &ctx);
-        assert!(text.lines().any(|l| l == label), "{lang}: the pill reads {label}");
-        assert!(!text.contains('\u{2304}'), "{lang}: no \u{2304} glyph is painted");
+        assert!(text.lines().any(|l| l == label), "{}: the pill reads {label}", language.code);
+        assert!(!text.contains('\u{2304}'), "{}: no \u{2304} glyph is painted", language.code);
     }
 }
 
@@ -343,273 +311,115 @@ fn live_switch_translates_the_shell_without_mutating_drawing_or_automation() {
     app.session.state_mut().unwrap().title = "Open".into();
     let ctx = egui::Context::default();
     app.logic(&ctx);
-    let before = render(&mut app, &ctx);
-    assert!(before.contains("Properties"));
+    assert!(render(&mut app, &ctx).contains("Properties"));
     let commands = crate::control::all_commands(&app);
     let (menu_request, _) = crate::ControlRequest::new("ui.menu.list", json!({}));
     let crate::control::Outcome::Done(menu_before) = crate::control::handle(&mut app, &ctx, &menu_request) else { panic!("expected menu reply") };
     app.start("line");
     let prompt = crate::control::cmdline_state(&app);
-    app.run("ui.language", json!({"lang":"uk"})).unwrap();
-    let after = render(&mut app, &ctx);
-    assert!(after.contains("Властивості"), "{after}");
-    assert!(after.contains("Файл"), "{after}");
-    assert!(after.contains("Укажіть першу точку"), "{after}");
-    assert!(after.contains("Open"), "the drawing title must remain unchanged");
-    assert_eq!(crate::control::cmdline_state(&app), prompt);
-    assert_eq!(crate::control::all_commands(&app), commands);
-    let crate::control::Outcome::Done(menu_after) = crate::control::handle(&mut app, &ctx, &menu_request) else { panic!("expected menu reply") };
-    assert_eq!(menu_before, menu_after);
-    assert_eq!(app.session.state().unwrap().title, "Open");
-    assert_eq!(t("Properties"), "Properties", "language must not leak out of the render scope");
-    assert!(app.run("ui.language", json!({"lang":"bad"})).is_err());
-    assert_eq!(app.language(), "uk");
-    app.run("ui.resetpalettes", json!({})).unwrap();
-    assert_eq!(app.language(), "uk");
-    app.run("ui.language", json!({"lang":"en"})).unwrap();
+    for language in translated() {
+        app.run("ui.language", json!({ "lang": language.code })).unwrap();
+        app.logic(&ctx);
+        // Without a font for its script, a language stays chosen and the interface shows English.
+        let shown = app.language();
+        assert_eq!(shown, if crate::theme::can_show(language.code) { language.code } else { "en" });
+        assert_eq!(app.fonts_language, Some(shown));
+        let text = render(&mut app, &ctx);
+        for source in ["Properties", "File"] {
+            assert!(text.contains(tr(shown, source)), "{}: {source}: {text}", language.code);
+        }
+        assert!(text.contains("Open"), "the drawing title must remain unchanged");
+        assert_eq!(crate::control::cmdline_state(&app), prompt);
+        assert_eq!(crate::control::all_commands(&app), commands);
+        let crate::control::Outcome::Done(menu_after) = crate::control::handle(&mut app, &ctx, &menu_request) else { panic!("expected menu reply") };
+        assert_eq!(menu_before, menu_after);
+        assert_eq!(app.session.state().unwrap().title, "Open");
+        assert_eq!(t("Properties"), "Properties", "language must not leak out of the render scope");
+        assert!(app.run("ui.language", json!({"lang":"bad"})).is_err());
+        app.run("ui.resetpalettes", json!({})).unwrap();
+        assert_eq!(app.language(), shown);
+    }
+    // The general ui.set route saves the same preference and installs the same fonts.
+    for code in ["ko", "zh", "en"] {
+        let (request, _) = crate::ControlRequest::new("ui.set", json!({ "interfaceLanguage": code }));
+        let _ = crate::control::handle(&mut app, &ctx, &request);
+        assert_eq!(app.ui.interface_language, Preference::parse(code).unwrap());
+        app.logic(&ctx);
+        assert_eq!(app.fonts_language, Some(app.language()));
+        render(&mut app, &ctx);
+    }
     assert!(render(&mut app, &ctx).contains("Properties"));
     // The menu tree used by the control channel keeps its original labels and IDs.
     assert_eq!(crate::menus::tree(&app).first().unwrap().0, "File");
 }
 
 #[test]
-fn dialogs_render_in_ukrainian_and_keep_their_source_ids() {
-    for (dialog, heading) in [
-        ("dsettings", "Налаштування креслення"),
-        ("about", "Про CADCraft"),
-        ("commands", "Довідник команд"),
-        ("blocks", "Блоки"),
-        ("layers", "Диспетчер властивостей шарів"),
-        ("qselect", "Швидкий вибір"),
-        ("parameters", "Диспетчер параметрів"),
-        ("language", "Мова інтерфейсу"),
-        ("hatch", "Штрихування та градієнт"),
-    ] {
-        let mut app = CadApp::new(Session::new(), Services::default());
-        app.ui.interface_language = Preference::Ukrainian;
-        app.ui.dialog = Some(dialog.into());
+fn dialogs_render_in_every_language_and_keep_their_source_ids() {
+    for language in translated() {
+        for (dialog, heading) in [
+            ("dsettings", "Drafting Settings"),
+            ("about", "About CADCraft"),
+            ("commands", "Command Reference"),
+            ("blocks", "Blocks"),
+            ("layers", "Layer Properties Manager"),
+            ("qselect", "Quick Select"),
+            ("parameters", "Parameters Manager"),
+            ("language", "Interface Language"),
+            ("hatch", "Hatch and Gradient"),
+            ("options:preferences", "User Preferences"),
+        ] {
+            let mut app = CadApp::new(Session::new(), Services::default());
+            app.ui.interface_language = Preference::parse(language.code).unwrap();
+            app.ui.dialog = Some(dialog.into());
+            let ctx = egui::Context::default();
+            app.logic(&ctx);
+            let text = render(&mut app, &ctx);
+            assert!(text.contains(tr(app.language(), heading)), "{}: {dialog}: {text}", language.code);
+            assert_eq!(app.ui.dialog.as_deref(), Some(dialog));
+        }
+    }
+}
+
+/// The letters of every catalog have glyphs in both UI families. Latin, Cyrillic and Greek come
+/// from egui's bundled fonts alone, as in the web build; the scripts they lack need a font that
+/// `install_fonts` finds, and are checked only where one is there.
+#[test]
+fn interface_fonts_cover_every_letter_in_each_catalog() {
+    for language in translated() {
+        let extra_font = ["ko", "zh", "ar"].contains(&language.code);
+        if extra_font && !crate::theme::can_show(language.code) {
+            continue;
+        }
         let ctx = egui::Context::default();
-        app.logic(&ctx);
-        let text = render(&mut app, &ctx);
-        assert!(text.contains(heading), "{dialog}: {text}");
-        assert_eq!(app.ui.dialog.as_deref(), Some(dialog));
-    }
-}
-
-#[test]
-fn default_fonts_cover_every_german_special_letter_in_the_catalog() {
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let letters: BTreeSet<_> = include_str!("de.tsv").chars().filter(|c| ('\u{00c0}'..='\u{00ff}').contains(c)).collect();
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
+        if extra_font {
+            crate::theme::install_fonts(&ctx, language.code);
+        }
+        let mut output = ctx.run_ui(Default::default(), |_| {});
+        output.textures_delta.clear();
+        let letters: BTreeSet<char> = language
+            .source
+            .lines()
+            .filter(|line| !line.starts_with('#'))
+            .filter_map(|line| line.split('\t').nth(2))
+            .flat_map(str::chars)
+            .filter(|c| !c.is_ascii() && c.is_alphabetic())
+            .collect();
+        let missing = ctx.fonts_mut(|view| {
+            let mut missing = Vec::new();
+            for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
+                // In egui 0.36, has_glyph can report a false negative for glyphs in the same
+                // face as the replacement character. Check the family's actual character maps.
+                let mut font = view.fonts.font(&family);
+                for c in &letters {
+                    if !font.characters().contains_key(c) {
+                        missing.push(format!("{family:?}: {c} (U+{:04X})", u32::from(*c)));
+                    }
+                }
             }
-        }
-    });
-}
-
-#[test]
-fn default_fonts_cover_every_brazilian_portuguese_letter_in_the_catalog() {
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let letters: BTreeSet<_> = include_str!("pt_br.tsv").chars().filter(|c| ('\u{00c0}'..='\u{00ff}').contains(c)).collect();
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
-            }
-        }
-    });
-}
-
-#[test]
-fn default_fonts_cover_every_ukrainian_letter_in_the_catalog() {
-    let ctx = egui::Context::default();
-    // Use only egui's bundled fonts, exactly as the web build does (no system-font loader).
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let letters: BTreeSet<_> = include_str!("uk.tsv").chars().filter(|c| ('\u{0400}'..='\u{04ff}').contains(c)).collect();
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            // In egui 0.36, has_glyph can report a false negative for glyphs in the same
-            // face as the replacement character. Check the family's actual character maps.
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
-            }
-        }
-    });
-}
-
-#[test]
-fn czech_locales_preferences_and_plural_forms() {
-    for tag in ["cs", "cs-CZ", "cs_CZ.UTF-8", "CS-cz", " cs-CZ ", "cs_CZ@euro"] {
-        assert_eq!(locale_language(tag), Some("cs"), "{tag}");
+            missing
+        });
+        assert!(missing.is_empty(), "{}: missing glyphs: {}", language.code, missing.join(", "));
     }
-    for tag in ["cz", "csharp", "csomething"] {
-        assert_eq!(locale_language(tag), None, "{tag}");
-    }
-    assert_eq!(Preference::parse("cs"), Some(Preference::Czech));
-    assert_eq!(Preference::Czech.name(), "Čeština");
-    assert_eq!(Preference::Czech.resolve(&["en-US".into()]), "cs");
-    assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), "cs-CZ".into(), "en-US".into()]), "cs");
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.interface_language = Preference::Czech;
-    let mut restored = CadApp::new(Session::new(), Services::default());
-    restored.load_prefs(&app.prefs_json());
-    assert_eq!(restored.ui.interface_language, Preference::Czech);
-    with_language("cs", || {
-        for (n, form) in [(0, 2), (1, 0), (2, 1), (4, 1), (5, 2), (11, 2), (21, 2), (22, 2), (25, 2), (u64::MAX, 2)] {
-            assert_eq!(plural_cs(n), form, "{n}");
-            let contributor = ["přispěvatel", "přispěvatelé", "přispěvatelů"][form];
-            let commit = ["commit", "commity", "commitů"][form];
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("{n} {contributor}"));
-            assert_eq!(count(n, "{n} commit", "{n} commits"), format!("{n} {commit}"));
-        }
-        assert_eq!(format("Current: {color}", &[("color", "{n} Open".into())]), "Aktuální: {n} Open");
-    });
-}
-
-#[test]
-fn czech_menu_headings_keep_object_labels_and_other_catalogs() {
-    with_language("cs", || {
-        assert_eq!(menu("View"), "Zobrazení");
-        assert_eq!(t("View"), "Pohled");
-        assert_eq!(menu("Dimension"), "Kótování");
-        assert_eq!(t("Dimension"), "Kóta");
-        assert_eq!(menu("Draw"), "Kreslení");
-        assert_eq!(menu("Modify"), "Modifikace");
-        assert_eq!(menu("Edit"), "Úpravy");
-        assert_eq!(menu("File"), "Soubor");
-    });
-    for language in ["en", "uk", "de", "es", "pt-BR", "unknown"] {
-        for source in crate::menus::MENUS {
-            assert_eq!(tr_menu(language, source), tr(language, source));
-        }
-    }
-}
-
-#[test]
-fn live_czech_switch_preserves_drawing_command_and_saved_choice() {
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.in_window_menu = true;
-    app.session.state_mut().unwrap().title = "Open".into();
-    let ctx = egui::Context::default();
-    app.logic(&ctx);
-    assert!(render(&mut app, &ctx).contains("Properties"));
-    app.start("line");
-    let prompt = crate::control::cmdline_state(&app);
-    let commands = crate::control::all_commands(&app);
-    app.run("ui.language", json!({"lang":"cs"})).unwrap();
-    let text = render(&mut app, &ctx);
-    for label in ["Vlastnosti", "Soubor", "Zobrazení", "Kreslení", "Kótování", "Určete první bod"] {
-        assert!(text.contains(label), "missing {label}: {text}");
-    }
-    assert_eq!(app.language(), "cs");
-    assert_eq!(app.session.state().unwrap().title, "Open");
-    assert_eq!(crate::control::cmdline_state(&app), prompt);
-    assert_eq!(crate::control::all_commands(&app), commands);
-    assert_eq!(t("Properties"), "Properties");
-    app.run("ui.resetpalettes", json!({})).unwrap();
-    assert_eq!(app.language(), "cs");
-    app.run("ui.language", json!({"lang":"en"})).unwrap();
-    assert!(render(&mut app, &ctx).contains("Properties"));
-}
-
-#[test]
-fn czech_dialogs_render_with_stable_ids() {
-    for (dialog, heading) in [
-        ("dsettings", "Nastavení kreslení"),
-        ("about", "O aplikaci CADCraft"),
-        ("commands", "Přehled příkazů"),
-        ("blocks", "Bloky"),
-        ("layers", "Správce vlastností hladin"),
-        ("qselect", "Rychlý výběr"),
-        ("parameters", "Správce parametrů"),
-        ("language", "Čeština"),
-        ("options:preferences", "Uživatelské předvolby"),
-    ] {
-        let mut app = CadApp::new(Session::new(), Services::default());
-        app.ui.interface_language = Preference::Czech;
-        app.ui.dialog = Some(dialog.into());
-        let ctx = egui::Context::default();
-        app.logic(&ctx);
-        let text = render(&mut app, &ctx);
-        assert!(text.contains(heading), "{dialog}: {text}");
-        assert_eq!(app.ui.dialog.as_deref(), Some(dialog));
-    }
-}
-
-#[test]
-fn default_fonts_cover_czech_letters_and_typographic_quotes() {
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let letters: BTreeSet<_> = "ÁČĎÉĚÍŇÓŘŠŤÚŮÝŽáčďéěíňóřšťúůýž„“".chars().collect();
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
-            }
-        }
-    });
-}
-
-#[test]
-fn russian_and_french_plurals() {
-    with_language("ru", || {
-        for (n, word) in [(1, "участник"), (2, "участника"), (5, "участников"), (21, "участник"), (22, "участника"), (11, "участников")]
-        {
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("{n} {word}"));
-        }
-    });
-    with_language("fr", || {
-        for (n, word) in [(0, "contributeur"), (1, "contributeur"), (2, "contributeurs"), (10, "contributeurs")] {
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("{n} {word}"));
-        }
-    });
-}
-
-#[test]
-fn italian_locales_plurals_and_accents() {
-    for tag in ["it", "it-IT", "it_IT.UTF-8", "IT-ch", " it-CH ", "it_IT@euro"] {
-        assert_eq!(locale_language(tag), Some("it"), "{tag}");
-    }
-    assert_eq!(locale_language("italic"), None);
-    assert_eq!(Preference::parse("it"), Some(Preference::Italian));
-    assert_eq!(Preference::Auto.resolve(&["it-IT".into(), "en-US".into()]), "it");
-    assert_eq!(Preference::Italian.resolve(&["uk-UA".into()]), "it");
-    with_language("it", || {
-        for (n, word) in [(0, "collaboratori"), (1, "collaboratore"), (2, "collaboratori"), (21, "collaboratori")] {
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("{n} {word}"));
-        }
-        assert_eq!(t("Draw"), "Disegna");
-        assert_eq!(tr_menu("it", "Modify"), "Edita");
-        assert_eq!(tr("it", "Modify"), "Modifica");
-        assert_eq!(tr_menu("it", "View"), "Visualizza");
-        assert_eq!(tr("it", "View"), "Vista");
-    });
-    // Italian accented letters (à è é ì ò ù and capitals) come from the bundled egui fonts.
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let letters: BTreeSet<_> = include_str!("it.tsv").chars().filter(|c| ('\u{00c0}'..='\u{00ff}').contains(c)).collect();
-    assert!(letters.contains(&'à') && letters.contains(&'è'));
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
-            }
-        }
-    });
 }
 
 /// Chinese shows only with a font for it: an installed CJK font, or one this build embedded from
@@ -631,163 +441,23 @@ fn chinese_needs_a_cjk_font() {
 }
 
 #[test]
-fn hatch_dialog_extents_label_says_extents_in_ukrainian() {
-    assert_eq!(tr("uk", "Default to boundary extents"), "Типово за габаритами контуру");
-}
-
-#[test]
-fn korean_representative_translations_remain_available() {
-    let ko = catalog("ko").unwrap();
-    // Fixed regression examples; new source strings remain reported, not required for Korean.
-    assert!(REPORTED.contains(&"ko"));
-    for (context, source, expected) in [
-        ("", "File", "파일"),
-        ("menu", "View", "보기"),
-        ("menu", "Draw", "그리기"),
-        ("menu", "Dimension", "치수"),
-        ("menu", "Modify", "수정"),
-        ("", "Options...", "옵션..."),
-        ("", "User Preferences", "사용자 기본 설정"),
-        ("", "Interface Language", "인터페이스 언어"),
-        ("", "Properties", "특성"),
-        ("", "Degree", "도 기호"),
-        ("", "Style: Standard", "스타일: Standard"),
-        ("", "WCS", "WCS"),
-        ("@plural", "{n} contributor", "기여자 {n}명"),
-        ("@plural", "{n} commit", "커밋 {n}개"),
-    ] {
-        assert_eq!(ko.get(&(context, source)).copied(), Some(expected), "{context}: {source}");
-    }
-    assert_eq!(tr("ko", "future untranslated label"), "future untranslated label");
-}
-
-#[test]
-fn korean_locale_saved_preference_and_single_count_form() {
-    for tag in ["ko", "ko-KR", "ko_KR.UTF-8", "KO-kr", " ko-KR ", "ko_KR@euro"] {
-        assert_eq!(locale_language(tag), Some("ko"), "{tag}");
-    }
-    for tag in ["kr", "korean", "kotlin"] {
-        assert_eq!(locale_language(tag), None, "{tag}");
-    }
-    assert_eq!(Preference::parse("ko"), Some(Preference::Korean));
-    assert_eq!(Preference::Korean.resolve(&["en-US".into()]), "ko");
-    assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), "ko-KR".into(), "en-US".into()]), "ko");
+fn korean_without_a_hangul_font_stays_english_and_says_why() {
     let mut app = CadApp::new(Session::new(), Services::default());
-    app.system_languages = vec!["ko-KR".into()];
-    app.run("ui.language", json!({"lang": "ko"})).unwrap();
-    let mut restored = CadApp::new(Session::new(), Services::default());
-    restored.system_languages = vec!["en-US".into()];
-    restored.load_prefs(&app.prefs_json());
-    assert_eq!(restored.ui.interface_language, Preference::Korean);
-    assert_eq!(restored.language(), app.language());
-    with_language("ko", || {
-        for n in [0, 1, 2, 5, 11, 21, 101, u64::MAX] {
-            assert_eq!(plural_ko(n), 0);
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("기여자 {n}명"));
-        }
-        assert_eq!(format("Current: {color}", &[("color", "{n} Open".into())]), "현재: {n} Open");
-    });
-}
-
-#[test]
-fn korean_live_switch_keeps_automation_and_drawing_and_falls_back_without_font() {
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.in_window_menu = true;
-    app.session.state_mut().unwrap().title = "Open".into();
-    let ctx = egui::Context::default();
-    app.logic(&ctx);
-    assert!(render(&mut app, &ctx).contains("Properties"));
-    app.start("line");
-    let prompt = crate::control::cmdline_state(&app);
-    let commands = crate::control::all_commands(&app);
-    let result = app.run("ui.language", json!({"lang": "ko"})).unwrap();
-    let supported = crate::theme::can_show("ko");
-    assert_eq!(result["shown"], if supported { "ko" } else { "en" });
+    let r = app.run("ui.language", json!({"lang": "ko"})).unwrap();
+    let shown = crate::theme::can_show("ko");
+    assert_eq!(r["shown"], if shown { "ko" } else { "en" });
     assert_eq!(app.ui.interface_language, Preference::Korean);
-    app.logic(&ctx);
-    assert_eq!(app.fonts_language, Some(app.language()));
-    let text = render(&mut app, &ctx);
-    if supported {
-        for label in ["특성", "파일", "첫 번째 점 지정"] {
-            assert!(text.contains(label), "missing {label}: {text}");
-        }
-    } else {
-        assert!(text.contains("Properties"));
+    if !shown {
         assert!(app.status.as_ref().is_some_and(|(s, _)| s.contains("No font covers the Korean interface")));
         assert_eq!(Preference::Korean.name(), "Korean");
     }
-    assert_eq!(app.session.state().unwrap().title, "Open");
-    assert_eq!(crate::control::cmdline_state(&app), prompt);
-    assert_eq!(crate::control::all_commands(&app), commands);
-    assert_eq!(t("Properties"), "Properties");
-    assert!(app.run("ui.language", json!({"lang": "bad"})).is_err());
-    app.run("ui.resetpalettes", json!({})).unwrap();
-    assert_eq!(app.ui.interface_language, Preference::Korean);
-    // The general ui.set route uses the same saved preference and font installation.
-    let (request, _) = crate::ControlRequest::new("ui.set", json!({"interfaceLanguage": "zh"}));
-    let _ = crate::control::handle(&mut app, &ctx, &request);
-    assert_eq!(app.ui.interface_language, Preference::Chinese);
-    app.logic(&ctx);
-    assert_eq!(app.fonts_language, Some(if crate::theme::can_show("zh") { "zh" } else { "en" }));
-    render(&mut app, &ctx);
-    let (request, _) = crate::ControlRequest::new("ui.set", json!({"interfaceLanguage": "ko"}));
-    let _ = crate::control::handle(&mut app, &ctx, &request);
-    assert_eq!(app.ui.interface_language, Preference::Korean);
-    app.logic(&ctx);
-    assert_eq!(app.fonts_language, Some(app.language()));
-    let text = render(&mut app, &ctx);
-    assert!(text.contains(if supported { "특성" } else { "Properties" }));
-    let (request, _) = crate::ControlRequest::new("ui.set", json!({"interfaceLanguage": "en"}));
-    let _ = crate::control::handle(&mut app, &ctx, &request);
-    app.logic(&ctx);
-    assert_eq!(app.fonts_language, Some("en"));
-    assert_eq!(app.ui.interface_language, Preference::English);
-    assert!(render(&mut app, &ctx).contains("Properties"));
-    assert_eq!(crate::menus::tree(&app).first().unwrap().0, "File");
 }
 
 #[test]
-fn korean_dialogs_keep_source_ids() {
-    if !crate::theme::can_show("ko") {
-        return; // The fallback path is covered above; do not claim glyph rendering here.
-    }
-    for (dialog, source) in [
-        ("dsettings", "Drafting Settings"),
-        ("about", "About CADCraft"),
-        ("commands", "Command Reference"),
-        ("blocks", "Blocks"),
-        ("layers", "Layer Properties Manager"),
-        ("qselect", "Quick Select"),
-        ("parameters", "Parameters Manager"),
-        ("language", "Interface Language"),
-        ("options:preferences", "User Preferences"),
-    ] {
-        let mut app = CadApp::new(Session::new(), Services::default());
-        app.ui.interface_language = Preference::Korean;
-        app.ui.dialog = Some(dialog.into());
-        let ctx = egui::Context::default();
-        app.logic(&ctx);
-        let text = render(&mut app, &ctx);
-        assert!(text.contains(tr("ko", source)), "{dialog}: {text}");
-        if dialog == "language" {
-            assert!(text.contains("한국어"), "{dialog}: {text}");
-        }
-        assert_eq!(app.ui.dialog.as_deref(), Some(dialog));
-    }
-}
-
-#[test]
-fn korean_ui_fonts_cover_catalog_and_language_picker_in_both_families() {
+fn korean_ui_fonts_cover_the_language_picker_in_both_families() {
     if !crate::theme::can_show("ko") {
         return;
     }
-    let letters: BTreeSet<_> = include_str!("ko.tsv")
-        .lines()
-        .filter_map(|line| line.split('\t').nth(2))
-        .flat_map(str::chars)
-        .chain("한국어".chars())
-        .filter(|c| !c.is_ascii())
-        .collect();
     // The picker shows 한국어 in an English interface only when the CJK fonts loaded in every
     // language cover Hangul; the Korean interface itself always does, with a fallback font.
     let ctx = egui::Context::default();
@@ -801,374 +471,13 @@ fn korean_ui_fonts_cover_catalog_and_language_picker_in_both_families() {
         let mut missing = Vec::new();
         for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
             let mut font = view.fonts.font(&family);
-            for c in &letters {
-                if !font.characters().contains_key(c) {
-                    missing.push(format!("{family:?}: {c} (U+{:04X})", u32::from(*c)));
+            for c in "한국어".chars() {
+                if !font.characters().contains_key(&c) {
+                    missing.push(format!("{family:?}: {c}"));
                 }
             }
         }
         missing
     });
-    assert!(missing.is_empty(), "missing Korean UI glyphs: {}", missing.join(", "));
-}
-
-#[test]
-fn swedish_locales_preferences_and_plural_forms() {
-    for tag in ["sv", "sv-SE", "sv_SE.UTF-8", "SV-se", " sv-SE ", "sv-FI"] {
-        assert_eq!(locale_language(tag), Some("sv"), "{tag}");
-    }
-    // `se` is Northern Sami and `swe` the three-letter code; neither picks Swedish.
-    for tag in ["se", "swe", "svenska"] {
-        assert_eq!(locale_language(tag), None, "{tag}");
-    }
-    assert_eq!(Preference::parse("sv"), Some(Preference::Swedish));
-    assert_eq!(Preference::Swedish.name(), "Svenska");
-    assert_eq!(Preference::Swedish.resolve(&["en-US".into()]), "sv");
-    assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), "sv-SE".into(), "en-US".into()]), "sv");
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.interface_language = Preference::Swedish;
-    let mut restored = CadApp::new(Session::new(), Services::default());
-    restored.load_prefs(&app.prefs_json());
-    assert_eq!(restored.ui.interface_language, Preference::Swedish);
-    with_language("sv", || {
-        for n in [0, 1, 2, 5, 21, u64::MAX] {
-            // `bidragsgivare` is the same in the singular and the plural; `commit` takes an -s.
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("{n} bidragsgivare"));
-            let commit = if n == 1 { "commit" } else { "commits" };
-            assert_eq!(count(n, "{n} commit", "{n} commits"), format!("{n} {commit}"));
-        }
-        assert_eq!(format("Current: {color}", &[("color", "{n} Open".into())]), "Aktuell: {n} Open");
-    });
-}
-
-#[test]
-fn swedish_menu_headings_keep_object_labels() {
-    with_language("sv", || {
-        assert_eq!(menu("Dimension"), "Måttsättning");
-        assert_eq!(t("Dimension"), "Mått");
-        assert_eq!(menu("View"), "Visa");
-        assert_eq!(menu("Draw"), "Rita");
-        assert_eq!(menu("Modify"), "Ändra");
-        assert_eq!(menu("Edit"), "Redigera");
-        assert_eq!(menu("File"), "Arkiv");
-    });
-}
-
-#[test]
-fn live_swedish_switch_preserves_drawing_command_and_saved_choice() {
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.in_window_menu = true;
-    app.session.state_mut().unwrap().title = "Open".into();
-    let ctx = egui::Context::default();
-    app.logic(&ctx);
-    assert!(render(&mut app, &ctx).contains("Properties"));
-    app.start("line");
-    let prompt = crate::control::cmdline_state(&app);
-    let commands = crate::control::all_commands(&app);
-    app.run("ui.language", json!({"lang":"sv"})).unwrap();
-    let text = render(&mut app, &ctx);
-    for label in ["Egenskaper", "Arkiv", "Visa", "Rita", "Måttsättning", "Ange första punkten"] {
-        assert!(text.contains(label), "missing {label}: {text}");
-    }
-    assert_eq!(app.language(), "sv");
-    assert_eq!(app.session.state().unwrap().title, "Open");
-    assert_eq!(crate::control::cmdline_state(&app), prompt);
-    assert_eq!(crate::control::all_commands(&app), commands);
-    app.run("ui.language", json!({"lang":"en"})).unwrap();
-    assert!(render(&mut app, &ctx).contains("Properties"));
-}
-
-#[test]
-fn swedish_dialogs_render_with_stable_ids() {
-    for (dialog, heading) in [
-        ("dsettings", "Ritinställningar"),
-        ("about", "Om CADCraft"),
-        ("blocks", "Block"),
-        ("layers", "Hantera lageregenskaper"),
-        ("qselect", "Snabbmarkering"),
-        ("parameters", "Hantera parametrar"),
-        ("language", "Svenska"),
-        ("options:preferences", "Användarinställningar"),
-    ] {
-        let mut app = CadApp::new(Session::new(), Services::default());
-        app.ui.interface_language = Preference::Swedish;
-        app.ui.dialog = Some(dialog.into());
-        let ctx = egui::Context::default();
-        app.logic(&ctx);
-        let text = render(&mut app, &ctx);
-        assert!(text.contains(heading), "{dialog}: {text}");
-        assert_eq!(app.ui.dialog.as_deref(), Some(dialog));
-    }
-}
-
-#[test]
-fn default_fonts_cover_swedish_letters_and_quotes() {
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let letters: BTreeSet<_> = "ÅÄÖÉåäöé”–".chars().collect();
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
-            }
-        }
-    });
-}
-
-#[test]
-fn hungarian_locales_preferences_and_plural_forms() {
-    for tag in ["hu", "hu-HU", "hu_HU.UTF-8", "HU-hu", " hu-HU "] {
-        assert_eq!(locale_language(tag), Some("hu"), "{tag}");
-    }
-    // `hun` is the three-letter code; neither it nor the endonym picks Hungarian.
-    for tag in ["hun", "magyar"] {
-        assert_eq!(locale_language(tag), None, "{tag}");
-    }
-    assert_eq!(Preference::parse("hu"), Some(Preference::Hungarian));
-    assert_eq!(Preference::Hungarian.name(), "Magyar");
-    assert_eq!(Preference::Hungarian.resolve(&["en-US".into()]), "hu");
-    assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), "hu-HU".into(), "en-US".into()]), "hu");
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.interface_language = Preference::Hungarian;
-    let mut restored = CadApp::new(Session::new(), Services::default());
-    restored.load_prefs(&app.prefs_json());
-    assert_eq!(restored.ui.interface_language, Preference::Hungarian);
-    with_language("hu", || {
-        for n in [0, 1, 2, 5, 21, u64::MAX] {
-            // A numeral takes the singular noun, so every count has the same form.
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("{n} közreműködő"));
-            assert_eq!(count(n, "{n} commit", "{n} commits"), format!("{n} commit"));
-        }
-        assert_eq!(format("Current: {color}", &[("color", "{n} Open".into())]), "Aktuális: {n} Open");
-    });
-}
-
-#[test]
-fn hungarian_menu_headings_keep_object_labels() {
-    with_language("hu", || {
-        assert_eq!(menu("Dimension"), "Méretezés");
-        assert_eq!(t("Dimension"), "Méret");
-        assert_eq!(menu("View"), "Nézet");
-        assert_eq!(menu("Draw"), "Rajzolás");
-        assert_eq!(menu("Modify"), "Módosítás");
-        assert_eq!(menu("Edit"), "Szerkesztés");
-        assert_eq!(menu("File"), "Fájl");
-    });
-}
-
-#[test]
-fn live_hungarian_switch_preserves_drawing_command_and_saved_choice() {
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.in_window_menu = true;
-    app.session.state_mut().unwrap().title = "Open".into();
-    let ctx = egui::Context::default();
-    app.logic(&ctx);
-    assert!(render(&mut app, &ctx).contains("Properties"));
-    app.start("line");
-    let prompt = crate::control::cmdline_state(&app);
-    let commands = crate::control::all_commands(&app);
-    app.run("ui.language", json!({"lang":"hu"})).unwrap();
-    let text = render(&mut app, &ctx);
-    for label in ["Tulajdonságok", "Fájl", "Nézet", "Rajzolás", "Méretezés", "Add meg az első pontot"] {
-        assert!(text.contains(label), "missing {label}: {text}");
-    }
-    assert_eq!(app.language(), "hu");
-    assert_eq!(app.session.state().unwrap().title, "Open");
-    assert_eq!(crate::control::cmdline_state(&app), prompt);
-    assert_eq!(crate::control::all_commands(&app), commands);
-    app.run("ui.language", json!({"lang":"en"})).unwrap();
-    assert!(render(&mut app, &ctx).contains("Properties"));
-}
-
-#[test]
-fn hungarian_dialogs_render_with_stable_ids() {
-    for (dialog, heading) in [
-        ("dsettings", "Rajzolási beállítások"),
-        ("about", "A CADCraft névjegye"),
-        ("blocks", "Blokk"),
-        ("layers", "Rétegtulajdonság-kezelő"),
-        ("qselect", "Gyorskijelölés"),
-        ("parameters", "Paraméterkezelő"),
-        ("language", "Magyar"),
-        ("options:preferences", "Felhasználói beállítások"),
-    ] {
-        let mut app = CadApp::new(Session::new(), Services::default());
-        app.ui.interface_language = Preference::Hungarian;
-        app.ui.dialog = Some(dialog.into());
-        let ctx = egui::Context::default();
-        app.logic(&ctx);
-        let text = render(&mut app, &ctx);
-        assert!(text.contains(heading), "{dialog}: {text}");
-        assert_eq!(app.ui.dialog.as_deref(), Some(dialog));
-    }
-}
-
-#[test]
-fn default_fonts_cover_hungarian_letters_and_quotes() {
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    // Ő ő Ű ű (double acute) are in Latin Extended-A, outside the ranges the other tests check.
-    let letters: BTreeSet<_> = "ÁÉÍÓÖŐÚÜŰáéíóöőúüű„”–…".chars().collect();
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
-            }
-        }
-    });
-}
-
-#[test]
-fn turkish_locales_preferences_and_single_count_form() {
-    for tag in ["tr", "tr-TR", "tr_TR.UTF-8", "TR-tr", " tr-TR ", "tr-CY"] {
-        assert_eq!(locale_language(tag), Some("tr"), "{tag}");
-    }
-    for tag in ["tur", "türkçe"] {
-        assert_eq!(locale_language(tag), None, "{tag}");
-    }
-    assert_eq!(Preference::parse("tr"), Some(Preference::Turkish));
-    assert_eq!(Preference::Turkish.name(), "Türkçe");
-    assert_eq!(Preference::Turkish.resolve(&["en-US".into()]), "tr");
-    assert_eq!(Preference::Auto.resolve(&["pl-PL".into(), "tr-TR".into(), "en-US".into()]), "tr");
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.interface_language = Preference::Turkish;
-    let mut restored = CadApp::new(Session::new(), Services::default());
-    restored.load_prefs(&app.prefs_json());
-    assert_eq!(restored.ui.interface_language, Preference::Turkish);
-    with_language("tr", || {
-        // A Turkish noun stays singular after a number, 1 included.
-        for n in [0, 1, 2, 5, 21, u64::MAX] {
-            assert_eq!(count(n, "{n} contributor", "{n} contributors"), format!("{n} katkıda bulunan"));
-            assert_eq!(count(n, "{n} commit", "{n} commits"), format!("{n} commit"));
-        }
-        assert_eq!(format("Current: {color}", &[("color", "{n} Open".into())]), "Geçerli: {n} Open");
-    });
-}
-
-#[test]
-fn turkish_menu_headings_keep_object_labels_and_prompt_keywords() {
-    with_language("tr", || {
-        assert_eq!(menu("Dimension"), "Ölçülendirme");
-        assert_eq!(t("Dimension"), "Ölçü");
-        assert_eq!(menu("View"), "Görünüm");
-        assert_eq!(menu("Draw"), "Çiz");
-        assert_eq!(menu("Modify"), "Değiştir");
-        assert_eq!(menu("Edit"), "Düzenle");
-        assert_eq!(menu("File"), "Dosya");
-        // Clickable keywords keep the spelling the engine accepts.
-        assert_eq!(t("Enter Top, Zero or Bottom."), "Top, Zero veya Bottom girin.");
-        assert_eq!(t("Specify first point on circle: _tan to"), "Daire üzerindeki ilk noktayı belirtin: _tan to");
-    });
-}
-
-#[test]
-fn live_turkish_switch_preserves_drawing_command_and_saved_choice() {
-    let mut app = CadApp::new(Session::new(), Services::default());
-    app.ui.in_window_menu = true;
-    app.session.state_mut().unwrap().title = "Open".into();
-    let ctx = egui::Context::default();
-    app.logic(&ctx);
-    assert!(render(&mut app, &ctx).contains("Properties"));
-    app.start("line");
-    let prompt = crate::control::cmdline_state(&app);
-    let commands = crate::control::all_commands(&app);
-    app.run("ui.language", json!({"lang":"tr"})).unwrap();
-    let text = render(&mut app, &ctx);
-    for label in ["Özellikler", "Dosya", "Görünüm", "Çiz", "Ölçülendirme", "İlk noktayı belirtin"] {
-        assert!(text.contains(label), "missing {label}: {text}");
-    }
-    assert_eq!(app.language(), "tr");
-    assert_eq!(app.session.state().unwrap().title, "Open");
-    assert_eq!(crate::control::cmdline_state(&app), prompt);
-    assert_eq!(crate::control::all_commands(&app), commands);
-    app.run("ui.language", json!({"lang":"en"})).unwrap();
-    assert!(render(&mut app, &ctx).contains("Properties"));
-}
-
-#[test]
-fn turkish_dialogs_render_with_stable_ids() {
-    for (dialog, heading) in [
-        ("dsettings", "Çizim Ayarları"),
-        ("about", "CADCraft Hakkında"),
-        ("blocks", "Bloklar"),
-        ("layers", "Katman Özellikleri Yöneticisi"),
-        ("qselect", "Hızlı Seçim"),
-        ("parameters", "Parametre Yöneticisi"),
-        ("language", "Türkçe"),
-        ("options:preferences", "Kullanıcı Tercihleri"),
-    ] {
-        let mut app = CadApp::new(Session::new(), Services::default());
-        app.ui.interface_language = Preference::Turkish;
-        app.ui.dialog = Some(dialog.into());
-        let ctx = egui::Context::default();
-        app.logic(&ctx);
-        let text = render(&mut app, &ctx);
-        assert!(text.contains(heading), "{dialog}: {text}");
-        assert_eq!(app.ui.dialog.as_deref(), Some(dialog));
-    }
-}
-
-#[test]
-fn default_fonts_cover_every_turkish_letter_in_the_catalog() {
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let mut letters: BTreeSet<_> = "ÇĞİÖŞÜçğıöşü".chars().collect();
-    let translations = include_str!("tr.tsv").lines().filter(|l| !l.starts_with('#')).filter_map(|l| l.rsplit('\t').next());
-    letters.extend(translations.flat_map(str::chars).filter(|c| !c.is_ascii() && c.is_alphabetic()));
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing {c} in {family:?}");
-            }
-        }
-    });
-}
-
-#[test]
-fn greek_catalog_locale_preferences_and_contexts() {
-    assert_eq!(Preference::parse("el"), Some(Preference::Greek));
-    assert_eq!(Preference::Greek.code(), "el");
-    assert_eq!(Preference::Greek.name(), "Ελληνικά");
-    for locale in ["el", "el-GR", "el_GR.UTF-8", "EL-cy"] {
-        assert_eq!(locale_language(locale), Some("el"));
-    }
-    assert_eq!(locale_language("elvish"), None);
-    assert_eq!(Preference::Greek.resolve(&["en-US".into()]), "el");
-    let saved = serde_json::to_string(&Preference::Greek).unwrap();
-    assert_eq!(saved, "\"el\"");
-    assert_eq!(serde_json::from_str::<Preference>(&saved).unwrap(), Preference::Greek);
-    assert_eq!(tr("el", "Layer"), "Επίπεδο (Layer)");
-    assert_eq!(tr_menu("el", "Dimension"), "Διαστασιολόγηση");
-    assert_eq!(tr("el", "Dimension"), "Διαστασιολόγηση (Dimension)");
-    with_language("el", || {
-        assert_eq!(t("Open"), "Άνοιγμα");
-        assert_eq!(count(1, "{n} contributor", "{n} contributors"), "1 συνεισφέρων");
-        assert_eq!(count(0, "{n} contributor", "{n} contributors"), "0 συνεισφέροντες");
-        assert_eq!(count(2, "{n} contributor", "{n} contributors"), "2 συνεισφέροντες");
-        assert_eq!(count(21, "{n} contributor", "{n} contributors"), "21 συνεισφέροντες");
-    });
-    assert_eq!(t("Open"), "Open", "language must not leak outside a render scope");
-}
-
-#[test]
-fn default_fonts_cover_all_greek_letters_in_the_catalog() {
-    let ctx = egui::Context::default();
-    let mut output = ctx.run_ui(Default::default(), |_| {});
-    output.textures_delta.clear();
-    let letters: BTreeSet<_> =
-        include_str!("el.tsv").chars().filter(|c| ('\u{0370}'..='\u{03ff}').contains(c) || ('\u{1f00}'..='\u{1fff}').contains(c)).collect();
-    ctx.fonts_mut(|view| {
-        for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
-            let mut font = view.fonts.font(&family);
-            for c in &letters {
-                assert!(font.characters().contains_key(c), "missing Greek glyph {c} in {family:?}");
-            }
-        }
-    });
+    assert!(missing.is_empty(), "missing Korean picker glyphs: {}", missing.join(", "));
 }
diff --git a/crates/ui-egui/src/options/mod.rs b/crates/ui-egui/src/options/mod.rs
index d2f805aa6..37ee2c404 100644
--- a/crates/ui-egui/src/options/mod.rs
+++ b/crates/ui-egui/src/options/mod.rs
@@ -391,20 +391,4 @@ mod tests {
             assert_eq!(parse_hex(bad), None, "{bad}");
         }
     }
-
-    #[test]
-    fn dialog_labels_have_ukrainian_translations() {
-        let sources = [include_str!("dialog.rs")];
-        let mut missing: Vec<String> = dialog::TABS.iter().filter(|(_, l)| crate::i18n::tr("uk", l) == *l).map(|(_, l)| l.to_string()).collect();
-        for source in sources {
-            for rest in source.split("crate::tl!(").skip(1) {
-                let Some(text) = rest.strip_prefix('"').and_then(|r| r.split('"').next()) else { continue };
-                // File format names read the same in every language.
-                if crate::i18n::tr("uk", text) == text && !["DXF", "DWG"].contains(&text) {
-                    missing.push(text.to_string());
-                }
-            }
-        }
-        assert!(missing.is_empty(), "missing translations: {missing:?}");
-    }
 }
diff --git a/crates/ui-egui/tests/it/context_menus.rs b/crates/ui-egui/tests/it/context_menus.rs
index 4957ad80f..3134b8d3c 100644
--- a/crates/ui-egui/tests/it/context_menus.rs
+++ b/crates/ui-egui/tests/it/context_menus.rs
@@ -169,37 +169,6 @@ fn a_selected_block_reference_offers_the_block_editor() {
     assert_eq!(app.session.state().unwrap().block_editor(), None);
 }
 
-#[test]
-fn every_menu_label_has_a_ukrainian_translation() {
-    let mut app = app();
-    app.cmdline("LINE 0,0 10,0");
-    app.cmdline("");
-    app.run("pline", json!({ "vertices": [[0, 0], [10, 0]] })).unwrap();
-    select_all(&mut app);
-    let mut all = flatten(&context_menu::entries(&app));
-    let line = app.session.doc().unwrap().model.handles()[0];
-    app.session.set_selection(app.session.doc().unwrap().model.handles().into_iter().filter(|h| *h != line).collect());
-    all.extend(flatten(&context_menu::entries(&app)));
-    all.extend(flatten(&context_menu::snap_entries(&app)));
-    type_line(&mut app, "LINE");
-    type_line(&mut app, "0,0");
-    all.extend(flatten(&context_menu::command_entries(&app).unwrap()));
-    let mut missing = Vec::new();
-    for (label, id, _) in &all {
-        let segments: Vec<&str> = label.split('/').collect();
-        // The item itself is user text when it types a value, or a command name (Recent Commands).
-        let user_text = (id.starts_with(context_menu::TYPE) && !id.contains('\'')) || segments.first() == Some(&"Recent Commands");
-        let n = segments.len() - usize::from(user_text);
-        for s in &segments[..n] {
-            // Point filters (.X) and "Repeat LINE" (a template) aren't catalog keys.
-            if !s.starts_with('.') && !s.starts_with("Repeat ") && cadcraft_ui_egui::i18n::tr("uk", s) == *s {
-                missing.push(s.to_string());
-            }
-        }
-    }
-    assert!(missing.is_empty(), "untranslated menu labels: {missing:?}");
-}
-
 /// The text painted in one frame at `time` (seconds).
 fn painted(app: &mut CadApp, ctx: &egui::Context, events: Vec<egui::Event>, time: f64) -> String {
     fn collect(shape: &egui::Shape, text: &mut String) {
diff --git a/crates/ui-egui/tests/it/shortcut_menus.rs b/crates/ui-egui/tests/it/shortcut_menus.rs
index eb132b8c8..360fce521 100644
--- a/crates/ui-egui/tests/it/shortcut_menus.rs
+++ b/crates/ui-egui/tests/it/shortcut_menus.rs
@@ -136,7 +136,7 @@ fn layer_and_properties_palette_menus() {
 }
 
 #[test]
-fn every_label_has_a_ukrainian_translation_and_every_id_a_command() {
+fn every_id_is_a_command() {
     let mut app = app();
     app.cmdline("LINE 0,0 10,0");
     app.cmdline("");
@@ -146,16 +146,7 @@ fn every_label_has_a_ukrainian_translation_and_every_id_a_command() {
     all.extend(flatten(&sm::layout_tab_entries(&app, "Layout1")));
     all.extend(flatten(&sm::layer_entries(&app, "0")));
     all.extend(flatten(&sm::properties_entries(&app)));
-    let mut missing = Vec::new();
     for (label, id, _) in &all {
-        let segments: Vec<&str> = label.split('/').collect();
-        // Command names (Recent Commands) and line counts aren't translated.
-        let n = segments.len() - usize::from(segments.len() > 1);
-        for s in &segments[..n] {
-            if cadcraft_ui_egui::i18n::tr("uk", s) == *s {
-                missing.push(s.to_string());
-            }
-        }
         let command = id.strip_prefix("run:").and_then(|r| r.split_once(':')).map_or(id.as_str(), |(c, _)| c);
         let special = ["drawing:", "layout:", "cmdline:"].iter().any(|p| id.starts_with(p));
         assert!(
@@ -163,5 +154,4 @@ fn every_label_has_a_ukrainian_translation_and_every_id_a_command() {
             "{label}: {id} isn't a command"
         );
     }
-    assert!(missing.is_empty(), "untranslated menu labels: {missing:?}");
 }
diff --git a/docs/localization.md b/docs/localization.md
index d3c6cc4e1..b7f21af3a 100644
--- a/docs/localization.md
+++ b/docs/localization.md
@@ -30,8 +30,8 @@ selection. Resetting palettes keeps the language choice.
 The catalogs cover command and menu labels, tool groups and tooltips, the Start page,
 file and model-space tabs, status controls, object snaps, drafting prompts, property labels,
 dialogs, and the About window's controls. The command reference can be searched by English
-command ID, English label, or translated label. Ukrainian has enforced coverage;
-missing entries in the other catalogs are reported by tests and fall back to English.
+command ID, English label, or translated label. A missing entry falls back to English and
+never fails a build; `cargo xtask i18n` (a step of `cargo xtask ci`) lists each language's.
 
 Czech has 1,202 catalog rows, covering the reference catalog and every marked UI
 literal, including Options. Four `menu` entries distinguish menu headings from object/command
@@ -139,14 +139,14 @@ The implementation follows the display-time catalog pattern used by
 - Windows retain explicit IDs based on their English source, and tool groups retain their
   source names as keys, so switching languages preserves their state.
 - Add a translation attribution row in `ATTRIBUTION.md`, update the language lists, and add
-  locale, plural, font-glyph and live-switch tests. Add the catalog to `REPORTED` in
-  `i18n/tests.rs`: only Ukrainian, the reference translation, is in `REQUIRED`, so adding a
-  command needs a row in one language, not in all of them.
+  the language's locale tags and plural rule. The rendering, font-glyph and live-switch tests
+  run for every catalog; no test checks one language's wording, and adding a command needs
+  only its English label.
 - Catalogs are embedded and parsed once. Missing or malformed rows cannot crash the app;
   tests reject invalid rows, duplicate keys, changed placeholders, and mismatched ellipses.
-- `cargo test -p cadcraft-ui-egui i18n` checks menu/command/tool/snap coverage, every marked
-  UI literal, locale resolution, preferences, integer plurals, bundled glyphs and actual
-  egui renders with language switching. `cargo xtask assets` checks asset attribution;
+- `cargo test -p cadcraft-ui-egui i18n` checks the catalogs, locale resolution, preferences,
+  integer plurals, bundled glyphs and actual egui renders with language switching.
+  `cargo xtask i18n` prints the strings each language shows in English. `cargo xtask assets` checks asset attribution;
   `cargo xtask ci` runs the workspace quality gates.
 
 Translations are original work under `MIT OR Apache-2.0`, written from the meaning of
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 5387d1619..d5ef7dcab 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -21,7 +21,8 @@ commands:
   layers          enforce the crate dependency layering (plan/architecture.md §3)
   wasm            cargo check --target wasm32-unknown-unknown for the wasm-safe crates
   test            cargo nextest run (cargo test without nextest) plus the doctests
-  ci              fmt --check, clippy -D warnings, test, assets, layers, wasm (stops at first failure)
+  i18n            print the strings each interface language shows in English (never fails)
+  ci              fmt --check, clippy -D warnings, test, i18n, assets, layers, wasm (stops at first failure)
   corpus [--download]
                   show where test corpora live; --download fetches PngSuite into corpus/pngsuite
   stats [--exact] count tests and lines per crate (--exact: ask the test harness via `-- --list`)
@@ -38,6 +39,7 @@ fn main() -> ExitCode {
         Some("layers") => cmd_layers(),
         Some("wasm") => cmd_wasm(),
         Some("test") => cmd_test(),
+        Some("i18n") => cmd_i18n(),
         Some("ci") => cmd_ci(),
         Some("corpus") => cmd_corpus(rest.contains(&"--download")),
         Some("stats") => stats::run(&root(), rest.contains(&"--exact")),
@@ -167,6 +169,18 @@ fn cmd_test() -> Result<(), String> {
     run(c, "cargo test --workspace --doc")
 }
 
+/// The translation gap report (`cadcraft-ui-egui`'s ignored `i18n::tests::translation_gaps`).
+/// A missing translation shows in English and never fails a build, so neither does this step.
+fn cmd_i18n() -> Result<(), String> {
+    let mut c = cargo();
+    // `--workspace` builds the same test binaries as the test step; `-p` alone would rebuild them.
+    c.args(["test", "--workspace", "--lib", "-q", "--", "--ignored", "--exact", "i18n::tests::translation_gaps", "--nocapture"]);
+    if let Err(e) = run(c, "cargo test --workspace --lib -q -- --ignored --exact i18n::tests::translation_gaps --nocapture") {
+        eprintln!("note: the translation gap report did not run: {e}");
+    }
+    Ok(())
+}
+
 fn cmd_ci() -> Result<(), String> {
     type Step = (&'static str, Box<dyn Fn() -> Result<(), String>>);
     let steps: Vec<Step> = vec![
@@ -187,6 +201,7 @@ fn cmd_ci() -> Result<(), String> {
             }),
         ),
         ("test", Box::new(cmd_test)),
+        ("i18n", Box::new(cmd_i18n)),
         ("assets", Box::new(|| assets::run(&root()))),
         ("layers", Box::new(cmd_layers)),
         ("wasm", Box::new(cmd_wasm)),