address review: check the original Path for the dictionary write; isolate the confinement test

ROADMAP.md

@@ -2,7 +2,6 @@
 
 **Stage: alpha** · next: beta, ~20 points and ~120–210 h away
 
-> **Last reviewed:** 2026-11-02 · **Last updated:** 2026-11-03 · **Change:** trivial (community PR wave 10: PPTX and native saves keep table cell centred anchoring, text overflow, compatible line spacing, normalised character height, Thai distributed alignment, RTL table direction, alternate run language and reflection transforms; imported effects placed by parent time-node delays; Reuse Slides fits the destination size and brings custom table styles; deleted slides leave custom shows; merged shapes drop their animations; Compress Pictures measures grouped pictures at displayed size; parity scores unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 > **Last reviewed:** 2026-11-02 · **Last updated:** 2026-11-02 · **Change:** trivial (File › About replaces Account; product links, credits and appearance retained; parity scores unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 > **Last reviewed:** 2026-10-14 · **Last updated:** 2026-11-01 · **Change:** trivial (locked No Fill and no-outline click-through regression coverage added; No Fill hit-testing follows resolved fill instead of the presence of a style (#1621); scores unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 > **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-30 · **Change:** trivial (progress log: read-only `slide.actions` lists shape and table text actions; parity scores unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
@@ -150,15 +149,7 @@ app's JSON control channel (`deckcraft --control PORT`).
 
 | Date | What landed |
 |---|---|
-| 2026-11-02 | Native and PPTX saves retain optional table right-to-left direction, including explicit false and omission; two-save round-trip tests keep labeled columns in order |
-| 2026-11-02 | Text runs preserve alternate-language metadata independently from the main language through native and PPTX saves |
-| 2026-11-02 | Picture compression measures displayed dimensions through nested group transforms; checklist score unchanged |
-| 2026-11-02 | Deleting slides removes their IDs from every custom show; the cleanup is undoable and survives native save/reopen |
-| 2026-11-02 | Reused slides scale their geometry and content dimensions to the destination slide, including kept source masters and layouts; the reuse picker still lacks thumbnails |
 | 2026-11-02 | File › About replaces the unused Account page, with version, project links, contributor/model credits and appearance preferences |
-| 2026-11-02 | PPTX reflection effects keep their authored start position, affine scale/skew, direction and fade, alignment, and rotation flag through native and PPTX saves |
-| 2026-11-03 | Reuse Slides brings along referenced custom table styles, including grouped tables, and remaps conflicting style ids without changing destination tables |
-| 2026-11-02 | Tiled picture fills in groups: a tile (`a:blipFill` with `a:tile`) keeps its size, offset and anchor in slide points whatever the group's child-coordinate scale, uniform or stretched unevenly, nested or flipped (also a group's own tile fill passed to its members, and a picture shape's own tile, with its shadow and reflection), and tiles with `rotWithShape="0"` keep their size in points at any zoom, as PowerPoint draws them (measured on its own PNG export of a synthetic probe deck: every grouped case within ~3/255 of the ungrouped control's own difference from PowerPoint, which is ~13/255 from resampling). Before, a group whose child space was ~1800 times smaller than its box showed one flat texel of the texture (a Venn diagram with paper-textured circles and a hatched intersection) |
 | 2026-10-31 | No Fill shape interiors allow selection and editing of underlying objects, even when a quick style remains; hit-testing uses the renderer’s fill resolution. Outlines, rotation, text targets and actual fills keep their hit behaviour (#1621) |
 | 2026-10-30 | Print-preview tests use the URL emitted by egui and its exact file path; previews are explicitly removed before the macOS process exits |
 | 2026-10-30 | `slide.actions` lists shape click and hover actions and text-run hyperlinks (including table cells and grouped shapes) for audit; listing never runs an action. The UI pane is a follow-up |
@@ -330,10 +321,7 @@ app's JSON control channel (`deckcraft --control PORT`).
 
 | Date | Change | Summary |
 |---|---|---|
-| 2026-11-02 | trivial | Progress log: run alternate-language metadata round-trips through native and PPTX formats; product parity scores unchanged |
-| 2026-11-03 | trivial | Reuse Slides brings referenced custom table styles along; scores unchanged |
 | 2026-11-02 | trivial | File › About replaces Account; product links, credits and appearance retained |
-| 2026-11-02 | trivial | Progress log: tiled picture fills keep their size in scaled groups. Scores and milestone names unchanged |
 | 2026-10-31 | trivial | No Fill hit-testing follows resolved fill instead of the presence of a style (#1621); scores unchanged |
 | 2026-10-30 | trivial | Progress log: read-only slide action inspection; parity scores unchanged |
 | 2026-10-29 | trivial | Progress log: going back in the slide show reverses the left slide's transition (#1531). Scores and milestone names unchanged |

crates/av1/src/decoder.rs

@@ -425,8 +425,6 @@ impl Decoder {
 
     fn parse_obus(&mut self, data: &[u8], out: &mut Vec<(Output, usize, u32)>) -> Result<()> {
         let mut tu = 0usize;
-        // Repeated-frame outputs in `out`, counted as they are added rather than recounted per OBU.
-        let mut existing = out.iter().filter(|(o, _, _)| matches!(o, Output::Existing { .. })).count();
         let mut pos = 0;
         while pos < data.len() {
             let obu = parse_obu_unit(data, pos)?;
@@ -446,10 +444,9 @@ impl Decoder {
                 }
                 OBU_FRAME_HEADER_T | OBU_REDUNDANT_FRAME_HEADER_T | OBU_FRAME_T => {
                     if let Some(o) = self.frame_obu(&obu)? {
-                        if existing >= 32 {
+                        if out.iter().filter(|(o, _, _)| matches!(o, Output::Existing { .. })).count() >= 32 {
                             return Err(Error::Invalid("too many frame outputs in chunk"));
                         }
-                        existing += usize::from(matches!(o, Output::Existing { .. }));
                         out.push((o, tu, spatial_id));
                     }
                 }

crates/engine/src/cmd/compress.rs

@@ -116,31 +116,16 @@ fn pack(data: &[u8], crop: [f64; 4], w_pt: f64, h_pt: f64, ppi: f64, delete_crop
     Some(Packed { bytes, content_type, crop: new_crop })
 }
 
-/// Pictures accepted by `want`, with width and height measured in slide space through group transforms.
+/// Picture shapes in `shapes` (groups included) that `want` accepts.
-fn pictures_mut<'a>(
+fn pictures_mut<'a>(shapes: &'a mut [Shape], want: &dyn Fn(ShapeId) -> bool, out: &mut Vec<&'a mut Shape>, depth: usize) {
-    shapes: &'a mut [Shape],
-    want: &dyn Fn(ShapeId) -> bool,
-    out: &mut Vec<(&'a mut Shape, f64, f64)>,
-    to_slide: deckcraft_geom::Affine,
-    depth: usize,
-) {
     if depth > 64 {
         return;
     }
     for sh in shapes {
-        let Some(xfrm) = sh.xfrm else { continue };
+        if matches!(sh.kind, ShapeKind::Picture { .. }) && want(sh.id) {
-        let local_to_slide = to_slide * xfrm.affine();
+            out.push(sh);
-        if matches!(&sh.kind, ShapeKind::Picture { .. }) && want(sh.id) {
+        } else if let Some(ch) = sh.children_mut() {
-            let origin = local_to_slide * deckcraft_geom::Point::ZERO;
+            pictures_mut(ch, want, out, depth + 1);
-            let across = local_to_slide * deckcraft_geom::Point::new(xfrm.w, 0.0);
-            let down = local_to_slide * deckcraft_geom::Point::new(0.0, xfrm.h);
-            out.push((sh, (across - origin).hypot(), (down - origin).hypot()));
-            continue;
-        }
-        if let ShapeKind::Group { children, child } = &mut sh.kind {
-            let child_rect = deckcraft_geom::Rect::new(child.x, child.y, child.x + child.w, child.y + child.h);
-            let child_to_slide = to_slide * deckcraft_geom::group_child_affine(&xfrm, child_rect);
-            pictures_mut(children, want, out, child_to_slide, depth + 1);
         }
     }
 }
@@ -170,9 +155,10 @@ fn compress(s: &mut Session, p: &Value) -> Result<Value> {
             let Some(slide) = doc.slides.get(i).cloned() else { continue };
             let mut slide = slide.as_ref().clone();
             let mut pics = vec![];
-            pictures_mut(&mut slide.shapes, &want, &mut pics, deckcraft_geom::Affine::IDENTITY, 0);
+            pictures_mut(&mut slide.shapes, &want, &mut pics, 0);
             let mut touched = false;
-            for (sh, w, h) in pics {
+            for sh in pics {
+                let (w, h) = sh.xfrm.map(|x| (x.w, x.h)).unwrap_or((0.0, 0.0));
                 let ShapeKind::Picture { fill } = &mut sh.kind else { continue };
                 let PictureFill { media, crop, .. } = fill.clone();
                 let key = (media.0, crop.map(f64::to_bits), w.to_bits(), h.to_bits());
@@ -246,114 +232,6 @@ mod tests {
         assert!(pack(b"<svg xmlns='http://www.w3.org/2000/svg'/>", [0.0; 4], 72.0, 72.0, 150.0, true).is_none());
     }
 
-    #[test]
-    fn grouped_pictures_use_their_displayed_size() {
-        let mut s = Session::with_new();
-        let original = png(600, 600);
-        s.edit(|doc, _| {
-            let media = doc.add_media("grouped.png", "image/png", original.clone()).ok_or_else(|| bad("test", "media"))?;
-            let picture = Shape {
-                id: ShapeId(70_101),
-                xfrm: Some(deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0)),
-                kind: ShapeKind::Picture { fill: PictureFill { media, ..Default::default() } },
-                ..Default::default()
-            };
-            let nested = Shape {
-                id: ShapeId(70_102),
-                xfrm: Some(deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0)),
-                kind: ShapeKind::Group { children: vec![picture], child: deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0) },
-                ..Default::default()
-            };
-            let group = Shape {
-                id: ShapeId(70_103),
-                xfrm: Some(deckcraft_geom::Xfrm::new(0.0, 0.0, 720.0, 720.0)),
-                kind: ShapeKind::Group { children: vec![nested], child: deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0) },
-                ..Default::default()
-            };
-            let slide = doc.slides.first_mut().ok_or_else(|| bad("test", "slide"))?;
-            Arc::make_mut(slide).shapes.push(group);
-            Ok(())
-        })
-        .unwrap();
-
-        let result = s.execute("picture.compress", &json!({"all": true, "ppi": 96, "deleteCropped": false})).unwrap();
-        assert_eq!(result["pictures"], 0, "a 600 px image displayed at 720×720 pt is already below the requested sampling density");
-        assert!(
-            s.doc().unwrap().doc.media.iter().any(|m| m.data.as_slice() == original.as_slice()),
-            "the under-target original media must remain untouched"
-        );
-    }
-
-    #[test]
-    fn anisotropic_nested_group_scaling_controls_sampling_dimensions() {
-        let mut s = Session::with_new();
-        let original = png(2000, 1000);
-        s.edit(|doc, _| {
-            let media = doc.add_media("scaled-group.png", "image/png", original).ok_or_else(|| bad("test", "media"))?;
-            let picture = Shape {
-                id: ShapeId(70_111),
-                xfrm: Some(deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0)),
-                kind: ShapeKind::Picture { fill: PictureFill { media, ..Default::default() } },
-                ..Default::default()
-            };
-            let nested = Shape {
-                id: ShapeId(70_112),
-                xfrm: Some(deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0)),
-                kind: ShapeKind::Group { children: vec![picture], child: deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0) },
-                ..Default::default()
-            };
-            let group = Shape {
-                id: ShapeId(70_113),
-                xfrm: Some(deckcraft_geom::Xfrm::new(0.0, 0.0, 720.0, 360.0)),
-                kind: ShapeKind::Group { children: vec![nested], child: deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0) },
-                ..Default::default()
-            };
-            let slide = doc.slides.first_mut().ok_or_else(|| bad("test", "slide"))?;
-            Arc::make_mut(slide).shapes.push(group);
-            Ok(())
-        })
-        .unwrap();
-
-        let result = s.execute("picture.compress", &json!({"all": true, "ppi": 96, "deleteCropped": false})).unwrap();
-        assert_eq!(result["pictures"], 1);
-        let slide = s.doc().unwrap().doc.slides.first().unwrap();
-        let picture = slide.shapes.iter().find(|sh| sh.id == ShapeId(70_113)).unwrap();
-        let ShapeKind::Group { children, .. } = &picture.kind else { panic!("outer group expected") };
-        let ShapeKind::Group { children, .. } = &children[0].kind else { panic!("nested group expected") };
-        let ShapeKind::Picture { fill } = &children[0].kind else { panic!("picture expected") };
-        let media = s.doc().unwrap().doc.media(fill.media).unwrap();
-        let image = image::load_from_memory(&media.data).unwrap();
-        assert_eq!((image.width(), image.height()), (960, 480));
-    }
-
-    #[test]
-    fn ungrouped_picture_still_compresses_and_deletes_its_crop() {
-        let mut s = Session::with_new();
-        let original = png(800, 800);
-        s.edit(|doc, _| {
-            let media = doc.add_media("cropped.png", "image/png", original).ok_or_else(|| bad("test", "media"))?;
-            let slide = doc.slides.first_mut().ok_or_else(|| bad("test", "slide"))?;
-            Arc::make_mut(slide).shapes.push(Shape {
-                id: ShapeId(70_104),
-                xfrm: Some(deckcraft_geom::Xfrm::new(0.0, 0.0, 72.0, 72.0)),
-                kind: ShapeKind::Picture { fill: PictureFill { media, crop: [0.5, 0.0, 0.0, 0.0], ..Default::default() } },
-                ..Default::default()
-            });
-            Ok(())
-        })
-        .unwrap();
-
-        let result = s.execute("picture.compress", &json!({"all": true, "ppi": 96, "deleteCropped": true})).unwrap();
-        assert_eq!(result["pictures"], 1);
-        let slide = s.doc().unwrap().doc.slides.first().unwrap();
-        let picture = slide.shapes.iter().find(|sh| sh.id == ShapeId(70_104)).unwrap();
-        let ShapeKind::Picture { fill } = &picture.kind else { panic!("picture expected") };
-        assert_eq!(fill.crop, [0.0; 4]);
-        let media = s.doc().unwrap().doc.media(fill.media).unwrap();
-        let image = image::load_from_memory(&media.data).unwrap();
-        assert_eq!((image.width(), image.height()), (96, 192));
-    }
-
     #[test]
     fn pack_deletes_cropped_areas_or_keeps_them() {
         let src = png(400, 400);

crates/engine/src/cmd/design/master_view.rs

@@ -1,17 +1,17 @@
 use super::{
     Arc, Fill, NO_ID_SPACE, PhType, Result, Run, RunKind, Session, Shape, ShapeId, Size, Target, TextBody, Value, bad, bool_param, json,
-    master_index, ok, opt_usize_param, rect_param, str_param,
+    master_index, ok, opt_usize_param, rect_param, str_param, usize_param,
 };
 
 pub(super) fn master_view(s: &mut Session, p: &Value) -> Result<Value> {
     let st = s.doc()?;
-    let mi = opt_usize_param(p, "master", "view.slideMaster")?.unwrap_or_else(|| master_index(&st.doc, &st.selection));
+    let mi = usize_param(p, "master").unwrap_or_else(|| master_index(&st.doc, &st.selection));
     // A master thumbnail sends `{master}` and means the master itself. `{master, layout}` selects
     // that layout. With neither key, follow the current slide's layout.
     let layout = if p.get("master").is_some() && p.get("layout").is_none() {
         None
     } else {
-        opt_usize_param(p, "layout", "view.slideMaster")?
+        usize_param(p, "layout")
             .or_else(|| st.current_slide().and_then(|sl| st.doc.masters.get(mi).and_then(|m| m.layouts.iter().position(|l| l.id == sl.layout))))
     };
     let target = match layout {

crates/engine/src/cmd/file.rs

@@ -345,7 +345,6 @@ pub fn save_bytes(doc: &Presentation, format: &str) -> Result<Vec<u8>> {
         "rtf" => Ok(deckcraft_format::rtf::slides_to_rtf(doc).into_bytes()),
         "pdf" => deckcraft_pdf::export(doc, &Default::default()).map_err(|e| EngineError::Other(e.to_string())),
         "gif" => gif_bytes(doc, &Value::Null),
-        "png" | "jpeg" | "jpg" => Err(EngineError::Other("saving a presentation as a single image isn't supported; use file.export".into())),
         _ => deckcraft_format::save(doc).map_err(|e| EngineError::Other(e.to_string())),
     }
 }
@@ -360,13 +359,7 @@ pub fn pdf_options(p: &Value, count: usize) -> Result<deckcraft_pdf::PdfOptions>
     let mut o = deckcraft_pdf::PdfOptions { layout: deckcraft_pdf::PageLayout::Slides, ..Default::default() };
     o.layout = match str_param(p, "layout").unwrap_or("slides") {
         "notes" => deckcraft_pdf::PageLayout::Notes,
-        "handouts" => {
+        "handouts" => deckcraft_pdf::PageLayout::Handouts { per_page: usize_param(p, "perPage").unwrap_or(6).clamp(1, 9) as u8 },
-            let per_page = opt_usize_param(p, "perPage", "file.export")?.unwrap_or(6);
-            if ![1, 2, 3, 4, 6, 9].contains(&per_page) {
-                return Err(bad("file.export", format!("perPage {per_page} isn't one of 1, 2, 3, 4, 6, 9")));
-            }
-            deckcraft_pdf::PageLayout::Handouts { per_page: per_page as u8 }
-        }
         _ => deckcraft_pdf::PageLayout::Slides,
     };
     o.dpi = f64_or(p, "dpi", o.dpi).clamp(36.0, 600.0);
@@ -397,7 +390,6 @@ pub fn pdf_options(p: &Value, count: usize) -> Result<deckcraft_pdf::PdfOptions>
 pub fn parse_slide_range(text: &str, count: usize) -> Result<Vec<usize>> {
     let invalid = || bad("file.export", format!("“{text}” isn't a valid slide range: use numbers and ranges such as 1-3, 5"));
     let mut out: Vec<usize> = vec![];
-    let mut seen: std::collections::HashSet<usize> = std::collections::HashSet::new();
     for part in text.split([',', ';']).map(str::trim).filter(|p| !p.is_empty()) {
         let (a, b) = match part.split_once('-') {
             Some((a, b)) => (a.trim(), b.trim()),
@@ -413,7 +405,7 @@ pub fn parse_slide_range(text: &str, count: usize) -> Result<Vec<usize>> {
             return Err(bad("file.export", format!("the presentation has {count} slides; “{part}” is outside them")));
         }
         for i in lo - 1..hi {
-            if seen.insert(i) {
+            if !out.contains(&i) {
                 out.push(i);
             }
         }
@@ -777,16 +769,6 @@ mod tests {
 
     use super::{parse_slide_range, write_file};
 
-    #[test]
-    fn broad_and_repeated_slide_ranges_expand_once() {
-        // 200 copies of a 100,000-slide range: each index once, in order, without a scan per index.
-        let text = vec!["1-100000"; 200].join(",");
-        let v = parse_slide_range(&text, 100_000).unwrap();
-        assert_eq!(v.len(), 100_000);
-        assert!(v.windows(2).all(|w| w[0] < w[1]));
-        assert_eq!(parse_slide_range("3, 1-3, 2", 3).unwrap(), vec![2, 0, 1]);
-    }
-
     #[test]
     fn slide_range_rejects_plus_sign() {
         assert!(parse_slide_range("+2", 3).is_err());

crates/engine/src/cmd/format/paragraph.rs

@@ -14,7 +14,6 @@ pub(super) fn align(s: &mut Session, p: &Value) -> Result<Value> {
         "justify" | "just" => Align::Justify,
         "justifyLow" | "justLow" => Align::JustLow,
         "distributed" | "dist" => Align::Distributed,
-        "thaiDist" => Align::ThaiDistributed,
         _ => Align::Left,
     };
     align_to(s, a)
@@ -56,7 +55,6 @@ pub(super) fn bullets(s: &mut Session, p: &Value) -> Result<Value> {
             }
             if size.is_some() {
                 para.props.bullet_size = size;
-                para.props.bullet_size_points = None;
                 para.props.bullet_size_follow_text = None;
             }
             if para.props.indent.is_none_or(|i| i >= 0.0) && para.props.margin_left.is_none_or(|m| m == 0.0) {
@@ -87,7 +85,6 @@ pub(super) fn numbering(s: &mut Session, p: &Value) -> Result<Value> {
             }
             if size.is_some() {
                 para.props.bullet_size = size;
-                para.props.bullet_size_points = None;
                 para.props.bullet_size_follow_text = None;
             }
             para.props.margin_left = Some(27.0 + 36.0 * para.level as f64);
@@ -187,8 +184,7 @@ fn parse_align(cmd: &str, s: &str) -> Result<Align> {
         "justify" | "just" => Align::Justify,
         "justLow" => Align::JustLow,
         "distributed" | "dist" => Align::Distributed,
-        "thaiDist" => Align::ThaiDistributed,
+        _ => return Err(bad(cmd, "`align` must be left, center, right, justify, justLow or distributed")),
-        _ => return Err(bad(cmd, "`align` must be left, center, right, justify, justLow, distributed or thaiDist")),
     })
 }
 
@@ -200,7 +196,6 @@ fn align_name(a: Align) -> &'static str {
         Align::Justify => "justify",
         Align::JustLow => "justLow",
         Align::Distributed => "distributed",
-        Align::ThaiDistributed => "thaiDist",
     }
 }
 

crates/engine/src/cmd/merge.rs

@@ -246,17 +246,8 @@ fn merge(s: &mut Session, p: &Value) -> Result<Value> {
             list.insert(at + k, sh);
         }
         list.retain(|x| !ids.contains(&x.id));
-        let _ = list;
-        if sel.target == crate::Target::Slides
-            && let Some(sl) = doc.slides.get_mut(sel.slide)
-        {
-            let sl = std::sync::Arc::make_mut(sl);
-            sl.animations.retain(|a| !ids.contains(&a.shape));
-            for a in sl.animations.iter_mut().filter(|a| a.trigger.is_some_and(|t| ids.contains(&t))) {
-                a.trigger = None;
-            }
-        }
         sel.shapes = new_ids.clone();
+        let _ = list;
         Ok(())
     })?;
     Ok(json!({"ids": new_ids.iter().map(|i| i.0).collect::<Vec<_>>()}))
@@ -347,36 +338,4 @@ mod tests {
         assert!(matches!(out.kind, ShapeKind::Shape) && out.text.is_none());
         assert!(matches!(out.fill, Some(deckcraft_model::style::Fill::Solid { .. })), "{:?}", out.fill);
     }
-
-    #[test]
-    fn merge_cleans_animation_targets_and_triggers_for_every_operation_and_undo_restores_them() {
-        for op in ["union", "combine", "fragment", "intersect", "subtract"] {
-            let mut s = Session::with_new();
-            let first = s.execute("shape.insert", &json!({"preset": "rect", "rect": [0, 0, 100, 100]})).expect("first shape")["id"]
-                .as_u64()
-                .expect("id") as u32;
-            let second = s.execute("shape.insert", &json!({"preset": "rect", "rect": [50, 0, 100, 100]})).expect("second shape")["id"]
-                .as_u64()
-                .expect("id") as u32;
-            let unrelated = s.execute("shape.insert", &json!({"preset": "rect", "rect": [200, 0, 100, 100]})).expect("unrelated shape")["id"]
-                .as_u64()
-                .expect("id") as u32;
-            s.execute("animation.add", &json!({"effect": "fade", "ids": [second]})).expect("operand animation");
-            s.execute("animation.add", &json!({"effect": "spin", "ids": [unrelated]})).expect("unrelated animation");
-            s.execute("animation.timing", &json!({"index": 1, "trigger": first})).expect("trigger animation");
-
-            s.execute("shape.merge", &json!({"op": op, "ids": [first, second]})).expect("merge");
-            let animations = &s.doc().expect("doc").doc.slides[0].animations;
-            assert_eq!(animations.len(), 1, "{op} removed animations for merged operands");
-            assert_eq!(animations[0].shape.0, unrelated, "{op} preserved the unrelated effect");
-            assert_eq!(animations[0].trigger, None, "{op} cleared the removed shape trigger");
-
-            s.execute("edit.undo", &json!({})).expect("undo merge");
-            let animations = &s.doc().expect("doc").doc.slides[0].animations;
-            assert_eq!(animations.len(), 2, "{op} undo restored removed effects");
-            assert_eq!(animations[0].shape.0, second);
-            assert_eq!(animations[1].shape.0, unrelated);
-            assert_eq!(animations[1].trigger.map(|id| id.0), Some(first));
-        }
-    }
 }

crates/engine/src/cmd/picture_style.rs

@@ -135,14 +135,7 @@ pub fn apply(sh: &mut Shape, id: &str) -> bool {
     let e = Effects {
         outer_shadow: lk.shadow.map(shadow),
         soft_edge: lk.soft_edge,
-        reflection: lk.reflection.then_some(Reflection {
+        reflection: lk.reflection.then_some(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.35, dist: 0.0 }),
-            blur: 0.5,
-            start_alpha: 0.5,
-            end_alpha: 0.0,
-            end_pos: 0.35,
-            dist: 0.0,
-            ..Default::default()
-        }),
         bevel: lk.bevel.map(str::to_string),
         ..Default::default()
     };

crates/engine/src/cmd/reuse.rs

@@ -6,155 +6,16 @@
 //! renumbered with animations, triggers and connector ends following them. Links to another
 //! reused slide follow its copy.
 
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::sync::Arc;
 
-use deckcraft_model::table::TableStyleDef;
+use deckcraft_model::text::{Action, Hyperlink, RunProps, TextBody};
-use deckcraft_model::text::{Action, Hyperlink, ListStyle, RunProps, Spacing, TextBody};
 use deckcraft_model::{LayoutId, Master, MasterId, MediaId, Presentation, ShapeId, ShapeKind, Slide, SlideId};
 use serde_json::{Value, json};
 
 use super::{CommandSpec, NO_ID_SPACE, bad, bool_or, cmd, has_doc, usize_param};
 use crate::{Result, Session, media_refs};
 
-/// Scale physical measurements in imported content to the destination slide's coordinate space.
-/// Text has one size, so it uses the geometric mean of the horizontal and vertical scale.
-fn scale_text(t: &mut TextBody, sx: f64, sy: f64) {
-    let unit = (sx * sy).sqrt();
-    for v in [&mut t.body.inset_l, &mut t.body.inset_r, &mut t.body.col_spacing].into_iter().flatten() {
-        *v *= sx;
-    }
-    for v in [&mut t.body.inset_t, &mut t.body.inset_b].into_iter().flatten() {
-        *v *= sy;
-    }
-    scale_list(&mut t.list_style, sx, unit);
-    for p in &mut t.paragraphs {
-        for v in [&mut p.props.margin_left, &mut p.props.margin_right, &mut p.props.indent, &mut p.props.default_tab].into_iter().flatten() {
-            *v *= sx;
-        }
-        if let Some(stops) = &mut p.props.tabs {
-            for stop in stops {
-                stop.pos *= sx;
-            }
-        }
-        for spacing in [&mut p.props.line_spacing, &mut p.props.space_before, &mut p.props.space_after] {
-            if let Some(Spacing::Pts(v)) = spacing {
-                *v *= unit;
-            }
-        }
-        if let Some(v) = &mut p.props.bullet_size_points {
-            *v *= unit;
-        }
-        scale_run(&mut p.def_props, unit);
-        scale_run(&mut p.end_props, unit);
-        for r in &mut p.runs {
-            scale_run(&mut r.props, unit);
-        }
-    }
-}
-
-fn scale_list(list: &mut ListStyle, sx: f64, unit: f64) {
-    for level in list.levels.iter_mut().flatten() {
-        for v in
-            [&mut level.para.margin_left, &mut level.para.margin_right, &mut level.para.indent, &mut level.para.default_tab].into_iter().flatten()
-        {
-            *v *= sx;
-        }
-        for spacing in [&mut level.para.line_spacing, &mut level.para.space_before, &mut level.para.space_after] {
-            if let Some(Spacing::Pts(v)) = spacing {
-                *v *= unit;
-            }
-        }
-        if let Some(v) = &mut level.para.bullet_size_points {
-            *v *= unit;
-        }
-        scale_run(&mut level.run, unit);
-    }
-}
-
-fn scale_run(run: &mut RunProps, factor: f64) {
-    for v in [&mut run.size, &mut run.spacing, &mut run.kern, &mut run.soft_edge].into_iter().flatten() {
-        *v *= factor;
-    }
-}
-
-fn scale_shapes(shapes: &mut [deckcraft_model::Shape], sx: f64, sy: f64, depth: usize) {
-    if depth > 64 {
-        return;
-    }
-    let unit = (sx * sy).sqrt();
-    for shape in shapes {
-        if let Some(x) = &mut shape.xfrm {
-            x.x *= sx;
-            x.w *= sx;
-            x.y *= sy;
-            x.h *= sy;
-        }
-        if let Some(text) = &mut shape.text {
-            scale_text(text, sx, sy);
-        }
-        match &mut shape.kind {
-            ShapeKind::Table(table) => {
-                for col in &mut table.cols {
-                    *col *= sx;
-                }
-                for row in &mut table.rows {
-                    row.height *= sy;
-                    for cell in &mut row.cells {
-                        if let Some(margins) = &mut cell.margins {
-                            if let Some(v) = margins.get_mut(0) {
-                                *v *= sx;
-                            }
-                            if let Some(v) = margins.get_mut(1) {
-                                *v *= sx;
-                            }
-                            if let Some(v) = margins.get_mut(2) {
-                                *v *= sy;
-                            }
-                            if let Some(v) = margins.get_mut(3) {
-                                *v *= sy;
-                            }
-                        }
-                        scale_text(&mut cell.text, sx, sy);
-                    }
-                }
-            }
-            ShapeKind::Group { children, child } => {
-                child.x *= sx;
-                child.w *= sx;
-                child.y *= sy;
-                child.h *= sy;
-                scale_shapes(children, sx, sy, depth + 1);
-            }
-            _ => {}
-        }
-        if let Some(effects) = &mut shape.effects {
-            for shadow in [&mut effects.outer_shadow, &mut effects.inner_shadow].into_iter().flatten() {
-                shadow.blur *= unit;
-                shadow.dist *= unit;
-            }
-            if let Some(glow) = &mut effects.glow {
-                glow.radius *= unit;
-            }
-            if let Some(reflection) = &mut effects.reflection {
-                reflection.blur *= unit;
-                reflection.dist *= unit;
-            }
-        }
-    }
-}
-
-fn scale_master(master: &mut Master, sx: f64, sy: f64) {
-    scale_shapes(&mut master.shapes, sx, sy, 0);
-    let unit = (sx * sy).sqrt();
-    scale_list(&mut master.title_style, sx, unit);
-    scale_list(&mut master.body_style, sx, unit);
-    scale_list(&mut master.other_style, sx, unit);
-    for layout in &mut master.layouts {
-        scale_shapes(&mut layout.shapes, sx, sy, 0);
-    }
-}
-
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         cmd!(
@@ -291,90 +152,6 @@ fn matching_layout(doc: &Presentation, name: &str, kind: deckcraft_model::Layout
         .unwrap_or_default()
 }
 
-fn collect_table_styles(shapes: &[deckcraft_model::Shape], styles: &mut Vec<String>, seen: &mut HashSet<String>, depth: usize) {
-    if depth > 64 {
-        return;
-    }
-    for shape in shapes {
-        if let ShapeKind::Table(table) = &shape.kind
-            && seen.insert(table.style.to_ascii_lowercase())
-        {
-            styles.push(table.style.clone());
-        }
-        collect_table_styles(shape.children(), styles, seen, depth + 1);
-    }
-}
-
-fn remap_table_styles(shapes: &mut [deckcraft_model::Shape], styles: &HashMap<String, String>, depth: usize) {
-    if depth > 64 {
-        return;
-    }
-    for shape in shapes {
-        if let ShapeKind::Table(table) = &mut shape.kind
-            && let Some(style) = styles.get(&table.style.to_ascii_lowercase())
-        {
-            table.style = style.clone();
-        }
-        if let Some(children) = shape.children_mut() {
-            remap_table_styles(children, styles, depth + 1);
-        }
-    }
-}
-
-fn same_table_style(a: &TableStyleDef, b: &TableStyleDef) -> bool {
-    a.name == b.name && a.parts == b.parts && a.background == b.background && a.raw == b.raw
-}
-
-/// Copy only definitions used on selected slides. Conflicting GUIDs receive a fresh GUID so
-/// existing destination tables continue to resolve to their original definitions.
-fn import_table_styles(cmd: &str, doc: &mut Presentation, src: &Presentation, used: &[String]) -> Result<HashMap<String, String>> {
-    let mut map = HashMap::new();
-    let mut source_defs = HashMap::new();
-    let mut source_ids = HashSet::new();
-    for (index, style) in src.table_styles.iter().enumerate() {
-        let key = style.id.to_ascii_lowercase();
-        source_defs.entry(key.clone()).or_insert(index);
-        source_ids.insert(key);
-    }
-    let mut destination_defs = HashMap::new();
-    for (index, style) in doc.table_styles.iter().enumerate() {
-        destination_defs.entry(style.id.to_ascii_lowercase()).or_insert(index);
-    }
-    for id in used {
-        let key = id.to_ascii_lowercase();
-        if map.contains_key(&key) {
-            continue;
-        }
-        let Some(source_index) = source_defs.get(&key).copied() else { continue };
-        let Some(source) = src.table_styles.get(source_index) else { continue };
-        let destination = destination_defs.get(&key).and_then(|index| doc.table_styles.get(*index));
-        let mut imported = source.clone();
-        if let Some(existing) = destination {
-            if same_table_style(existing, source) {
-                map.insert(key, existing.id.clone());
-                continue;
-            }
-            let candidate = loop {
-                let n = doc.alloc_id().ok_or_else(|| bad(cmd, NO_ID_SPACE))?;
-                let candidate = format!("{{00000000-0000-4000-8000-{n:012X}}}");
-                let key = candidate.to_ascii_lowercase();
-                if !destination_defs.contains_key(&key) && !source_ids.contains(&key) {
-                    break candidate;
-                }
-            };
-            // The definition's own XML names it too, and PPTX export writes that XML as is.
-            imported.raw = imported.raw.replacen(&format!("styleId=\"{}\"", source.id), &format!("styleId=\"{candidate}\""), 1);
-            imported.id.clone_from(&candidate);
-            map.insert(key, candidate);
-        } else {
-            map.insert(key, imported.id.clone());
-        }
-        destination_defs.insert(imported.id.to_ascii_lowercase(), doc.table_styles.len());
-        doc.table_styles.push(imported);
-    }
-    Ok(map)
-}
-
 fn reuse(s: &mut Session, p: &Value) -> Result<Value> {
     let (name, bytes) = super::insert::media_bytes(p, "slide.reuse")?;
     let src = super::file::open_presentation(&name, &bytes)?;
@@ -399,23 +176,8 @@ fn reuse(s: &mut Session, p: &Value) -> Result<Value> {
     }
     let keep = bool_or(p, "keepFormatting", false);
     let at = usize_param(p, "at");
-    let source_size = src.slide_size;
     s.edit(|doc, sel| {
         let at = at.unwrap_or(sel.slide + 1).min(doc.slides.len());
-        let mut used_table_styles = Vec::new();
-        let mut seen_table_styles = HashSet::new();
-        for &i in &picked {
-            if let Some(slide) = src.slides.get(i) {
-                collect_table_styles(&slide.shapes, &mut used_table_styles, &mut seen_table_styles, 0);
-            }
-        }
-        let table_style_map = import_table_styles("slide.reuse", doc, &src, &used_table_styles)?;
-        let scale = |source: f64, destination: f64| {
-            let ratio = destination / source;
-            if source > 0.0 && destination > 0.0 && ratio.is_finite() && ratio > 0.0 { ratio } else { 1.0 }
-        };
-        let sx = scale(source_size.width, doc.slide_size.width);
-        let sy = scale(source_size.height, doc.slide_size.height);
         // Media: what the slides use is copied under fresh ids.
         let mut media_map: HashMap<MediaId, MediaId> = HashMap::new();
         // Keep Source Formatting: bring each source master used, once, with fresh ids.
@@ -428,8 +190,7 @@ fn reuse(s: &mut Session, p: &Value) -> Result<Value> {
                     continue;
                 }
                 masters_done.push(m.id);
-                let mut m = import_master("slide.reuse", doc, &src, m, &mut media_map, &mut layout_map)?;
+                let m = import_master("slide.reuse", doc, &src, m, &mut media_map, &mut layout_map)?;
-                scale_master(&mut m, sx, sy);
                 doc.masters.push(Arc::new(m));
             }
         }
@@ -440,8 +201,6 @@ fn reuse(s: &mut Session, p: &Value) -> Result<Value> {
             let Some(from) = src.slides.get(i) else { continue };
             copy_media("slide.reuse", doc, &src, &media_refs::slide_media(from), &mut media_map)?;
             let mut sl: Slide = from.as_ref().clone();
-            remap_table_styles(&mut sl.shapes, &table_style_map, 0);
-            scale_shapes(&mut sl.shapes, sx, sy, 0);
             media_refs::visit_mut::slide(&mut sl, &mut remap(&media_map));
             sl.id = SlideId(doc.alloc_id().ok_or_else(|| bad("slide.reuse", NO_ID_SPACE))?);
             let map = renumber("slide.reuse", doc, &mut sl.shapes)?;
@@ -525,205 +284,13 @@ fn copy_media(cmd: &str, doc: &mut Presentation, src: &Presentation, used: &[Med
 
 #[cfg(test)]
 mod tests {
-    use deckcraft_geom::{Size, Xfrm};
     use deckcraft_model::style::{Artistic, Fill, PictureFill};
-    use deckcraft_model::table::TableStyleDef;
     use deckcraft_model::text::{Action, Bullet, Hyperlink, TextBody};
-    use deckcraft_model::{Background, MediaClip, Shape, ShapeKind, Table, defaults};
+    use deckcraft_model::{Background, MediaClip, Shape, ShapeKind, defaults};
     use serde_json::json;
 
     use super::*;
 
-    const CUSTOM_STYLE: &str = "{11111111-2222-4333-8444-555555555555}";
-
-    fn styled_table_presentation(id: &str, color: &str) -> Presentation {
-        let mut p = deckcraft_model::defaults::new_presentation(None);
-        let raw = format!(
-            r#"<a:tblStyle xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" styleId="{id}" styleName="Owned"><a:wholeTbl><a:tcStyle><a:fill><a:solidFill><a:srgbClr val="{color}"/></a:solidFill></a:fill></a:tcStyle></a:wholeTbl></a:tblStyle>"#
-        );
-        p.table_styles.push(TableStyleDef { id: id.into(), name: "Owned".into(), raw, ..Default::default() });
-        let table = deckcraft_model::Table { style: id.into(), ..deckcraft_model::Table::new(1, 1, 100.0, 24.0) };
-        let child = deckcraft_model::Shape { id: ShapeId(p.alloc_id().expect("shape id")), kind: ShapeKind::Table(table), ..Default::default() };
-        let group = deckcraft_model::Shape {
-            id: ShapeId(p.alloc_id().expect("group id")),
-            kind: ShapeKind::Group { children: vec![child], child: Default::default() },
-            ..Default::default()
-        };
-        let slide = p.slides.first_mut().expect("default slide");
-        Arc::make_mut(slide).shapes.push(group);
-        p
-    }
-
-    fn first_table_style(shapes: &[deckcraft_model::Shape]) -> Option<String> {
-        for shape in shapes {
-            if let ShapeKind::Table(table) = &shape.kind {
-                return Some(table.style.clone());
-            }
-            if let Some(style) = first_table_style(shape.children()) {
-                return Some(style);
-            }
-        }
-        None
-    }
-
-    #[test]
-    fn reused_grouped_table_styles_survive_native_and_pptx_round_trips_and_undo() {
-        for (name, bytes) in [
-            ("source.deckcraft", deckcraft_format::save(&styled_table_presentation(CUSTOM_STYLE, "FF0000")).expect("native source")),
-            ("source.pptx", deckcraft_pptx::export(&styled_table_presentation(CUSTOM_STYLE, "FF0000")).expect("pptx source")),
-        ] {
-            let data = super::super::base64_encode(&bytes);
-            let mut session = Session::with_new();
-            session.execute("slide.reuse", &json!({"data": data, "name": name, "slides": [0], "keepFormatting": true})).expect("reuse");
-            let doc = &session.doc().expect("doc").doc;
-            assert_eq!(doc.table_styles.iter().filter(|style| style.id == CUSTOM_STYLE).count(), 1);
-            assert!(doc.table_styles.iter().any(|style| style.id == CUSTOM_STYLE && style.raw.contains("FF0000")));
-            assert_eq!(first_table_style(&doc.slides.get(1).expect("reused slide").shapes).as_deref(), Some(CUSTOM_STYLE));
-
-            session.execute("edit.undo", &json!({})).expect("undo reuse");
-            let doc = &session.doc().expect("doc").doc;
-            assert!(doc.table_styles.iter().all(|style| style.id != CUSTOM_STYLE));
-            session.execute("edit.redo", &json!({})).expect("redo reuse");
-            let bytes = crate::cmd::file::save_bytes(&session.doc().expect("doc").doc, "deckcraft").expect("save destination");
-            let reopened = crate::cmd::file::open_presentation("destination.deckcraft", &bytes).expect("reopen destination");
-            assert!(reopened.table_styles.iter().any(|style| style.id == CUSTOM_STYLE));
-            assert_eq!(first_table_style(&reopened.slides.get(1).expect("reused slide").shapes).as_deref(), Some(CUSTOM_STYLE));
-        }
-    }
-
-    #[test]
-    fn reused_table_style_definitions_are_deduplicated_or_remapped_on_collision() {
-        let source = styled_table_presentation(CUSTOM_STYLE, "FF0000");
-        let source_bytes = deckcraft_format::save(&source).expect("save source");
-
-        let mut identical = Session::with_new();
-        identical
-            .edit(|doc, _| {
-                doc.table_styles.push(source.table_styles.first().cloned().unwrap_or_default());
-                Ok(())
-            })
-            .expect("seed identical definition");
-        identical
-            .execute("slide.reuse", &json!({"data": super::super::base64_encode(&source_bytes), "name": "source.deckcraft", "slides": [0]}))
-            .expect("reuse identical definition");
-        let doc = &identical.doc().expect("doc").doc;
-        assert_eq!(doc.table_styles.iter().filter(|style| style.id == CUSTOM_STYLE).count(), 1);
-        assert_eq!(first_table_style(&doc.slides.get(1).expect("reused slide").shapes).as_deref(), Some(CUSTOM_STYLE));
-
-        let mut conflicting = Session::with_new();
-        conflicting
-            .edit(|doc, _| {
-                let mut own = source.table_styles.first().cloned().unwrap_or_default();
-                own.raw = own.raw.replace("FF0000", "0000FF");
-                doc.table_styles.push(own);
-                let table = deckcraft_model::Table { style: CUSTOM_STYLE.into(), ..deckcraft_model::Table::new(1, 1, 100.0, 24.0) };
-                let id = ShapeId(doc.alloc_id().expect("destination table id"));
-                if let Some(slide) = doc.slides.first_mut() {
-                    Arc::make_mut(slide).shapes.push(Shape { id, kind: ShapeKind::Table(table), ..Default::default() });
-                }
-                Ok(())
-            })
-            .expect("seed conflicting definition");
-        conflicting
-            .execute("slide.reuse", &json!({"data": super::super::base64_encode(&source_bytes), "name": "source.deckcraft", "slides": [0]}))
-            .expect("reuse conflicting definition");
-        let doc = &conflicting.doc().expect("doc").doc;
-        assert_eq!(first_table_style(&doc.slides.first().expect("destination slide").shapes).as_deref(), Some(CUSTOM_STYLE));
-        let imported_style = first_table_style(&doc.slides.get(1).expect("reused slide").shapes).expect("grouped table style");
-        assert_ne!(imported_style, CUSTOM_STYLE);
-        assert!(
-            doc.table_styles.iter().any(|style| style.id == imported_style
-                && style.raw.contains("FF0000")
-                && style.raw.contains(&format!("styleId=\"{imported_style}\"")))
-        );
-        assert!(doc.table_styles.iter().any(|style| style.id == CUSTOM_STYLE && style.raw.contains("0000FF")));
-    }
-
-    #[test]
-    fn reused_slide_content_fits_destination_size() {
-        let mut src = defaults::new_presentation(None);
-        src.slide_size = Size::new(960.0, 540.0);
-        let slide_id = src.slides.first().map(|s| s.id).unwrap_or_default();
-        if let Some(slide) = src.slides.first_mut().map(Arc::make_mut) {
-            let mut text = TextBody::from_text("scaled");
-            if let Some(run) = text.paragraphs.first_mut().and_then(|p| p.runs.first_mut()) {
-                run.props.size = Some(24.0);
-            }
-            slide.shapes = vec![
-                Shape { xfrm: Some(Xfrm::new(800.0, 400.0, 200.0, 100.0)), ..Default::default() },
-                Shape {
-                    xfrm: Some(Xfrm::new(40.0, 50.0, 400.0, 200.0)),
-                    text: Some(text),
-                    kind: ShapeKind::Table({
-                        let mut table = Table::new(2, 2, 400.0, 40.0);
-                        table.rows[0].cells[0].text = TextBody::from_text("cell");
-                        if let Some(run) = table.rows[0].cells[0].text.paragraphs.first_mut().and_then(|p| p.runs.first_mut()) {
-                            run.props.size = Some(18.0);
-                        }
-                        table
-                    }),
-                    ..Default::default()
-                },
-                Shape {
-                    xfrm: Some(Xfrm::new(100.0, 80.0, 300.0, 150.0)),
-                    kind: ShapeKind::Group {
-                        child: Xfrm::new(0.0, 0.0, 300.0, 150.0),
-                        children: vec![Shape { xfrm: Some(Xfrm::new(200.0, 100.0, 80.0, 40.0)), ..Default::default() }],
-                    },
-                    ..Default::default()
-                },
-            ];
-        }
-        if let Some(master) = src.masters.first_mut().map(Arc::make_mut) {
-            master.shapes = vec![Shape { xfrm: Some(Xfrm::new(800.0, 400.0, 100.0, 50.0)), ..Default::default() }];
-            if let Some(layout) = master.layouts.first_mut() {
-                layout.shapes = vec![Shape { xfrm: Some(Xfrm::new(700.0, 300.0, 100.0, 50.0)), ..Default::default() }];
-            }
-        }
-        let bytes = deckcraft_format::save(&src).expect("source save");
-        let data = super::super::base64_encode(&bytes);
-        let mut session = Session::with_new();
-        session
-            .edit(|doc, _| {
-                doc.slide_size = Size::new(480.0, 270.0);
-                Ok(())
-            })
-            .expect("destination size");
-        session.execute("slide.reuse", &json!({"data": data, "name": "source.deckcraft", "slides": [0], "keepFormatting": true})).expect("reuse");
-
-        let doc = &session.doc().expect("doc").doc;
-        let reused = doc.slides.get(1).expect("reused slide");
-        let first = reused.shapes.first().and_then(|s| s.xfrm).expect("shape transform");
-        assert_eq!(first, Xfrm::new(400.0, 200.0, 100.0, 50.0));
-        let table_shape = reused.shapes.get(1).expect("table");
-        let table_box = table_shape.xfrm.expect("table transform");
-        assert_eq!(table_box, Xfrm::new(20.0, 25.0, 200.0, 100.0));
-        assert!(matches!(&table_shape.kind, ShapeKind::Table(_)));
-        let ShapeKind::Table(table) = &table_shape.kind else { return };
-        assert_eq!(table.cols, vec![100.0, 100.0]);
-        assert_eq!(table.rows.first().map(|r| r.height), Some(20.0));
-        let font_size = table_shape.text.as_ref().and_then(|t| t.paragraphs.first()).and_then(|p| p.runs.first()).and_then(|r| r.props.size);
-        assert_eq!(font_size, Some(12.0));
-        let cell_size = table.rows[0].cells[0].text.paragraphs.first().and_then(|p| p.runs.first()).and_then(|r| r.props.size);
-        assert_eq!(cell_size, Some(9.0));
-        let group = reused.shapes.get(2).expect("group");
-        assert!(matches!(&group.kind, ShapeKind::Group { .. }));
-        let ShapeKind::Group { children, child } = &group.kind else { return };
-        assert_eq!(group.xfrm, Some(Xfrm::new(50.0, 40.0, 150.0, 75.0)));
-        assert_eq!(*child, Xfrm::new(0.0, 0.0, 150.0, 75.0));
-        assert_eq!(children.first().and_then(|s| s.xfrm), Some(Xfrm::new(100.0, 50.0, 40.0, 20.0)));
-
-        let imported_master = doc.masters.last().expect("imported master");
-        assert_eq!(imported_master.shapes.first().and_then(|s| s.xfrm), Some(Xfrm::new(400.0, 200.0, 50.0, 25.0)));
-        assert_eq!(imported_master.layouts.first().and_then(|l| l.shapes.first()).and_then(|s| s.xfrm), Some(Xfrm::new(350.0, 150.0, 50.0, 25.0)));
-        assert_ne!(reused.id, slide_id);
-
-        let saved = deckcraft_format::save(&doc.clone()).expect("destination save");
-        let reopened = crate::cmd::file::open_presentation("destination.deckcraft", &saved).expect("destination reopen");
-        let reopened_shape = reopened.slides.get(1).and_then(|s| s.shapes.first()).and_then(|s| s.xfrm);
-        assert_eq!(reopened_shape, Some(Xfrm::new(400.0, 200.0, 100.0, 50.0)));
-    }
-
     /// Every kind of media a slide can hold comes along, each pointing at its own bytes: the
     /// artistic-effect original, a background picture, poster, sounds and picture bullets too.
     #[test]

crates/engine/src/cmd/review.rs

@@ -367,7 +367,7 @@ fn spelling(s: &mut Session, p: &Value) -> Result<Value> {
             }
             out.push(v);
         }
-        let rep: std::collections::HashSet<usize> = crate::spell::repeated(para, &default).iter().map(|w| w.start).collect();
+        let rep: Vec<usize> = crate::spell::repeated(para, &default).iter().map(|w| w.start).collect();
         for w in crate::spell::paragraph_words(para, &default) {
             if ignore.contains(&w.text.to_lowercase()) || rep.contains(&w.start) {
                 continue;
@@ -421,30 +421,23 @@ fn add_to_dictionary(_s: &mut Session, p: &Value) -> Result<Value> {
 /// Replace whole-word `from` with `to` in `text`; how many were replaced.
 fn replace_word(text: &mut String, from: &str, to: &str, all: bool) -> usize {
     let is_word = |c: char| c.is_alphanumeric() || c == '\'' || c == '’';
-    // The result is built in one pass; the text is not edited in place for every match.
+    let mut n = 0;
-    let mut out = String::new();
+    let mut at = 0;
-    let (mut n, mut at, mut copied) = (0, 0, 0);
     while let Some(i) = text.get(at..).and_then(|t| t.find(from)).map(|i| i + at) {
         let end = i + from.len();
-        // The character before the match as the edited text would have it.
+        let before = text.get(..i).and_then(|t| t.chars().next_back()).is_some_and(is_word);
-        let before = text.get(copied..i).and_then(|t| t.chars().next_back()).or_else(|| out.chars().next_back()).is_some_and(is_word);
         let after = text.get(end..).and_then(|t| t.chars().next()).is_some_and(is_word);
         if before || after {
             at = end;
             continue;
         }
-        out.push_str(text.get(copied..i).unwrap_or_default());
+        text.replace_range(i..end, to);
-        out.push_str(to);
         n += 1;
-        (at, copied) = (end, end);
+        at = i + to.len();
         if !all {
             break;
         }
     }
-    if n > 0 {
-        out.push_str(text.get(copied..).unwrap_or_default());
-        *text = out;
-    }
     n
 }
 
@@ -771,49 +764,6 @@ fn end_compare(s: &mut Session, _: &Value) -> Result<Value> {
 
 #[cfg(test)]
 mod tests {
-    /// The replacement as it ran before: edited in place for every match.
-    fn replace_word_in_place(text: &mut String, from: &str, to: &str, all: bool) -> usize {
-        let is_word = |c: char| c.is_alphanumeric() || c == '\'' || c == '’';
-        let mut n = 0;
-        let mut at = 0;
-        while let Some(i) = text.get(at..).and_then(|t| t.find(from)).map(|i| i + at) {
-            let end = i + from.len();
-            let before = text.get(..i).and_then(|t| t.chars().next_back()).is_some_and(is_word);
-            let after = text.get(end..).and_then(|t| t.chars().next()).is_some_and(is_word);
-            if before || after {
-                at = end;
-                continue;
-            }
-            text.replace_range(i..end, to);
-            n += 1;
-            at = i + to.len();
-            if !all {
-                break;
-            }
-        }
-        n
-    }
-
-    #[test]
-    fn replace_word_matches_the_in_place_version() {
-        let cases = [
-            ("a a b a", "a", "x", true),
-            ("aa a. a", "a", "bb", true),
-            ("a-a -a-", "-", "ab", true),
-            ("foo. foo.", "foo.", "", true),
-            ("it's it", "it", "so", true),
-            ("x.x. x.", "x.", "y", true),
-            ("a a a", "a", "b", false),
-            ("none", "z", "q", true),
-            ("é é", "é", "e", true),
-        ];
-        for (text, from, to, all) in cases {
-            let (mut a, mut b) = (text.to_string(), text.to_string());
-            let (na, nb) = (replace_word(&mut a, from, to, all), replace_word_in_place(&mut b, from, to, all));
-            assert_eq!((na, a), (nb, b), "{text:?} {from:?} -> {to:?}");
-        }
-    }
-
     use super::*;
     use serde_json::json;
 

crates/engine/src/cmd/shape/appearance.rs

@@ -371,9 +371,9 @@ pub(super) fn effects(s: &mut Session, p: &Value) -> Result<Value> {
     let soft = p.get("softEdges").map(|v| v.as_f64().filter(|x| *x > 0.0).map(|x| x.min(100.0)));
     let refl = str_param(p, "reflection").map(|r| match r {
         "none" => None,
-        "half" => Some(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.55, dist: 4.0, ..Default::default() }),
+        "half" => Some(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.55, dist: 4.0 }),
-        "full" => Some(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.9, dist: 4.0, ..Default::default() }),
+        "full" => Some(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.9, dist: 4.0 }),
-        _ => Some(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.35, dist: 0.0, ..Default::default() }),
+        _ => Some(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.35, dist: 0.0 }),
     });
     let three_d = p.get("threeD").filter(|v| v.is_object());
     let bevel = str_param(p, "bevel").map(|b| if b == "none" { None } else { Some(b.to_string()) });
@@ -467,14 +467,7 @@ pub(super) fn effects(s: &mut Session, p: &Value) -> Result<Value> {
             e.glow = (g.radius > 0.0).then_some(g);
         }
         if let Some(v) = &refl_props {
-            let mut r = e.reflection.take().unwrap_or(Reflection {
+            let mut r = e.reflection.take().unwrap_or(Reflection { blur: 0.5, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.35, dist: 0.0 });
-                blur: 0.5,
-                start_alpha: 0.5,
-                end_alpha: 0.0,
-                end_pos: 0.35,
-                dist: 0.0,
-                ..Default::default()
-            });
             if let Some(t) = num(v, "transparency") {
                 r.start_alpha = 1.0 - t.clamp(0.0, 1.0);
             }

crates/engine/src/cmd/slide.rs

@@ -267,9 +267,6 @@ fn delete(s: &mut Session, p: &Value) -> Result<Value> {
         for sec in &mut doc.sections {
             sec.slides.retain(|x| !ids.contains(x));
         }
-        for show in &mut doc.custom_shows {
-            show.slides.retain(|x| !ids.contains(x));
-        }
         sel.slide = first.min(doc.slides.len().saturating_sub(1));
         sel.slides = doc.slides.get(sel.slide).map(|x| vec![x.id]).unwrap_or_default();
         sel.shapes.clear();
@@ -408,9 +405,8 @@ fn select_slides(s: &mut Session, p: &Value) -> Result<Value> {
     };
     s.select(|doc, sel| {
         if add {
-            let mut have: std::collections::HashSet<_> = sel.slides.iter().copied().collect();
             for i in &ids {
-                if have.insert(*i) {
+                if !sel.slides.contains(i) {
                     sel.slides.push(*i);
                 }
             }
@@ -781,45 +777,6 @@ mod tests {
         (sel.slide, sel.slides.iter().map(|x| x.0).collect())
     }
 
-    #[test]
-    fn deleting_slide_prunes_every_custom_show_in_one_undo_step() {
-        let (mut s, ids) = deck(3);
-        let shows = vec![
-            deckcraft_model::CustomShow {
-                name: "First".into(),
-                slides: vec![deckcraft_model::SlideId(ids[0]), deckcraft_model::SlideId(ids[1]), deckcraft_model::SlideId(ids[1])],
-            },
-            deckcraft_model::CustomShow { name: "Second".into(), slides: vec![deckcraft_model::SlideId(ids[1]), deckcraft_model::SlideId(ids[2])] },
-            deckcraft_model::CustomShow { name: "Empty after delete".into(), slides: vec![deckcraft_model::SlideId(ids[1])] },
-        ];
-        s.edit(|doc, _| {
-            doc.custom_shows = shows;
-            Ok(())
-        })
-        .expect("set custom shows");
-
-        s.execute("slide.delete", &json!({"index": 1})).expect("delete slide");
-        let shows = &s.doc().expect("doc").doc.custom_shows;
-        assert_eq!(shows[0].slides, [deckcraft_model::SlideId(ids[0])]);
-        assert_eq!(shows[1].slides, [deckcraft_model::SlideId(ids[2])]);
-        assert!(shows[2].slides.is_empty());
-
-        s.execute("edit.undo", &json!({})).expect("undo deletion");
-        assert_eq!(order(&s), ids);
-        assert_eq!(
-            s.doc().expect("doc").doc.custom_shows[0].slides,
-            [deckcraft_model::SlideId(ids[0]), deckcraft_model::SlideId(ids[1]), deckcraft_model::SlideId(ids[1])]
-        );
-        assert_eq!(s.doc().expect("doc").doc.custom_shows[1].slides, [deckcraft_model::SlideId(ids[1]), deckcraft_model::SlideId(ids[2])]);
-
-        s.execute("edit.redo", &json!({})).expect("redo deletion");
-        let bytes = deckcraft_format::save(&s.doc().expect("doc").doc).expect("save deck");
-        let reopened = deckcraft_format::load(&bytes).expect("reopen deck");
-        assert_eq!(reopened.custom_shows[0].slides, [deckcraft_model::SlideId(ids[0])]);
-        assert_eq!(reopened.custom_shows[1].slides, [deckcraft_model::SlideId(ids[2])]);
-        assert!(reopened.custom_shows[2].slides.is_empty());
-    }
-
     #[test]
     fn move_from_to_moves_one_slide() {
         let (mut s, ids) = deck(4);

crates/engine/src/compare.rs

@@ -121,10 +121,9 @@ pub fn diff(cur: &Presentation, rev: &Presentation, by_position: bool) -> Vec<Ch
     let cur_matched: HashSet<usize> = pairs.iter().map(|p| p.0).collect();
     let rev_matched: HashSet<usize> = pairs.iter().map(|p| p.1).collect();
     let mut out = vec![];
-    let mut media = Media::new(cur, rev);
     for (i, j) in &pairs {
         let (Some(a), Some(b)) = (cur.slides.get(*i), rev.slides.get(*j)) else { continue };
-        let details = slide_details(cur, a, rev, b, &mut media);
+        let details = slide_details(cur, a, rev, b);
         if !details.is_empty() {
             out.push(Change { kind: ChangeKind::Changed, slide: *i, number: i.saturating_add(1), only_in: None, revised: Some(*j), details });
         }
@@ -141,18 +140,10 @@ pub fn diff(cur: &Presentation, rev: &Presentation, by_position: bool) -> Vec<Ch
             });
         }
     }
-    // Each revised slide's open match (the first pair naming it).
-    let mut rev_to_cur: HashMap<usize, usize> = HashMap::new();
-    for p in &pairs {
-        rev_to_cur.entry(p.1).or_insert(p.0);
-    }
-    // After the open slide that matches the nearest matched revised slide before it.
-    let mut at = 0;
     for (j, s) in rev.slides.iter().enumerate() {
-        if let Some(i) = rev_to_cur.get(&j) {
-            at = i + 1;
-        }
         if !rev_matched.contains(&j) {
+            // After the open slide that matches the revised slide before it.
+            let at = (0..j).rev().find_map(|k| pairs.iter().find(|p| p.1 == k).map(|p| p.0 + 1)).unwrap_or(0);
             out.push(Change {
                 kind: ChangeKind::Inserted,
                 slide: at,
@@ -183,34 +174,8 @@ fn shape_label(s: &Shape) -> String {
     if s.name.trim().is_empty() { format!("Shape {}", s.id.0) } else { s.name.clone() }
 }
 
-/// Both decks' media bytes by id, and which picture pairs were already compared: a deck can
+fn media_bytes(p: &Presentation, id: MediaId) -> Option<&[u8]> {
-/// show one picture many times, and its bytes are compared once per pair.
+    p.media(id).map(|m| m.data.as_slice())
-struct Media<'a> {
-    cur: HashMap<MediaId, &'a [u8]>,
-    rev: HashMap<MediaId, &'a [u8]>,
-    same: HashMap<(MediaId, MediaId), bool>,
-}
-
-impl<'a> Media<'a> {
-    fn new(cur: &'a Presentation, rev: &'a Presentation) -> Self {
-        // The first item with an id wins, as in `Presentation::media`.
-        let index = |p: &'a Presentation| {
-            let mut m = HashMap::new();
-            for x in &p.media {
-                m.entry(x.id).or_insert(x.data.as_slice());
-            }
-            m
-        };
-        Media { cur: index(cur), rev: index(rev), same: HashMap::new() }
-    }
-    /// Whether the pictures (by media id, `None` for a shape that is not a picture) differ.
-    fn differ(&mut self, a: Option<MediaId>, b: Option<MediaId>) -> bool {
-        let (ba, bb) = (a.and_then(|x| self.cur.get(&x)), b.and_then(|y| self.rev.get(&y)));
-        match (a, b) {
-            (Some(x), Some(y)) if ba.is_some() && bb.is_some() => !*self.same.entry((x, y)).or_insert_with(|| ba == bb),
-            _ => ba.is_some() || bb.is_some(),
-        }
-    }
 }
 
 /// A shape without its ids (shape and media), for comparing across decks.
@@ -239,7 +204,7 @@ fn turn(ctx: Option<&Ctx>, s: &Shape) -> (f64, bool, bool) {
     drawn_box(ctx, s).map_or((0.0, false, false), |x| (x.rot, x.flip_h, x.flip_v))
 }
 
-fn shape_details(ca: Option<&Ctx>, a: &Shape, cb: Option<&Ctx>, b: &Shape, media: &mut Media, out: &mut Vec<String>) {
+fn shape_details(cp: &Presentation, ca: Option<&Ctx>, a: &Shape, rp: &Presentation, cb: Option<&Ctx>, b: &Shape, out: &mut Vec<String>) {
     let label = shape_label(b);
     let text = |s: &Shape| s.text.as_ref().map(|t| t.text()).unwrap_or_default();
     let mut what = vec![];
@@ -269,11 +234,11 @@ fn shape_details(ca: Option<&Ctx>, a: &Shape, cb: Option<&Ctx>, b: &Shape, media
     if a.fill != b.fill || a.line != b.line || a.style != b.style || a.effects != b.effects {
         what.push("formatting");
     }
-    let pic = |s: &Shape| match &s.kind {
+    let pic = |p: &Presentation, s: &Shape| match &s.kind {
-        ShapeKind::Picture { fill } => Some(fill.media),
+        ShapeKind::Picture { fill } => media_bytes(p, fill.media).map(|b| b.to_vec()),
         _ => None,
     };
-    if media.differ(pic(a), pic(b)) {
+    if pic(cp, a) != pic(rp, b) {
         what.push("picture");
     }
     // Anything the checks above do not cover (alt text, hidden, a link…) is reported too, also
@@ -300,32 +265,21 @@ fn shape_details(ca: Option<&Ctx>, a: &Shape, cb: Option<&Ctx>, b: &Shape, media
     }
 }
 
-fn slide_details(cp: &Presentation, a: &Slide, rp: &Presentation, b: &Slide, media: &mut Media) -> Vec<String> {
+fn slide_details(cp: &Presentation, a: &Slide, rp: &Presentation, b: &Slide) -> Vec<String> {
     let mut out = vec![];
     let mut used: HashSet<usize> = HashSet::new();
     let (ca, cb) = (Ctx::for_slide(cp, a), Ctx::for_slide(rp, b));
-    // The revised shapes by id (first wins) and by name (in order, with a cursor past used ones).
-    let mut by_id: HashMap<ShapeId, usize> = HashMap::new();
-    let mut by_name: HashMap<&str, (Vec<usize>, usize)> = HashMap::new();
-    for (k, x) in b.shapes.iter().enumerate() {
-        by_id.entry(x.id).or_insert(k);
-        if !x.name.is_empty() {
-            by_name.entry(x.name.as_str()).or_default().0.push(k);
-        }
-    }
     for sa in &a.shapes {
-        let k = by_id.get(&sa.id).copied().or_else(|| {
+        let k = b
-            let (ks, next) = by_name.get_mut(sa.name.as_str())?;
+            .shapes
-            while ks.get(*next).is_some_and(|k| used.contains(k)) {
+            .iter()
-                *next += 1;
+            .position(|x| x.id == sa.id)
-            }
+            .or_else(|| b.shapes.iter().enumerate().position(|(k, x)| !used.contains(&k) && x.name == sa.name && !x.name.is_empty()));
-            ks.get(*next).copied()
-        });
         match k {
             Some(k) if !used.contains(&k) => {
                 used.insert(k);
                 if let Some(sb) = b.shapes.get(k) {
-                    shape_details(ca.as_ref(), sa, cb.as_ref(), sb, media, &mut out);
+                    shape_details(cp, ca.as_ref(), sa, rp, cb.as_ref(), sb, &mut out);
                 }
             }
             _ => out.push(format!("{} deleted (only in the deck)", shape_label(sa))),
@@ -380,34 +334,19 @@ pub fn adopt(doc: &mut Presentation, rev: &Presentation, slide: &Slide, replacin
     let mut sl = slide.clone();
     // Media.
     let mut media_map: HashMap<MediaId, MediaId> = HashMap::new();
-    // Both decks' media by id (the first item with an id wins, as in `Presentation::media`),
-    // looked up once per reference instead of searched.
-    let mut rev_at: HashMap<MediaId, usize> = HashMap::new();
-    for (i, m) in rev.media.iter().enumerate() {
-        rev_at.entry(m.id).or_insert(i);
-    }
-    let mut doc_at: HashMap<MediaId, usize> = HashMap::new();
-    for (i, m) in doc.media.iter().enumerate() {
-        doc_at.entry(m.id).or_insert(i);
-    }
     for id in crate::media_refs::slide_media(&sl) {
-        let Some(m) = rev_at.get(&id).and_then(|&i| rev.media.get(i)) else { continue };
+        let Some(m) = rev.media(id) else { continue };
-        match doc_at.get(&id).and_then(|&i| doc.media.get(i)) {
+        match doc.media(id) {
             Some(x) if x.data == m.data => {}
             None => {
                 // Keeps the revision's id, so later ids must start past it.
-                doc_at.insert(id, doc.media.len());
                 doc.media.push(m.clone());
                 doc.next_id = doc.next_id.max(id.0);
             }
             Some(_) => {
-                let before = doc.media.len();
                 let new = doc
                     .add_media(&m.name, &m.content_type, m.data.as_ref().clone())
                     .ok_or_else(|| crate::cmd::bad("review.accept", crate::cmd::NO_ID_SPACE))?;
-                if doc.media.len() > before {
-                    doc_at.entry(new).or_insert(before);
-                }
                 media_map.insert(id, new);
             }
         }
@@ -580,39 +519,6 @@ mod tests {
         assert_eq!(s.doc().unwrap().doc.slides.len(), n, "comparing alone changes nothing");
     }
 
-    #[test]
-    fn many_inserted_slides_and_same_named_pictures_compare_by_index() {
-        use std::sync::Arc;
-
-        use deckcraft_model::style::PictureFill;
-        use deckcraft_model::{Shape, ShapeId, ShapeKind, SlideId, defaults};
-
-        // One slide of 3,000 pictures of one image, all named "Box"; the revision has the same
-        // pictures under other ids (matched by name, in order) and 3,000 slides inserted after it.
-        let mut cur = defaults::new_presentation(None);
-        let img = cur.add_media("a.png", "image/png", vec![7; 4096]).unwrap();
-        let mut rev = cur.clone();
-        let pic = |id: u32| Shape {
-            id: ShapeId(id),
-            name: "Box".into(),
-            xfrm: Some(deckcraft_model::Xfrm::new(10.0, 10.0, 50.0, 50.0)),
-            kind: ShapeKind::Picture { fill: PictureFill { media: img, ..Default::default() } },
-            ..Default::default()
-        };
-        Arc::make_mut(&mut cur.slides[0]).shapes = (0..3000).map(|k| pic(100_000 + k)).collect();
-        Arc::make_mut(&mut rev.slides[0]).shapes = (0..3000).map(|k| pic(200_000 + k)).collect();
-        let mut base = (*rev.slides[0]).clone();
-        base.shapes.clear();
-        for k in 0..3000 {
-            let mut s = base.clone();
-            s.id = SlideId(300_000 + k);
-            rev.slides.push(Arc::new(s));
-        }
-        let changes = super::diff(&cur, &rev, false);
-        assert_eq!(changes.len(), 3000, "only the inserted slides differ");
-        assert!(changes.iter().all(|c| c.kind == super::ChangeKind::Inserted && c.slide == 1));
-    }
-
     /// A deck with one slide: a table whose cell has a picture fill, a picture background and a
     /// transition sound. `tag` starts the bytes of each.
     fn media_deck(tag: &str) -> deckcraft_model::Presentation {

crates/engine/src/file_access.rs

@@ -85,14 +85,20 @@ impl AutomationRoots {
 
     /// May the file or folder at `path` be read (or written)? `Err` says why not.
     pub fn check(&self, path: &str, access: Access) -> Result<(), String> {
+        self.check_path(Path::new(path), access)
+    }
+
+    /// [`Self::check`] for a path that may not be UTF-8: the checked path is the one opened.
+    pub fn check_path(&self, path: &Path, access: Access) -> Result<(), String> {
+        let path_text = path.display();
         let roots = match access {
             Access::Read => &self.read,
             Access::Write => &self.write,
         };
         if roots.is_empty() {
             return match access {
-                Access::Read => Err(format!("automation filesystem access is not granted: read authority is absent: {path}")),
+                Access::Read => Err(format!("automation filesystem access is not granted: read authority is absent: {path_text}")),
-                Access::Write => Err(format!("automation filesystem access is not granted: write authority is absent: {path}")),
+                Access::Write => Err(format!("automation filesystem access is not granted: write authority is absent: {path_text}")),
             };
         }
         let resolved = resolve(path)?;
@@ -101,8 +107,8 @@ impl AutomationRoots {
         }
         let roots = roots.iter().map(|root| root.shown.display().to_string()).collect::<Vec<_>>().join(", ");
         match access {
-            Access::Read => Err(format!("automation path rejected: outside the read roots {roots}: {path}")),
+            Access::Read => Err(format!("automation path rejected: outside the read roots {roots}: {path_text}")),
-            Access::Write => Err(format!("automation path rejected: outside the write roots {roots}: {path}")),
+            Access::Write => Err(format!("automation path rejected: outside the write roots {roots}: {path_text}")),
         }
     }
 }
@@ -191,17 +197,23 @@ pub fn check_write(path: &str) -> Result<(), String> {
     current().map_or(Ok(()), |r| r.check(path, Access::Write))
 }
 
+/// May `path` be written here? Always, without roots in force. For a path that may not be UTF-8.
+pub fn check_write_path(path: &Path) -> Result<(), String> {
+    current().map_or(Ok(()), |r| r.check_path(path, Access::Write))
+}
+
 /// `path` made absolute with its links followed; for a path that doesn't exist (yet), its nearest
 /// existing folder's links followed and the rest appended.
-fn resolve(path: &str) -> Result<PathBuf, String> {
+fn resolve(path: &Path) -> Result<PathBuf, String> {
-    if path.is_empty() {
+    if path.as_os_str().is_empty() {
         return Err("automation path rejected: path is empty".into());
     }
+    let shown = path.display();
     // Checked as given: making `…\NUL` absolute gives the device path `\\.\NUL` on Windows.
-    if cfg!(windows) && Path::new(path).components().any(|c| matches!(c, Component::Normal(n) if is_device_name(&n.to_string_lossy()))) {
+    if cfg!(windows) && path.components().any(|c| matches!(c, Component::Normal(n) if is_device_name(&n.to_string_lossy()))) {
-        return Err(format!("automation path rejected: reserved device names are not allowed: {path}"));
+        return Err(format!("automation path rejected: reserved device names are not allowed: {shown}"));
     }
-    let absolute = std::path::absolute(path).map_err(|e| format!("automation path rejected: cannot resolve {path}: {e}"))?;
+    let absolute = std::path::absolute(path).map_err(|e| format!("automation path rejected: cannot resolve {shown}: {e}"))?;
     // The names below the nearest existing folder, last first.
     let mut missing: Vec<OsString> = vec![];
     let mut at = absolute.as_path();
@@ -212,11 +224,11 @@ fn resolve(path: &str) -> Result<PathBuf, String> {
                 return Ok(found);
             }
             Err(e) => match std::fs::symlink_metadata(at) {
-                Ok(m) if m.file_type().is_symlink() => return Err(format!("automation path rejected: a link that leads nowhere: {path}")),
+                Ok(m) if m.file_type().is_symlink() => return Err(format!("automation path rejected: a link that leads nowhere: {shown}")),
                 // There, yet its real path can't be had (no permission): nothing to compare.
-                Ok(_) => return Err(format!("automation path rejected: cannot resolve {path}: {e}")),
+                Ok(_) => return Err(format!("automation path rejected: cannot resolve {shown}: {e}")),
                 Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
-                Err(e) => return Err(format!("automation path rejected: cannot resolve {path}: {e}")),
+                Err(e) => return Err(format!("automation path rejected: cannot resolve {shown}: {e}")),
             },
         }
         let parent = at.parent();
@@ -226,12 +238,12 @@ fn resolve(path: &str) -> Result<PathBuf, String> {
                 at = parent;
             }
             (Some(Component::ParentDir), _) => {
-                return Err(format!("automation path rejected: parent traversal below a folder that doesn't exist: {path}"));
+                return Err(format!("automation path rejected: parent traversal below a folder that doesn't exist: {shown}"));
             }
             // Down to the root (or drive) and it doesn't exist either.
             _ => {
                 let e = std::io::Error::from(std::io::ErrorKind::NotFound);
-                return Err(format!("automation path rejected: cannot resolve {path}: {e}"));
+                return Err(format!("automation path rejected: cannot resolve {shown}: {e}"));
             }
         }
     }

crates/engine/src/io.rs

@@ -41,15 +41,12 @@ pub fn write_file(path: &str, bytes: &[u8]) -> Result<(), String> {
         Ok(canonical) => canonical,
         Err(_) => std::path::PathBuf::from(path),
     };
+    let target_str = target_path.to_str().unwrap_or(path);
     let existing_perms = std::fs::metadata(&target_path).ok().map(|m| m.permissions());
 
     let mut attempts = 0;
     let (tmp, mut file) = loop {
-        // A short fixed-size name: appending to the target's name could exceed the file name limit.
+        let tmp = format!("{target_str}.{}.{}.saving", std::process::id(), COUNTER.fetch_add(1, Ordering::Relaxed));
-        let tmp_name = format!(".deckcraft.{}.{}.saving", std::process::id(), COUNTER.fetch_add(1, Ordering::Relaxed));
-        let tmp = target_path.with_file_name(tmp_name);
-        // The sibling must pass the same check: when `path` is the write root itself it lands outside.
-        crate::file_access::check_write(&tmp.to_string_lossy())?;
         match std::fs::OpenOptions::new().write(true).create_new(true).open(&tmp) {
             Ok(f) => break (tmp, f),
             Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists && attempts < 16 => attempts += 1,
@@ -123,30 +120,4 @@ mod tests {
         let _ = std::fs::remove_file(&test_file);
         let _ = std::fs::remove_dir(&tmp_dir);
     }
-
-    #[test]
-    fn write_file_overwrites_file_with_name_near_the_length_limit() {
-        let dir = std::env::temp_dir().join("deckcraft_io_long_name_test");
-        let _ = std::fs::create_dir_all(&dir);
-        let file = dir.join(format!("{}.pptx", "a".repeat(250)));
-        std::fs::write(&file, b"old").unwrap();
-        let path_str = file.to_str().unwrap();
-
-        write_file(path_str, b"new").unwrap();
-        assert_eq!(read_file(path_str).unwrap(), b"new");
-
-        let _ = std::fs::remove_file(&file);
-    }
-
-    #[test]
-    fn write_file_to_the_write_root_itself_creates_no_sibling_outside_it() {
-        let base = std::env::temp_dir().join(format!("deckcraft_io_root_test_{}", std::process::id()));
-        let root = base.join("root");
-        std::fs::create_dir_all(&root).unwrap();
-        let roots = crate::file_access::AutomationRoots::new(&[], std::slice::from_ref(&root)).unwrap().unwrap();
-        let res = crate::file_access::confine(Some(&roots), || write_file(root.to_str().unwrap(), b"x"));
-        assert!(res.unwrap_err().contains("outside the write root"));
-        assert_eq!(std::fs::read_dir(&base).unwrap().count(), 1, "only the root is there");
-        let _ = std::fs::remove_dir_all(&base);
-    }
 }

crates/engine/src/spell.rs

@@ -668,6 +668,8 @@ pub fn add_user_word(word: &str) -> std::io::Result<()> {
         return Ok(());
     }
     let path = user_dictionary_path().ok_or_else(|| std::io::Error::new(std::io::ErrorKind::NotFound, "no folder for the user dictionary"))?;
+    // A confined automation client may write only inside its write roots, this file included.
+    crate::file_access::check_write_path(&path).map_err(|e| std::io::Error::new(std::io::ErrorKind::PermissionDenied, e))?;
     if let Some(d) = path.parent() {
         std::fs::create_dir_all(d)?;
     }
@@ -700,29 +702,15 @@ pub struct Word {
     pub repeated: Option<usize>,
 }
 
-/// Longest language tag a word is checked in. BCP 47 tags in documents are a few bytes; a longer
-/// value from a file is no language we have a dictionary for, and copying it into every word of
-/// a paragraph would multiply it.
-const MAX_LANG_LEN: usize = 64;
-
 /// The words of `p`, each with its run's language (`lang` on the run, else `default`). Words
 /// with digits are skipped; apostrophes inside a word belong to it; hyphenated words are checked
-/// part by part. A language over [`MAX_LANG_LEN`] counts as none.
+/// part by part.
 pub fn paragraph_words(p: &deckcraft_model::Paragraph, default: &str) -> Vec<Word> {
     let mut chars: Vec<(char, usize)> = vec![];
     for (ri, r) in p.runs.iter().enumerate() {
         chars.extend(r.content().chars().map(|c| (c, ri)));
     }
-    let default = if default.len() > MAX_LANG_LEN { "" } else { default };
+    let lang_of = |ri: usize| p.runs.get(ri).and_then(|r| r.props.lang.clone()).filter(|l| !l.is_empty()).unwrap_or_else(|| default.to_string());
-    let lang_of = |ri: usize| {
-        p.runs
-            .get(ri)
-            .and_then(|r| r.props.lang.as_deref())
-            .filter(|l| !l.is_empty())
-            .map(|l| if l.len() > MAX_LANG_LEN { "" } else { l })
-            .unwrap_or(default)
-            .to_string()
-    };
     // Combining marks (decomposed accents) belong to the letter before them.
     let inside = |c: char| c.is_alphanumeric() || deckcraft_model::words::is_combining_mark(c) || c == '\'' || c == '’' || c == '-';
     let mut out = vec![];
@@ -805,18 +793,15 @@ pub fn misspelt(p: &deckcraft_model::Paragraph, default: &str, ignore: &[String]
         .chain(repeated(p, default))
         .collect::<Vec<_>>()
         .into_iter()
-        .fold((vec![], HashMap::new()), |(mut v, mut at): (Vec<Word>, HashMap<usize, usize>), w| {
+        .fold(vec![], |mut v: Vec<Word>, w| {
             // A repeated misspelt word is reported once, as repeated.
-            match at.get(&w.start).and_then(|&i| v.get_mut(i)) {
+            if let Some(i) = v.iter().position(|x| x.start == w.start) {
-                Some(x) => *x = w,
+                v[i] = w;
-                None => {
+            } else {
-                    at.insert(w.start, v.len());
+                v.push(w);
-                    v.push(w);
-                }
             }
-            (v, at)
+            v
         })
-        .0
 }
 
 /// Use `d` for `lang` from now on in this process (a dictionary the app loaded itself).
@@ -971,20 +956,17 @@ SFX D Y 1\nSFX D 0 ed/S .\n";
     }
 
     #[test]
-    fn a_long_paragraph_with_a_huge_language_is_checked_in_linear_work() {
+    fn a_confined_client_cannot_write_the_user_dictionary_outside_its_roots() {
-        use deckcraft_model::{Paragraph, Run, RunProps};
+        let root = std::env::temp_dir().join(format!("deckcraft-dict-root-{}", std::process::id()));
-        // 100,000 copies of one word under a 1 MB language value: every word after the first is
+        std::fs::create_dir_all(&root).unwrap();
-        // a repeat, and no word carries a copy of the value.
+        let roots = crate::file_access::AutomationRoots::new(std::slice::from_ref(&root), std::slice::from_ref(&root)).unwrap();
-        let lang = "x".repeat(1 << 20);
+        // The user dictionary is a file of its own outside `root`, not whatever HOME points at.
-        let p =
+        let outside = std::env::temp_dir().join(format!("deckcraft-dict-outside-{}", std::process::id()));
-            Paragraph { runs: vec![Run::with("the ".repeat(100_000), RunProps { lang: Some(lang), ..Default::default() })], ..Default::default() };
+        set_user_dictionary_path(outside.join("user.dic"));
-        let words = paragraph_words(&p, "en-US");
+        let r = crate::file_access::confine(roots.as_ref(), || add_user_word("zqxconfinedword"));
-        assert_eq!(words.len(), 100_000);
+        assert_eq!(r.map_err(|e| e.kind()), Err(std::io::ErrorKind::PermissionDenied));
-        assert!(words.iter().all(|w| w.lang.is_empty()));
+        assert!(!outside.exists(), "the refused write created nothing");
-        let bad = misspelt(&p, "en-US", &[]);
+        let _ = std::fs::remove_dir_all(&root);
-        assert_eq!(bad.len(), 99_999);
-        assert!(bad.iter().all(|w| w.repeated.is_some()));
-        assert!(paragraph_words(&Paragraph::new("word"), &"y".repeat(100)).iter().all(|w| w.lang.is_empty()));
     }
 
     #[test]

crates/engine/src/tests.rs

@@ -2410,23 +2410,6 @@ fn pdf_options_take_paper_and_orientation() {
     assert!(cmd::file::pdf_options(&json!({"orientation": "sideways"}), 1).is_err());
 }
 
-/// Handout `perPage` accepts only 1, 2, 3, 4, 6 and 9; anything else is an error, not a 9-up page.
-#[test]
-fn pdf_options_reject_unsupported_per_page() {
-    for n in [1, 2, 3, 4, 6, 9] {
-        let o = cmd::file::pdf_options(&json!({"layout": "handouts", "perPage": n}), 1).unwrap();
-        assert!(matches!(o.layout, deckcraft_pdf::PageLayout::Handouts { per_page } if per_page as usize == n));
-    }
-    for n in [0, 5, 7, 8, 10] {
-        let e = cmd::file::pdf_options(&json!({"layout": "handouts", "perPage": n}), 1).unwrap_err();
-        assert!(e.to_string().contains("1, 2, 3, 4, 6, 9"), "perPage {n}: {e}");
-    }
-    // Not a count at all: refused too, instead of falling back to 6.
-    for v in [json!(-1), json!(5.5), json!("6")] {
-        assert!(cmd::file::pdf_options(&json!({"layout": "handouts", "perPage": v}), 1).is_err(), "perPage {v}");
-    }
-}
-
 #[test]
 fn shape_line_sets_compound_and_arrow_sizes() {
     // The Format Shape pane's Line page: compound type, arrowheads and their sizes.
@@ -3223,7 +3206,6 @@ fn numbering_takes_color_and_size() {
         props.bullet_font_follow_text = Some(true);
         props.bullet_color_follow_text = Some(true);
         props.bullet_size_follow_text = Some(true);
-        props.bullet_size_points = Some(12.0);
     }
     s.execute("format.numbering", &json!({"on": true, "scheme": "romanUcPeriod", "start": 3, "color": "accent2", "size": 150})).unwrap();
     let para = |s: &Session| {
@@ -3237,11 +3219,9 @@ fn numbering_takes_color_and_size() {
     assert_eq!(pp.bullet_font_follow_text, Some(true));
     assert_eq!(pp.bullet_color_follow_text, None);
     assert_eq!(pp.bullet_size_follow_text, None);
-    assert_eq!(pp.bullet_size_points, None);
     assert_eq!(pp.bullet_color, Some(deckcraft_model::ColorRef::scheme(deckcraft_color::SchemeSlot::Accent2)));
     s.execute("format.bullets", &json!({"on": true, "char": "★", "size": 9000})).unwrap();
     assert_eq!(para(&s).bullet_size, Some(4.0));
-    assert_eq!(para(&s).bullet_size_points, None);
     assert_eq!(para(&s).bullet_font_follow_text, None);
 }
 
@@ -5362,8 +5342,7 @@ fn opening_a_file_caps_absurd_effect_sizes() {
                 e.soft_edge = Some(f64::NAN);
                 let sw = e.outer_shadow.as_mut().unwrap();
                 (sw.blur, sw.dist, sw.sx) = (huge, huge, huge);
-                *e.reflection.as_mut().unwrap() =
+                *e.reflection.as_mut().unwrap() = Reflection { blur: huge, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.5, dist: huge };
-                    Reflection { blur: huge, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.5, dist: huge, ..Default::default() };
             }
             let glow = Some(Glow { color: deckcraft_model::style::ColorRef::rgb(deckcraft_color::Rgba::BLACK), radius: huge });
             let runs: Vec<&mut deckcraft_model::text::Run> = match &mut sh.kind {
@@ -6479,30 +6458,3 @@ fn master_body_placeholder_format_keeps_per_level_formatting() {
     assert_eq!((level(&s, 0).run.size, level(&s, 1).run.size), (Some(28.0), Some(24.0)));
     assert_eq!(shown(&s), vec![Some(28.0), Some(24.0)]);
 }
-
-#[test]
-fn slide_master_view_rejects_invalid_indices() {
-    let mut s = Session::with_new();
-    for p in [json!({"master": -1}), json!({"master": 0.5}), json!({"master": 0, "layout": -1}), json!({"master": 0, "layout": 1.5})] {
-        let r = s.execute("view.slideMaster", &p);
-        assert!(r.is_err(), "invalid index accepted for {p}: {r:?}");
-    }
-    assert!(s.execute("view.slideMaster", &json!({})).is_ok());
-    assert!(s.execute("view.slideMaster", &json!({"master": 0})).is_ok());
-}
-
-#[test]
-fn save_to_image_path_is_an_error_not_zip_bytes() {
-    let dir = std::env::temp_dir().join(format!("deckcraft-save-img-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    for (cmd, name) in [("file.save", "a.png"), ("file.saveAs", "a.jpg"), ("file.save", "a.jpeg")] {
-        let mut s = Session::new();
-        sample::open_sample(&mut s).unwrap();
-        let path = dir.join(name).to_string_lossy().to_string();
-        let before = s.doc().unwrap().path.clone();
-        assert!(s.execute(cmd, &json!({"path": path})).is_err(), "{cmd} {name} should fail");
-        assert!(!std::path::Path::new(&path).exists(), "{name} must not be written");
-        assert_eq!(s.doc().unwrap().path, before);
-    }
-    let _ = std::fs::remove_dir_all(&dir);
-}

crates/fonts/src/fallback.rs

@@ -227,9 +227,6 @@ impl FontDb {
     }
 }
 
-/// Most caret records read for one ligature glyph.
-const MAX_LIGATURE_CARETS: usize = 64;
-
 /// Caret positions inside a ligature glyph from GDEF `LigCaretList`, in font units from the
 /// glyph's origin (sorted ascending). Empty when the font has none for `gid`.
 pub fn ligature_carets(face: &FontFace, gid: u32) -> Vec<i32> {
@@ -239,12 +236,9 @@ pub fn ligature_carets(face: &FontFace, gid: u32) -> Vec<i32> {
     let Ok(cov) = list.coverage() else { return Vec::new() };
     let Some(idx) = cov.get(skrifa::GlyphId::new(gid)) else { return Vec::new() };
     let Ok(lig) = list.lig_glyphs().get(idx as usize) else { return Vec::new() };
-    // The limit applies to the records read, not to the carets kept: a font can list thousands of
-    // records it then has to be read through for every ligature laid out.
     let mut out: Vec<i32> = lig
         .caret_values()
         .iter()
-        .take(MAX_LIGATURE_CARETS)
         .filter_map(|cv| cv.ok())
         .filter_map(|cv| match cv {
             skrifa::raw::tables::gdef::CaretValue::Format1(f) => Some(f.coordinate() as i32),
@@ -252,6 +246,7 @@ pub fn ligature_carets(face: &FontFace, gid: u32) -> Vec<i32> {
             // Format 2 is a contour point index; outlines aren't consulted here.
             skrifa::raw::tables::gdef::CaretValue::Format2(_) => None,
         })
+        .take(64)
         .collect();
     out.sort_unstable();
     out

crates/fonts/src/fontdb.rs

@@ -368,7 +368,7 @@ struct CatalogEntry {
 /// Process-wide font database.
 pub struct FontDb {
     faces: RwLock<Vec<Arc<FontFace>>>,
-    outlines: Mutex<OutlineCache>,
+    outlines: Mutex<HashMap<(u32, u32), Arc<BezPath>>>,
     #[cfg(not(target_arch = "wasm32"))]
     catalog: RwLock<Vec<CatalogEntry>>,
     /// The folders the system font scan reads (the platform's font folders for [`FontDb::global`]).
@@ -439,38 +439,6 @@ const SYSTEM_FALLBACKS: &[&str] = &[
 
 static NEXT_ID: AtomicU32 = AtomicU32::new(1);
 const OUTLINE_CACHE_MAX: usize = 50_000;
-/// Most path elements one glyph outline may expand to. Composite and `VARC` glyphs can draw a
-/// shared outline many times over; a glyph past this draws nothing rather than holding megabytes.
-const MAX_OUTLINE_ELEMENTS: usize = 1 << 15;
-/// Most path elements the outline cache holds across all glyphs (about 230 MB at most) before it
-/// starts over: distinct glyph ids can each expand one dense outline.
-const OUTLINE_CACHE_MAX_ELEMENTS: usize = 1 << 22;
-
-/// Glyph outlines by (face, glyph), with the path elements they hold.
-#[derive(Default)]
-struct OutlineCache {
-    paths: HashMap<(u32, u32), Arc<BezPath>>,
-    elements: usize,
-}
-
-impl OutlineCache {
-    fn get(&self, key: &(u32, u32)) -> Option<Arc<BezPath>> {
-        self.paths.get(key).cloned()
-    }
-
-    fn insert(&mut self, key: (u32, u32), path: Arc<BezPath>) {
-        let n = path.elements().len();
-        if let Some(old) = self.paths.remove(&key) {
-            self.elements = self.elements.saturating_sub(old.elements().len());
-        }
-        if self.paths.len() >= OUTLINE_CACHE_MAX || self.elements.saturating_add(n) > OUTLINE_CACHE_MAX_ELEMENTS {
-            self.paths.clear();
-            self.elements = 0;
-        }
-        self.paths.insert(key, path);
-        self.elements = self.elements.saturating_add(n);
-    }
-}
 
 fn name(font: &skrifa::FontRef<'_>, ids: &[StringId]) -> Option<String> {
     ids.iter().find_map(|id| font.localized_strings(*id).english_or_first().map(|s| s.to_string()).filter(|s| !s.is_empty()))
@@ -726,10 +694,6 @@ const MAX_COLLECTION_FACES: u32 = 256;
 const MAX_COLLECTION_ENTRIES_SCANNED: u32 = 16_384;
 /// Maximum named instances read from a single face.
 const MAX_NAMED_INSTANCES_PER_FACE: usize = 1024;
-/// Maximum faces (named instances counted separately) enumerated from one font file, across all
-/// of a collection's faces: the per-collection and per-face limits multiply, and each face found
-/// is then built with its own shaper.
-const MAX_ENUMERATED_FACES: usize = 4096;
 
 fn distinct_face_indices(entries: impl IntoIterator<Item = (u32, u32)>) -> Vec<u32> {
     let mut offsets = std::collections::HashSet::new();
@@ -766,30 +730,21 @@ fn enumerate_faces(data: &[u8]) -> Vec<Found> {
         Err(_) => Vec::new(),
     };
     let mut out = Vec::new();
-    // Named instances read and plain faces kept, across the whole file.
-    let mut budget = MAX_ENUMERATED_FACES;
     for i in indices {
-        if budget == 0 {
-            break;
-        }
         let Ok(f) = skrifa::FontRef::from_index(data, i) else { continue };
         let Some((family, style)) = face_names(&f) else { continue };
         let axes = f.axes();
         let mut named = Vec::new();
-        let mut seen = std::collections::HashSet::new();
         let instances = f.named_instances();
         for ni in instances.iter().take(capped_named_instance_count(instances.len())) {
-            let Some(left) = budget.checked_sub(1) else { break };
-            budget = left;
             let Some(style) = name(&f, &[ni.subfamily_name_id()]) else { continue };
-            if !seen.insert(style.to_ascii_lowercase()) {
+            if named.iter().any(|(_, s, _): &(u32, String, _)| s.eq_ignore_ascii_case(&style)) {
                 continue;
             }
             let coords: Vec<([u8; 4], f32)> = axes.iter().zip(ni.user_coords()).map(|(a, v)| (a.tag().to_be_bytes(), v)).collect();
             named.push((i, style, coords));
         }
         if named.is_empty() {
-            budget = budget.saturating_sub(1);
             out.push((i, family, style, Vec::new()));
         } else {
             out.extend(named.into_iter().map(|(i, s, c)| (i, family.clone(), s, c)));
@@ -950,7 +905,7 @@ impl FontDb {
         }
         Self {
             faces: RwLock::new(faces),
-            outlines: Mutex::new(OutlineCache::default()),
+            outlines: Mutex::new(HashMap::new()),
             #[cfg(not(target_arch = "wasm32"))]
             catalog: RwLock::new(Vec::new()),
             font_dirs,
@@ -1558,72 +1513,41 @@ impl FontDb {
     pub fn outline(&self, face: &FontFace, gid: u32) -> Arc<BezPath> {
         let key = (face.id, gid);
         if let Some(p) = self.outlines.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&key) {
-            return p;
+            return p.clone();
         }
-        let mut pen = FlipPen::new(MAX_OUTLINE_ELEMENTS);
+        let mut pen = FlipPen(BezPath::new());
         if let Some(f) = face.skrifa()
             && let Some(g) = f.outline_glyphs().get(GlyphId::new(gid))
         {
             let _ = g.draw(DrawSettings::unhinted(Size::unscaled(), face.location()), &mut pen);
         }
-        let p = Arc::new(pen.finish());
+        let p = Arc::new(pen.0);
-        self.outlines.lock().unwrap_or_else(std::sync::PoisonError::into_inner).insert(key, p.clone());
+        let mut cache = self.outlines.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+        if cache.len() >= OUTLINE_CACHE_MAX {
+            cache.clear();
+        }
+        cache.insert(key, p.clone());
         p
     }
 }
 
-/// Collects a glyph outline, y flipped, up to `limit` path elements. Past the limit it ignores
+struct FlipPen(BezPath);
-/// what follows and [`FlipPen::finish`] gives an empty path: a cut-off outline would fill wrongly.
-struct FlipPen {
-    path: BezPath,
-    limit: usize,
-    over: bool,
-}
-
-impl FlipPen {
-    fn new(limit: usize) -> Self {
-        FlipPen { path: BezPath::new(), limit, over: false }
-    }
-
-    /// Room for one more element?
-    fn room(&mut self) -> bool {
-        if !self.over && self.path.elements().len() >= self.limit {
-            self.over = true;
-            self.path = BezPath::new();
-        }
-        !self.over
-    }
-
-    fn finish(self) -> BezPath {
-        if self.over { BezPath::new() } else { self.path }
-    }
-}
 
 impl OutlinePen for FlipPen {
     fn move_to(&mut self, x: f32, y: f32) {
-        if self.room() {
+        self.0.move_to((x as f64, -y as f64));
-            self.path.move_to((x as f64, -y as f64));
-        }
     }
     fn line_to(&mut self, x: f32, y: f32) {
-        if self.room() {
+        self.0.line_to((x as f64, -y as f64));
-            self.path.line_to((x as f64, -y as f64));
-        }
     }
     fn quad_to(&mut self, cx0: f32, cy0: f32, x: f32, y: f32) {
-        if self.room() {
+        self.0.quad_to((cx0 as f64, -cy0 as f64), (x as f64, -y as f64));
-            self.path.quad_to((cx0 as f64, -cy0 as f64), (x as f64, -y as f64));
-        }
     }
     fn curve_to(&mut self, cx0: f32, cy0: f32, cx1: f32, cy1: f32, x: f32, y: f32) {
-        if self.room() {
+        self.0.curve_to((cx0 as f64, -cy0 as f64), (cx1 as f64, -cy1 as f64), (x as f64, -y as f64));
-            self.path.curve_to((cx0 as f64, -cy0 as f64), (cx1 as f64, -cy1 as f64), (x as f64, -y as f64));
-        }
     }
     fn close(&mut self) {
-        if self.room() {
+        self.0.close_path();
-            self.path.close_path();
-        }
     }
 }
 
@@ -1651,55 +1575,6 @@ mod font_dir_tests {
         assert_eq!(capped_named_instance_count(MAX_NAMED_INSTANCES_PER_FACE + 1), MAX_NAMED_INSTANCES_PER_FACE);
     }
 
-    #[test]
-    fn faces_of_one_file_are_bounded_across_the_collection() {
-        // The per-collection and per-face limits together would allow far more.
-        assert!((MAX_COLLECTION_FACES as usize) * MAX_NAMED_INSTANCES_PER_FACE > 16 * MAX_ENUMERATED_FACES);
-        for data in bundled() {
-            assert!(enumerate_faces(data).len() <= MAX_ENUMERATED_FACES);
-        }
-    }
-
-    #[test]
-    fn an_outline_past_the_element_limit_draws_nothing() {
-        let mut pen = FlipPen::new(8);
-        pen.move_to(0.0, 0.0);
-        pen.line_to(1.0, 1.0);
-        pen.close();
-        assert_eq!(pen.finish().elements().len(), 3);
-        // A shared outline drawn over and over (composite and VARC glyphs).
-        let mut pen = FlipPen::new(8);
-        for i in 0..1_000_000 {
-            pen.move_to(0.0, 0.0);
-            pen.line_to(i as f32, 1.0);
-            pen.close();
-        }
-        assert_eq!(pen.path.elements().len(), 0);
-        assert!(pen.finish().elements().is_empty());
-    }
-
-    #[test]
-    fn outline_cache_is_bounded_by_elements() {
-        let mut path = BezPath::new();
-        path.move_to((0.0, 0.0));
-        for i in 1..MAX_OUTLINE_ELEMENTS {
-            path.line_to((i as f64, 0.0));
-        }
-        let path = Arc::new(path);
-        let mut cache = OutlineCache::default();
-        let glyphs = 4 * OUTLINE_CACHE_MAX_ELEMENTS / MAX_OUTLINE_ELEMENTS;
-        for gid in 0..glyphs as u32 {
-            cache.insert((1, gid), path.clone());
-            assert!(cache.elements <= OUTLINE_CACHE_MAX_ELEMENTS);
-            assert_eq!(cache.elements, cache.paths.values().map(|p| p.elements().len()).sum::<usize>());
-        }
-        assert!(cache.get(&(1, glyphs as u32 - 1)).is_some());
-        // Replacing an entry does not count it twice.
-        let before = cache.elements;
-        cache.insert((1, glyphs as u32 - 1), path.clone());
-        assert_eq!(cache.elements, before);
-    }
-
     #[test]
     fn xdg_data_dirs_contribute_their_fonts_folders() {
         let home = Path::new("/home/ann");

crates/format/src/chart_parts_tests.rs

@@ -85,14 +85,14 @@ fn chart_parts_share_media_byte_and_item_budgets() {
     let mut p = fixture(vec![7; 600]);
     p.add_media("a.bin", "application/octet-stream", vec![8; 600]).unwrap();
     let bytes = save(&p).unwrap();
-    assert!(load_within(&bytes, Budget::media(1200, 2)).is_ok());
+    assert!(load_within(&bytes, Budget { total: 1200, items: 2 }).is_ok());
-    assert!(load_within(&bytes, Budget::media(1199, 2)).is_err(), "chart payloads share the cumulative media budget");
+    assert!(load_within(&bytes, Budget { total: 1199, items: 2 }).is_err(), "chart payloads share the cumulative media budget");
-    assert!(load_within(&bytes, Budget::media(1200, 1)).is_err(), "chart parts share the media item budget");
+    assert!(load_within(&bytes, Budget { total: 1200, items: 1 }).is_err(), "chart parts share the media item budget");
     let duplicated = rewrite_manifest(&bytes, |manifest| {
         let media = manifest["presentation"]["media"].as_array_mut().unwrap();
         media.push(media[0].clone());
     });
-    assert!(load_within(&duplicated, Budget::media(1200, 2)).is_err(), "duplicate media IDs still count as listed items");
+    assert!(load_within(&duplicated, Budget { total: 1200, items: 2 }).is_err(), "duplicate media IDs still count as listed items");
 }
 
 #[test]
@@ -104,9 +104,9 @@ fn legacy_inline_chart_bytes_are_budgeted_and_preserved() {
         part.remove("nativeEntry");
         part.insert("bytes".into(), json!(vec![9_u8; 600]));
     });
-    assert_eq!(load_within(&legacy, Budget::media(1200, 2)).unwrap().0, p);
+    assert_eq!(load_within(&legacy, Budget { total: 1200, items: 2 }).unwrap().0, p);
-    assert!(load_within(&legacy, Budget::media(1199, 2)).is_err());
+    assert!(load_within(&legacy, Budget { total: 1199, items: 2 }).is_err());
-    assert!(load_within(&legacy, Budget::media(1200, 1)).is_err());
+    assert!(load_within(&legacy, Budget { total: 1200, items: 1 }).is_err());
 }
 
 #[test]
@@ -207,7 +207,7 @@ fn corrupt_chart_members_stop_before_reusing_the_inflation_budget() {
     }
     // A failed CRC may already have inflated bytes. Continuing with the same remaining
     // budget would let each corrupt member consume that work budget again.
-    let result = load_within(&bytes, Budget::media(10, 2));
+    let result = load_within(&bytes, Budget { total: 10, items: 2 });
     assert!(result.is_err(), "two corrupt 10-byte members must not reuse a 10-byte budget");
     assert!(result.unwrap_err().to_string().contains("chart-parts/0"));
 }
@@ -228,7 +228,7 @@ fn duplicate_physical_zip_names_are_indexed_and_inflated_once() {
     assert_eq!(replaced, 2);
     let z = zip::ZipArchive::new(Cursor::new(bytes.as_slice())).unwrap();
     assert_eq!(z.file_names().filter(|n| n.starts_with("chart-parts/")).count(), 1);
-    let (q, damaged) = load_within(&bytes, Budget::media(10, 2)).unwrap();
+    let (q, damaged) = load_within(&bytes, Budget { total: 10, items: 2 }).unwrap();
     assert_eq!(damaged.len(), 1, "the second reference is missing, not inflated again");
     let ShapeKind::Group { children, .. } = &q.slides[0].shapes[0].kind else { panic!("group") };
     let ShapeKind::Chart(chart) = &children[0].kind else { panic!("chart") };

crates/format/src/lib.rs

@@ -29,24 +29,12 @@ const MAX_ENTRY: u64 = 2 << 30;
 const MAX_TOTAL_MEDIA: u64 = 4 << 30;
 /// Media items and chart sidecar parts one file may list.
 const MAX_MEDIA_ITEMS: usize = 100_000;
-/// Largest `presentation.json` we will inflate. The manifest holds no media bytes, so it is far
-/// smaller than a media entry may be; inflating and parsing one is what dominates memory.
-const MAX_MANIFEST: u64 = 256 << 20;
 
 /// What one load may inflate.
 #[derive(Clone, Copy)]
 struct Budget {
     total: u64,
     items: usize,
-    manifest: u64,
-}
-
-#[cfg(test)]
-impl Budget {
-    /// A media budget with the default manifest limit.
-    fn media(total: u64, items: usize) -> Self {
-        Budget { total, items, manifest: MAX_MANIFEST }
-    }
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -119,7 +107,6 @@ pub fn sniff(bytes: &[u8]) -> bool {
     bytes.starts_with(b"PK") && [MIMETYPE, LEGACY_MIMETYPE].iter().any(|m| bytes.windows(m.len()).take(200).any(|w| w == m.as_bytes()))
 }
 
-#[cfg(test)]
 fn read_entry(z: &mut zip::ZipArchive<Cursor<&[u8]>>, name: &str) -> Result<Vec<u8>> {
     read_entry_max(z, name, MAX_ENTRY)
 }
@@ -127,30 +114,13 @@ fn read_entry(z: &mut zip::ZipArchive<Cursor<&[u8]>>, name: &str) -> Result<Vec<
 /// Read one member, refusing it before inflating if it declares more than `max` bytes, and
 /// stopping at `max` if it inflates further than it declared.
 fn read_entry_max(z: &mut zip::ZipArchive<Cursor<&[u8]>>, name: &str, max: u64) -> Result<Vec<u8>> {
-    read_entry_counted(z, name, max, &mut 0)
-}
-
-/// [`read_entry_max`] within `left` (and [`MAX_ENTRY`]), charging `left` for every byte inflated,
-/// including those inflated before a decode or CRC error, so a member that fails late still
-/// spends the shared budget it used.
-fn read_entry_charged(z: &mut zip::ZipArchive<Cursor<&[u8]>>, name: &str, left: &mut u64) -> Result<Vec<u8>> {
-    let mut spent = 0;
-    let out = read_entry_counted(z, name, (*left).min(MAX_ENTRY), &mut spent);
-    *left = left.saturating_sub(spent);
-    out
-}
-
-/// [`read_entry_max`], adding the bytes inflated to `spent` whether or not the read succeeds.
-fn read_entry_counted(z: &mut zip::ZipArchive<Cursor<&[u8]>>, name: &str, max: u64, spent: &mut u64) -> Result<Vec<u8>> {
     let f = z.by_name(name).map_err(|e| FormatError::Damaged(format!("{name}: {e}")))?;
     if f.size() > max {
         return Err(FormatError::Damaged(format!("{name} is too large")));
     }
     let mut out = Vec::with_capacity(f.size().min(64 << 20) as usize);
     let mut f = f.take(max.saturating_add(1));
-    let read = f.read_to_end(&mut out);
+    f.read_to_end(&mut out).map_err(|e| FormatError::Damaged(format!("{name}: {e}")))?;
-    *spent = spent.saturating_add(out.len() as u64);
-    read.map_err(|e| FormatError::Damaged(format!("{name}: {e}")))?;
     if out.len() as u64 > max {
         return Err(FormatError::Damaged(format!("{name} is too large")));
     }
@@ -167,15 +137,12 @@ pub fn load(bytes: &[u8]) -> Result<Presentation> {
 /// A chart member that is present but fails decoding, CRC or its entry limit refuses the file.
 /// Linked media saved without its bytes isn't damage.
 pub fn load_checked(bytes: &[u8]) -> Result<(Presentation, Vec<String>)> {
-    load_within(bytes, Budget { total: MAX_TOTAL_MEDIA, items: MAX_MEDIA_ITEMS, manifest: MAX_MANIFEST })
+    load_within(bytes, Budget { total: MAX_TOTAL_MEDIA, items: MAX_MEDIA_ITEMS })
 }
 
 fn load_within(bytes: &[u8], budget: Budget) -> Result<(Presentation, Vec<String>)> {
     let mut z = zip::ZipArchive::new(Cursor::new(bytes)).map_err(|e| FormatError::NotOurs(e.to_string()))?;
-    if z.index_for_name("presentation.json").is_none() {
+    let json = read_entry(&mut z, "presentation.json").map_err(|_| FormatError::NotOurs("no presentation.json".into()))?;
-        return Err(FormatError::NotOurs("no presentation.json".into()));
-    }
-    let json = read_entry_max(&mut z, "presentation.json", budget.manifest)?;
     let m = parse_manifest(&json)?;
     if m.format != "deckcraft" {
         return Err(FormatError::NotOurs(m.format));
@@ -197,9 +164,11 @@ fn load_within(bytes: &[u8], budget: Budget) -> Result<(Presentation, Vec<String
         if z.by_name(&name).is_ok_and(|f| f.size() > left) {
             return Err(FormatError::Damaged("embedded media is larger than DeckCraft can open".into()));
         }
-        // A failed read is charged for what it inflated, so later members can't reuse that budget.
+        match read_entry_max(&mut z, &name, left.min(MAX_ENTRY)) {
-        match read_entry_charged(&mut z, &name, &mut left) {
+            Ok(data) => {
-            Ok(data) => item.data = Arc::new(data),
+                left -= data.len() as u64;
+                item.data = Arc::new(data);
+            }
             Err(_) if linked_only => {}
             Err(e) => damaged.push(e.to_string()),
         }
@@ -219,11 +188,9 @@ pub fn repair(p: &mut Presentation) {
     }
     p.fix_next_id();
     let first_layout = p.masters.first().and_then(|m| m.layouts.first()).map(|l| l.id).unwrap_or_default();
-    // Indexed once: a per-slide scan of every layout is slides × layouts work.
-    let layouts: std::collections::HashSet<_> = p.masters.iter().flat_map(|m| m.layouts.iter().map(|l| l.id)).collect();
     let mut seen = std::collections::HashSet::new();
     for i in 0..p.slides.len() {
-        let needs_layout = p.slides.get(i).is_some_and(|s| !layouts.contains(&s.layout));
+        let needs_layout = p.slides.get(i).is_some_and(|s| p.layout(s.layout).is_none());
         let dup = p.slides.get(i).is_some_and(|s| !seen.insert(s.id));
         if needs_layout || dup {
             // An exhausted id space leaves a duplicate slide as it is: the engine refuses to
@@ -247,11 +214,6 @@ pub fn repair(p: &mut Presentation) {
     if !(p.notes_size.width.is_finite() && p.notes_size.width > 0.0 && p.notes_size.height.is_finite() && p.notes_size.height > 0.0) {
         p.notes_size = Presentation::default().notes_size;
     }
-    // A notes page is bounded like a slide: canvas and handout drawing scale with it.
-    p.notes_size = deckcraft_model::Size::new(
-        p.notes_size.width.clamp(*SLIDE_SIDE.start(), *SLIDE_SIDE.end()),
-        p.notes_size.height.clamp(*SLIDE_SIDE.start(), *SLIDE_SIDE.end()),
-    );
     sane_numbers(p);
 }
 
@@ -369,20 +331,16 @@ fn failure(src: &[u8]) -> std::result::Result<Manifest, (String, (usize, usize))
 /// nearest first, and a patch is kept only if the parse then gets further. (Files saved since
 /// [`finite::Finite`] never contain such `null`s; this reads older ones.)
 fn parse_manifest(json: &[u8]) -> Result<Manifest> {
-    // Parse the inflated text as it is: only a file that fails on a `null` number is copied for
+    let mut src = json.to_vec();
-    // patching (the copy is bounded by `MAX_MANIFEST`).
+    let mut last = match failure(&src) {
-    let mut last = match failure(json) {
         Ok(m) => return Ok(m),
         Err(f) => f,
     };
-    if !is_null_number(&last.0) {
-        return Err(FormatError::Damaged(last.0));
-    }
-    let mut src = json.to_vec();
     let mut budget = MAX_REPARSE_BYTES;
     'fixes: for _ in 0..MAX_NULL_FIXES {
         let (msg, pos) = &last;
-        if !is_null_number(msg) {
+        let number = msg.starts_with("invalid type: null, expected f") || msg.starts_with("invalid type: null, expected a number");
+        if !number {
             break;
         }
         let end = offset(&src, pos.0, pos.1).unwrap_or(src.len());
@@ -416,11 +374,6 @@ fn parse_manifest(json: &[u8]) -> Result<Manifest> {
     Err(FormatError::Damaged(last.0))
 }
 
-/// Is this parse error a `null` where a number belongs (a NaN or infinity serde_json wrote)?
-fn is_null_number(msg: &str) -> bool {
-    msg.starts_with("invalid type: null, expected f") || msg.starts_with("invalid type: null, expected a number")
-}
-
 /// Byte offset of a 1-based `line`:`column`.
 fn offset(src: &[u8], line: usize, column: usize) -> Option<usize> {
     let mut start = 0;
@@ -500,9 +453,6 @@ fn sane_shadow(s: &mut deckcraft_model::style::Shadow) {
 fn sane_reflection(r: &mut deckcraft_model::style::Reflection) {
     r.blur = effect_size(r.blur, MAX_REFLECTION);
     r.dist = effect_size(r.dist, MAX_REFLECTION);
-    if r.align.as_deref().is_some_and(|v| !matches!(v, "tl" | "t" | "tr" | "l" | "ctr" | "r" | "bl" | "b" | "br")) {
-        r.align = None;
-    }
 }
 
 /// Run properties a list style hands down to the text that inherits it.

crates/format/src/tests.rs

@@ -11,31 +11,6 @@ fn chart_sidecars_are_optional_for_older_native_files() {
     assert_eq!(serde_json::from_value::<Chart>(json).expect("empty sidecar"), chart);
 }
 
-#[test]
-fn alternate_run_language_survives_two_native_saves_and_absence() {
-    use deckcraft_model::text::{Paragraph, Run, RunProps, TextBody};
-    let mut p = defaults::new_presentation(None);
-    Arc::make_mut(&mut p.slides[0]).shapes[0].text = Some(TextBody {
-        paragraphs: vec![Paragraph {
-            runs: vec![
-                Run::with("bonjour", RunProps { lang: Some("en-US".into()), alt_lang: Some("fr-FR".into()), ..Default::default() }),
-                Run::with(" plain", RunProps { lang: Some("en-US".into()), ..Default::default() }),
-            ],
-            ..Default::default()
-        }],
-        ..Default::default()
-    });
-    let mut q = load(&save(&p).expect("save")).expect("load");
-    for _ in 0..2 {
-        let runs = &q.slides[0].shapes[0].text.as_ref().expect("text").paragraphs[0].runs;
-        assert_eq!(runs[0].props.lang.as_deref(), Some("en-US"));
-        assert_eq!(runs[0].props.alt_lang.as_deref(), Some("fr-FR"));
-        assert_eq!(runs[1].props.lang.as_deref(), Some("en-US"));
-        assert_eq!(runs[1].props.alt_lang, None);
-        q = load(&save(&q).expect("save again")).expect("load again");
-    }
-}
-
 #[test]
 fn native_save_keeps_chart_relationships_and_payloads() {
     use deckcraft_model::chart::{Chart, ChartKept, ChartPart, ChartRel, ChartType};
@@ -73,38 +48,6 @@ fn native_save_keeps_chart_relationships_and_payloads() {
     }
 }
 
-#[test]
-fn native_table_direction_and_column_text_survive_two_saves() {
-    use deckcraft_model::table::{Cell, Table};
-    use deckcraft_model::{Shape, ShapeId, ShapeKind};
-    use std::sync::Arc;
-
-    for rtl in [Some(true), Some(false), None] {
-        let mut p = defaults::new_presentation(None);
-        let mut table = Table::new(1, 2, 200.0, 30.0);
-        table.rtl = rtl;
-        table.rows[0].cells[0] = Cell::new("Left column");
-        table.rows[0].cells[1] = Cell::new("Right column");
-        let shape = Shape { id: ShapeId(p.alloc_id().expect("id")), kind: ShapeKind::Table(table), ..Default::default() };
-        Arc::make_mut(&mut p.slides[0]).shapes.push(shape);
-        let mut q = load(&save(&p).expect("save")).expect("load");
-        for _ in 0..2 {
-            let table = q.slides[0]
-                .shapes
-                .iter()
-                .find_map(|s| match &s.kind {
-                    ShapeKind::Table(table) => Some(table),
-                    _ => None,
-                })
-                .expect("table shape");
-            assert_eq!(table.rtl, rtl);
-            assert_eq!(table.rows[0].cells[0].text.paragraphs[0].runs[0].text, "Left column");
-            assert_eq!(table.rows[0].cells[1].text.paragraphs[0].runs[0].text, "Right column");
-            q = load(&save(&q).expect("save again")).expect("load again");
-        }
-    }
-}
-
 /// The same package without the entries `drop` names.
 fn without(bytes: &[u8], drop: &str) -> Vec<u8> {
     let mut z = zip::ZipArchive::new(Cursor::new(bytes)).unwrap();
@@ -150,60 +93,9 @@ fn media_budget_is_cumulative() {
     p.add_media("b.bin", "application/octet-stream", vec![2; 600]);
     let bytes = save(&p).unwrap();
     // Exactly at the limit opens; one byte under is refused, though each item fits.
-    assert!(load_within(&bytes, Budget::media(1200, 2)).is_ok());
+    assert!(load_within(&bytes, Budget { total: 1200, items: 2 }).is_ok());
-    assert!(load_within(&bytes, Budget::media(1199, 2)).is_err());
+    assert!(load_within(&bytes, Budget { total: 1199, items: 2 }).is_err());
-    assert!(load_within(&bytes, Budget::media(1200, 1)).is_err());
+    assert!(load_within(&bytes, Budget { total: 1200, items: 1 }).is_err());
-}
-
-#[test]
-fn corrupt_media_is_charged_for_what_it_inflated() {
-    let mut p = Presentation::default();
-    p.add_media("a.png", "image/png", b"PICTURE-AAAAAAAAAAAA".to_vec());
-    p.add_media("b.png", "image/png", b"PICTURE-BBBBBBBBBBBB".to_vec());
-    let mut bytes = save(&p).unwrap();
-    // Corrupt both stored members, so each fails its CRC only after inflating all its bytes.
-    for tag in [b"PICTURE-AAAA", b"PICTURE-BBBB"] {
-        let at = bytes.windows(tag.len()).position(|w| w == tag).unwrap();
-        bytes[at] ^= 0xff;
-    }
-    // Each member fits the budget on its own; the second must not reuse what the first spent.
-    let result = load_within(&bytes, Budget::media(20, 2));
-    assert!(result.is_err(), "two corrupt 20-byte members must not share a 20-byte budget");
-    // With room for both, the file opens and reports both.
-    let (_, damaged) = load_within(&bytes, Budget::media(40, 2)).unwrap();
-    assert_eq!(damaged.len(), 2, "{damaged:?}");
-}
-
-#[test]
-fn oversized_manifest_is_refused_before_inflating() {
-    let bytes = save(&Presentation::default()).unwrap();
-    let mut z = zip::ZipArchive::new(Cursor::new(bytes.as_slice())).unwrap();
-    let size = z.by_name("presentation.json").unwrap().size();
-    assert!(load_within(&bytes, Budget { total: 0, items: 0, manifest: size }).is_ok());
-    let err = load_within(&bytes, Budget { total: 0, items: 0, manifest: size - 1 }).unwrap_err();
-    assert!(err.to_string().contains("too large"), "{err}");
-}
-
-#[test]
-fn many_slides_on_missing_layouts_are_repaired() {
-    let mut p = Presentation::default();
-    let template = p.slides[0].clone();
-    let good = template.layout;
-    p.slides = (0..2000u32)
-        .map(|i| {
-            let mut s = (*template).clone();
-            s.id = deckcraft_model::SlideId(10_000 + i);
-            if i % 2 == 1 {
-                s.layout = deckcraft_model::LayoutId(900_000 + i);
-            }
-            Arc::new(s)
-        })
-        .collect();
-    p.next_id = 20_000;
-    repair(&mut p);
-    assert!(p.validate().is_empty(), "{:?}", p.validate().first());
-    assert!(p.slides.iter().all(|s| p.layout(s.layout).is_some()));
-    assert_eq!(p.slides[0].layout, good);
 }
 
 #[test]
@@ -232,7 +124,7 @@ fn repeated_media_ids_are_read_once() {
     }
     let bytes = out.finish().unwrap().into_inner();
     // 51 references to one 1000-byte member fit a 1000-byte budget: it's inflated once.
-    let q = load_within(&bytes, Budget::media(1000, 51)).unwrap().0;
+    let q = load_within(&bytes, Budget { total: 1000, items: 51 }).unwrap().0;
     assert_eq!(q.media.len(), 1);
     assert_eq!(q.media[0].data.len(), 1000);
     // And the deck saves again.
@@ -316,54 +208,6 @@ fn a_file_saved_with_non_finite_numbers_reopens() {
     assert_eq!(load(&save(&back).unwrap()).unwrap(), back);
 }
 
-#[test]
-fn reflection_transform_survives_two_native_saves_and_absent_fields_stay_absent() {
-    use deckcraft_model::style::Reflection;
-    use deckcraft_model::{Effects, Shape};
-    let mut p = Presentation::default();
-    let reflection = Reflection {
-        blur: 1.0,
-        start_alpha: 0.5,
-        end_alpha: 0.0,
-        end_pos: 0.75,
-        dist: 2.0,
-        st_pos: Some(20_000),
-        fade_dir: Some(0),
-        sx: Some(75_000),
-        sy: Some(-50_000),
-        kx: Some(600_000),
-        align: Some("bl".into()),
-        rotate_with_shape: Some(false),
-        ..Default::default()
-    };
-    let shape = Shape { effects: Some(Effects { reflection: Some(reflection.clone()), ..Default::default() }), ..Default::default() };
-    Arc::make_mut(&mut p.slides[0]).shapes.push(shape);
-    let once = load(&save(&p).expect("save")).expect("load");
-    let twice = load(&save(&once).expect("save again")).expect("load again");
-    assert_eq!(twice.slides[0].shapes.last().and_then(|s| s.effects.as_ref()).and_then(|e| e.reflection.as_ref()), Some(&reflection));
-
-    let absent = Reflection {
-        blur: 1.0,
-        start_alpha: 1.0,
-        end_alpha: 0.0,
-        end_pos: 1.0,
-        dist: 0.0,
-        st_pos: None,
-        dir: None,
-        fade_dir: None,
-        sx: None,
-        sy: None,
-        kx: None,
-        ky: None,
-        align: None,
-        rotate_with_shape: None,
-    };
-    let shape = Shape { effects: Some(Effects { reflection: Some(absent.clone()), ..Default::default() }), ..Default::default() };
-    Arc::make_mut(&mut p.slides[0]).shapes = vec![shape];
-    let reopened = load(&save(&p).expect("save absent values")).expect("load absent values");
-    assert_eq!(reopened.slides[0].shapes.last().and_then(|s| s.effects.as_ref()).and_then(|e| e.reflection.as_ref()), Some(&absent));
-}
-
 /// Files written before [`finite::Finite`] (plain serde_json: NaN as `null`) open too,
 /// including a `null` inside a tagged enum, where serde reports only the enclosing object.
 #[test]
@@ -451,13 +295,6 @@ fn degenerate_slide_sizes_are_repaired() {
     }
 }
 
-#[test]
-fn repair_bounds_the_notes_page_size() {
-    let mut p = Presentation { notes_size: deckcraft_model::Size::new(1e12, 0.01), ..Default::default() };
-    repair(&mut p);
-    assert_eq!((p.notes_size.width, p.notes_size.height), (4032.0, 72.0));
-}
-
 /// A file whose slide size is null, a string or missing a side (written by hand or by
 /// another tool; NaN is also saved as null) opens with the default size rather than failing
 /// as damaged.

crates/geom/src/morph.rs

@@ -126,21 +126,6 @@ fn split_curve(c: &[Point], n: usize, out: &mut Vec<Point>) {
     out.extend([p1, p2, p3]);
 }
 
-/// A piece length ordered totally, so it can sit in a heap.
-#[derive(PartialEq)]
-struct Share(f64);
-impl Eq for Share {}
-impl PartialOrd for Share {
-    fn partial_cmp(&self, o: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(o))
-    }
-}
-impl Ord for Share {
-    fn cmp(&self, o: &Self) -> std::cmp::Ordering {
-        self.0.total_cmp(&o.0)
-    }
-}
-
 /// Brings a contour to `n` curves. Unlike manim (which splits every curve equally often), the extra
 /// splits go to the longest pieces, so a long side gets more points than a short one.
 fn refine(c: &Contour, n: usize) -> Contour {
@@ -151,15 +136,11 @@ fn refine(c: &Contour, n: usize) -> Contour {
     let curves: Vec<&[Point]> = (0..have).filter_map(|k| c.pts.get(3 * k..3 * k + 4)).collect();
     let len: Vec<f64> = curves.iter().map(|q| curve_length(q) + 1e-9).collect();
     let mut parts = vec![1usize; curves.len()];
-    // The curve with the longest piece gets the next split (the lowest index on a tie); a heap keeps
-    // this O(n log n) instead of rescanning every curve for each split.
-    let mut heap: std::collections::BinaryHeap<(Share, std::cmp::Reverse<usize>)> =
-        len.iter().enumerate().map(|(k, l)| (Share(*l), std::cmp::Reverse(k))).collect();
     for _ in 0..n - have {
-        let Some((_, std::cmp::Reverse(best))) = heap.pop() else { break };
+        let share = |k: usize| len.get(k).copied().unwrap_or(0.0) / parts.get(k).copied().unwrap_or(1) as f64;
+        let best = (1..curves.len()).fold(0, |b, k| if share(k) > share(b) { k } else { b });
         if let Some(p) = parts.get_mut(best) {
             *p += 1;
-            heap.push((Share(len.get(best).copied().unwrap_or(0.0) / *p as f64), std::cmp::Reverse(best)));
         }
     }
     let mut out = Vec::with_capacity(1 + 3 * n);
@@ -439,16 +420,6 @@ mod tests {
         assert_eq!(contours(&to_path(&cs)), cs);
     }
 
-    #[test]
-    fn refine_many_curves_finishes_at_the_asked_count() {
-        let mut c = Contour { closed: false, pts: vec![Point::ZERO] };
-        for i in 1..=20_000 {
-            line_to(&mut c.pts, Point::new(f64::from(i), f64::from(i % 7)));
-        }
-        let r = refine(&c, 40_000);
-        assert_eq!(r.curves(), 40_000);
-    }
-
     #[test]
     fn refine_splits_the_longest_curves_and_keeps_the_shape() {
         let c = Contour { closed: false, pts: vec![Point::ZERO, Point::new(1.0, 0.0), Point::new(2.0, 0.0), Point::new(3.0, 0.0)] };

crates/geom/src/warp.rs

@@ -928,25 +928,11 @@ impl Warp {
             k_fill = 1.0;
         }
         zoom = zoom.max(k_fill);
-        // Per band, measured once: its widest line and its first and last lines' baselines.
-        let mut stats: Vec<Option<(f64, f64, f64)>> = vec![None; nb];
-        for (l, &b) in lines.iter().zip(&band_of) {
-            let w = l.extent.1 - l.extent.0;
-            if let Some(slot) = stats.get_mut(b) {
-                match slot {
-                    Some((widest, _, last)) => {
-                        *widest = widest.max(w);
-                        *last = l.ref_y;
-                    }
-                    None => *slot = Some((0.0f64.max(w), l.ref_y, l.ref_y)),
-                }
-            }
-        }
         let mut maps = Vec::with_capacity(n);
         let mut offsets = Vec::new();
         for (i, l) in lines.iter().enumerate() {
             let b = band_of.get(i).copied().unwrap_or(0);
-            let band = stats.get(b).copied().flatten();
+            let in_band = |j: &usize| band_of.get(*j) == Some(&b);
             match self.bands.get(b) {
                 Some(Band::Fill { .. }) | None => {
                     let (y0, y1) = band_y.get(b).copied().flatten().unwrap_or((0.0, 1.0));
@@ -955,12 +941,16 @@ impl Warp {
                 }
                 Some(Band::Follow { path, anchor }) => {
                     let len = path.length();
-                    let widest = band.map_or(0.0, |s| s.0);
+                    let widest = (0..n).filter(in_band).filter_map(|j| lines.get(j)).map(|l| l.extent.1 - l.extent.0).fold(0.0, f64::max);
                     let k = if widest > len && widest > 1e-9 { len / widest } else { 1.0 };
+                    let members: Vec<&WarpLine> = (0..n).filter(in_band).filter_map(|j| lines.get(j)).collect();
                     let ref_y = match anchor {
-                        LineAnchor::Last => band.map(|s| s.2),
+                        LineAnchor::Last => members.last().map(|l| l.ref_y),
-                        LineAnchor::First => band.map(|s| s.1),
+                        LineAnchor::First => members.first().map(|l| l.ref_y),
-                        LineAnchor::Middle => band.map(|s| (s.1 + s.2) / 2.0),
+                        LineAnchor::Middle => match (members.first(), members.last()) {
+                            (Some(a), Some(z)) => Some((a.ref_y + z.ref_y) / 2.0),
+                            _ => None,
+                        },
                     }
                     .unwrap_or(l.ref_y);
                     // Lines off the guide run on a parallel curve at their natural length.

crates/geom/src/warp/tests.rs

@@ -319,20 +319,3 @@ fn arch_and_inflate_handles_follow_the_pointer() {
     assert!(more > adjust_defaults("textInflate")[0], "{more}");
     assert!((more - 20_000.0).abs() < 1.0, "{more}");
 }
-
-#[test]
-fn many_lines_on_a_follow_band_are_mapped_from_one_measurement() {
-    // 50,000 lines on an arch: each line's scale and anchor come from the band measured once.
-    let w = warp("textArchUp", &[], rect()).unwrap();
-    let inner = Rect::new(7.2, 3.6, W - 7.2, H - 3.6);
-    let lines: Vec<WarpLine> = (0..50_000)
-        .map(|i| {
-            let y = i as f64 * 0.01;
-            WarpLine { ink: Some(Rect::new(190.0, y, 230.0, y + 1.0)), extent: (190.0, 230.0), ref_y: y + 1.0 }
-        })
-        .collect();
-    let m = w.mapper(&lines, inner);
-    // The last line sits on the arc, as with two lines.
-    let last = lines.len() - 1;
-    assert!(m.map(last, Point::new(210.0, lines[last].ref_y)).y.abs() < 0.05);
-}

crates/hevc/src/slice.rs

@@ -326,9 +326,7 @@ impl SliceHeader {
 
     /// entry_point_offset list (tiles / wavefront substreams).
     fn parse_entry_points(&mut self, r: &mut BitReader, pps: &Pps, sps: &Sps) -> Result<()> {
-        // A fresh list, not `clear()`: a dependent segment starts as a copy of its independent
+        self.entry_points.clear();
-        // segment's header, and clearing would keep that copy's allocation for every segment.
-        self.entry_points = Vec::new();
         if pps.tiles_enabled || pps.entropy_coding_sync {
             let n = r.read_ue()?;
             ensure!(n <= sps.pic_width_in_ctbs() * sps.pic_height_in_ctbs(), "num_entry_point_offsets out of range");

crates/model/src/chart.rs

@@ -758,20 +758,17 @@ impl Chart {
     }
 
     fn stacked_value_range(&self, n: usize) -> (f64, f64) {
-        // Sums per category, from the values the series hold (an absent one adds nothing).
+        let mut lo: f64 = 0.0;
-        let (mut pos, mut neg) = (vec![0.0f64; n], vec![0.0f64; n]);
+        let mut hi: f64 = 0.0;
-        for s in &self.series {
+        for i in 0..n {
-            for (i, v) in s.values.iter().enumerate().take(n) {
+            let (mut p, mut m) = (0.0, 0.0);
-                let v = v.unwrap_or(0.0);
+            for s in &self.series {
-                if v >= 0.0 {
+                let v = s.values.get(i).copied().flatten().unwrap_or(0.0);
-                    pos[i] += v;
+                if v >= 0.0 { p += v } else { m += v }
-                } else {
-                    neg[i] += v;
-                }
             }
+            hi = hi.max(p);
+            lo = lo.min(m);
         }
-        let hi = pos.iter().fold(0.0f64, |a, &p| a.max(p));
-        let lo = neg.iter().fold(0.0f64, |a, &m| a.min(m));
         (lo, hi)
     }
 
@@ -1351,50 +1348,40 @@ impl Chart {
     /// The box chart's groups (distinct category labels in order of appearance; one unnamed
     /// group without categories) and, per series, each group's summary (None when it has no
     /// points).
-    ///
-    /// Each value is put in its group's bucket once (groups are found by name in a map), and the
-    /// series x groups result is held to [`MAX_BOX_CELLS`]: groups past it are left out.
     pub fn box_groups(&self) -> (Vec<String>, Vec<Vec<Option<BoxStats>>>) {
-        let max_groups = (MAX_BOX_CELLS / self.series.len().max(1)).max(1);
         let mut groups: Vec<String> = Vec::new();
-        let mut index: std::collections::HashMap<&str, usize> = std::collections::HashMap::new();
         for c in &self.categories {
-            if !index.contains_key(c.as_str()) && groups.len() < max_groups {
+            if !groups.contains(c) {
-                index.insert(c, groups.len());
                 groups.push(c.clone());
             }
         }
         if groups.is_empty() {
             groups.push(String::new());
-            index.insert("", 0);
         }
-        // A value past the categories belongs to the unnamed group, when there is one.
-        let past_end = index.get("").copied();
         let stats = self
             .series
             .iter()
             .map(|s| {
-                let mut buckets: Vec<Vec<f64>> = vec![Vec::new(); groups.len()];
+                groups
-                for (i, v) in s.values.iter().enumerate() {
+                    .iter()
-                    let Some(v) = v.filter(|v| v.is_finite()) else { continue };
+                    .map(|g| {
-                    let g = match self.categories.get(i) {
+                        let pts: Vec<f64> = s
-                        Some(c) => index.get(c.as_str()).copied(),
+                            .values
-                        None => past_end,
+                            .iter()
-                    };
+                            .enumerate()
-                    if let Some(b) = g.and_then(|g| buckets.get_mut(g)) {
+                            .filter(|(i, _)| self.categories.get(*i).map_or(g.is_empty() || self.categories.is_empty(), |c| c == g))
-                        b.push(v);
+                            .filter_map(|(_, v)| *v)
-                    }
+                            .filter(|v| v.is_finite())
-                }
+                            .collect();
-                buckets.into_iter().map(|pts| box_stats_by(pts, self.inclusive_quartiles)).collect()
+                        box_stats_by(pts, self.inclusive_quartiles)
+                    })
+                    .collect()
             })
             .collect();
         (groups, stats)
     }
 }
 
-/// Most series x group summaries [`Chart::box_groups`] makes.
-pub const MAX_BOX_CELLS: usize = 1_000_000;
-
 /// Widens the (min, max) extent `ext` to include `v`.
 fn widen(ext: &mut (f64, f64), v: f64) {
     ext.0 = ext.0.min(v);
@@ -1467,41 +1454,33 @@ impl Chart {
         let n = self.categories.len().max(s.values.len());
         let levels: Vec<&Vec<String>> = self.category_levels.iter().take(MAX_LEVELS).collect();
         // Each leaf's path from the top level down, blanks filled from the row above.
-        // Labels are shared, not copied: an outer label given once stands for every leaf under it.
+        let mut last: Vec<String> = vec![String::new(); levels.len()];
-        use std::rc::Rc;
+        let paths: Vec<Vec<String>> = (0..n)
-        let empty: Rc<str> = Rc::from("");
-        let mut last: Vec<Rc<str>> = vec![empty.clone(); levels.len()];
-        let paths: Vec<Vec<Rc<str>>> = (0..n)
             .map(|i| {
                 let mut path = Vec::with_capacity(levels.len() + 1);
                 for (d, lv) in levels.iter().enumerate().rev() {
                     let l = lv.get(i).map(|x| x.trim()).unwrap_or("");
                     if !l.is_empty() {
-                        last[d] = Rc::from(l);
+                        last[d] = l.to_string();
                         // A new outer label starts fresh inner groups.
                         for inner in last.iter_mut().take(d) {
-                            *inner = empty.clone();
+                            inner.clear();
                         }
                     }
                     path.push(last[d].clone());
                 }
-                path.push(self.categories.get(i).map_or_else(|| empty.clone(), |c| Rc::from(c.as_str())));
+                path.push(self.categories.get(i).cloned().unwrap_or_default());
                 path
             })
             .collect();
         let value = |i: usize| s.values.get(i).copied().flatten().filter(|v| v.is_finite()).unwrap_or(0.0).max(0.0);
-        fn build(rows: &[(usize, &[std::rc::Rc<str>])], value: &dyn Fn(usize) -> f64) -> Vec<TreeNode> {
+        fn build(rows: &[(usize, &[String])], value: &dyn Fn(usize) -> f64) -> Vec<TreeNode> {
             let mut out: Vec<TreeNode> = Vec::new();
             let mut i = 0;
             while i < rows.len() {
                 let (idx, path) = rows[i];
                 if path.len() <= 1 {
-                    out.push(TreeNode {
+                    out.push(TreeNode { name: path.first().cloned().unwrap_or_default(), value: value(idx), leaf: Some(idx), children: vec![] });
-                        name: path.first().map(|p| p.to_string()).unwrap_or_default(),
-                        value: value(idx),
-                        leaf: Some(idx),
-                        children: vec![],
-                    });
                     i += 1;
                     continue;
                 }
@@ -1510,14 +1489,14 @@ impl Chart {
                 while j < rows.len() && rows[j].1.len() > 1 && &rows[j].1[0] == head {
                     j += 1;
                 }
-                let sub: Vec<(usize, &[std::rc::Rc<str>])> = rows[i..j].iter().map(|(k, p)| (*k, &p[1..])).collect();
+                let sub: Vec<(usize, &[String])> = rows[i..j].iter().map(|(k, p)| (*k, &p[1..])).collect();
                 let children = build(&sub, value);
-                out.push(TreeNode { name: head.to_string(), value: children.iter().map(|c| c.value).sum(), leaf: None, children });
+                out.push(TreeNode { name: head.clone(), value: children.iter().map(|c| c.value).sum(), leaf: None, children });
                 i = j;
             }
             out
         }
-        let rows: Vec<(usize, &[Rc<str>])> = paths.iter().enumerate().map(|(i, p)| (i, p.as_slice())).collect();
+        let rows: Vec<(usize, &[String])> = paths.iter().enumerate().map(|(i, p)| (i, p.as_slice())).collect();
         build(&rows, &value)
     }
 }
@@ -1628,40 +1607,6 @@ mod chartex_tests {
         assert!(c.category_tree().iter().all(|n| n.leaf.is_some()));
     }
 
-    #[test]
-    fn large_box_hierarchy_and_stacked_charts_take_linear_work() {
-        // 50,000 distinct categories in one series: grouped through a map, one pass.
-        let n = 50_000;
-        let mut c = Chart::sample(ChartType::BoxWhisker);
-        c.series.truncate(1);
-        c.categories = (0..n).map(|i| format!("g{i}")).collect();
-        c.series[0].values = (0..n).map(|i| Some(i as f64)).collect();
-        let (groups, stats) = c.box_groups();
-        assert_eq!((groups.len(), stats[0].len()), (n, n));
-        assert!(stats[0].iter().all(Option::is_some));
-        // 2,000 series cap the groups so the result stays within MAX_BOX_CELLS.
-        c.series = vec![c.series[0].clone(); 2000];
-        let (groups, stats) = c.box_groups();
-        assert_eq!(groups.len(), MAX_BOX_CELLS / 2000);
-        assert!(stats.iter().all(|s| s.len() == groups.len()));
-        // One long outer label over 50,000 leaves is shared, not copied per leaf.
-        let mut t = Chart::sample(ChartType::Treemap);
-        t.series.truncate(1);
-        t.categories = (0..n).map(|i| format!("c{i}")).collect();
-        t.series[0].values = (0..n).map(|_| Some(1.0)).collect();
-        let mut outer = vec![String::new(); n];
-        outer[0] = "o".repeat(1 << 16);
-        t.category_levels = vec![outer];
-        let tree = t.category_tree();
-        assert_eq!(tree.len(), 1);
-        assert_eq!(tree[0].children.len(), n);
-        // Stacked sums over many sparse series.
-        let mut st = Chart::sample(ChartType::StackedBar);
-        st.categories = (0..n).map(|i| i.to_string()).collect();
-        st.series = (0..2000).map(|k| Series { values: vec![Some(1.0); if k == 0 { n } else { 1 }], ..Default::default() }).collect();
-        assert!(st.value_range().1 >= 2000.0, "{:?}", st.value_range());
-    }
-
     #[test]
     fn box_groups_follow_category_labels() {
         let c = Chart::sample(ChartType::BoxWhisker);

crates/model/src/edit.rs

@@ -78,57 +78,45 @@ pub fn insert(body: &mut TextBody, pos: Pos, text: &str, props: Option<RunProps>
     if body.paragraphs.is_empty() {
         body.paragraphs.push(Paragraph::default());
     }
-    let (pi0, mut ch) = clamp(body, pos);
+    let (mut pi, mut ch) = clamp(body, pos);
-    let props = props.unwrap_or_else(|| props_at(body, (pi0, ch)));
+    let props = props.unwrap_or_else(|| props_at(body, (pi, ch)));
     let text = text.replace("\r\n", "\n").replace('\r', "\n");
-    // Work on the paragraph being edited apart from the body, so each new paragraph is pushed to a
-    // list and the body's vector is spliced once instead of shifted for every `\n`.
-    let Some(slot) = body.paragraphs.get_mut(pi0) else { return (pi0, ch) };
-    let mut cur = std::mem::take(slot);
-    let mut done: Vec<Paragraph> = Vec::new();
     let mut first = true;
     for part in text.split('\n') {
         if !first {
-            // Split the current paragraph at ch.
+            // Split paragraph pi at ch.
-            let idx = split_at(&mut cur, ch);
+            let Some(p) = body.paragraphs.get_mut(pi) else { break };
-            let tail: Vec<Run> = cur.runs.drain(idx..).collect();
+            let idx = split_at(p, ch);
-            let newp = Paragraph {
+            let tail: Vec<Run> = p.runs.drain(idx..).collect();
-                level: cur.level,
+            let newp =
-                props: cur.props.clone(),
+                Paragraph { level: p.level, props: p.props.clone(), runs: tail, def_props: p.def_props.clone(), end_props: p.end_props.clone() };
-                runs: tail,
+            p.end_props = props.clone();
-                def_props: cur.def_props.clone(),
+            body.paragraphs.insert(pi + 1, newp);
-                end_props: cur.end_props.clone(),
+            pi += 1;
-            };
-            cur.end_props = props.clone();
-            done.push(std::mem::replace(&mut cur, newp));
             ch = 0;
         }
         first = false;
-        // The run index just after the last insertion: the next one lands there with no rescan.
-        let mut next: Option<usize> = None;
         for (k, seg) in part.split('\u{b}').enumerate() {
+            let Some(p) = body.paragraphs.get_mut(pi) else { break };
             if k > 0 {
-                let idx = next.unwrap_or_else(|| split_at(&mut cur, ch));
+                let idx = split_at(p, ch);
-                cur.runs.insert(idx, Run { text: String::new(), props: props.clone(), kind: RunKind::Break });
+                p.runs.insert(idx, Run { text: String::new(), props: props.clone(), kind: RunKind::Break });
                 ch += 1;
-                next = Some(idx + 1);
             }
             if seg.is_empty() {
                 continue;
             }
-            let idx = next.unwrap_or_else(|| split_at(&mut cur, ch));
+            let idx = split_at(p, ch);
-            cur.runs.insert(idx, Run::with(seg, props.clone()));
+            p.runs.insert(idx, Run::with(seg, props.clone()));
             ch += seg.chars().count();
-            next = Some(idx + 1);
         }
-        cur.normalize();
+        if let Some(p) = body.paragraphs.get_mut(pi) {
-        if cur.runs.is_empty() {
+            p.normalize();
-            cur.end_props = props.clone();
+            if p.runs.is_empty() {
+                p.end_props = props.clone();
+            }
         }
     }
-    let pi = pi0 + done.len();
-    done.push(cur);
-    body.paragraphs.splice(pi0..=pi0, done);
     (pi, ch)
 }
 
@@ -264,16 +252,8 @@ pub fn slice(body: &TextBody, a: Pos, b: Pos) -> TextBody {
 /// Insert a formatted body at `pos` (paste): first paragraph merges into the current one.
 pub fn insert_body(body: &mut TextBody, pos: Pos, src: &TextBody) -> Pos {
     let mut caret = clamp(body, pos);
-    // Plain text runs go straight in at the run index after the previous one and the paragraph is
-    // normalized once, not rescanned and merged for every source run.
-    let mut next: Option<usize> = None;
-    let mut dirty = false;
     for (k, sp) in src.paragraphs.iter().enumerate() {
         if k > 0 {
-            if let (true, Some(p)) = (dirty, body.paragraphs.get_mut(caret.0)) {
-                p.normalize();
-            }
-            (next, dirty) = (None, false);
             caret = insert(body, caret, "\n", None);
             if let Some(p) = body.paragraphs.get_mut(caret.0) {
                 p.level = sp.level;
@@ -281,22 +261,6 @@ pub fn insert_body(body: &mut TextBody, pos: Pos, src: &TextBody) -> Pos {
             }
         }
         for r in &sp.runs {
-            if r.kind == RunKind::Text
-                && !r.text.is_empty()
-                && !r.text.contains(['\n', '\r', '\u{b}'])
-                && let Some(p) = body.paragraphs.get_mut(caret.0)
-            {
-                let idx = next.unwrap_or_else(|| split_at(p, caret.1));
-                p.runs.insert(idx, Run::with(&r.text, r.props.clone()));
-                caret.1 += r.text.chars().count();
-                (next, dirty) = (Some(idx + 1), true);
-                continue;
-            }
-            // Anything else takes the general path, after the pending runs are merged.
-            if let (true, Some(p)) = (dirty, body.paragraphs.get_mut(caret.0)) {
-                p.normalize();
-            }
-            (next, dirty) = (None, false);
             match r.kind {
                 RunKind::Text => caret = insert(body, caret, &r.text, Some(r.props.clone())),
                 RunKind::Break => caret = insert(body, caret, "\u{b}", Some(r.props.clone())),
@@ -310,9 +274,6 @@ pub fn insert_body(body: &mut TextBody, pos: Pos, src: &TextBody) -> Pos {
             }
         }
     }
-    if let (true, Some(p)) = (dirty, body.paragraphs.get_mut(caret.0)) {
-        p.normalize();
-    }
     caret
 }
 
@@ -607,74 +568,6 @@ mod tests {
         assert_eq!(caret, (0, 5));
     }
 
-    /// The paste as it ran before the fast path: one `insert` (and normalize) per source run.
-    fn insert_body_by_runs(body: &mut TextBody, pos: Pos, src: &TextBody) -> Pos {
-        let mut caret = clamp(body, pos);
-        for (k, sp) in src.paragraphs.iter().enumerate() {
-            if k > 0 {
-                caret = insert(body, caret, "\n", None);
-                if let Some(p) = body.paragraphs.get_mut(caret.0) {
-                    p.level = sp.level;
-                    p.props = sp.props.clone();
-                }
-            }
-            for r in &sp.runs {
-                match r.kind {
-                    RunKind::Text => caret = insert(body, caret, &r.text, Some(r.props.clone())),
-                    RunKind::Break => caret = insert(body, caret, "\u{b}", Some(r.props.clone())),
-                    _ => {
-                        if let Some(p) = body.paragraphs.get_mut(caret.0) {
-                            let idx = split_at(p, caret.1);
-                            p.runs.insert(idx, r.clone());
-                            caret.1 += r.char_len();
-                        }
-                    }
-                }
-            }
-        }
-        caret
-    }
-
-    #[test]
-    fn paste_matches_inserting_run_by_run() {
-        let bold = |t: &str| Run::with(t, RunProps { bold: Some(true), ..Default::default() });
-        let mut src = body("");
-        src.paragraphs = vec![
-            Paragraph {
-                runs: vec![Run::with("ab", RunProps::default()), Run::with("cd", RunProps::default()), bold("ef"), bold("g")],
-                ..Default::default()
-            },
-            Paragraph {
-                runs: vec![
-                    bold("h"),
-                    Run { text: String::new(), props: RunProps::default(), kind: RunKind::Break },
-                    Run::with("i", RunProps::default()),
-                ],
-                level: 1,
-                ..Default::default()
-            },
-            Paragraph { runs: vec![Run::with("jk", RunProps::default())], ..Default::default() },
-        ];
-        for at in [0, 1, 3, 6] {
-            let mut dest = body("XYZabc");
-            format(&mut dest, (0, 2), (0, 4), &|p| p.italic = Some(true));
-            let mut want = dest.clone();
-            let want_caret = insert_body_by_runs(&mut want, (0, at), &src);
-            let caret = insert_body(&mut dest, (0, at), &src);
-            assert_eq!(caret, want_caret, "caret at {at}");
-            assert_eq!(format!("{:?}", dest.paragraphs), format!("{:?}", want.paragraphs), "paste at {at}");
-        }
-    }
-
-    #[test]
-    fn multiline_insert_splits_into_paragraphs() {
-        let mut b = body("abcd");
-        let c = insert(&mut b, (0, 2), "x\ny\u{b}z\n\nw", None);
-        assert_eq!(c, (3, 1));
-        let texts: Vec<String> = b.paragraphs.iter().map(Paragraph::text).collect();
-        assert_eq!(texts, ["abx", "y\u{b}z", "", "wcd"]);
-    }
-
     #[test]
     fn words_and_moves() {
         let b = body("Hello brave world");

crates/model/src/lib.rs

@@ -1112,13 +1112,11 @@ impl Presentation {
     pub fn validate(&self) -> Vec<String> {
         let mut out = vec![];
         let mut seen = std::collections::HashSet::new();
-        // Indexed once: a per-slide scan of every layout is slides × layouts work.
-        let layouts: std::collections::HashSet<_> = self.masters.iter().flat_map(|m| m.layouts.iter().map(|l| l.id)).collect();
         for s in &self.slides {
             if !seen.insert(s.id) {
                 out.push(format!("duplicate slide id {}", s.id));
             }
-            if !layouts.contains(&s.layout) {
+            if self.layout(s.layout).is_none() {
                 out.push(format!("slide {} uses missing layout {}", s.id, s.layout));
             }
             let mut ids = std::collections::HashSet::new();

crates/model/src/numfmt.rs

@@ -143,14 +143,9 @@ fn group(digits: &str, sep: char) -> String {
     out
 }
 
-/// Longest number format applied, as in Excel (255 characters); a longer one formats as
-/// General, so a chart cannot make every label expand a huge format.
-pub const MAX_CODE_LEN: usize = 255;
-
 /// `v` formatted with the Excel number format `code` in language `lang` (axis labels: the text
 /// section of a format doesn't apply).
 pub fn format(code: &str, v: f64, lang: Option<&str>) -> String {
-    let code = if code.len() > MAX_CODE_LEN * 4 || code.chars().count() > MAX_CODE_LEN { "General" } else { code };
     let (sep, dec) = marks(lang);
     if !v.is_finite() {
         return String::new();
@@ -304,14 +299,6 @@ mod tests {
 
     const RUB: &str = r#"_-* #\ ##0\ "₽"_-;\-* #\ ##0\ "₽"_-;_-* "-"??\ "₽"_-;_-@_-"#;
 
-    #[test]
-    fn an_overlong_format_is_general() {
-        let code = "0".repeat(100_000);
-        assert_eq!(format(&code, 12.5, None), format("General", 12.5, None));
-        let ok = "0".repeat(MAX_CODE_LEN);
-        assert_eq!(format(&ok, 7.0, None).len(), MAX_CODE_LEN);
-    }
-
     #[test]
     fn scientific_subnormal() {
         assert_eq!(format("0.00E+00", 5e-324, None), "4.94E-324");

crates/model/src/resolve.rs

@@ -249,9 +249,6 @@ pub fn body(ctx: &Ctx, shape: &Shape) -> BodyProps {
         rtl_col: Some(false),
         upright: Some(false),
         space_first_last: Some(false),
-        compat_ln_spc: None,
-        vert_overflow: None,
-        horz_overflow: None,
     });
     b
 }

crates/model/src/style.rs

@@ -459,44 +459,13 @@ pub struct Glow {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
+#[serde(rename_all = "camelCase")]
 pub struct Reflection {
     pub blur: f64,
     pub start_alpha: f64,
     pub end_alpha: f64,
     pub end_pos: f64,
     pub dist: f64,
-    /// DrawingML reflection transform values retain their native integer units.
-    pub st_pos: Option<i32>,
-    pub dir: Option<i32>,
-    pub fade_dir: Option<i32>,
-    pub sx: Option<i32>,
-    pub sy: Option<i32>,
-    pub kx: Option<i32>,
-    pub ky: Option<i32>,
-    pub align: Option<String>,
-    pub rotate_with_shape: Option<bool>,
-}
-
-impl Default for Reflection {
-    fn default() -> Self {
-        Self {
-            blur: 0.0,
-            start_alpha: 0.0,
-            end_alpha: 0.0,
-            end_pos: 0.0,
-            dist: 0.0,
-            st_pos: None,
-            dir: Some(5_400_000),
-            fade_dir: None,
-            sx: None,
-            sy: Some(-100_000),
-            kx: None,
-            ky: None,
-            align: Some("bl".into()),
-            rotate_with_shape: Some(false),
-        }
-    }
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]

crates/model/src/table.rs

@@ -23,8 +23,6 @@ pub struct Cell {
     pub h_merge: bool,
     pub v_merge: bool,
     pub vertical: Option<crate::text::TextDir>,
-    pub anchor_ctr: Option<bool>,
-    pub horz_overflow: Option<crate::text::TextOverflow>,
 }
 
 impl Cell {
@@ -57,9 +55,6 @@ pub struct Table {
     pub last_col: bool,
     pub band_row: bool,
     pub band_col: bool,
-    /// Whether columns are ordered right-to-left (`a:tblPr/@rtl`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub rtl: Option<bool>,
     /// `a:tblPr` fill: a fill behind the whole table (over the style's own background).
     #[serde(skip_serializing_if = "Option::is_none")]
     pub background: Option<Fill>,
@@ -77,7 +72,6 @@ impl Default for Table {
             last_col: false,
             band_row: true,
             band_col: false,
-            rtl: None,
             background: None,
         }
     }

crates/model/src/text.rs

@@ -121,46 +121,6 @@ pub struct BodyProps {
     pub upright: Option<bool>,
     /// Space before the first paragraph and after the last count too (`spcFirstLastPara`).
     pub space_first_last: Option<bool>,
-    pub compat_ln_spc: Option<bool>,
-    pub vert_overflow: Option<TextOverflow>,
-    pub horz_overflow: Option<TextOverflow>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum TextOverflow {
-    Overflow,
-    Clip,
-    Ellipsis,
-}
-
-impl TextOverflow {
-    pub fn xml(self) -> &'static str {
-        match self {
-            Self::Overflow => "overflow",
-            Self::Clip => "clip",
-            Self::Ellipsis => "ellipsis",
-        }
-    }
-
-    pub fn from_xml(value: &str) -> Option<Self> {
-        Some(match value {
-            "overflow" => Self::Overflow,
-            "clip" => Self::Clip,
-            "ellipsis" => Self::Ellipsis,
-            _ => return None,
-        })
-    }
-
-    /// A `horzOverflow` value: `ST_TextHorzOverflowType` has only `overflow` and `clip`.
-    pub fn from_horz_xml(value: &str) -> Option<Self> {
-        Self::from_xml(value).filter(|v| *v != Self::Ellipsis)
-    }
-
-    /// The `horzOverflow` attribute to write, leaving out `ellipsis`, which is vertical only.
-    pub fn horz_xml(v: Option<Self>) -> Option<&'static str> {
-        v.filter(|v| *v != Self::Ellipsis).map(Self::xml)
-    }
 }
 
 impl BodyProps {
@@ -184,9 +144,6 @@ impl BodyProps {
         self.rtl_col = self.rtl_col.or(p.rtl_col);
         self.upright = self.upright.or(p.upright);
         self.space_first_last = self.space_first_last.or(p.space_first_last);
-        self.compat_ln_spc = self.compat_ln_spc.or(p.compat_ln_spc);
-        self.vert_overflow = self.vert_overflow.or(p.vert_overflow);
-        self.horz_overflow = self.horz_overflow.or(p.horz_overflow);
     }
 }
 
@@ -200,7 +157,6 @@ pub enum Align {
     /// Justified with kashida (tatweel) elongation for Arabic (`justLow`).
     JustLow,
     Distributed,
-    ThaiDistributed,
 }
 
 impl Align {
@@ -212,7 +168,6 @@ impl Align {
             Align::Justify => "just",
             Align::JustLow => "justLow",
             Align::Distributed => "dist",
-            Align::ThaiDistributed => "thaiDist",
         }
     }
     pub fn from_xml(s: &str) -> Option<Self> {
@@ -220,8 +175,7 @@ impl Align {
             "l" => Align::Left,
             "ctr" => Align::Center,
             "r" => Align::Right,
-            "just" => Align::Justify,
+            "just" | "thaiDist" => Align::Justify,
-            "thaiDist" => Align::ThaiDistributed,
             "justLow" => Align::JustLow,
             "dist" => Align::Distributed,
             _ => return None,
@@ -288,8 +242,6 @@ pub struct ParaProps {
     pub bullet_color_follow_text: Option<bool>,
     /// Bullet size as a fraction of the text size.
     pub bullet_size: Option<f64>,
-    /// Absolute bullet font size in points, independent of the paragraph's run size.
-    pub bullet_size_points: Option<f64>,
     pub bullet_size_follow_text: Option<bool>,
     pub tabs: Option<Vec<TabStop>>,
     pub default_tab: Option<f64>,
@@ -334,13 +286,11 @@ impl ParaProps {
                 self.bullet_color.clone_from(&p.bullet_color);
             }
         }
-        if self.bullet_size_follow_text == Some(false) || self.bullet_size.is_some() || self.bullet_size_points.is_some() {
+        if self.bullet_size_follow_text == Some(false) || self.bullet_size.is_some() {
             self.bullet_size_follow_text = None;
         }
-        if self.bullet_size.is_none() && self.bullet_size_points.is_none() && self.bullet_size_follow_text.is_none() {
+        if self.bullet_size.is_none() && self.bullet_size_follow_text.is_none() {
-            if p.bullet_size_points.is_some() {
+            if p.bullet_size_follow_text == Some(true) {
-                self.bullet_size_points = p.bullet_size_points;
-            } else if p.bullet_size_follow_text == Some(true) {
                 self.bullet_size_follow_text = Some(true);
             } else {
                 self.bullet_size = p.bullet_size;
@@ -360,33 +310,6 @@ impl ParaProps {
     }
 }
 
-#[cfg(test)]
-mod bullet_size_tests {
-    use super::ParaProps;
-
-    #[test]
-    fn bullet_size_inheritance_keeps_percentage_and_points_as_one_mode() {
-        let parent = ParaProps { bullet_size_points: Some(12.0), ..Default::default() };
-        let mut child = ParaProps { bullet_size: Some(2.0), ..Default::default() };
-        child.inherit(&parent);
-        assert_eq!(child.bullet_size, Some(2.0));
-        assert_eq!(child.bullet_size_points, None);
-
-        let parent = ParaProps { bullet_size: Some(1.5), ..Default::default() };
-        let mut child = ParaProps { bullet_size_points: Some(14.0), ..Default::default() };
-        child.inherit(&parent);
-        assert_eq!(child.bullet_size, None);
-        assert_eq!(child.bullet_size_points, Some(14.0));
-
-        let parent = ParaProps { bullet_size_points: Some(12.0), ..Default::default() };
-        let mut child = ParaProps { bullet_size_follow_text: Some(true), ..Default::default() };
-        child.inherit(&parent);
-        assert_eq!(child.bullet_size, None);
-        assert_eq!(child.bullet_size_points, None);
-        assert_eq!(child.bullet_size_follow_text, Some(true));
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum Caps {
@@ -502,8 +425,6 @@ pub struct RunProps {
     /// Action on mouse over (Insert ▸ Action ▸ Mouse Over on selected text, `a:hlinkMouseOver`).
     pub hover: Option<Hyperlink>,
     pub lang: Option<String>,
-    #[serde(deserialize_with = "bounded_language")]
-    pub alt_lang: Option<String>,
     pub shadow: Option<crate::style::Shadow>,
     /// `a:innerShdw` on the run. Outer shadow stays in `shadow`.
     pub inner_shadow: Option<crate::style::Shadow>,
@@ -513,14 +434,6 @@ pub struct RunProps {
     pub soft_edge: Option<f64>,
     /// Spelling/grammar errors are not flagged.
     pub no_proof: Option<bool>,
-    pub normalize_height: Option<bool>,
-}
-
-fn bounded_language<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    Option::<String>::deserialize(deserializer).map(|lang| lang.map(|value| value.chars().take(256).collect()))
 }
 
 impl RunProps {
@@ -549,14 +462,12 @@ impl RunProps {
             link,
             hover,
             lang,
-            alt_lang,
             shadow,
             inner_shadow,
             glow,
             reflection,
             soft_edge,
-            no_proof,
+            no_proof
-            normalize_height
         );
     }
 }
@@ -753,20 +664,6 @@ mod tests {
     use super::*;
     use deckcraft_color::Rgba;
 
-    #[test]
-    fn alternate_language_inherits_and_native_input_is_bounded() {
-        let mut child = RunProps::default();
-        child.inherit(&RunProps { lang: Some("en-US".into()), alt_lang: Some("fr-FR".into()), ..Default::default() });
-        assert_eq!(child.lang.as_deref(), Some("en-US"));
-        assert_eq!(child.alt_lang.as_deref(), Some("fr-FR"));
-
-        let oversized = "x".repeat(300);
-        let json = serde_json::json!({"altLang": oversized});
-        let props: RunProps = serde_json::from_value(json).expect("run props");
-        assert_eq!(props.alt_lang.as_deref().map(str::len), Some(256));
-        assert_eq!(serde_json::from_value::<RunProps>(serde_json::json!({})).expect("old run props"), RunProps::default());
-    }
-
     #[test]
     fn explicit_bullet_follow_text_resets_block_inheritance() {
         let parent = ParaProps {

crates/pptx/src/lib.rs

@@ -175,43 +175,3 @@ mod import_theme_tests {
         assert!(crate::import_theme(&out.finish().unwrap().into_inner()).is_err());
     }
 }
-
-#[cfg(test)]
-mod table_direction_tests {
-    use deckcraft_model::table::{Cell, Table};
-    use deckcraft_model::{Presentation, Shape, ShapeId, ShapeKind, defaults};
-    use std::sync::Arc;
-
-    fn table(p: &Presentation) -> &Table {
-        p.slides[0]
-            .shapes
-            .iter()
-            .find_map(|shape| match &shape.kind {
-                ShapeKind::Table(table) => Some(table),
-                _ => None,
-            })
-            .expect("table shape")
-    }
-
-    #[test]
-    fn table_direction_and_column_order_survive_two_pptx_saves() {
-        for rtl in [Some(true), Some(false), None] {
-            let mut p = defaults::new_presentation(None);
-            let mut t = Table::new(1, 2, 200.0, 30.0);
-            t.rtl = rtl;
-            t.rows[0].cells[0] = Cell::new("First column");
-            t.rows[0].cells[1] = Cell::new("Second column");
-            let shape = Shape { id: ShapeId(p.alloc_id().expect("id")), kind: ShapeKind::Table(t), ..Default::default() };
-            Arc::make_mut(&mut p.slides[0]).shapes.push(shape);
-
-            let mut roundtrip = crate::import(&crate::export(&p).expect("export")).expect("import");
-            for _ in 0..2 {
-                let t = table(&roundtrip);
-                assert_eq!(t.rtl, rtl);
-                assert_eq!(t.rows[0].cells[0].text.paragraphs[0].runs[0].text, "First column");
-                assert_eq!(t.rows[0].cells[1].text.paragraphs[0].runs[0].text, "Second column");
-                roundtrip = crate::import(&crate::export(&roundtrip).expect("export again")).expect("import again");
-            }
-        }
-    }
-}

crates/pptx/src/opc.rs

@@ -171,7 +171,6 @@ fn rels_of(doc: &xml::Doc, part: &str) -> Rels {
         let external = r.attr("TargetMode").is_some_and(|m| m.eq_ignore_ascii_case("external"));
         let target_raw = target.to_string();
         let target = if external { target_raw.clone() } else { resolve(&base, target) };
-        out.by_id.entry(id.to_string()).or_insert(out.items.len());
         out.items.push(Rel {
             id: id.to_string(),
             kind: ty.rsplit('/').next().unwrap_or(ty).to_string(),
@@ -212,13 +211,11 @@ pub struct Rel {
 #[derive(Clone, Debug, Default)]
 pub struct Rels {
     pub items: Vec<Rel>,
-    /// Id → index of its first relationship in `items`.
-    by_id: HashMap<String, usize>,
 }
 
 impl Rels {
     pub fn get(&self, id: &str) -> Option<&Rel> {
-        self.by_id.get(id).and_then(|&i| self.items.get(i))
+        self.items.iter().find(|r| r.id == id)
     }
     pub fn target(&self, id: &str) -> Option<&str> {
         self.get(id).map(|r| r.target.as_str())
@@ -342,29 +339,23 @@ pub fn relative(from: &str, to: &str) -> String {
 #[derive(Default)]
 pub struct RelsOut {
     pub items: Vec<(String, String, String, bool)>,
-    /// (type, target, external) → id of the relationship [`RelsOut::add`] made for it.
-    added: HashMap<(String, String, bool), String>,
 }
 
 impl RelsOut {
     /// Add (or reuse) a relationship; `kind` is a full type URI or a suffix of the standard base.
     pub fn add(&mut self, kind: &str, target: &str, external: bool) -> String {
         let ty = if kind.starts_with("http") { kind.to_string() } else { format!("{RT_BASE}{kind}") };
-        let key = (ty, target.to_string(), external);
+        if let Some((id, ..)) = self.items.iter().find(|(_, t, tg, e)| *t == ty && tg == target && *e == external) {
-        if let Some(id) = self.added.get(&key) {
             return id.clone();
         }
         let id = format!("rId{}", self.items.len() + 1);
-        self.items.push((id.clone(), key.0.clone(), key.1.clone(), external));
+        self.items.push((id.clone(), ty, target.to_string(), external));
-        self.added.insert(key, id.clone());
         id
     }
     /// Always add a new relationship even if an identical one exists.
     pub fn add_new(&mut self, kind: &str, target: &str, external: bool) -> String {
         let ty = if kind.starts_with("http") { kind.to_string() } else { format!("{RT_BASE}{kind}") };
         let id = format!("rId{}", self.items.len() + 1);
-        // `add` reuses the first relationship for a target, whichever call made it.
-        self.added.entry((ty.clone(), target.to_string(), external)).or_insert_with(|| id.clone());
         self.items.push((id.clone(), ty, target.to_string(), external));
         id
     }
@@ -509,27 +500,6 @@ mod tests {
         assert!(p.get("e").is_some());
     }
 
-    #[test]
-    fn many_relationships_are_found_by_index_and_first_id_wins() {
-        let n = 50_000;
-        let mut x = String::from(r#"<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">"#);
-        for i in 0..n {
-            x.push_str(&format!(r#"<Relationship Id="rId{i}" Type="{RT_BASE}image" Target="../media/image{i}.png"/>"#));
-        }
-        x.push_str(&format!(r#"<Relationship Id="rId0" Type="{RT_BASE}image" Target="../media/dup.png"/></Relationships>"#));
-        let rels = rels_from_bytes(x.as_bytes(), "ppt/slides/slide1.xml");
-        assert_eq!(rels.target("rId0"), Some("ppt/media/image0.png"), "the first of a repeated id wins");
-        assert!((0..n).all(|i| rels.target(&format!("rId{i}")) == Some(&*format!("ppt/media/image{i}.png"))));
-
-        let mut out = RelsOut::default();
-        let ids: Vec<String> = (0..n).map(|i| out.add("hyperlink", &format!("https://example.com/{i}"), true)).collect();
-        assert_eq!(out.add("hyperlink", "https://example.com/7", true), ids[7], "an identical target reuses its id");
-        assert_eq!(out.add("hyperlink", "https://example.com/7", false), format!("rId{}", n + 1), "internal is distinct");
-        let fresh = out.add_new("image", "../media/a.png", false);
-        assert_ne!(out.add_new("image", "../media/a.png", false), fresh);
-        assert_eq!(out.add("image", "../media/a.png", false), fresh, "add reuses the first add_new made");
-    }
-
     #[test]
     fn backslash_zip_entry_names_are_found() {
         let z = zip_of(&[("PPT\\Slides\\Slide1.xml", 3)]);

crates/pptx/src/read.rs

@@ -46,9 +46,6 @@ pub struct Imp<'a> {
     pub tag_bytes: usize,
     /// The tag budget ran out and the warning was given.
     pub tags_capped: bool,
-    /// Whether a part has relationships of its own, by normalized part name: looked up once
-    /// however many embedded objects point at the part.
-    pub has_rels: HashMap<String, bool>,
 }
 
 impl Imp<'_> {
@@ -449,7 +446,6 @@ pub fn import_theme(bytes: &[u8]) -> Result<(deckcraft_model::theme::Theme, Vec<
         tags_by_part: HashMap::new(),
         tag_bytes: 0,
         tags_capped: false,
-        has_rels: HashMap::new(),
     };
     let part = Part::new(&pkg, &theme_path, &doc);
     let theme = theme::read_theme(&mut imp, &part, &doc.root);
@@ -491,7 +487,6 @@ pub fn import_checked(bytes: &[u8]) -> Result<(Presentation, Vec<String>), PptxE
         tags_by_part: HashMap::new(),
         tag_bytes: 0,
         tags_capped: false,
-        has_rels: HashMap::new(),
     };
     // Slide ids first so hyperlinks anywhere can point at slides.
     let slide_ids = register_slides(&mut imp, &docs, &slide_entries, &mut lost_slides);
@@ -668,55 +663,52 @@ fn read_slides(
     let pkg = imp.pkg;
     let fallback_layout = p.masters.first().and_then(|m| m.layouts.first()).map(|l| l.id).unwrap_or_default();
     let mut file_slide_ids: HashMap<u32, SlideId> = HashMap::new();
-    // A notes or comments part belongs to one slide; one shared by many must not be read (and
+    let mut notes_by_target: HashMap<String, TextBody> = HashMap::new();
-    // copied) once per slide that names it.
-    let mut owned_parts: HashSet<String> = HashSet::new();
     for (file_id, path, id) in slide_ids {
         let Some(doc) = docs.get(&opc::norm(path)) else { continue };
         let part = Part::new(pkg, path, doc);
         let layout = part.rels.first_of("slideLayout").and_then(|r| layout_by_part.get(&opc::norm(&r.target)).copied()).unwrap_or(fallback_layout);
         let mut slide = read_slide(imp, &part, doc, *id, layout);
-        if let Some(notes) = slide_notes(imp, &part, &mut owned_parts) {
+        if let Some(notes) = slide_notes(imp, &part, &mut notes_by_target) {
             slide.notes = notes;
         }
-        read_slide_comments(pkg, pres_part, &part, &mut slide, &mut owned_parts);
+        read_slide_comments(pkg, pres_part, &part, &mut slide);
         file_slide_ids.insert(*file_id, *id);
         p.slides.push(Arc::new(slide));
     }
     file_slide_ids
 }
 
-/// The slide's notes text. A notes part is the notes of the first slide that names it.
+/// The slide's notes text, read once per notes part.
-fn slide_notes(imp: &mut Imp, part: &Part, owned: &mut HashSet<String>) -> Option<TextBody> {
+fn slide_notes(imp: &mut Imp, part: &Part, cache: &mut HashMap<String, TextBody>) -> Option<TextBody> {
     let n = part.rels.first_of("notesSlide")?;
-    if !owned.insert(opc::norm(&n.target)) {
+    let key = opc::norm(&n.target);
-        log::warn!("pptx: notes part {} is named by more than one slide; kept on the first", n.target);
+    if let Some(cached) = cache.get(&key) {
-        return None;
+        return Some(cached.clone());
     }
     let pkg = imp.pkg;
     let nd = load(pkg, &n.target)?;
     let np = Part::new(pkg, &n.target, &nd);
-    Some(read_notes(imp, &np, &nd.root))
+    let notes = read_notes(imp, &np, &nd.root);
+    cache.insert(key, notes.clone());
+    Some(notes)
 }
 
 /// Comments. A modern part and the legacy part can describe the same threads (PowerPoint
 /// writes both): the modern one wins, its flattened legacy copy is skipped.
-/// Each comments part is read once, for the first slide that names it.
+fn read_slide_comments(pkg: &Package, pres_part: &Part, part: &Part, slide: &mut Slide) {
-fn read_slide_comments(pkg: &Package, pres_part: &Part, part: &Part, slide: &mut Slide, owned: &mut HashSet<String>) {
+    let mut parts: Vec<(Doc, bool)> = vec![];
-    let mut parts: Vec<(Doc, bool, bool)> = vec![];
     for c in part.rels.all_of("comments") {
-        // An already-owned part is not re-read, but its kind still decides modern precedence.
-        let fresh = owned.insert(opc::norm(&c.target));
         if let Some(cd) = pkg.xml(&c.target) {
             // The content type names the modern part; a package that types it only through a
             // Default entry instead of an Override is still modern when its root is p188.
             let modern = pkg.content_type(&c.target).as_deref() == Some(crate::write::CT_COMMENTS_MODERN) || cd.root.prefix() == "p188";
-            parts.push((cd, modern, fresh));
+            parts.push((cd, modern));
         }
     }
-    let has_modern = parts.iter().any(|(_, m, _)| *m);
+    let has_modern = parts.iter().any(|(_, m)| *m);
-    for (cd, modern, fresh) in parts {
+    for (cd, modern) in parts {
-        if !fresh || (has_modern && !modern) {
+        if has_modern && !modern {
             continue;
         }
         slide.comments.extend(read_comments(pkg, pres_part, &cd.root, modern));

crates/pptx/src/read/dml.rs

@@ -23,16 +23,6 @@ pub fn pct(e: &El, name: &str) -> Option<f64> {
     e.f64(name).map(|v| v / 100_000.0)
 }
 
-fn bullet_size_points(value: Option<&str>) -> Option<f64> {
-    value.and_then(|v| v.trim().parse::<u32>().ok()).filter(|v| (100..=400_000).contains(v)).map(|v| v as f64 / 100.0)
-}
-
-fn bullet_size_percent(value: Option<&str>) -> Option<f64> {
-    let value = value?.trim();
-    let (value, scale) = if let Some(value) = value.strip_suffix('%') { (value.trim(), 100.0) } else { (value, 100_000.0) };
-    value.parse::<f64>().ok().filter(|v| v.is_finite()).map(|v| v / scale)
-}
-
 /// 1/60 000 degree → degrees.
 pub fn ang(e: &El, name: &str) -> Option<f64> {
     e.f64(name).map(|v| v / 60_000.0)
@@ -322,15 +312,6 @@ pub fn effects(el: &El) -> Effects {
                     end_alpha: pct(e, "endA").unwrap_or(0.0),
                     end_pos: pct(e, "endPos").unwrap_or(1.0),
                     dist: pt(e, "dist").unwrap_or(0.0),
-                    st_pos: e.i64("stPos").and_then(|v| i32::try_from(v).ok()),
-                    dir: e.i64("dir").and_then(|v| i32::try_from(v).ok()),
-                    fade_dir: e.i64("fadeDir").and_then(|v| i32::try_from(v).ok()),
-                    sx: e.i64("sx").and_then(|v| i32::try_from(v).ok()),
-                    sy: e.i64("sy").and_then(|v| i32::try_from(v).ok()),
-                    kx: e.i64("kx").and_then(|v| i32::try_from(v).ok()),
-                    ky: e.i64("ky").and_then(|v| i32::try_from(v).ok()),
-                    align: e.attr("algn").filter(|v| matches!(*v, "tl" | "t" | "tr" | "l" | "ctr" | "r" | "bl" | "b" | "br")).map(str::to_owned),
-                    rotate_with_shape: e.bool("rotWithShape"),
                 })
             }
             _ => {}
@@ -377,9 +358,6 @@ pub fn body_pr(b: &El) -> BodyProps {
         rtl_col: b.bool("rtlCol"),
         upright: b.bool("upright"),
         space_first_last: b.bool("spcFirstLastPara"),
-        compat_ln_spc: b.bool("compatLnSpc"),
-        vert_overflow: b.attr("vertOverflow").and_then(deckcraft_model::text::TextOverflow::from_xml),
-        horz_overflow: b.attr("horzOverflow").and_then(deckcraft_model::text::TextOverflow::from_horz_xml),
         ..Default::default()
     };
     for e in b.elements() {
@@ -476,22 +454,9 @@ pub fn ppr(imp: &mut Imp, part: &Part, p: &El) -> (Option<u8>, ParaProps, Option
             "buFont" => pp.bullet_font = e.attr("typeface").map(String::from),
             "buFontTx" => pp.bullet_font_follow_text = Some(true),
             "buClr" => pp.bullet_color = color(e),
-            "buSzPct" => {
-                pp.bullet_size_points = None;
-                pp.bullet_size_follow_text = None;
-                pp.bullet_size = bullet_size_percent(e.attr("val")).map(|v| v.clamp(0.25, 4.0));
-            }
-            "buSzPts" => {
-                pp.bullet_size = None;
-                pp.bullet_size_follow_text = None;
-                pp.bullet_size_points = bullet_size_points(e.attr("val"));
-            }
             "buClrTx" => pp.bullet_color_follow_text = Some(true),
-            "buSzTx" => {
+            "buSzPct" => pp.bullet_size = pct(e, "val").map(|v| v.clamp(0.25, 4.0)),
-                pp.bullet_size = None;
+            "buSzTx" => pp.bullet_size_follow_text = Some(true),
-                pp.bullet_size_points = None;
-                pp.bullet_size_follow_text = Some(true);
-            }
             "tabLst" => {
                 pp.tabs = Some(
                     e.children_named("tab")
@@ -565,7 +530,6 @@ fn typeface(e: &El) -> Option<String> {
 pub fn rpr(imp: &mut Imp, part: &Part, r: &El) -> RunProps {
     let mut p = RunProps {
         lang: r.attr("lang").map(String::from),
-        alt_lang: r.attr("altLang").map(|lang| lang.chars().take(256).collect()),
         size: r.f64("sz").map(|s| (s / 100.0).clamp(1.0, 4000.0)),
         bold: r.bool("b"),
         italic: r.bool("i"),
@@ -584,7 +548,6 @@ pub fn rpr(imp: &mut Imp, part: &Part, r: &El) -> RunProps {
         spacing: r.f64("spc").map(|s| (s / 100.0).clamp(-4000.0, 4000.0)),
         kern: r.f64("kern").map(|k| (k / 100.0).clamp(0.0, 4000.0)),
         no_proof: r.bool("noProof"),
-        normalize_height: r.bool("normalizeH"),
         ..Default::default()
     };
     for e in r.elements() {
@@ -664,22 +627,12 @@ fn push_text_runs(para: &mut Paragraph, props: RunProps, text: &str) {
 /// Appends an Office Math (a14:m) run: its plain text and its OMML.
 fn push_math_run(para: &mut Paragraph, part: &Part, e: &El) {
     if para.runs.len() < MAX_PARAGRAPH_RUNS {
-        // The text of the outermost `t` elements: a `t` nested in another is already part of
-        // the outer one's text, and taking it again would copy it once per nesting level.
-        fn outer_t(e: &El, depth: usize, text: &mut String) {
-            if depth > crate::xml::MAX_DEPTH {
-                return;
-            }
-            for c in e.elements() {
-                if c.is("t") {
-                    text.push_str(&c.text());
-                } else {
-                    outer_t(c, depth + 1, text);
-                }
-            }
-        }
         let mut text = String::new();
-        outer_t(e, 0, &mut text);
+        let mut ts = vec![];
+        e.find_all("t", &mut ts);
+        for t in ts {
+            text.push_str(&t.text());
+        }
         let omml = e.elements().map(|c| part.keep_inner(c)).collect::<String>();
         para.runs.push(Run { text, props: RunProps::default(), kind: RunKind::Math { omml } });
     }
@@ -724,17 +677,6 @@ mod tests {
     use super::*;
     use crate::xml::parse;
 
-    #[test]
-    fn nested_math_text_is_taken_once() {
-        // 200 `m:t` nested in each other around one word: the word, not 200 copies of it.
-        let x = format!(r#"<a14:m xmlns:a14="a" xmlns:m="m"><m:oMath>{}word{}</m:oMath></a14:m>"#, "<m:t>".repeat(200), "</m:t>".repeat(200));
-        let d = parse(x.as_bytes()).unwrap();
-        let part = Part { name: "ppt/slides/slide1.xml".into(), rels: Default::default(), ns: vec![], inner_ns: vec![] };
-        let mut para = Paragraph::default();
-        push_math_run(&mut para, &part, &d.root);
-        assert_eq!(para.runs[0].text, "word");
-    }
-
     #[test]
     fn colors_and_transforms() {
         let d = parse(
@@ -750,21 +692,6 @@ mod tests {
         assert_eq!(color(&d.root).unwrap().base, ColorBase::Rgb { rgb: Rgba::rgb(255, 0, 0) });
     }
 
-    #[test]
-    fn bullet_point_size_trims_schema_whitespace() {
-        let d = parse(br#"<a:buSzPts xmlns:a="x" val=" 1400 "/>"#).unwrap();
-        assert_eq!(bullet_size_points(d.root.attr("val")), Some(14.0));
-        assert_eq!(bullet_size_points(Some("1400")), Some(14.0));
-    }
-
-    #[test]
-    fn bullet_percentage_size_accepts_numeric_and_percent_forms() {
-        assert_eq!(bullet_size_percent(Some("100000")), Some(1.0));
-        assert_eq!(bullet_size_percent(Some("100%")), Some(1.0));
-        assert_eq!(bullet_size_percent(Some(" 125% ")), Some(1.25));
-        assert_eq!(bullet_size_percent(Some("invalid")), None);
-    }
-
     #[test]
     fn miter_limit_accepts_both_percentage_forms_with_schema_bounds() {
         assert_eq!(parse_miter_limit("200000"), Some(200_000));

crates/pptx/src/read/shapes.rs

@@ -475,8 +475,7 @@ fn frame(imp: &mut Imp, part: &Part, ctx: &mut IdCtx, e: &El, depth: usize) -> S
         .into_iter()
         .map(|id| {
             let rel = part.rels.get(&id).filter(|r| !r.external)?;
-            let pkg = imp.pkg;
+            if !imp.pkg.rels(&rel.target).items.is_empty() {
-            if *imp.has_rels.entry(crate::opc::norm(&rel.target)).or_insert_with(|| !pkg.rels(&rel.target).items.is_empty()) {
                 return None;
             }
             let (kind, target) = (rel.ty.clone(), rel.target.clone());
@@ -758,7 +757,6 @@ fn table(imp: &mut Imp, part: &Part, tbl: &El) -> Table {
         t.last_col = pr.bool("lastCol").unwrap_or(false);
         t.band_row = pr.bool("bandRow").unwrap_or(false);
         t.band_col = pr.bool("bandCol").unwrap_or(false);
-        t.rtl = pr.bool("rtl");
         if let Some(id) = pr.child("tableStyleId").map(|e| e.text()) {
             // A style the file defines is drawn from its definition (by its GUID).
             // DeckCraft's own styles (written with GUIDs derived from their ids) map back to them.
@@ -807,8 +805,6 @@ fn cell(imp: &mut Imp, part: &Part, tc: &El) -> Cell {
             ]);
         }
         c.anchor = pr.attr("anchor").and_then(Anchor::from_xml);
-        c.anchor_ctr = pr.bool("anchorCtr");
-        c.horz_overflow = pr.attr("horzOverflow").and_then(deckcraft_model::text::TextOverflow::from_horz_xml);
         c.vertical = pr.attr("vert").and_then(TextDir::from_xml);
         for (i, n) in ["lnL", "lnR", "lnT", "lnB"].iter().enumerate() {
             if let Some(ln) = pr.child(n)

crates/pptx/src/read/timing.rs

@@ -53,128 +53,25 @@ pub fn transition(imp: &mut Imp, part: &Part, t: &El) -> Option<Transition> {
 struct Found<'a> {
     ctn: &'a El,
     trigger: Option<u32>,
-    /// Click group the effect sits in: a new one starts at every time node whose start is `indefinite`.
-    group: usize,
-    /// Sum of the start delays of the time nodes between the click group and the effect, in ms.
-    offset: u32,
 }
 
-/// Where `collect` is in the time tree: the click group and the delay accumulated inside it.
+fn collect<'a>(e: &'a El, trigger: Option<u32>, out: &mut Vec<Found<'a>>, depth: usize) {
-#[derive(Clone, Copy)]
-struct At {
-    trigger: Option<u32>,
-    group: usize,
-    offset: u32,
-}
-
-fn collect<'a>(e: &'a El, at: At, groups: &mut usize, out: &mut Vec<Found<'a>>, depth: usize) {
     if depth > 64 || out.len() > 10_000 {
         return;
     }
     for c in e.elements() {
         if c.is("cTn") && c.has_attr("presetClass") {
-            out.push(Found { ctn: c, trigger: at.trigger, group: at.group, offset: at.offset });
+            out.push(Found { ctn: c, trigger });
             continue;
         }
-        let mut at = at;
+        let mut trig = trigger;
         if c.is("seq")
             && let Some(ctn) = c.child("cTn")
             && ctn.attr("nodeType") == Some("interactiveSeq")
         {
-            at.trigger = ctn.path(&["stCondLst", "cond", "tgtEl", "spTgt"]).and_then(|s| s.u32("spid"));
+            trig = ctn.path(&["stCondLst", "cond", "tgtEl", "spTgt"]).and_then(|s| s.u32("spid"));
-        }
-        if c.is("cTn")
-            && let Some(cond) = c.path(&["stCondLst", "cond"])
-        {
-            if cond.attr("delay").map(str::trim) == Some("indefinite") {
-                *groups += 1;
-                at.group = *groups;
-                at.offset = 0;
-            } else {
-                at.offset = at.offset.saturating_add(ms_attr(cond, "delay").unwrap_or(0));
-            }
-        }
-        collect(c, at, groups, out, depth + 1);
-    }
-}
-
-/// How long an effect holds back an After Previous one, as the show timeline counts it.
-fn span_ms(a: &Animation) -> u32 {
-    let iterations = if a.repeat == u32::MAX || a.repeat <= 1 { 1 } else { a.repeat.min(1_000) };
-    a.duration_ms.saturating_mul(if a.auto_reverse { 2 } else { 1 }).saturating_mul(iterations)
-}
-
-/// Start times (ms after the click) that the flat effect list plays at, effect after effect.
-fn flat_starts(anims: &[&Animation]) -> Vec<u32> {
-    let (mut begin, mut end) = (0u32, 0u32);
-    anims
-        .iter()
-        .map(|a| {
-            if a.start == AnimStart::AfterPrevious {
-                begin = end;
-            }
-            let start = begin.saturating_add(a.delay_ms);
-            end = end.max(start.saturating_add(span_ms(a)));
-            start
-        })
-        .collect()
-}
-
-/// PowerPoint places each effect at the delays of all its enclosing time nodes, so a file may list
-/// effects out of time order (a countdown written first, then effects at 5 s placed only by their
-/// parent's delay). The flat list only knows "after/with previous" plus the effect's own delay, so
-/// a click group listed out of time order, whose flat reading disagrees with the file, is sorted by
-/// start time and its starts and delays rewritten to land every effect where PowerPoint plays it.
-/// Every other group is left untouched.
-fn place_by_parent_delays(out: &mut [(Animation, u32, String, bool)], at: &[(Option<u32>, usize, u32)]) {
-    let mut groups: Vec<Vec<usize>> = vec![];
-    let mut slot: std::collections::HashMap<(Option<u32>, usize), usize> = std::collections::HashMap::new();
-    for (i, &(t, g, _)) in at.iter().enumerate() {
-        let n = *slot.entry((t, g)).or_insert_with(|| {
-            groups.push(vec![]);
-            groups.len() - 1
-        });
-        groups[n].push(i);
-    }
-    for idx in groups {
-        // More than one click in a group means the tree isn't one click per group: leave it.
-        if idx.iter().skip(1).any(|&i| out[i].0.start == AnimStart::OnClick) {
-            continue;
-        }
-        let abs: Vec<u32> = idx.iter().map(|&i| at[i].2.saturating_add(out[i].0.delay_ms)).collect();
-        // Only a file that lists effects out of time order needs this: files PowerPoint or DeckCraft
-        // save are in order, and their reading stays exactly as before.
-        if abs.is_sorted() {
-            continue;
-        }
-        let flat = flat_starts(&idx.iter().map(|&i| &out[i].0).collect::<Vec<_>>());
-        if flat == abs {
-            continue;
-        }
-        // The group's click stays on whichever effect now plays first.
-        let had_click = out[idx[0]].0.start == AnimStart::OnClick;
-        let mut order: Vec<usize> = (0..idx.len()).collect();
-        order.sort_by_key(|&k| abs[k]);
-        let mut sorted: Vec<(Animation, u32, String, bool)> = order.iter().map(|&k| out[idx[k]].clone()).collect();
-        let (mut begin, mut end) = (0u32, 0u32);
-        for (n, (&k, item)) in order.iter().zip(sorted.iter_mut()).enumerate() {
-            let a = &mut item.0;
-            let t = abs[k];
-            if n == 0 && had_click {
-                a.start = AnimStart::OnClick;
-                a.delay_ms = t;
-            } else if a.start == AnimStart::AfterPrevious && t >= end {
-                begin = end;
-                a.delay_ms = t - end;
-            } else {
-                a.start = AnimStart::WithPrevious;
-                a.delay_ms = t.saturating_sub(begin);
-            }
-            end = end.max(t.saturating_add(span_ms(a)));
-        }
-        for (&i, item) in idx.iter().zip(sorted) {
-            out[i] = item;
         }
+        collect(c, trig, out, depth + 1);
     }
 }
 
@@ -238,7 +135,7 @@ pub fn animations(imp: &mut Imp, part: &Part, ctx: &IdCtx, timing: &El, shapes:
     let _ = (imp, part);
     let Some(tn) = timing.child("tnLst") else { return vec![] };
     let mut found = vec![];
-    collect(tn, At { trigger: None, group: 0, offset: 0 }, &mut 0, &mut found, 0);
+    collect(tn, None, &mut found, 0);
     // Paragraph builds (`bldP build="p"`) by (spid, grpId).
     let by_para: Vec<(u32, String)> = timing
         .child("bldLst")
@@ -250,7 +147,6 @@ pub fn animations(imp: &mut Imp, part: &Part, ctx: &IdCtx, timing: &El, shapes:
         })
         .unwrap_or_default();
     let mut out: Vec<(Animation, u32, String, bool)> = vec![];
-    let mut at: Vec<(Option<u32>, usize, u32)> = vec![];
     for f in found {
         let c = f.ctn;
         let class = AnimClass::from_xml(c.attr("presetClass").unwrap_or("entr"));
@@ -316,9 +212,7 @@ pub fn animations(imp: &mut Imp, part: &Part, ctx: &IdCtx, timing: &El, shapes:
         let grp = c.attr("grpId").unwrap_or("0").to_string();
         let build = paragraph.is_some() && by_para.iter().any(|(s, g)| *s == file_id && *g == grp);
         out.push((a, file_id, grp, build));
-        at.push((f.trigger, f.group, f.offset));
     }
-    place_by_parent_delays(&mut out, &at);
     // A paragraph build's effects, one per paragraph, become one by-paragraph animation only when
     // the timeline plays that back exactly: PowerPoint lets each paragraph keep its own start and
     // effect, and other shapes' effects can sit between them (#844).

crates/pptx/src/tables.rs

@@ -210,20 +210,13 @@ pub fn table_styles_xml(used: &[String], defs: &[deckcraft_model::table::TableSt
     let mut w = W::new();
     w.open("a:tblStyleLst", A::new().a("xmlns:a", NS_A).a("def", "{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"));
     let names = deckcraft_model::table::table_styles();
-    // Indexes instead of scans: written ids (as given and ASCII lower-case), and the file's
+    let mut done: Vec<&str> = vec![];
-    // definitions by lower-case id (the first wins).
-    let mut done: std::collections::HashSet<&str> = std::collections::HashSet::new();
-    let mut done_lower: std::collections::HashSet<String> = std::collections::HashSet::new();
-    let mut def_of: std::collections::HashMap<String, &deckcraft_model::table::TableStyleDef> = std::collections::HashMap::new();
-    for d in defs {
-        def_of.entry(d.id.to_ascii_lowercase()).or_insert(d);
-    }
     for s in used {
-        if !done.insert(s.as_str()) {
+        if done.contains(&s.as_str()) {
             continue;
         }
-        done_lower.insert(s.to_ascii_lowercase());
+        done.push(s);
-        if let Some(d) = def_of.get(&s.to_ascii_lowercase())
+        if let Some(d) = defs.iter().find(|d| d.id.eq_ignore_ascii_case(s))
             && crate::xml::parse(d.raw.as_bytes()).is_ok_and(|x| x.root.is("tblStyle"))
         {
             w.raw(&d.raw);
@@ -238,11 +231,11 @@ pub fn table_styles_xml(used: &[String], defs: &[deckcraft_model::table::TableSt
     }
     // Styles the file defined but no table uses still belong to the deck.
     for d in defs {
-        if done_lower.contains(&d.id.to_ascii_lowercase()) {
+        if done.iter().any(|s| s.eq_ignore_ascii_case(&d.id)) {
             continue;
         }
         if crate::xml::parse(d.raw.as_bytes()).is_ok_and(|x| x.root.is("tblStyle")) {
-            done_lower.insert(d.id.to_ascii_lowercase());
+            done.push(&d.id);
             w.raw(&d.raw);
         }
     }

crates/pptx/src/write.rs

@@ -53,8 +53,6 @@ pub struct Exp<'a> {
     pub p: &'a Presentation,
     pub pkg: PackageOut,
     media_parts: HashMap<MediaId, String>,
-    /// Each media id's item in `p.media` (the first with the id, as `Presentation::media`).
-    media_at: HashMap<MediaId, usize>,
     n_image: u32,
     n_media: u32,
     n_chart: u32,
@@ -65,8 +63,6 @@ pub struct Exp<'a> {
     n_kept: u32,
     pub slide_parts: HashMap<SlideId, String>,
     pub table_styles: Vec<String>,
-    /// The ids in `table_styles`, for checking membership without a scan.
-    pub table_style_set: std::collections::HashSet<String>,
     placeholder: Option<String>,
 }
 
@@ -123,17 +119,12 @@ fn ext_for(content_type: &str, name: &str, data: &[u8]) -> String {
     if !e.is_empty() && e.len() <= 5 && e.chars().all(|c| c.is_ascii_alphanumeric()) { e } else { "bin".into() }
 }
 
-impl<'a> Exp<'a> {
+impl Exp<'_> {
-    /// The media item `id`, found through the index rather than a scan of every item.
-    pub fn media(&self, id: MediaId) -> Option<&'a deckcraft_model::MediaItem> {
-        let p: &'a Presentation = self.p;
-        self.media_at.get(&id).and_then(|&i| p.media.get(i))
-    }
     fn media_part(&mut self, id: MediaId) -> Option<String> {
         if let Some(p) = self.media_parts.get(&id) {
             return Some(p.clone());
         }
-        let m = self.media(id)?;
+        let m = self.p.media(id)?;
         if m.data.is_empty() {
             return None;
         }
@@ -156,7 +147,7 @@ impl<'a> Exp<'a> {
     }
     /// A relationship from `o` to a media item (embedded part, or external link).
     pub fn media_rel(&mut self, o: &mut Out, id: MediaId, kind: &str) -> Option<String> {
-        let m = self.media(id)?;
+        let m = self.p.media(id)?;
         if m.data.is_empty() {
             let link = m.link.clone()?;
             return Some(o.rels.add(kind, &link, true));
@@ -165,7 +156,7 @@ impl<'a> Exp<'a> {
         Some(o.rels.add(kind, &opc::relative(&o.name, &part), false))
     }
     pub fn media_rel_new(&mut self, o: &mut Out, id: MediaId, kind: &str) -> Option<String> {
-        let m = self.media(id)?;
+        let m = self.p.media(id)?;
         if m.data.is_empty() {
             return None;
         }
@@ -498,8 +489,7 @@ fn valid_date(s: &str) -> bool {
 /// A copy of the presentation with every slide pointing at a layout that exists.
 fn sanitized(p: &Presentation) -> std::borrow::Cow<'_, Presentation> {
     let mut need = p.masters.is_empty() || p.masters.iter().any(|m| m.layouts.is_empty());
-    let layouts: std::collections::HashSet<_> = p.masters.iter().flat_map(|m| m.layouts.iter().map(|l| l.id)).collect();
+    need |= p.slides.iter().any(|s| p.layout(s.layout).is_none());
-    need |= p.slides.iter().any(|s| !layouts.contains(&s.layout));
     if !need {
         return std::borrow::Cow::Borrowed(p);
     }
@@ -542,13 +532,6 @@ pub fn export(p: &Presentation, main_ct: &str) -> Result<Vec<u8>, PptxError> {
         p,
         pkg: PackageOut::default(),
         media_parts: HashMap::new(),
-        media_at: {
-            let mut m = HashMap::new();
-            for (i, item) in p.media.iter().enumerate() {
-                m.entry(item.id).or_insert(i);
-            }
-            m
-        },
         n_image: 0,
         n_media: 0,
         n_chart: 0,
@@ -558,7 +541,6 @@ pub fn export(p: &Presentation, main_ct: &str) -> Result<Vec<u8>, PptxError> {
         n_kept: 0,
         slide_parts: HashMap::new(),
         table_styles: vec![],
-        table_style_set: Default::default(),
         placeholder: None,
     };
     for (i, s) in p.slides.iter().enumerate() {
@@ -977,16 +959,9 @@ fn section_slides(p: &Presentation) -> Vec<(String, Vec<usize>)> {
     if out.is_empty() {
         return out;
     }
-    // Each slide's first section, found once: a section may name a slide many times.
-    let mut first: HashMap<SlideId, usize> = HashMap::new();
-    for (k, sec) in p.sections.iter().enumerate() {
-        for id in &sec.slides {
-            first.entry(*id).or_insert(k);
-        }
-    }
     let mut cur = 0usize;
     for (i, s) in p.slides.iter().enumerate() {
-        if let Some(&k) = first.get(&s.id)
+        if let Some(k) = p.sections.iter().position(|sec| sec.slides.contains(&s.id))
             && k >= cur
         {
             cur = k;
@@ -1052,7 +1027,7 @@ fn write_embedded_fonts(x: &mut Exp, o: &mut Out) -> Vec<WrittenFont> {
         if let Some(rid) = seen_part.get(&id) {
             return Some(rid.clone());
         }
-        let m = x.media(id)?;
+        let m = x.p.media(id)?;
         if m.data.is_empty() || m.data.len() > 32 * 1024 * 1024 {
             return None;
         }

crates/pptx/src/write/dml.rs

@@ -100,7 +100,7 @@ pub fn fill(w: &mut W, x: &mut Exp, o: &mut Out, f: &Fill) {
 pub fn blip_fill(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, pf: &PictureFill) {
     // An image that lives outside the package is a linked picture: `a:blip` names it through
     // `r:link`; `r:embed` may only reference a part inside the package.
-    let linked = x.media(pf.media).is_some_and(|m| m.data.is_empty() && m.link.is_some());
+    let linked = x.p.media(pf.media).is_some_and(|m| m.data.is_empty() && m.link.is_some());
     let rid = x.media_rel(o, pf.media, "image").unwrap_or_else(|| x.placeholder_rel(o));
     w.open(tag, A::new().a("rotWithShape", if pf.upright { "0" } else { "1" }));
     let adj = &pf.adjust;
@@ -357,18 +357,10 @@ pub fn effects(w: &mut W, fx: &Effects) {
                 .a("endA", pct(r.end_alpha.clamp(0.0, 1.0)))
                 .a("endPos", pct(r.end_pos.clamp(0.0, 1.0)))
                 .a("dist", emu(r.dist).max(0))
-                // Kept from a file as read: held to the schema's ranges so a stray value can't
+                .a("dir", 5_400_000)
-                // make PowerPoint repair the file (ST_PositiveFixedAngle, ST_FixedAngle,
+                .a("sy", -100_000)
-                // ST_PositiveFixedPercentage).
+                .a("algn", "bl")
-                .o("stPos", r.st_pos.map(|v| v.clamp(0, 100_000)))
+                .a("rotWithShape", "0"),
-                .o("dir", r.dir.map(|v| v.rem_euclid(21_600_000)))
-                .o("fadeDir", r.fade_dir.map(|v| v.rem_euclid(21_600_000)))
-                .o("sx", r.sx)
-                .o("sy", r.sy)
-                .o("kx", r.kx.map(|v| v.clamp(-5_399_999, 5_399_999)))
-                .o("ky", r.ky.map(|v| v.clamp(-5_399_999, 5_399_999)))
-                .o("algn", r.align.as_deref())
-                .b("rotWithShape", r.rotate_with_shape),
         );
     }
     if let Some(r) = fx.soft_edge {
@@ -449,7 +441,7 @@ pub fn hyperlink(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, h: &Hyperlink)
         return;
     };
     w.open(tag, attrs);
-    let name = x.media(sound_id).map(|m| sound_label(&m.name)).unwrap_or_else(|| "sound.wav".into());
+    let name = x.p.media(sound_id).map(|m| sound_label(&m.name)).unwrap_or_else(|| "sound.wav".into());
     w.empty("a:snd", A::new().a("r:embed", sound_rid).a("name", name));
     w.close(tag);
 }
@@ -476,10 +468,7 @@ pub fn body_pr(w: &mut W, b: &BodyProps) {
         .o("anchor", b.anchor.map(|a| a.xml()))
         .b("anchorCtr", b.anchor_ctr)
         .b("upright", b.upright)
-        .b("spcFirstLastPara", b.space_first_last)
+        .b("spcFirstLastPara", b.space_first_last);
-        .b("compatLnSpc", b.compat_ln_spc)
-        .o("vertOverflow", b.vert_overflow.map(|v| v.xml()))
-        .o("horzOverflow", deckcraft_model::text::TextOverflow::horz_xml(b.horz_overflow));
     let warp = b.warp.as_deref().filter(|s| !s.is_empty() && s.chars().all(|c| c.is_ascii_alphanumeric()));
     if warp.is_none() && b.autofit.is_none() {
         w.empty("a:bodyPr", a);
@@ -554,7 +543,6 @@ pub fn ppr(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, level: Option<u8>, p:
         || p.bullet_color.is_some()
         || p.bullet_color_follow_text.is_some()
         || p.bullet_size.is_some()
-        || p.bullet_size_points.is_some()
         || p.bullet_size_follow_text.is_some()
         || p.tabs.is_some()
         || def.is_some();
@@ -579,10 +567,8 @@ pub fn ppr(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, level: Option<u8>, p:
         color(w, c);
         w.close("a:buClr");
     }
-    if p.bullet_size.is_none() && p.bullet_size_points.is_none() && p.bullet_size_follow_text == Some(true) {
+    if p.bullet_size.is_none() && p.bullet_size_follow_text == Some(true) {
         w.empty0("a:buSzTx");
-    } else if let Some(s) = p.bullet_size_points.filter(|s| s.is_finite() && (1.0..=4000.0).contains(s)) {
-        w.val("a:buSzPts", ((s * 100.0).round() as u32).to_string());
     } else if let Some(s) = p.bullet_size {
         w.val("a:buSzPct", pct(s.clamp(0.25, 4.0)));
     }
@@ -601,7 +587,7 @@ pub fn ppr(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, level: Option<u8>, p:
         Some(Bullet::Picture { media }) => match x.media_rel(o, *media, "image") {
             Some(rid) => {
                 w.open0("a:buBlip");
-                let a = if x.media(*media).is_some_and(|m| m.data.is_empty() && m.link.is_some()) {
+                let a = if x.p.media(*media).is_some_and(|m| m.data.is_empty() && m.link.is_some()) {
                     A::new().a("r:link", &rid)
                 } else {
                     A::new().a("r:embed", &rid)
@@ -640,7 +626,6 @@ fn typeface(w: &mut W, tag: &str, f: &Option<String>) {
 pub fn rpr(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, r: &RunProps) {
     let a = A::new()
         .o("lang", r.lang.as_deref().filter(|l| !l.is_empty()))
-        .o("altLang", r.alt_lang.as_deref().filter(|l| !l.is_empty()))
         .o("sz", r.size.map(|s| (s.clamp(1.0, 4000.0) * 100.0).round() as i64))
         .b("b", r.bold)
         .b("i", r.italic)
@@ -664,8 +649,7 @@ pub fn rpr(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, r: &RunProps) {
         )
         .o("spc", r.spacing.map(|s| (s.clamp(-4000.0, 4000.0) * 100.0).round() as i64))
         .o("baseline", r.baseline.map(|b| pct(b.clamp(-10.0, 10.0))))
-        .b("noProof", r.no_proof)
+        .b("noProof", r.no_proof);
-        .b("normalizeH", r.normalize_height);
     let has_fx = r.shadow.is_some() || r.inner_shadow.is_some() || r.glow.is_some() || r.reflection.is_some() || r.soft_edge.is_some();
     let has_kids = r.outline.is_some()
         || r.fill.is_some()
@@ -762,27 +746,17 @@ pub fn text_body(w: &mut W, x: &mut Exp, o: &mut Out, tag: &str, tb: &TextBody,
 }
 
 fn run_text(w: &mut W, x: &mut Exp, o: &mut Out, text: &str, props: &RunProps) {
-    // The run's properties are the same for every piece and line break: serialize them once.
-    let mut rpr_xml: Option<String> = None;
-    let mut put_rpr = |w: &mut W| match &rpr_xml {
-        Some(xml) => w.s.push_str(xml),
-        None => {
-            let start = w.s.len();
-            rpr(w, x, o, "a:rPr", props);
-            rpr_xml = Some(w.s[start..].to_string());
-        }
-    };
     for (i, piece) in text.split(['\n', '\u{b}']).enumerate() {
         if i > 0 {
             w.open0("a:br");
-            put_rpr(w);
+            rpr(w, x, o, "a:rPr", props);
             w.close("a:br");
         }
         if piece.is_empty() && i > 0 {
             continue;
         }
         w.open0("a:r");
-        put_rpr(w);
+        rpr(w, x, o, "a:rPr", props);
         w.elt("a:t", piece);
         w.close("a:r");
     }

crates/pptx/src/write/shapes.rs

@@ -446,7 +446,7 @@ pub fn shape(w: &mut W, x: &mut Exp, o: &mut Out, cx: &mut Ctx, s: &Shape, depth
 }
 
 fn model_rel(x: &mut Exp, o: &mut Out, media: deckcraft_model::MediaId) -> Option<String> {
-    if x.media(media).is_none_or(|m| m.data.is_empty()) {
+    if x.p.media(media).is_none_or(|m| m.data.is_empty()) {
         return None;
     }
     x.media_rel(o, media, crate::opc::RT_MODEL3D)
@@ -479,7 +479,7 @@ fn write_model(
         return;
     };
     let id = cx.id_for(s);
-    let poster = poster.filter(|p| x.media(*p).is_some_and(|m| !m.data.is_empty()));
+    let poster = poster.filter(|p| x.p.media(*p).is_some_and(|m| !m.data.is_empty()));
     let Some(poster) = poster else {
         write_model_part(w, x, o, id, s, &rid);
         return;
@@ -700,7 +700,7 @@ fn table(w: &mut W, x: &mut Exp, o: &mut Out, t: &Table) {
     t.normalize();
     w.open0("a:tbl");
     let (guid, _) = crate::tables::guid_for_style(&t.style);
-    if x.table_style_set.insert(t.style.clone()) {
+    if !x.table_styles.contains(&t.style) {
         x.table_styles.push(t.style.clone());
     }
     w.open(
@@ -711,8 +711,7 @@ fn table(w: &mut W, x: &mut Exp, o: &mut Out, t: &Table) {
             .t("lastRow", t.last_row)
             .t("lastCol", t.last_col)
             .t("bandRow", t.band_row)
-            .t("bandCol", t.band_col)
+            .t("bandCol", t.band_col),
-            .b("rtl", t.rtl),
     );
     if let Some(f) = &t.background {
         dml::fill(w, x, o, f);
@@ -747,8 +746,6 @@ fn table(w: &mut W, x: &mut Exp, o: &mut Out, t: &Table) {
                     other => other.xml(),
                 }),
             );
-            a = a.b("anchorCtr", c.anchor_ctr);
-            a = a.o("horzOverflow", deckcraft_model::text::TextOverflow::horz_xml(c.horz_overflow));
             w.open("a:tcPr", a);
             for (tag, l) in [
                 ("a:lnL", &c.borders[0]),
@@ -884,7 +881,7 @@ fn opaque(
         p.name = label.to_string();
     }
     match preview {
-        Some(m) if x.media(m).is_some() => {
+        Some(m) if x.p.media(m).is_some() => {
             p.kind = ShapeKind::Picture { fill: deckcraft_model::style::PictureFill { media: m, ..Default::default() } };
             p.ph = None;
             shape_with_id(w, x, o, cx, &p, id);

crates/pptx/src/write/timing.rs

@@ -1,7 +1,7 @@
 //! Transitions and the animation timing tree.
 
 use deckcraft_model::anim::{AnimClass, AnimStart, Animation, BuildRole, TextBuild, Transition, build_filled, paragraph_build_roles};
-use deckcraft_model::{Shape, ShapeId, ShapeKind};
+use deckcraft_model::{Shape, ShapeId, ShapeKind, find_shape};
 
 use super::shapes::IdMap;
 use super::{Exp, Out};
@@ -16,7 +16,7 @@ pub fn transition(w: &mut W, x: &mut Exp, o: &mut Out, t: &Transition) {
         601..=900 => "med",
         _ => "slow",
     };
-    let sound = t.sound.and_then(|m| x.media_rel(o, m, "audio").map(|r| (r, x.media(m).map(|i| i.name.clone()).unwrap_or_default())));
+    let sound = t.sound.and_then(|m| x.media_rel(o, m, "audio").map(|r| (r, x.p.media(m).map(|i| i.name.clone()).unwrap_or_default())));
     let snd = |w: &mut W| {
         if let Some((r, name)) = &sound {
             w.open0("p:sndAc");
@@ -577,21 +577,6 @@ fn click_pars(w: &mut W, x: &mut Exp, ids: &mut Ids, clicks: &Groups, interactiv
     }
 }
 
-/// Most effects one slide's timing writes; animations past it are left out.
-const MAX_EFFECTS: usize = 100_000;
-
-/// The shapes of the tree by id, the first in document order for a repeated id (as `find_shape`
-/// finds it), so each animation resolves its shape without a tree walk.
-fn shape_index<'a>(shapes: &'a [Shape], depth: usize, out: &mut std::collections::HashMap<ShapeId, &'a Shape>) {
-    if depth > 64 {
-        return;
-    }
-    for s in shapes {
-        out.entry(s.id).or_insert(s);
-        shape_index(s.children(), depth + 1, out);
-    }
-}
-
 /// Write `p:timing` for a slide's animations.
 pub fn timing(w: &mut W, x: &mut Exp, anims: &[Animation], shapes: &[Shape], idmap: &IdMap) {
     let mut grp_count: std::collections::HashMap<u32, u32> = Default::default();
@@ -600,31 +585,16 @@ pub fn timing(w: &mut W, x: &mut Exp, anims: &[Animation], shapes: &[Shape], idm
     let mut bld: Vec<(u32, u32, bool)> = vec![];
     // The last paragraph effect written: (shape, class, trigger, grpId).
     let mut prev_para: Option<(ShapeId, AnimClass, Option<ShapeId>, u32)> = None;
-    let mut by_id = std::collections::HashMap::new();
-    shape_index(shapes, 0, &mut by_id);
-    let mut roles_of: std::collections::HashMap<ShapeId, Vec<BuildRole>> = Default::default();
-    let mut effect_count = 0usize;
-    let mut warned = false;
     for a in anims.iter().take(10_000) {
-        if effect_count >= MAX_EFFECTS {
-            if !warned {
-                log::warn!("pptx: more than {MAX_EFFECTS} animation effects; the rest are left out");
-            }
-            break;
-        }
         let Some(spid) = idmap.get(a.shape) else {
             log::warn!("pptx: animation on missing shape {} skipped", a.shape);
             continue;
         };
-        let Some(&shape) = by_id.get(&a.shape) else { continue };
+        let Some(shape) = find_shape(shapes, a.shape) else { continue };
         let text_sp = matches!(shape.kind, ShapeKind::Shape) && shape.text.is_some();
         let is_text_sp = matches!(shape.kind, ShapeKind::Shape) && shape.text.as_ref().is_some_and(|t| !t.is_empty());
         let text = shape.text.as_ref().filter(|_| a.text_build == TextBuild::ByParagraph && is_text_sp);
-        let no_roles = Vec::new();
+        let roles = text.map(paragraph_build_roles).unwrap_or_default();
-        let roles = match text {
-            Some(t) => roles_of.entry(a.shape).or_insert_with(|| paragraph_build_roles(t)),
-            None => &no_roles,
-        };
         let by_para = roles.contains(&BuildRole::Top);
         // PowerPoint keeps a shape's consecutive paragraph effects in one build (`grpId`) marked
         // `build="p"`; the reader turns them back into a by-paragraph build only if that plays them
@@ -662,19 +632,11 @@ pub fn timing(w: &mut W, x: &mut Exp, anims: &[Animation], shapes: &[Shape], idm
                     _ => continue,
                 };
                 let Ok(pi) = u32::try_from(i) else { break };
-                if effect_count + effs.len() >= MAX_EFFECTS {
-                    if !warned {
-                        log::warn!("pptx: more than {MAX_EFFECTS} animation effects; the rest are left out");
-                        warned = true;
-                    }
-                    break;
-                }
                 effs.push(Eff { a, spid, start, paragraph: Some(pi), grp });
             }
         } else {
             effs.push(Eff { a, spid, start: a.start, paragraph: a.paragraph, grp });
         }
-        effect_count += effs.len();
         if text_sp && !joins {
             bld.push((spid, grp, by_para || para_effect));
         }

crates/pptx/tests/it/comments.rs

@@ -146,33 +146,6 @@ fn comments_on_several_slides_round_trip() {
     assert_eq!(q.slides[2].comments[0].text, "Slide three");
 }
 
-/// A slide that names a modern part another slide already owns, plus its own legacy part, must
-/// not import the legacy copy: modern precedence holds even when the modern part is not re-read.
-#[test]
-fn owned_modern_part_still_suppresses_later_legacy() {
-    let mut p = deck();
-    let layout = p.slides[0].layout;
-    let s2 = defaults::new_slide(&mut p, layout).expect("slide");
-    p.slides.push(Arc::new(s2));
-    Arc::make_mut(&mut p.slides[1]).comments = vec![Comment { author: "Cara".into(), text: "Slide two".into(), ..Default::default() }];
-    let bytes = deckcraft_pptx::export(&p).expect("export");
-    let rels2 = part(&bytes, "ppt/slides/_rels/slide2.xml.rels").replace("modernComment2.xml", "modernComment1.xml");
-    let mut z = zip::ZipArchive::new(std::io::Cursor::new(&bytes)).expect("zip");
-    let mut out = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
-    for i in 0..z.len() {
-        let mut f = z.by_index(i).expect("entry");
-        out.start_file(f.name(), zip::write::SimpleFileOptions::default()).expect("start");
-        if f.name() == "ppt/slides/_rels/slide2.xml.rels" {
-            std::io::Write::write_all(&mut out, rels2.as_bytes()).expect("write");
-        } else {
-            std::io::copy(&mut f, &mut out).expect("copy");
-        }
-    }
-    let q = deckcraft_pptx::import(&out.finish().expect("finish").into_inner()).expect("import");
-    assert_eq!(q.slides[0].comments.len(), 2);
-    assert!(q.slides[1].comments.is_empty(), "{:?}", q.slides[1].comments);
-}
-
 /// A legacy-only package (what older tools read and write) still imports: 1/8 pt positions,
 /// flattened replies.
 #[test]

crates/pptx/tests/it/corpus_style.rs

@@ -34,7 +34,7 @@ fn glow() -> Glow {
 }
 
 fn reflection() -> Reflection {
-    Reflection { blur: 2.0, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.75, dist: 6.0, ..Default::default() }
+    Reflection { blur: 2.0, start_alpha: 0.5, end_alpha: 0.0, end_pos: 0.75, dist: 6.0 }
 }
 
 fn gradient(angle: f64) -> Fill {

crates/pptx/tests/it/corpus_themes.rs

@@ -103,7 +103,7 @@ fn effects_and_links() -> Vec<u8> {
         "Reflected",
         "",
         8636000,
-        r#"<a:reflection blurRad="6350" stA="50000" endA="300" endPos="55500" dist="50800" stPos="20000" dir="5400000" fadeDir="0" sx="75000" sy="-50000" kx="600000" ky="-300000" algn="bl" rotWithShape="0"/>"#,
+        r#"<a:reflection blurRad="6350" stA="50000" endA="300" endPos="55500" dist="50800" dir="5400000" sy="-100000" algn="bl" rotWithShape="0"/>"#,
         r#"<a:p><a:r><a:rPr lang="en-US"><a:hlinkMouseOver r:id="rId90" tooltip="Preview"/></a:rPr><a:t>Hover me</a:t></a:r></a:p>"#,
     );
     let slide = format!(
@@ -134,11 +134,6 @@ fn effects_and_links_survive_a_round_trip() {
     assert_eq!(fx(get("Soft edged")).soft_edge, Some(5.0));
     let r = fx(get("Reflected")).reflection.expect("reflection");
     assert!((r.end_pos - 0.555).abs() < 1e-6 && (r.dist - 4.0).abs() < 1e-6, "{r:?}");
-    assert_eq!(
-        (r.st_pos, r.dir, r.fade_dir, r.sx, r.sy, r.kx, r.ky),
-        (Some(20_000), Some(5_400_000), Some(0), Some(75_000), Some(-50_000), Some(600_000), Some(-300_000))
-    );
-    assert_eq!((r.align.as_deref(), r.rotate_with_shape), (Some("bl"), Some(false)));
     let shape = get("Shadowed");
     assert!(matches!(shape.click.as_ref().map(|h| (&h.action, h.highlight_click)), Some((Action::EndShow, true))));
     assert!(
@@ -178,17 +173,7 @@ fn effects_and_links_survive_resave(a: &Presentation) {
         assert_eq!(ha, hb, "text hover of {n}");
     }
     let out = deckcraft_pptx::export(&b).expect("export");
-    let xml = part(&out, "ppt/slides/slide1.xml");
+    assert!(part(&out, "ppt/slides/slide1.xml").contains("hlinkMouseOver"));
-    assert!(xml.contains("hlinkMouseOver"));
-    let c = deckcraft_pptx::import(&out).expect("second reopen");
-    assert_eq!(fx(shapes_named(&b, 0)("Reflected")).reflection, fx(shapes_named(&c, 0)("Reflected")).reflection);
-    assert!(
-        xml.contains("stPos=\"20000\"")
-            && xml.contains("fadeDir=\"0\"")
-            && xml.contains("sx=\"75000\"")
-            && xml.contains("sy=\"-50000\"")
-            && xml.contains("kx=\"600000\"")
-    );
 }
 
 /// Two masters with their own themes (colours, fonts) and layouts, slides on each.

crates/pptx/tests/it/export_scale.rs

@@ -1,31 +0,0 @@
-//! Export looks media, layouts, sections and table styles up by id: a deck with many of each and
-//! many references to the last ones exports in time linear in its size.
-
-use std::sync::Arc;
-
-use deckcraft_model::style::PictureFill;
-use deckcraft_model::{Section, Shape, ShapeId, ShapeKind, defaults};
-
-#[test]
-fn many_media_sections_and_table_styles_export() {
-    let mut p = defaults::new_presentation(None);
-    // 5,000 media items; 5,000 pictures of the last one.
-    let mut last = None;
-    for i in 0..5_000u32 {
-        last = p.add_media(&format!("m{i}.png"), "image/png", i.to_le_bytes().to_vec());
-    }
-    let last = last.unwrap();
-    let pic = |k: u32| Shape {
-        id: ShapeId(100_000 + k),
-        kind: ShapeKind::Picture { fill: PictureFill { media: last, ..Default::default() } },
-        ..Default::default()
-    };
-    Arc::make_mut(&mut p.slides[0]).shapes = (0..5_000).map(pic).collect();
-    // A section naming the slide 50,000 times, after 2,000 empty sections.
-    let id = p.slides[0].id;
-    p.sections = (0..2_000).map(|i| Section { name: format!("s{i}"), slides: vec![] }).collect();
-    p.sections.push(Section { name: "last".into(), slides: vec![id; 50_000] });
-    let bytes = deckcraft_pptx::export(&p).expect("export");
-    let q = deckcraft_pptx::import(&bytes).expect("import");
-    assert_eq!(q.slides[0].shapes.iter().filter(|s| matches!(s.kind, ShapeKind::Picture { .. })).count(), 5_000);
-}

crates/pptx/tests/it/main.rs

@@ -9,7 +9,6 @@ mod corpus_kinds;
 mod corpus_media;
 mod corpus_style;
 mod corpus_themes;
-mod export_scale;
 mod fills;
 mod kept_parts;
 mod locks;
@@ -19,7 +18,6 @@ mod media_timing;
 mod notes;
 mod ole;
 mod ole_vml;
-mod parent_delays;
 mod placeholders;
 mod roundtrip;
 mod sample;

crates/pptx/tests/it/malformed.rs

@@ -287,34 +287,3 @@ fn unreadable_slide_is_reported() {
     assert_eq!(lost, vec!["ppt/slides/slide2.xml".to_string()]);
     assert_eq!(deckcraft_pptx::import(&broken).expect("import").slides.len(), 1);
 }
-
-/// Many slides naming one notes part: it is read for the first slide only, not copied onto every
-/// slide that names it.
-#[test]
-fn a_shared_notes_part_is_read_once() {
-    use std::sync::Arc;
-    let mut p = defaults::new_presentation(None);
-    let layout = p.slides[0].layout;
-    for _ in 0..3 {
-        let s = defaults::new_slide(&mut p, layout).expect("slide");
-        p.slides.push(Arc::new(s));
-    }
-    for (i, s) in p.slides.iter_mut().enumerate() {
-        Arc::make_mut(s).notes = deckcraft_model::text::TextBody::from_text(&format!("notes {i}"));
-    }
-    let mut es = entries(&deckcraft_pptx::export(&p).expect("export"));
-    for (n, d) in es.iter_mut() {
-        if n.starts_with("ppt/slides/_rels/") {
-            let x = String::from_utf8(d.clone()).expect("utf8");
-            let x = x
-                .replace("notesSlide2.xml", "notesSlide1.xml")
-                .replace("notesSlide3.xml", "notesSlide1.xml")
-                .replace("notesSlide4.xml", "notesSlide1.xml");
-            *d = x.into_bytes();
-        }
-    }
-    let q = deckcraft_pptx::import(&rezip(&es)).expect("import");
-    assert_eq!(q.slides.len(), 4);
-    assert_eq!(q.slides[0].notes.text(), "notes 0");
-    assert!(q.slides[1..].iter().all(|s| s.notes.text().is_empty()), "a shared notes part is not copied");
-}

crates/pptx/tests/it/parent_delays.rs

@@ -1,145 +0,0 @@
-//! PowerPoint places an effect at the sum of its enclosing time nodes' delays, so a file can list
-//! effects out of time order. The BNI meeting-deck generator writes a 1 s countdown chain first,
-//! then "swap to the visual at 5 s" effects placed only by their parent `p:par` delay: read in file
-//! order, those all fired together when the countdown ended.
-
-use std::io::{Cursor, Read, Write};
-
-use deckcraft_geom::Xfrm;
-use deckcraft_model::anim::AnimStart;
-use deckcraft_model::{Shape, ShapeId, defaults};
-
-/// An "appear"/"disappear" effect (preset 1) in its own `p:par`, as PowerPoint writes it.
-fn eff(id: u32, class: &str, node: &str, delay: u32, spid: u32) -> String {
-    let vis = if class == "entr" { "visible" } else { "hidden" };
-    format!(
-        r#"<p:par><p:cTn id="{id}" presetID="1" presetClass="{class}" presetSubtype="0" fill="hold" nodeType="{node}"><p:stCondLst><p:cond delay="{delay}"/></p:stCondLst><p:childTnLst><p:set><p:cBhvr><p:cTn id="{}" dur="1" fill="hold"><p:stCondLst><p:cond delay="0"/></p:stCondLst></p:cTn><p:tgtEl><p:spTgt spid="{spid}"/></p:tgtEl><p:attrNameLst><p:attrName>style.visibility</p:attrName></p:attrNameLst></p:cBhvr><p:to><p:strVal val="{vis}"/></p:to></p:set></p:childTnLst></p:cTn></p:par>"#,
-        id + 1000
-    )
-}
-
-/// A group `p:par` starting `delay` ms into the click, holding `inner`.
-fn group(id: u32, delay: u32, inner: &str) -> String {
-    format!(
-        r#"<p:par><p:cTn id="{id}" fill="hold"><p:stCondLst><p:cond delay="{delay}"/></p:stCondLst><p:childTnLst>{inner}</p:childTnLst></p:cTn></p:par>"#
-    )
-}
-
-fn import_with_timing(build: impl Fn(&[u32]) -> String) -> Vec<(String, AnimStart, u32)> {
-    let mut p = defaults::new_presentation(None);
-    let shapes: Vec<Shape> = ["Three", "Two", "One", "Visual"]
-        .into_iter()
-        .map(|name| Shape {
-            id: ShapeId(p.alloc_id().expect("id")),
-            name: name.into(),
-            xfrm: Some(Xfrm::new(10.0, 10.0, 100.0, 50.0)),
-            ..Default::default()
-        })
-        .collect();
-    std::sync::Arc::make_mut(&mut p.slides[0]).shapes = shapes;
-    let mut z = zip::ZipArchive::new(Cursor::new(deckcraft_pptx::export(&p).expect("export"))).expect("zip");
-    let mut out = zip::ZipWriter::new(Cursor::new(Vec::new()));
-    for i in 0..z.len() {
-        let mut f = z.by_index(i).expect("entry");
-        let name = f.name().to_string();
-        let mut d = vec![];
-        f.read_to_end(&mut d).expect("read");
-        if name == "ppt/slides/slide1.xml" {
-            let xml = String::from_utf8(d).expect("utf8");
-            let spids: Vec<u32> = ["Three", "Two", "One", "Visual"]
-                .iter()
-                .map(|n| {
-                    let at = xml.find(&format!(r#"name="{n}""#)).expect("shape written");
-                    let open = xml[..at].rfind("<p:cNvPr ").expect("cNvPr");
-                    let tag = &xml[open..at];
-                    let id = tag.split(r#"id=""#).nth(1).expect("id").split('"').next().expect("id");
-                    id.parse().expect("number")
-                })
-                .collect();
-            let timing = format!(
-                r#"<p:timing><p:tnLst><p:par><p:cTn id="1" dur="indefinite" restart="never" nodeType="tmRoot"><p:childTnLst><p:seq concurrent="1" nextAc="seek"><p:cTn id="2" dur="indefinite" nodeType="mainSeq"><p:childTnLst><p:par><p:cTn id="3" fill="hold"><p:stCondLst><p:cond delay="indefinite"/></p:stCondLst><p:childTnLst>{}</p:childTnLst></p:cTn></p:par></p:childTnLst></p:cTn><p:prevCondLst><p:cond evt="onPrev" delay="0"><p:tgtEl><p:sldTgt/></p:tgtEl></p:cond></p:prevCondLst><p:nextCondLst><p:cond evt="onNext" delay="0"><p:tgtEl><p:sldTgt/></p:tgtEl></p:cond></p:nextCondLst></p:seq></p:childTnLst></p:cTn></p:par></p:tnLst></p:timing>"#,
-                build(&spids)
-            );
-            let xml = match (xml.find("<p:timing>"), xml.find("</p:timing>")) {
-                (Some(a), Some(b)) => format!("{}{}{}", &xml[..a], timing, &xml[b + "</p:timing>".len()..]),
-                _ => xml.replacen("</p:sld>", &format!("{timing}</p:sld>"), 1),
-            };
-            d = xml.into_bytes();
-        }
-        out.start_file(name, zip::write::SimpleFileOptions::default()).expect("start");
-        out.write_all(&d).expect("write");
-    }
-    let q = deckcraft_pptx::import(&out.finish().expect("finish").into_inner()).expect("import");
-    let s = &q.slides[0];
-    s.animations
-        .iter()
-        .map(|a| {
-            let name = s.shapes.iter().find(|x| x.id == a.shape).map(|x| x.name.clone()).unwrap_or_default();
-            (name, a.start, a.delay_ms)
-        })
-        .collect()
-}
-
-/// Start (ms after the click) of each effect when the flat list is played effect after effect.
-fn flat(effects: &[(String, AnimStart, u32)]) -> Vec<(String, u32)> {
-    let (mut begin, mut end) = (0u32, 0u32);
-    effects
-        .iter()
-        .map(|(n, start, delay)| {
-            if *start == AnimStart::AfterPrevious {
-                begin = end;
-            }
-            let t = begin + delay;
-            end = end.max(t);
-            (n.clone(), t)
-        })
-        .collect()
-}
-
-#[test]
-fn effects_placed_by_parent_delay_play_when_powerpoint_plays_them() {
-    // Click: "Three" goes, then "Two" after 1 s, "One" after 1 s more (a countdown chain), then —
-    // written last — the visual appears at 1 s, placed only by its parent's delay.
-    let fx = import_with_timing(|s| {
-        [
-            group(10, 0, &eff(11, "exit", "clickEffect", 0, s[0])),
-            group(20, 0, &eff(21, "exit", "afterEffect", 1000, s[1])),
-            group(30, 1000, &eff(31, "exit", "afterEffect", 1000, s[2])),
-            group(40, 1000, &eff(41, "entr", "afterEffect", 0, s[3])),
-        ]
-        .concat()
-    });
-    let got = flat(&fx);
-    let at = |n: &str| got.iter().find(|(x, _)| x == n).map(|(_, t)| *t);
-    assert_eq!((at("Three"), at("Two"), at("Visual"), at("One")), (Some(0), Some(1000), Some(1000), Some(2000)), "{fx:?}");
-}
-
-#[test]
-fn a_timeline_already_in_order_is_read_unchanged() {
-    let fx = import_with_timing(|s| {
-        [
-            group(10, 0, &[eff(11, "exit", "clickEffect", 0, s[0]), eff(12, "entr", "withEffect", 500, s[3])].concat()),
-            group(20, 500, &eff(21, "exit", "afterEffect", 1000, s[1])),
-        ]
-        .concat()
-    });
-    let starts: Vec<_> = fx.iter().map(|(n, st, d)| (n.as_str(), *st, *d)).collect();
-    assert_eq!(starts, [("Three", AnimStart::OnClick, 0), ("Visual", AnimStart::WithPrevious, 500), ("Two", AnimStart::AfterPrevious, 1000)]);
-}
-
-#[test]
-fn a_delayed_click_effect_sorted_after_a_with_effect_keeps_the_click_on_the_group() {
-    // The click effect waits 500 ms; a with-effect in the same click plays at once, and a later
-    // effect is placed only by its parent's delay. Sorted, the with-effect plays first and takes
-    // the click, so the group still waits for one.
-    let fx = import_with_timing(|s| {
-        [
-            group(10, 0, &[eff(11, "exit", "clickEffect", 500, s[0]), eff(12, "entr", "withEffect", 0, s[3])].concat()),
-            group(20, 1000, &eff(21, "exit", "afterEffect", 0, s[1])),
-        ]
-        .concat()
-    });
-    let starts: Vec<_> = fx.iter().map(|(n, st, _)| (n.as_str(), *st)).collect();
-    assert_eq!(starts[0], ("Visual", AnimStart::OnClick), "{fx:?}");
-    assert_eq!(starts.iter().filter(|(_, st)| *st == AnimStart::OnClick).count(), 1, "{fx:?}");
-}

crates/pptx/tests/it/roundtrip.rs

@@ -12,7 +12,7 @@ use deckcraft_model::style::{
 };
 use deckcraft_model::table::Table;
 use deckcraft_model::text::{
-    Action, Align, Anchor, AutoFit, BodyProps, Bullet, Caps, Hyperlink, Paragraph, Run, RunKind, RunProps, Spacing, Strike, TextBody, TextOverflow,
+    Action, Align, Anchor, AutoFit, BodyProps, Bullet, Caps, Hyperlink, Paragraph, Run, RunKind, RunProps, Spacing, Strike, TextBody,
 };
 use deckcraft_model::{
     Background, Comment, CustomPath, CustomShow, Geom, InkStroke, MediaClip, Presentation, Section, Shape, ShapeId, ShapeKind, Slide, SlideId,
@@ -468,143 +468,6 @@ fn text_and_formatting_round_trip() {
     assert_eq!(run.text, "x=1");
 }
 
-#[test]
-fn centered_cell_anchor_survives_two_pptx_round_trips() {
-    let mut p = Presentation::default();
-    let mut slide = new_slide(&mut p, "Cell anchor");
-    let mut table_shape = shape(&mut p, "Table", 10.0, 10.0, 200.0, 80.0);
-    let mut table = Table::new(1, 1, 200.0, 80.0);
-    table.rows[0].cells[0].anchor_ctr = Some(true);
-    table_shape.kind = ShapeKind::Table(table);
-    slide.shapes.push(table_shape);
-    p.slides.push(Arc::new(slide));
-
-    let once = round(&p);
-    let twice = round(&once);
-    let slide = twice.slides.last().expect("added slide");
-    let ShapeKind::Table(table) = &by_name(slide, "Table").kind else { panic!("table") };
-    assert_eq!(table.rows[0].cells[0].anchor_ctr, Some(true));
-}
-
-#[test]
-fn normalized_character_height_survives_two_pptx_round_trips() {
-    let mut p = Presentation::default();
-    let mut slide = new_slide(&mut p, "Normalized height");
-    let mut enabled = shape(&mut p, "Enabled", 10.0, 10.0, 200.0, 80.0);
-    let mut enabled_body = TextBody::from_text("enabled");
-    enabled_body.paragraphs[0].runs[0].props.normalize_height = Some(true);
-    enabled_body.paragraphs[0].runs[0].props.size = Some(18.0);
-    enabled_body.paragraphs[0].runs[0].props.caps = Some(Caps::Small);
-    enabled_body.paragraphs[0].runs[0].props.spacing = Some(1.5);
-    enabled.text = Some(enabled_body);
-    let mut disabled = shape(&mut p, "Disabled", 10.0, 100.0, 200.0, 80.0);
-    let mut disabled_body = TextBody::from_text("disabled");
-    disabled_body.paragraphs[0].runs[0].props.normalize_height = Some(false);
-    disabled.text = Some(disabled_body);
-    let mut absent = shape(&mut p, "Absent", 10.0, 190.0, 200.0, 80.0);
-    absent.text = Some(TextBody::from_text("absent"));
-    slide.shapes = vec![enabled, disabled, absent];
-    p.slides.push(Arc::new(slide));
-
-    let twice = round(&round(&p));
-    let slide = twice.slides.last().expect("added slide");
-    let run = &by_name(slide, "Enabled").text.as_ref().expect("text").paragraphs[0].runs[0];
-    assert_eq!(run.props.normalize_height, Some(true));
-    assert_eq!(run.props.size, Some(18.0));
-    assert_eq!(run.props.caps, Some(Caps::Small));
-    assert_eq!(run.props.spacing, Some(1.5));
-    let run = &by_name(slide, "Disabled").text.as_ref().expect("text").paragraphs[0].runs[0];
-    assert_eq!(run.props.normalize_height, Some(false));
-    let run = &by_name(slide, "Absent").text.as_ref().expect("text").paragraphs[0].runs[0];
-    assert_eq!(run.props.normalize_height, None);
-}
-
-#[test]
-fn thai_distributed_alignment_survives_two_pptx_round_trips() {
-    assert_eq!(Align::from_xml("thaiDist"), Some(Align::ThaiDistributed));
-    assert_eq!(Align::ThaiDistributed.xml(), "thaiDist");
-    assert_eq!(Align::from_xml("just"), Some(Align::Justify));
-
-    let mut p = Presentation::default();
-    let mut slide = new_slide(&mut p, "Thai distributed alignment");
-    let mut text = shape(&mut p, "Text", 10.0, 10.0, 200.0, 80.0);
-    let mut body = TextBody::from_text("one two three");
-    body.paragraphs[0].props.align = Some(Align::ThaiDistributed);
-    text.text = Some(body);
-    slide.shapes.push(text);
-    p.slides.push(Arc::new(slide));
-
-    let twice = round(&round(&p));
-    let slide = twice.slides.last().expect("added slide");
-    let text = by_name(slide, "Text").text.as_ref().expect("text body");
-    assert_eq!(text.paragraphs[0].props.align, Some(Align::ThaiDistributed));
-}
-
-#[test]
-fn compatible_line_spacing_mode_survives_two_pptx_round_trips() {
-    let mut p = Presentation::default();
-    let mut slide = new_slide(&mut p, "Compatible line spacing");
-    let mut enabled = shape(&mut p, "Enabled", 10.0, 10.0, 200.0, 80.0);
-    let mut enabled_body = TextBody::from_text("enabled");
-    enabled_body.body.compat_ln_spc = Some(true);
-    enabled.text = Some(enabled_body);
-    let mut disabled = shape(&mut p, "Disabled", 10.0, 100.0, 200.0, 80.0);
-    let mut disabled_body = TextBody::from_text("disabled");
-    disabled_body.body.compat_ln_spc = Some(false);
-    disabled.text = Some(disabled_body);
-    slide.shapes = vec![enabled, disabled];
-    p.slides.push(Arc::new(slide));
-
-    let twice = round(&round(&p));
-    let slide = twice.slides.last().expect("added slide");
-    assert_eq!(by_name(slide, "Enabled").text.as_ref().expect("text").body.compat_ln_spc, Some(true));
-    assert_eq!(by_name(slide, "Disabled").text.as_ref().expect("text").body.compat_ln_spc, Some(false));
-}
-
-#[test]
-fn text_overflow_policies_survive_two_pptx_round_trips() {
-    let mut p = Presentation::default();
-    let mut slide = new_slide(&mut p, "Text overflow");
-    let mut text = shape(&mut p, "Text", 10.0, 10.0, 200.0, 80.0);
-    let mut body = TextBody::from_text("policy");
-    body.body.vert_overflow = Some(TextOverflow::Clip);
-    body.body.horz_overflow = Some(TextOverflow::Overflow);
-    text.text = Some(body);
-    let mut table_shape = shape(&mut p, "Table", 10.0, 100.0, 200.0, 80.0);
-    let mut table = Table::new(1, 1, 200.0, 80.0);
-    table.rows[0].cells[0].horz_overflow = Some(TextOverflow::Clip);
-    table_shape.kind = ShapeKind::Table(table);
-    slide.shapes = vec![text, table_shape];
-    p.slides.push(Arc::new(slide));
-
-    let twice = round(&round(&p));
-    let slide = twice.slides.last().expect("added slide");
-    let text = by_name(slide, "Text").text.as_ref().expect("text body");
-    assert_eq!(text.body.vert_overflow, Some(TextOverflow::Clip));
-    assert_eq!(text.body.horz_overflow, Some(TextOverflow::Overflow));
-    let ShapeKind::Table(table) = &by_name(slide, "Table").kind else { panic!("table") };
-    assert_eq!(table.rows[0].cells[0].horz_overflow, Some(TextOverflow::Clip));
-}
-
-#[test]
-fn horizontal_ellipsis_is_not_written_because_only_vertical_overflow_has_it() {
-    let mut p = Presentation::default();
-    let mut slide = new_slide(&mut p, "Horizontal ellipsis");
-    let mut text = shape(&mut p, "Text", 10.0, 10.0, 200.0, 80.0);
-    let mut body = TextBody::from_text("policy");
-    body.body.vert_overflow = Some(TextOverflow::Ellipsis);
-    body.body.horz_overflow = Some(TextOverflow::Ellipsis);
-    text.text = Some(body);
-    slide.shapes = vec![text];
-    p.slides.push(Arc::new(slide));
-
-    let once = round(&p);
-    let slide = once.slides.last().expect("added slide");
-    let text = by_name(slide, "Text").text.as_ref().expect("text body");
-    assert_eq!(text.body.vert_overflow, Some(TextOverflow::Ellipsis));
-    assert_eq!(text.body.horz_overflow, None);
-}
-
 #[test]
 fn shapes_fills_lines_effects_round_trip() {
     let p = rich_deck();
@@ -627,33 +490,6 @@ fn shapes_fills_lines_effects_round_trip() {
     assert_eq!(by_name(&q.slides[1], "Group").id, by_name(&p.slides[1], "Group").id);
 }
 
-#[test]
-fn bullet_size_in_points_survives_two_pptx_round_trips() {
-    let mut p = Presentation::default();
-    let mut textbox = shape(&mut p, "Point-sized bullet", 20.0, 20.0, 400.0, 100.0);
-    textbox.text = Some(TextBody {
-        paragraphs: [12.0, 500.0, 4000.0]
-            .into_iter()
-            .map(|size| Paragraph {
-                props: deckcraft_model::text::ParaProps {
-                    bullet: Some(Bullet::Char { char: "•".into() }),
-                    bullet_size_points: Some(size),
-                    ..Default::default()
-                },
-                runs: vec![Run::with("Bullet text", RunProps::default())],
-                ..Default::default()
-            })
-            .collect(),
-        ..Default::default()
-    });
-    Arc::make_mut(&mut p.slides[0]).shapes.push(textbox);
-
-    let q = round(&round(&p));
-    let props = &by_name(&q.slides[0], "Point-sized bullet").text.as_ref().expect("text").paragraphs;
-    assert_eq!(props.iter().map(|p| p.props.bullet_size_points).collect::<Vec<_>>(), vec![Some(12.0), Some(500.0), Some(4000.0)]);
-    assert!(props.iter().all(|p| p.props.bullet_size.is_none()));
-}
-
 #[test]
 fn line_miter_limit_survives_two_pptx_round_trips() {
     let mut p = Presentation::default();
@@ -1664,32 +1500,6 @@ fn literal_line_ends_in_run_text_read_as_breaks_and_survive_save() {
     assert_eq!(runs_of(&round(&a), "one"), want, "save and reopen keep the runs");
 }
 
-#[test]
-fn alternate_run_language_survives_pptx_saves_and_absence() {
-    let mut p = defaults::new_presentation(None);
-    let first = p.slides[0].id;
-    let slide = p.slide_mut(first).expect("slide");
-    slide.shapes[0].text = Some(TextBody {
-        paragraphs: vec![Paragraph {
-            runs: vec![
-                Run::with("bonjour", RunProps { lang: Some("en-US".into()), alt_lang: Some("fr-FR".into()), ..Default::default() }),
-                Run::with(" plain", RunProps { lang: Some("en-US".into()), ..Default::default() }),
-            ],
-            ..Default::default()
-        }],
-        ..Default::default()
-    });
-    let mut q = round(&p);
-    for _ in 0..2 {
-        let runs = &q.slides[0].shapes[0].text.as_ref().expect("text").paragraphs[0].runs;
-        assert_eq!(runs[0].props.lang.as_deref(), Some("en-US"));
-        assert_eq!(runs[0].props.alt_lang.as_deref(), Some("fr-FR"));
-        assert_eq!(runs[1].props.lang.as_deref(), Some("en-US"));
-        assert_eq!(runs[1].props.alt_lang, None);
-        q = round(&q);
-    }
-}
-
 #[test]
 fn color_pulse_keeps_its_effect_colour_and_duration() {
     let mut p = defaults::new_presentation(None);
@@ -2257,26 +2067,3 @@ fn default_durations_match_powerpoint() {
         assert_eq!(a.4, ms, "{effect}");
     }
 }
-
-#[test]
-fn reflection_angles_and_skews_out_of_range_are_written_inside_the_schema() {
-    let mut p = Presentation::default();
-    let mut slide = new_slide(&mut p, "Reflection ranges");
-    let mut s = shape(&mut p, "Reflected", 10.0, 10.0, 200.0, 80.0);
-    s.effects = Some(deckcraft_model::style::Effects {
-        reflection: Some(deckcraft_model::style::Reflection {
-            st_pos: Some(150_000),
-            dir: Some(-5),
-            fade_dir: Some(21_600_000),
-            kx: Some(9_000_000),
-            ky: Some(-9_000_000),
-            ..Default::default()
-        }),
-        ..Default::default()
-    });
-    slide.shapes.push(s);
-    p.slides.push(Arc::new(slide));
-
-    let r = round(&p).slides.last().and_then(|sl| by_name(sl, "Reflected").effects.clone()).and_then(|fx| fx.reflection).expect("reflection");
-    assert_eq!((r.st_pos, r.dir, r.fade_dir, r.kx, r.ky), (Some(100_000), Some(21_599_995), Some(0), Some(5_399_999), Some(-5_399_999)));
-}

crates/render/src/chart.rs

@@ -1,7 +1,5 @@
 //! Charts: title, plot area with axes and gridlines, series marks, legend.
 
-use std::collections::HashMap;
-
 use deckcraft_color::{ColorTransform, Rgba, SchemeSlot};
 use deckcraft_model::Shape;
 use deckcraft_model::chart::{Chart, ChartType, TrendlineType, axis_scale};
@@ -87,9 +85,9 @@ fn bar_outline(ctx: &Ctx, s: &deckcraft_model::chart::Series) -> Option<(Rgba, f
 /// Paint of one bar: a `<c:dPt>` fill wins, and a single-series chart that varies colours by point uses one accent per point
 /// (not waterfalls, which are never read from a `<c:barChart>`). Pattern fills draw as patterns and
 /// `a:noFill` leaves the bar empty, as in PowerPoint.
-fn bar_paint(ctx: &Ctx, c: &Chart, si: usize, pi: usize, s: &deckcraft_model::chart::Series, fills: Option<&HashMap<usize, &Fill>>) -> Paint {
+fn bar_paint(ctx: &Ctx, c: &Chart, si: usize, pi: usize, s: &deckcraft_model::chart::Series) -> Paint {
-    if let Some(f) = fills.and_then(|m| m.get(&pi)) {
+    if let Some((_, f)) = s.point_fills.iter().find(|(k, _)| *k == pi) {
-        return paint_of(ctx, Some(*f), series_fill(ctx, c, si, Some(s)));
+        return paint_of(ctx, Some(f), series_fill(ctx, c, si, Some(s)));
     }
     if c.vary_colors && c.series.len() == 1 && s.fill.is_none() && c.kind != ChartType::Waterfall {
         return Paint::Color(series_color(ctx, c, pi));
@@ -885,8 +883,6 @@ fn draw_lines(ctx: &mut RenderContext, draw: &mut LineDrawing<'_, '_>) {
         let col = if area_kind { series_fill(rctx, c, si, Some(s)) } else { series_line(rctx, c, si, s) };
         let series_stats = s.error_bars.as_ref().map(|_| deckcraft_model::chart::SeriesStats::of(&s.values));
         let mut pts = vec![];
-        // Whether the series has any x value, found once rather than per point.
-        let any_x = s.x_values.iter().flatten().next().is_some();
         for i in 0..ncat {
             let Some(v) = s.values.get(i).copied().flatten() else { continue };
             let v = if stacked {
@@ -900,11 +896,11 @@ fn draw_lines(ctx: &mut RenderContext, draw: &mut LineDrawing<'_, '_>) {
             };
             let x = match kind {
                 ChartType::Scatter | ChartType::Bubble => {
-                    match (s.x_values.get(i).copied().flatten().and_then(to_x), any_x) {
+                    match (s.x_values.get(i).copied().flatten().and_then(to_x), s.x_values.iter().flatten().next()) {
                         (Some(x), _) => x,
                         // No x values at all: the points are numbered 1, 2, 3...
-                        (None, false) => to_x(i as f64 + 1.0).unwrap_or(plot.x0 + band * (slot(i) + 0.5)),
+                        (None, None) => to_x(i as f64 + 1.0).unwrap_or(plot.x0 + band * (slot(i) + 0.5)),
-                        (None, true) => continue,
+                        (None, Some(_)) => continue,
                     }
                 }
                 _ => plot.x0 + band * (slot(i) + 0.5),
@@ -974,19 +970,6 @@ fn draw_bars(ctx: &mut RenderContext, draw: &BarDrawing<'_, '_>) -> Vec<(f64, f6
         let group = bar + step * (n - 1.0);
         // Error bars need each series' mean and spread: worked out once, not per point.
         let stats: Vec<deckcraft_model::chart::SeriesStats> = bars.iter().map(|(_, s)| deckcraft_model::chart::SeriesStats::of(&s.values)).collect();
-        // Each series' per-point fills by point (the first for a point wins), not searched per bar.
-        let point_fills: Vec<HashMap<usize, &Fill>> = bars
-            .iter()
-            .map(|(_, s)| {
-                let mut m = HashMap::new();
-                for (k, f) in &s.point_fills {
-                    m.entry(*k).or_insert(f);
-                }
-                m
-            })
-            .collect();
-        // A waterfall's running bars, worked out once for all its categories.
-        let waterfall_bars = if waterfall { c.waterfall_bars() } else { Vec::new() };
         for i in 0..ncat {
             let mut pos_acc = 0.0;
             let mut neg_acc = 0.0;
@@ -1000,7 +983,7 @@ fn draw_bars(ctx: &mut RenderContext, draw: &BarDrawing<'_, '_>) -> Vec<(f64, f6
                 let v = s.values.get(i).copied().flatten().unwrap_or(0.0) / total;
                 let start = band * slot(i) + (band - group) / 2.0 + if stacked { 0.0 } else { step * bi as f64 };
                 let (a, b) = if waterfall {
-                    waterfall_bars.get(i).copied().unwrap_or_default()
+                    c.waterfall_bars().get(i).copied().unwrap_or_default()
                 } else if stacked {
                     if v >= 0.0 {
                         let r = (pos_acc, pos_acc + v);
@@ -1032,7 +1015,7 @@ fn draw_bars(ctx: &mut RenderContext, draw: &BarDrawing<'_, '_>) -> Vec<(f64, f6
                     };
                     Paint::Color(series_color(rctx, c, slot))
                 } else {
-                    bar_paint(rctx, c, *si, i, s, point_fills.get(bi))
+                    bar_paint(rctx, c, *si, i, s)
                 };
                 fill_with(ctx, &paint, r.abs(), m);
                 if !waterfall && let Some((oc, ow)) = bar_outline(rctx, s).filter(|o| o.1 > 0.0) {

crates/render/src/images.rs

@@ -37,8 +37,7 @@ struct Cache {
     bad_order: VecDeque<usize>,
     bad_bytes: usize,
     /// GIFs by bytes address and adjustments (`None`: not animated); the bytes stay alive with them.
-    /// Decoded animations by (bytes, adjustments), each with the clock of its last use.
+    anims: HashMap<(usize, u64), (Arc<Vec<u8>>, Option<Arc<Anim>>)>,
-    anims: HashMap<(usize, u64), (Arc<Vec<u8>>, Option<Arc<Anim>>, u64)>,
 }
 
 /// Longest side, total decoded size and frame count kept for one animated GIF; the largest canvas
@@ -433,33 +432,16 @@ fn anim(bytes: &Arc<Vec<u8>>, adj: &PictureAdjust) -> Option<Arc<Anim>> {
         return None;
     }
     let key = (Arc::as_ptr(bytes) as usize, adjust_key(adj));
-    let hit = with(|c| {
+    if let Some(a) = with(|c| c.anims.get(&key).map(|e| e.1.clone())) {
-        c.clock += 1;
-        let clock = c.clock;
-        c.anims.get_mut(&key).map(|e| {
-            e.2 = clock;
-            e.1.clone()
-        })
-    });
-    if let Some(a) = hit {
         return a;
     }
     let a = decode_anim(bytes, adj).map(Arc::new);
     with(|c| {
-        // Make room by dropping the least recently used animations, not every one of them, so a
+        let held: usize = c.anims.values().filter_map(|e| e.1.as_ref()).map(|a| a.bytes()).sum();
-        // slide whose animations overflow the cache does not decode all of them again each frame.
+        if held + a.as_ref().map_or(0, |a| a.bytes()) > GIF_CACHE_BUDGET || c.anims.len() >= 64 {
-        let new = a.as_ref().map_or(0, |a| a.bytes());
+            c.anims.clear();
-        loop {
-            let held: usize = c.anims.values().filter_map(|e| e.1.as_ref()).map(|a| a.bytes()).sum();
-            if held + new <= GIF_CACHE_BUDGET && c.anims.len() < 64 {
-                break;
-            }
-            let Some(oldest) = c.anims.iter().min_by_key(|(_, e)| e.2).map(|(k, _)| *k) else { break };
-            c.anims.remove(&oldest);
         }
-        c.clock += 1;
+        c.anims.insert(key, (bytes.clone(), a.clone()));
-        let clock = c.clock;
-        c.anims.insert(key, (bytes.clone(), a.clone(), clock));
     });
     a
 }
@@ -553,26 +535,6 @@ mod tests {
         out.into_inner()
     }
 
-    /// A two-frame GIF whose first pixel is `n`, so each one has its own bytes.
-    fn gif(n: u8) -> Arc<Vec<u8>> {
-        use image::codecs::gif::GifEncoder;
-        let frame = |c: u8| image::Frame::new(image::RgbaImage::from_pixel(2, 2, image::Rgba([n, c, 0, 255])));
-        let mut out = Vec::new();
-        GifEncoder::new(&mut out).encode_frames([frame(0), frame(255)]).expect("encode");
-        Arc::new(out)
-    }
-
-    #[test]
-    fn a_full_animation_cache_drops_the_oldest_entry_not_all_of_them() {
-        let adj = PictureAdjust::default();
-        let gifs: Vec<_> = (0..70).map(gif).collect();
-        for g in &gifs {
-            assert!(anim(g, &adj).is_some());
-        }
-        let (len, newest) = with(|c| (c.anims.len(), c.anims.contains_key(&(Arc::as_ptr(&gifs[69]) as usize, adjust_key(&adj)))));
-        assert!(newest && len >= 32, "{len} cached");
-    }
-
     #[test]
     fn rgba_conversion_is_refused_past_the_cap() {
         let png = grey_png(100, 50);

crates/render/src/morph_text.rs

@@ -76,12 +76,16 @@ fn tokens(l: &TextLayout, chars: bool) -> (Vec<Token>, Vec<(usize, usize)>) {
 
 /// For each token of `b`, the token of `a` with the same text, in reading order, each used once.
 fn matches(a: &[Token], b: &[Token]) -> Vec<Option<usize>> {
-    // Unused tokens of `a` by text, in reading order, so each lookup is a pop rather than a scan.
+    let mut used = vec![false; a.len()];
-    let mut free: std::collections::HashMap<&str, std::collections::VecDeque<usize>> = std::collections::HashMap::new();
+    b.iter()
-    for (i, ta) in a.iter().enumerate() {
+        .map(|tb| {
-        free.entry(ta.key.as_str()).or_default().push_back(i);
+            let i = a.iter().enumerate().position(|(i, ta)| !used.get(i).copied().unwrap_or(true) && ta.key == tb.key)?;
-    }
+            if let Some(u) = used.get_mut(i) {
-    b.iter().map(|tb| free.get_mut(tb.key.as_str())?.pop_front()).collect()
+                *u = true;
+            }
+            Some(i)
+        })
+        .collect()
 }
 
 fn layout(ctx: &Ctx, s: &Shape, x: Xfrm, fields: &dyn Fields) -> Option<TextLayout> {
@@ -224,19 +228,3 @@ pub(crate) fn draw(
 pub(crate) fn token_keys(l: &TextLayout, chars: bool) -> Vec<String> {
     tokens(l, chars).0.into_iter().map(|t| t.key).collect()
 }
-
-#[cfg(test)]
-mod match_tests {
-    use super::*;
-
-    fn tok(k: &str) -> Token {
-        Token { key: k.into(), glyphs: Vec::new(), origin: Point::ZERO, run: 0 }
-    }
-
-    #[test]
-    fn each_source_token_is_used_once_in_reading_order() {
-        let a: Vec<Token> = ["a", "b", "a"].map(tok).into();
-        let b: Vec<Token> = ["a", "a", "a", "b", "c"].map(tok).into();
-        assert_eq!(matches(&a, &b), vec![Some(0), Some(2), None, Some(1), None]);
-    }
-}

crates/render/src/paint.rs

@@ -91,10 +91,7 @@ pub fn fill_path(
                 let on_path = m * path.clone();
                 ctx.set_transform(Affine::IDENTITY);
                 ctx.push_clip_layer(&on_path);
-                // Drawn in device pixels, so a tile (given in shape units) is sized to pixels first.
+                picture(ctx, pres, &resolved(rctx, pf, ph), on_slide, Affine::IDENTITY, None);
-                let tiled = tiled_per_point(fill, (c[0].hypot(c[1]), c[2].hypot(c[3])));
-                let upright = if let Fill::Picture(p) = tiled.as_ref() { p } else { pf };
-                picture(ctx, pres, &resolved(rctx, upright, ph), on_slide, Affine::IDENTITY, None);
                 ctx.pop_layer();
                 return;
             }
@@ -229,12 +226,9 @@ pub fn picture(ctx: &mut RenderContext, pres: &Presentation, pf: &PictureFill, b
         }
         let (nw, nh) = images::natural_size(&item.data).unwrap_or((iw, ih));
         // PowerPoint draws the tile at a whole number of output pixels.
-        // Per axis: a group can stretch its child space unevenly, and a pixel is then a different
+        let k = px_scale.max(1e-9);
-        // number of shape units across and down.
+        let snap = |v: f64| (v * k).round().max(1.0) / k;
-        let c = m.as_coeffs();
+        let (tile_w, tile_h) = (snap(nw * 0.75 * sx), snap(nh * 0.75 * sy));
-        let (kx, ky) = (c[0].hypot(c[1]).max(1e-9), c[2].hypot(c[3]).max(1e-9));
-        let snap = |v: f64, k: f64| (v * k).round().max(1.0) / k;
-        let (tile_w, tile_h) = (snap(nw * 0.75 * sx, kx), snap(nh * 0.75 * sy, ky));
         if !(tile_w > 1e-6 && tile_h > 1e-6 && tile_w.is_finite() && tile_h.is_finite()) {
             return;
         }
@@ -266,31 +260,6 @@ pub fn picture(ctx: &mut RenderContext, pres: &Presentation, pf: &PictureFill, b
     draw_image(ctx, &image, iw, ih, dest, m, alpha);
 }
 
-/// `fill`, with a tiled picture's tile size and offset moved from points to shape units, given
-/// the shape units to the point along x and y. A group's child coordinates scale its shapes'
-/// boxes (a group can stretch them unevenly), but a tile keeps its size on the slide as PowerPoint
-/// draws it, so in a group with a legacy child space the tile would otherwise cover hundreds of
-/// boxes and the fill show one flat texel. Anything but a tiled picture, or a unit scale, is
-/// returned as it is.
-pub fn tiled_per_point(fill: &Fill, per_point: (f64, f64)) -> std::borrow::Cow<'_, Fill> {
-    let Fill::Picture(pf) = fill else { return std::borrow::Cow::Borrowed(fill) };
-    match tiled_picture_per_point(pf, per_point) {
-        std::borrow::Cow::Borrowed(_) => std::borrow::Cow::Borrowed(fill),
-        std::borrow::Cow::Owned(p) => std::borrow::Cow::Owned(Fill::Picture(p)),
-    }
-}
-
-/// [`tiled_per_point`] for a picture fill itself (a picture shape's own fill is not a [`Fill`]).
-pub fn tiled_picture_per_point(pf: &PictureFill, per_point: (f64, f64)) -> std::borrow::Cow<'_, PictureFill> {
-    let PictureMode::Tile { tx, ty, sx, sy, flip, align } = &pf.mode else { return std::borrow::Cow::Borrowed(pf) };
-    let (kx, ky) = per_point;
-    if !(kx.is_finite() && ky.is_finite() && kx > 1e-12 && ky > 1e-12) || ((kx - 1.0).abs() < 1e-9 && (ky - 1.0).abs() < 1e-9) {
-        return std::borrow::Cow::Borrowed(pf);
-    }
-    let mode = PictureMode::Tile { tx: tx * kx, ty: ty * ky, sx: sx * kx, sy: sy * ky, flip: flip.clone(), align: align.clone() };
-    std::borrow::Cow::Owned(PictureFill { mode, ..pf.clone() })
-}
-
 /// Where the first tile of a tiled picture fill goes in `bounds`: its corner, edge middle or
 /// centre named by `align` (`tl`, `t`, `tr`, `l`, `ctr`, `r`, `bl`, `b`, `br`) on the same point
 /// of the box, then moved by the offset (points).

crates/render/src/placed.rs

@@ -131,11 +131,9 @@ fn place(out: &mut Placed, rctx: &Ctx, fields: &SlideFields, s: &Shape, parent:
         }
         ShapeKind::Table(t) => {
             // Cell text, laid out exactly as the table draws it.
-            // The table's style is looked up once, not once per cell.
-            let def = table::resolve_style(rctx, t);
             for (r, c, rect) in table::cell_rects(t, &table::row_heights(rctx, t, fields)) {
                 let Some(cell) = t.cell(r, c).filter(|cell| !cell.text.is_empty()) else { continue };
-                let body = table::cell_body_with_def(rctx, def, t, r, c, cell);
+                let body = table::cell_body(rctx, t, r, c, cell);
                 let tmp = Shape::table_cell(body.clone());
                 place_text(out, rctx, fields, s.id, &tmp, &body, rect, m);
             }

crates/render/src/renderer.rs

@@ -33,10 +33,6 @@ pub struct Renderer {
     /// Visits spent on outer-shadow silhouette passes, kept apart so they cannot use up the budget
     /// of the normal drawing that follows.
     shadow_work: usize,
-    /// `RenderOpts::skip` as a set, with the slice (address, length) it was built from: the
-    /// slice can be as long as the slide, and is tested for every shape drawn. Forgotten when a
-    /// frame starts, so another frame's slice at the same address is never mistaken for it.
-    skip: Option<(usize, usize, std::collections::HashSet<ShapeId>)>,
 }
 
 impl Default for Renderer {
@@ -52,7 +48,6 @@ impl Default for Renderer {
             in_shadow_pass: false,
             render_work: 0,
             shadow_work: 0,
-            skip: None,
         }
     }
 }
@@ -168,7 +163,6 @@ impl Renderer {
     pub(crate) fn slide(&mut self, pres: &Presentation, slide: &Slide, index: usize, opts: &RenderOpts) -> Image {
         self.render_work = 0;
         self.shadow_work = 0;
-        self.skip = None;
         self.in_shadow_pass = false;
         let (mut ctx, w, h, view) = Self::canvas(pres, opts, needs_filters(pres, slide));
         let f = Frame { pres, opts, fields: Self::fields(pres, index, opts) };
@@ -184,7 +178,6 @@ impl Renderer {
     pub(crate) fn slide_part(&mut self, pres: &Presentation, slide: &Slide, index: usize, part: SlidePart, opts: &RenderOpts) -> Image {
         self.render_work = 0;
         self.shadow_work = 0;
-        self.skip = None;
         self.in_shadow_pass = false;
         let (mut ctx, w, h, view) = Self::canvas(pres, opts, needs_filters(pres, slide));
         let f = Frame { pres, opts, fields: Self::fields(pres, index, opts) };
@@ -219,7 +212,6 @@ impl Renderer {
         let mix = if mix.is_finite() { mix.clamp(0.0, 1.0) } else { 1.0 };
         self.render_work = 0;
         self.shadow_work = 0;
-        self.skip = None;
         self.in_shadow_pass = false;
         let (mut ctx, w, h, view) = Self::canvas(pres, opts, needs_filters(pres, old.0) || needs_filters(pres, new.0));
         let (Some(co), Some(cn)) = (Ctx::for_slide(pres, old.0), Ctx::for_slide(pres, new.0)) else { return self.finish(ctx, w, h) };
@@ -268,7 +260,6 @@ impl Renderer {
     pub(crate) fn layout(&mut self, pres: &Presentation, mi: usize, li: Option<usize>, opts: &RenderOpts) -> Image {
         self.render_work = 0;
         self.shadow_work = 0;
-        self.skip = None;
         self.in_shadow_pass = false;
         let (w, h) = output_size(pres, opts);
         let mut ctx = RenderContext::new_with(w, h, vello_cpu::RenderSettings { num_threads: 0, ..Default::default() });
@@ -355,14 +346,6 @@ impl Renderer {
         if k.is_finite() && k > 1e-12 { 1.0 / k } else { 1.0 }
     }
 
-    /// [`Renderer::per_point`] along the shape's own x and y axes: a group can stretch its child
-    /// space unevenly, and a tiled fill keeps its size in points on the slide on both axes.
-    fn per_point_xy(&self, m: Affine, depth: usize) -> (f64, f64) {
-        let c = self.line_space(m, depth).1.as_coeffs();
-        let inv = |s: f64| if s.is_finite() && s > 1e-12 { 1.0 / s } else { 1.0 };
-        (inv(c[0].hypot(c[1])), inv(c[2].hypot(c[3])))
-    }
-
     /// The size and transform a shape's text is set in: inside a group whose child coordinates
     /// scale the shape, the shape's size in slide points and `m` with that scale taken out, so
     /// insets and font sizes stay in points; otherwise `w`, `h` and `m` themselves.
@@ -402,25 +385,8 @@ impl Renderer {
         geo
     }
 
-    /// Whether `id` is in `skip`, looked up in a set built once per frame and slice.
-    fn skipped(&mut self, skip: &[ShapeId], id: ShapeId) -> bool {
-        if skip.is_empty() {
-            return false;
-        }
-        let key = (skip.as_ptr() as usize, skip.len());
-        match &self.skip {
-            Some((p, n, set)) if (*p, *n) == key => set.contains(&id),
-            _ => {
-                let set: std::collections::HashSet<ShapeId> = skip.iter().copied().collect();
-                let hit = set.contains(&id);
-                self.skip = Some((key.0, key.1, set));
-                hit
-            }
-        }
-    }
-
     fn shape_at(&mut self, ctx: &mut RenderContext, f: &Frame, rctx: &Ctx, s: &Shape, parent: Affine, depth: usize) {
-        if depth > 32 || (s.hidden && !f.opts.show_hidden) || self.skipped(f.opts.skip, s.id) {
+        if depth > 32 || (s.hidden && !f.opts.show_hidden) || f.opts.skip.contains(&s.id) {
             return;
         }
         let work = if self.in_shadow_pass { &mut self.shadow_work } else { &mut self.render_work };
@@ -462,8 +428,7 @@ impl Renderer {
                 // A group's own fill (a group filled with its parent's passes that on).
                 let own = match &s.fill {
                     Some(Fill::Group) | None => self.group_fill.clone(),
-                    // A tile is given in points; this group's own space may be scaled by its parents.
+                    Some(fl) => Some((fl.clone(), m, Rect::new(0.0, 0.0, x.w, x.h))),
-                    Some(fl) => Some((paint::tiled_per_point(fl, self.per_point_xy(m, depth)).into_owned(), m, Rect::new(0.0, 0.0, x.w, x.h))),
                 };
                 let outer = std::mem::replace(&mut self.group_fill, own);
                 // A group's outer shadow is cast by everything in it, as PowerPoint draws it: the
@@ -576,7 +541,6 @@ impl Renderer {
         geo: &Geometry,
         (w, h): (f64, f64),
         m: Affine,
-        per_point: (f64, f64),
         fade: &dyn Fn(usize) -> deckcraft_geom::morph::Fade,
     ) {
         for (i, sp) in geo.paths.iter().enumerate() {
@@ -602,10 +566,7 @@ impl Renderer {
                         paint::fill_path(ctx, rctx, gf, None, &path, *gbox, *gm, sp.fill, fade(i).fill, f.pres);
                     }
                 }
-                _ => {
+                _ => paint::fill_path(ctx, rctx, fl, fill_ph, &sp.path, Rect::new(0.0, 0.0, w, h), m, sp.fill, fade(i).fill, f.pres),
-                    let fl = paint::tiled_per_point(fl, per_point);
-                    paint::fill_path(ctx, rctx, &fl, fill_ph, &sp.path, Rect::new(0.0, 0.0, w, h), m, sp.fill, fade(i).fill, f.pres)
-                }
             }
             ctx.set_fill_rule(peniko::Fill::NonZero);
         }
@@ -694,13 +655,9 @@ impl Renderer {
         let line = &d.line;
         // Effects below the shape.
         if let Some(e) = &effects {
-            // A picture (or picture fill) casts its shadow from its pixels, not its frame. A tile
+            // A picture (or picture fill) casts its shadow from its pixels, not its frame.
-            // is sized in points on the slide, as the face's is, and so is its shadow and reflection.
             let content = match (&s.kind, &fill) {
-                (ShapeKind::Picture { fill: pf }, _) | (_, Some(Fill::Picture(pf))) => {
+                (ShapeKind::Picture { fill: pf }, _) | (_, Some(Fill::Picture(pf))) => Some(paint::resolved(rctx, pf, None).into_owned()),
-                    let pf = paint::tiled_picture_per_point(pf, self.per_point_xy(m, depth));
-                    Some(paint::resolved(rctx, &pf, None).into_owned())
-                }
                 _ => None,
             };
             // What casts the shadow: the fill as see-through as it is, and the outline.
@@ -779,7 +736,6 @@ impl Renderer {
         let fill = &d.fill;
         let outline = &d.outline;
         let fade = |i: usize| d.fade(i);
-        let pt_xy = self.per_point_xy(m, d.depth);
         // Fill.
         match &s.kind {
             ShapeKind::Picture { fill: pf } => {
@@ -788,14 +744,13 @@ impl Renderer {
                 if s.fill.as_ref().is_some_and(|f| !f.is_none())
                     && let Some(fl) = &fill
                 {
-                    self.fill_geometry(ctx, f, rctx, fl, fill_ph, geo, (w, h), m, pt_xy, &fade);
+                    self.fill_geometry(ctx, f, rctx, fl, fill_ph, geo, (w, h), m, &fade);
                 }
                 ctx.set_transform(m);
                 let bounds = Rect::new(0.0, 0.0, w, h);
                 ctx.push_clip_layer(outline);
                 let t = f.opts.gif_times.iter().find(|g| g.0 == s.id).map(|g| g.1);
-                let pf = paint::tiled_picture_per_point(pf, pt_xy);
+                paint::picture(ctx, f.pres, &paint::resolved(rctx, pf, None), bounds, m, t);
-                paint::picture(ctx, f.pres, &paint::resolved(rctx, &pf, None), bounds, m, t);
                 ctx.pop_layer();
             }
             // An object DeckCraft doesn't model (an embedded OLE object, an unknown graphic): its
@@ -806,7 +761,7 @@ impl Renderer {
                 if s.fill.as_ref().is_some_and(|f| !f.is_none())
                     && let Some(fl) = &fill
                 {
-                    self.fill_geometry(ctx, f, rctx, fl, fill_ph, geo, (w, h), m, pt_xy, &fade);
+                    self.fill_geometry(ctx, f, rctx, fl, fill_ph, geo, (w, h), m, &fade);
                 }
                 ctx.set_transform(m);
                 let pf = deckcraft_model::style::PictureFill { media: *media, ..Default::default() };
@@ -832,7 +787,7 @@ impl Renderer {
                 if let Some(fl) = &fill
                     && !(empty_ph && f.opts.edit && s.fill.is_none() && s.line.is_none() && s.style.is_none())
                 {
-                    self.fill_geometry(ctx, f, rctx, fl, fill_ph, geo, (w, h), m, pt_xy, &fade);
+                    self.fill_geometry(ctx, f, rctx, fl, fill_ph, geo, (w, h), m, &fade);
                 }
             }
         }

crates/render/src/stroke.rs

@@ -191,8 +191,7 @@ pub(crate) fn limit_dash_count(path: &BezPath, pat: Vec<f64>) -> Vec<f64> {
         return pat;
     }
     let len: f64 = path.segments().map(|s| s.arclen(1e-2)).sum();
-    // Every dash of the pattern counts, not each repeat of it: a custom pattern can hold many.
+    let dashes = len / period;
-    let dashes = len / period * pat.len().div_ceil(2) as f64;
     if !len.is_finite() {
         return vec![];
     }

crates/render/src/tests_effect_holes.rs

@@ -44,9 +44,7 @@ fn scene(shape: &str, effect: Effect) -> Presentation {
             })
         }
         Effect::Glow => effects.glow = Some(Glow { color: ColorRef::rgb(Rgba::rgb(255, 0, 0)), radius: 8.0 }),
-        Effect::Reflection => {
+        Effect::Reflection => effects.reflection = Some(Reflection { blur: 0.0, start_alpha: 1.0, end_alpha: 0.0, end_pos: 1.0, dist: 10.0 }),
-            effects.reflection = Some(Reflection { blur: 0.0, start_alpha: 1.0, end_alpha: 0.0, end_pos: 1.0, dist: 10.0, ..Default::default() })
-        }
     }
     let slide = std::sync::Arc::make_mut(&mut p.slides[0]);
     slide.background = Some(deckcraft_model::Background::Fill { fill: Fill::solid(ColorRef::rgb(Rgba::WHITE)) });

crates/render/src/tests_wild.rs

@@ -454,198 +454,6 @@ fn tiled_pictures_flip_align_and_skip_non_positive_scales() {
     assert!(close(img.pixel(115, 115), WHITE, 5) && close(img.pixel(300, 150), WHITE, 5));
 }
 
-#[allow(clippy::unwrap_used)]
-fn red_over_blue() -> Vec<u8> {
-    let img = image::RgbImage::from_fn(4, 8, |_, y| if y < 4 { image::Rgb([255, 0, 0]) } else { image::Rgb([0, 0, 255]) });
-    let mut out = std::io::Cursor::new(vec![]);
-    image::DynamicImage::ImageRgb8(img).write_to(&mut out, image::ImageFormat::Png).unwrap();
-    out.into_inner()
-}
-
-#[test]
-fn a_tile_keeps_its_size_in_a_group_with_scaled_child_coordinates() {
-    use deckcraft_model::style::{PictureFill, PictureMode};
-    // A group's child space scales its shapes' boxes, not the tile: the same tiles show whether
-    // the group's child space is 1600 times smaller (old decks write them so), 4 times larger,
-    // the slide's own or stretched unevenly (PowerPoint draws all of them alike, measured on its
-    // own export of a probe deck). Before, one tile covered hundreds of boxes and the fill was one
-    // flat texel, and an uneven group stretched the tile.
-    // Wide: 8x4 px = 6x3 pt, ten times = 60x30 pt tiles, red then blue across.
-    // Tall: 4x8 px = 3x6 pt, ten times = 30x60 pt tiles, red over blue down.
-    let blue = Rgba::rgb(0, 0, 255);
-    let scales = [(1.0, 1.0), (1600.0, 1600.0), (0.25, 0.25), (2.0, 0.5), (0.5, 2.0), (1800.0, 1.0), (1.0, 1800.0)];
-    for (kx, ky) in scales {
-        for tall in [false, true] {
-            let mut p = Presentation::default();
-            let png = if tall { red_over_blue() } else { half_red_half_blue() };
-            let media = p.add_media("t.png", "image/png", png).expect("media");
-            let mode = PictureMode::Tile { tx: 0.0, ty: 0.0, sx: 10.0, sy: 10.0, flip: "none".into(), align: "tl".into() };
-            let member = Shape {
-                id: ShapeId(22),
-                xfrm: Some(Xfrm::new(0.0, 0.0, 240.0 / kx, 60.0 / ky)),
-                fill: Some(Fill::Picture(PictureFill { media, mode, ..Default::default() })),
-                line: no_line(),
-                ..Default::default()
-            };
-            let group = Shape {
-                id: ShapeId(21),
-                xfrm: Some(Xfrm::new(100.0, 100.0, 240.0, 60.0)),
-                kind: ShapeKind::Group { children: vec![member], child: Xfrm::new(0.0, 0.0, 240.0 / kx, 60.0 / ky) },
-                ..Default::default()
-            };
-            std::sync::Arc::make_mut(&mut p.slides[0]).shapes = vec![group];
-            let img = render_slide(&p, 0, &RenderOpts { scale: 1.0, ..Default::default() });
-            // Along the tile's long side: first half red, second blue, then red again.
-            let (a, b, c) = if tall { ((115, 115), (115, 145), (115, 175)) } else { ((115, 115), (145, 115), (175, 115)) };
-            let (pa, pb, pc) = (img.pixel(a.0, a.1), img.pixel(b.0, b.1), img.pixel(c.0, c.1));
-            assert!(
-                close(pa, RED, 30) && close(pb, blue, 30) && (tall || close(pc, RED, 30)) && (!tall || close(pc, WHITE, 5) || close(pc, RED, 30)),
-                "child space {kx} x {ky}, tall={tall}: {pa:?} {pb:?} {pc:?}"
-            );
-        }
-    }
-}
-
-/// A slide with `shape` (built for a box of `w` x `h` child units) in a group at (100, 100) that is
-/// 240 x 60 pt on the slide and scaled `kx` x `ky` against its child space, drawn at 1 px per point.
-fn in_a_scaled_group(kx: f64, ky: f64, p: Presentation, shape: impl FnOnce(f64, f64) -> Shape) -> Image {
-    let (w, h) = (240.0 / kx, 60.0 / ky);
-    let group = Shape {
-        id: ShapeId(21),
-        xfrm: Some(Xfrm::new(100.0, 100.0, 240.0, 60.0)),
-        kind: ShapeKind::Group { children: vec![shape(w, h)], child: Xfrm::new(0.0, 0.0, w, h) },
-        ..Default::default()
-    };
-    let mut p = p;
-    std::sync::Arc::make_mut(&mut p.slides[0]).shapes = vec![group];
-    render_slide(&p, 0, &RenderOpts { scale: 1.0, ..Default::default() })
-}
-
-#[test]
-fn a_tile_a_group_passes_to_its_members_keeps_its_size_inside_a_scaled_group() {
-    use deckcraft_model::style::{PictureFill, PictureMode};
-    // The group that owns the tiled fill sits inside another group whose child space is scaled: the
-    // members that take it (`grpFill`) get tiles of 60 x 30 pt, as with no outer group.
-    let blue = Rgba::rgb(0, 0, 255);
-    for (kx, ky) in [(1.0, 1.0), (0.25, 0.25), (1600.0, 1600.0), (2.0, 0.5)] {
-        let mut p = Presentation::default();
-        let media = p.add_media("t.png", "image/png", half_red_half_blue()).expect("media");
-        let mode = PictureMode::Tile { tx: 0.0, ty: 0.0, sx: 10.0, sy: 10.0, flip: "none".into(), align: "tl".into() };
-        let img = in_a_scaled_group(kx, ky, p, |w, h| {
-            let member =
-                Shape { id: ShapeId(23), xfrm: Some(Xfrm::new(0.0, 0.0, w, h)), fill: Some(Fill::Group), line: no_line(), ..Default::default() };
-            Shape {
-                id: ShapeId(22),
-                xfrm: Some(Xfrm::new(0.0, 0.0, w, h)),
-                fill: Some(Fill::Picture(PictureFill { media, mode, ..Default::default() })),
-                kind: ShapeKind::Group { children: vec![member], child: Xfrm::new(0.0, 0.0, w, h) },
-                ..Default::default()
-            }
-        });
-        let (a, b, c) = (img.pixel(115, 115), img.pixel(145, 115), img.pixel(175, 115));
-        assert!(close(a, RED, 30) && close(b, blue, 30) && close(c, RED, 30), "outer group {kx} x {ky}: {a:?} {b:?} {c:?}");
-    }
-}
-
-#[test]
-fn a_picture_shapes_own_tile_keeps_its_size_inside_a_scaled_group() {
-    use deckcraft_model::style::{PictureFill, PictureMode};
-    // A picture (`p:pic`) whose blip fill is a tile rather than a stretch.
-    let blue = Rgba::rgb(0, 0, 255);
-    for (kx, ky) in [(1.0, 1.0), (0.25, 0.25), (1600.0, 1600.0), (2.0, 0.5)] {
-        let mut p = Presentation::default();
-        let media = p.add_media("t.png", "image/png", half_red_half_blue()).expect("media");
-        let mode = PictureMode::Tile { tx: 0.0, ty: 0.0, sx: 10.0, sy: 10.0, flip: "none".into(), align: "tl".into() };
-        let img = in_a_scaled_group(kx, ky, p, |w, h| Shape {
-            id: ShapeId(22),
-            xfrm: Some(Xfrm::new(0.0, 0.0, w, h)),
-            kind: ShapeKind::Picture { fill: PictureFill { media, mode, ..Default::default() } },
-            line: no_line(),
-            ..Default::default()
-        });
-        let (a, b, c) = (img.pixel(115, 115), img.pixel(145, 115), img.pixel(175, 115));
-        assert!(close(a, RED, 30) && close(b, blue, 30) && close(c, RED, 30), "group {kx} x {ky}: {a:?} {b:?} {c:?}");
-    }
-}
-
-#[test]
-fn a_tiled_pictures_reflection_keeps_the_tile_size_inside_a_scaled_group() {
-    use deckcraft_model::style::{PictureFill, PictureMode, Reflection};
-    // The reflection mirrors the picture's pixels, so its tiles must be the face's, 60 x 30 pt,
-    // whatever the group's child scale: just below the box it shows the same colours.
-    let reflected = |kx: f64, ky: f64| {
-        let mut p = Presentation::default();
-        let media = p.add_media("t.png", "image/png", half_red_half_blue()).expect("media");
-        let mode = PictureMode::Tile { tx: 0.0, ty: 0.0, sx: 10.0, sy: 10.0, flip: "none".into(), align: "tl".into() };
-        let rf = Reflection { blur: 0.0, start_alpha: 1.0, end_alpha: 0.0, end_pos: 0.5, dist: 0.0, ..Default::default() };
-        let img = in_a_scaled_group(kx, ky, p, |w, h| Shape {
-            id: ShapeId(22),
-            xfrm: Some(Xfrm::new(0.0, 0.0, w, h)),
-            kind: ShapeKind::Picture { fill: PictureFill { media, mode, ..Default::default() } },
-            line: no_line(),
-            effects: Some(deckcraft_model::Effects { reflection: Some(rf), ..Default::default() }),
-            ..Default::default()
-        });
-        [img.pixel(115, 163), img.pixel(145, 163), img.pixel(175, 163)]
-    };
-    let plain = reflected(1.0, 1.0);
-    assert!(plain[0][0] > plain[0][2] && plain[1][2] > plain[1][0] && plain[2][0] > plain[2][2], "red, blue, red in the reflection: {plain:?}");
-    for (kx, ky) in [(0.25, 0.25), (1600.0, 1600.0), (2.0, 0.5)] {
-        let got = reflected(kx, ky);
-        for (g, e) in got.iter().zip(&plain) {
-            assert!(close(*g, Rgba::rgb(e[0], e[1], e[2]), 40), "child scale {kx} x {ky}: {got:?} against {plain:?}");
-        }
-    }
-}
-
-#[test]
-fn an_upright_tile_in_a_turned_shape_keeps_its_size_in_points_at_any_zoom() {
-    use deckcraft_model::style::{PictureFill, PictureMode};
-    // `rotWithShape="0"` draws the tiles on the slide's axes, in device pixels: they were sized in
-    // pixels, so zooming (or a group's child scale) changed their size on the slide. PowerPoint's
-    // export of the same shapes shows 60x30 pt tiles at every zoom.
-    let draw = |scale: f64, group: f64| {
-        let mut p = Presentation::default();
-        let media = p.add_media("t.png", "image/png", half_red_half_blue()).expect("media");
-        let mode = PictureMode::Tile { tx: 0.0, ty: 0.0, sx: 10.0, sy: 10.0, flip: "none".into(), align: "tl".into() };
-        let fill = Fill::Picture(PictureFill { media, mode, upright: true, ..Default::default() });
-        let shape = Shape {
-            id: ShapeId(22),
-            xfrm: Some(Xfrm { rot: 20.0, ..Xfrm::new(0.0, 0.0, 240.0 / group, 120.0 / group) }),
-            fill: Some(fill),
-            line: no_line(),
-            ..Default::default()
-        };
-        let shape = if group == 1.0 {
-            Shape { xfrm: Some(Xfrm { rot: 20.0, ..Xfrm::new(100.0, 100.0, 240.0, 120.0) }), ..shape }
-        } else {
-            Shape {
-                id: ShapeId(21),
-                xfrm: Some(Xfrm::new(100.0, 100.0, 240.0, 120.0)),
-                kind: ShapeKind::Group { children: vec![shape], child: Xfrm::new(0.0, 0.0, 240.0 / group, 120.0 / group) },
-                ..Default::default()
-            }
-        };
-        std::sync::Arc::make_mut(&mut p.slides[0]).shapes = vec![shape];
-        render_slide(&p, 0, &RenderOpts { scale, ..Default::default() })
-    };
-    for group in [1.0, 0.25] {
-        let (one, two) = (draw(1.0, group), draw(2.0, group));
-        let (mut same, mut total) = (0, 0);
-        for y in (120..220).step_by(7) {
-            for x in (120..320).step_by(9) {
-                let (a, b) = (one.pixel(x, y), two.pixel(2 * x, 2 * y));
-                if close(a, WHITE, 5) && close(b, WHITE, 5) {
-                    continue; // outside the turned rectangle
-                }
-                total += 1;
-                same += usize::from(close(a, Rgba::rgb(b[0], b[1], b[2]), 40));
-            }
-        }
-        assert!(total > 40 && same * 10 >= total * 9, "group scale {group}: {same} of {total} samples agree between zoom 1 and 2");
-    }
-}
-
 #[test]
 fn a_tiles_first_copy_sits_on_the_point_its_alignment_names() {
     let b = Rect::new(0.0, 0.0, 100.0, 50.0);
@@ -935,7 +743,7 @@ fn a_picture_reflects_its_pixels() {
     let mut p = picture_deck(None);
     let s = std::sync::Arc::make_mut(&mut p.slides[0]);
     if let Some(sh) = s.shapes.first_mut() {
-        let rf = deckcraft_model::style::Reflection { blur: 0.0, start_alpha: 1.0, end_alpha: 0.0, end_pos: 0.5, dist: 0.0, ..Default::default() };
+        let rf = deckcraft_model::style::Reflection { blur: 0.0, start_alpha: 1.0, end_alpha: 0.0, end_pos: 0.5, dist: 0.0 };
         sh.effects = Some(deckcraft_model::Effects { reflection: Some(rf), ..Default::default() });
     }
     let img = render_slide(&p, 0, &RenderOpts { scale: 1.0, ..Default::default() });
@@ -990,37 +798,4 @@ fn a_tiny_dash_on_a_huge_shape_draws_without_running_out_of_memory() {
     p.line_to((4.0e6, 0.0));
     let pat = limit_dash_count(&p, vec![1.0, 1.0]);
     assert!((4.0e6 / (pat[0] + pat[1]) - MAX_DASHES).abs() < 1.0, "{pat:?}");
-    // A custom pattern of 1,000 dashes counts each of them: the limit is on dashes drawn.
-    let pat = limit_dash_count(&p, vec![1.0; 2000]);
-    let period: f64 = pat.iter().sum();
-    assert!((4.0e6 / period * 1000.0 - MAX_DASHES).abs() < 1.0, "{}", period);
-}
-
-/// A bar chart with 20,000 points, each with its own fill, and a sparse scatter of the same size:
-/// the per-point fills and the scatter's "has any x" are looked up, not searched per point.
-#[test]
-fn many_point_fills_and_sparse_scatter_x_render() {
-    use deckcraft_model::ShapeKind;
-    use deckcraft_model::chart::{Chart, ChartType};
-    use deckcraft_model::style::Fill;
-    let n = 20_000;
-    let chart = |kind: ChartType| {
-        let mut c = Chart::sample(kind);
-        c.series.truncate(1);
-        c.categories = (0..n).map(|i| i.to_string()).collect();
-        c.series[0].values = (0..n).map(|i| Some(i as f64)).collect();
-        c
-    };
-    let mut bars = chart(ChartType::Column);
-    bars.series[0].point_fills = (0..n).rev().map(|i| (i, Fill::solid(ColorRef::rgb(Rgba::rgb(200, 0, 0))))).collect();
-    let mut scatter = chart(ChartType::Scatter);
-    scatter.series[0].x_values = (0..n).map(|i| (i + 1 == n).then_some(1.0)).collect();
-    let shape = |id: u32, c: Chart| Shape {
-        id: ShapeId(id),
-        xfrm: Some(Xfrm::new(10.0, 10.0, 400.0, 300.0)),
-        kind: ShapeKind::Chart(Box::new(c)),
-        ..Default::default()
-    };
-    let img = render(vec![shape(2, bars), shape(3, scatter)]);
-    assert!(img.width > 0);
 }

crates/render/src/text_draw.rs

@@ -35,30 +35,22 @@ pub(crate) fn prompt_body(rctx: &Ctx, s: &Shape, kind: PhType) -> TextBody {
     t
 }
 
-/// Most path elements this thread's glyph cache retains. Its entries are shared with the font
-/// cache, but they stay alive here after that cache evicts them, so they are bounded by elements.
-const GLYPH_CACHE_MAX_ELEMENTS: usize = 1 << 22;
-
 thread_local! {
-    /// The cached outlines, and the path elements they hold.
+    static GLYPH_CACHE: std::cell::RefCell<HashMap<(u32, u32), Arc<BezPath>>> = std::cell::RefCell::new(HashMap::new());
-    static GLYPH_CACHE: std::cell::RefCell<(HashMap<(u32, u32), Arc<BezPath>>, usize)> = std::cell::RefCell::new((HashMap::new(), 0));
 }
 
 pub(crate) fn glyph(face: &deckcraft_fonts::FontFace, gid: u32) -> Arc<BezPath> {
     let key = (face.id(), gid);
-    if let Some(p) = GLYPH_CACHE.with(|c| c.borrow().0.get(&key).cloned()) {
+    if let Some(p) = GLYPH_CACHE.with(|c| c.borrow().get(&key).cloned()) {
         return p;
     }
     let p = FontDb::global().outline(face, gid);
     GLYPH_CACHE.with(|c| {
         let mut c = c.borrow_mut();
-        let n = p.elements().len();
+        if c.len() > 200_000 {
-        if c.0.len() > 200_000 || c.1.saturating_add(n) > GLYPH_CACHE_MAX_ELEMENTS {
+            c.clear();
-            c.0.clear();
-            c.1 = 0;
         }
-        c.1 += n;
+        c.insert(key, p.clone());
-        c.0.insert(key, p.clone());
     });
     p
 }
@@ -113,7 +105,6 @@ pub fn draw_layout(ctx: &mut RenderContext, l: &deckcraft_text::TextLayout, tr:
 pub fn draw_layout_with(ctx: &mut RenderContext, l: &deckcraft_text::TextLayout, tr: Rect, m: Affine, paras: &[(usize, ParaState)]) {
     let para = |i: usize| paras.iter().find(|(p, _)| *p == i).map(|(_, s)| *s).unwrap_or_default();
     let m = text_transform(m, tr, l.rotation);
-    let lines_of = LineIndex::new(l);
     let deco = |ctx: &mut RenderContext, d: &deckcraft_text::Deco| {
         let ps = para(d.para);
         if !ps.visible || ps.opacity <= 0.001 {
@@ -153,7 +144,7 @@ pub fn draw_layout_with(ctx: &mut RenderContext, l: &deckcraft_text::TextLayout,
                 draw_glyph(ctx, run, *gid, at, ps.opacity);
                 continue;
             };
-            let li = lines_of.line_at(run.para, *y);
+            let li = line_at(l, run.para, *y);
             if !grads.iter().any(|(i, _)| *i == li) {
                 let scheme = deckcraft_color::ColorScheme { name: String::new(), colors: [Rgba::BLACK; 12] };
                 let stops = g.stops.iter().map(|s| (s.pos, s.color.resolve(&scheme, None))).collect();
@@ -200,78 +191,8 @@ pub(crate) fn fill_deco(ctx: &mut RenderContext, d: &deckcraft_text::Deco) {
     }
 }
 
-/// Finds the line of a paragraph holding a glyph on baseline `y` without scanning the paragraph's
+/// The line of paragraph `para` holding a glyph on baseline `y` (the nearest baseline).
-/// lines for every glyph. A paragraph whose lines are ordered top to bottom (every layout the text
+fn line_at(l: &deckcraft_text::TextLayout, para: usize, y: f64) -> usize {
-/// crate produces) is searched by bisection; any other falls back to a scan with the same answer.
-pub(crate) struct LineIndex<'a> {
-    l: &'a deckcraft_text::TextLayout,
-    /// Per paragraph: its lines' tops, bottoms and baselines all rise with the line index.
-    ordered: Vec<bool>,
-}
-
-impl<'a> LineIndex<'a> {
-    pub(crate) fn new(l: &'a deckcraft_text::TextLayout) -> Self {
-        let ordered = l
-            .para_lines
-            .iter()
-            .map(|&(first, count)| {
-                let end = first.saturating_add(count).min(l.lines.len());
-                l.lines.get(first..end).is_some_and(|ls| {
-                    ls.iter().all(|a| a.top <= a.bottom)
-                        && ls.windows(2).all(|w| w[0].top <= w[1].top && w[0].bottom <= w[1].bottom && w[0].baseline <= w[1].baseline)
-                })
-            })
-            .collect();
-        LineIndex { l, ordered }
-    }
-
-    /// The nearest line baseline to `y` among `lines` (the first of equals), as an index into `lines`.
-    fn nearest(lines: &[deckcraft_text::LineInfo], y: f64) -> Option<usize> {
-        let i = lines.partition_point(|li| li.baseline < y);
-        let best = match (i.checked_sub(1), lines.get(i)) {
-            (Some(p), Some(n)) => {
-                if (lines[p].baseline - y).abs() <= (n.baseline - y).abs() {
-                    p
-                } else {
-                    i
-                }
-            }
-            (Some(p), None) => p,
-            (None, Some(_)) => i,
-            (None, None) => return None,
-        };
-        let b = lines[best].baseline;
-        Some(lines.partition_point(|li| li.baseline < b))
-    }
-
-    /// The paragraph's lines when they are ordered, with the index of the first.
-    fn ordered_lines(&self, para: usize) -> Option<(usize, &[deckcraft_text::LineInfo])> {
-        let &(first, count) = self.l.para_lines.get(para)?;
-        let end = first.saturating_add(count).min(self.l.lines.len());
-        (self.ordered[para] && first < end).then(|| (first, &self.l.lines[first..end]))
-    }
-
-    /// The line of paragraph `para` holding a glyph on baseline `y` (the nearest baseline).
-    pub(crate) fn line_at(&self, para: usize, y: f64) -> usize {
-        if let Some((first, ls)) = self.ordered_lines(para) {
-            return Self::nearest(ls, y).map_or(0, |i| first + i);
-        }
-        line_at_scan(self.l, para, y)
-    }
-
-    /// The first line of paragraph `para` whose box holds `y`, else the nearest baseline's line.
-    pub(crate) fn line_of(&self, para: usize, y: f64) -> Option<usize> {
-        let Some((first, ls)) = self.ordered_lines(para) else { return crate::warp::line_of_scan(self.l, para, y) };
-        let i = ls.partition_point(|li| li.bottom + 0.01 < y);
-        if ls.get(i).is_some_and(|li| y >= li.top - 0.01) {
-            return Some(first + i);
-        }
-        Self::nearest(ls, y).map(|i| first + i)
-    }
-}
-
-/// The line of paragraph `para` holding a glyph on baseline `y` (the nearest baseline), by scanning.
-fn line_at_scan(l: &deckcraft_text::TextLayout, para: usize, y: f64) -> usize {
     if let Some(&(first, count)) = l.para_lines.get(para) {
         if count == 0 {
             return 0;
@@ -397,38 +318,3 @@ fn draw_glyph_with(
         ctx.stroke_path(&path);
     }
 }
-
-#[cfg(test)]
-mod line_index_tests {
-    use super::*;
-    use deckcraft_text::{LineInfo, TextLayout};
-
-    fn layout(ordered: bool) -> TextLayout {
-        let line = |para, top: f64| LineInfo { para, top, baseline: top + 8.0, bottom: top + 10.0, ..Default::default() };
-        let mut lines: Vec<LineInfo> = (0..40).map(|i| line(usize::from(i >= 25), f64::from(i) * 10.0)).collect();
-        if !ordered {
-            lines.swap(3, 7);
-        }
-        TextLayout { lines, para_lines: vec![(0, 25), (25, 15)], ..Default::default() }
-    }
-
-    #[test]
-    fn bisection_matches_the_scan() {
-        for ordered in [true, false] {
-            let l = layout(ordered);
-            let idx = LineIndex::new(l_ref(&l));
-            assert_eq!(idx.ordered, vec![ordered, true]);
-            for para in 0..2 {
-                for k in -20..450 {
-                    let y = f64::from(k) * 0.9;
-                    assert_eq!(idx.line_at(para, y), line_at_scan(&l, para, y), "line_at {para} {y}");
-                    assert_eq!(idx.line_of(para, y), crate::warp::line_of_scan(&l, para, y), "line_of {para} {y}");
-                }
-            }
-        }
-    }
-
-    fn l_ref(l: &TextLayout) -> &TextLayout {
-        l
-    }
-}

crates/render/src/warp.rs

@@ -9,14 +9,13 @@ use deckcraft_text::{GlyphRun, TextLayout};
 use kurbo::{Affine, BezPath, PathEl, Point, Rect, Shape as _};
 use vello_cpu::{RenderContext, peniko};
 
-use crate::text_draw::LineIndex;
 use crate::{ParaState, color, glyph, scale_of, text_transform};
 
 /// Most points one warped glyph may have (a hostile size or zoom can't explode the work).
 const MAX_POINTS: usize = 40_000;
 
-/// The line of `l` a glyph of paragraph `para` on baseline `y` belongs to, by scanning.
+/// The line of `l` a glyph of paragraph `para` on baseline `y` belongs to.
-pub(crate) fn line_of_scan(l: &TextLayout, para: usize, y: f64) -> Option<usize> {
+fn line_of(l: &TextLayout, para: usize, y: f64) -> Option<usize> {
     if let Some(&(first, count)) = l.para_lines.get(para) {
         if count == 0 {
             return None;
@@ -111,7 +110,6 @@ pub(crate) fn draw(ctx: &mut RenderContext, l: &TextLayout, tr: Rect, m: Affine,
     let para = |i: usize| paras.iter().find(|(p, _)| *p == i).map(|(_, s)| *s).unwrap_or_default();
     let m = text_transform(m, tr, l.rotation);
     let n = l.lines.len();
-    let lines_of = LineIndex::new(l);
     let mut ink: Vec<Option<Rect>> = vec![None; n];
     let mut off: Vec<Option<f64>> = vec![None; n];
     let mut items: Vec<Item> = Vec::new();
@@ -119,7 +117,7 @@ pub(crate) fn draw(ctx: &mut RenderContext, l: &TextLayout, tr: Rect, m: Affine,
         let k = run.size / run.face.upem.max(1.0);
         let skew = if run.fake_italic { Affine::new([1.0, 0.0, -0.2, 1.0, 0.0, 0.0]) } else { Affine::IDENTITY };
         for (gid, x, y) in &run.glyphs {
-            let Some(li) = lines_of.line_of(run.para, *y) else { continue };
+            let Some(li) = line_of(l, run.para, *y) else { continue };
             if let Some(o) = off.get_mut(li) {
                 *o = Some(o.map_or(ref_offset(run), |v| v.max(ref_offset(run))));
             }
@@ -158,7 +156,7 @@ pub(crate) fn draw(ctx: &mut RenderContext, l: &TextLayout, tr: Rect, m: Affine,
             return;
         }
         let y = (d.rect.y0 + d.rect.y1) / 2.0;
-        let Some(li) = lines_of.line_of(d.para, y) else { return };
+        let Some(li) = line_of(l, d.para, y) else { return };
         ctx.set_transform(m * Affine::translate(ps.offset));
         ctx.set_paint(color(d.color, ps.opacity));
         for r in d.pieces() {

crates/text/src/breaking.rs

@@ -260,15 +260,12 @@ pub(crate) struct Tab {
     align: TabAlign,
 }
 
-/// The paragraph's tab stops in position order (a stop at no finite position is left out), so
-/// [`tab_advance`] finds the next one by binary search instead of a scan per tab.
 pub(crate) fn tabs_of(props: &ParaProps) -> Vec<Tab> {
-    let mut tabs: Vec<Tab> = props
+    props
         .tabs
         .as_ref()
         .map(|t| {
             t.iter()
-                .filter(|s| s.pos.is_finite())
                 .map(|s| Tab {
                     pos: s.pos,
                     align: match s.align.as_str() {
@@ -280,9 +277,7 @@ pub(crate) fn tabs_of(props: &ParaProps) -> Vec<Tab> {
                 })
                 .collect()
         })
-        .unwrap_or_default();
+        .unwrap_or_default()
-    tabs.sort_by(|a, b| a.pos.total_cmp(&b.pos));
-    tabs
 }
 
 /// Width of the text after the tab at cell `i` up to the next tab or line break, and the width of
@@ -306,30 +301,18 @@ pub(crate) fn tab_segment(cells: &[Cell], i: usize) -> (f64, f64) {
 /// (`seg`: its width, and its width before the decimal point) as the stop aligns it but never
 /// moving back, as PowerPoint does; past the last stop, to the next default stop.
 pub(crate) fn tab_advance(x: f64, stops: &[Tab], default_tab: f64, seg: (f64, f64)) -> f64 {
-    // `stops` is in position order (`tabs_of`): the next stop is the first past x.
+    for s in stops {
-    // A NaN `x` (a NaN spacing upstream) skips the lookup and takes the finite default-stop path.
+        if s.pos > x + 0.5 {
-    if let Some(s) = stops.get(stops.partition_point(|s| s.pos <= x + 0.5)).filter(|_| !x.is_nan()) {
+            let to = s.pos - x;
-        let to = s.pos - x;
+            return match s.align {
-        return match s.align {
+                TabAlign::Left => to,
-            TabAlign::Left => to,
+                TabAlign::Right => (to - seg.0).max(0.0),
-            TabAlign::Right => (to - seg.0).max(0.0),
+                TabAlign::Center => (to - seg.0 / 2.0).max(0.0),
-            TabAlign::Center => (to - seg.0 / 2.0).max(0.0),
+                TabAlign::Decimal => (to - seg.1).max(0.0),
-            TabAlign::Decimal => (to - seg.1).max(0.0),
+            };
-        };
+        }
     }
     let d = if default_tab > 1.0 { default_tab } else { 72.0 };
     let next = ((x / d).floor() + 1.0) * d;
     (next - x).max(1.0)
 }
-
-#[cfg(test)]
-mod tab_tests {
-    use super::*;
-
-    #[test]
-    fn a_nan_position_takes_the_finite_default_stop() {
-        let stops = [Tab { pos: 100.0, align: TabAlign::Left }];
-        assert!(tab_advance(f64::NAN, &stops, 72.0, (0.0, 0.0)).is_finite());
-        assert_eq!(tab_advance(10.0, &stops, 72.0, (0.0, 0.0)), 90.0);
-    }
-}

crates/text/src/layout.rs

@@ -418,7 +418,7 @@ fn justify_line(p: &ParaShaped, rl: &RawLine, adv: &mut [f64], align: Align, sla
             filled = true;
         }
     }
-    if stretch && !filled && matches!(align, Align::Justify | Align::JustLow | Align::ThaiDistributed) {
+    if stretch && !filled && matches!(align, Align::Justify | Align::JustLow) {
         let spaces = line_cells.iter().filter(|c| c.ch == ' ').count();
         if spaces > 0 {
             for (a, c) in adv.iter_mut().zip(line_cells) {
@@ -450,8 +450,8 @@ fn line_left(align: Align, filled: bool, rtl: bool, bx: (f64, f64), line_w: f64,
         Align::Center => box_l + (box_r - box_l - line_w) / 2.0,
         Align::Distributed if n <= 1 => box_l + slack / 2.0,
         // Justified lines that aren't stretched (the last one) sit at the start edge.
-        Align::Justify | Align::JustLow | Align::Distributed | Align::ThaiDistributed if rtl => box_r - line_w,
+        Align::Justify | Align::JustLow | Align::Distributed if rtl => box_r - line_w,
-        Align::Justify | Align::JustLow | Align::Distributed | Align::ThaiDistributed => box_l,
+        Align::Justify | Align::JustLow | Align::Distributed => box_l,
     }
 }
 

crates/text/src/run.rs

@@ -22,7 +22,7 @@ pub struct GlyphRun {
     pub link: bool,
     /// Opacity of the fill on top of `color`'s own alpha (0 for no fill).
     pub alpha: f64,
-    pub gradient: Option<std::sync::Arc<deckcraft_model::style::Gradient>>,
+    pub gradient: Option<deckcraft_model::style::Gradient>,
     /// Shadow and glow behind the glyphs (`a:rPr/a:effectLst`).
     pub effects: Option<RunEffects>,
     /// East Asian vertical text (`eaVert`): each glyph stands upright, turned a quarter turn

crates/text/src/shape.rs

@@ -76,7 +76,7 @@ pub(crate) fn shape_para(
             if let Some(c) = &props.bullet_color {
                 rp.fill = Some(Fill::solid(c.clone()));
             }
-            rp.size = Some(props.bullet_size_points.unwrap_or(lead.size.unwrap_or(18.0) * props.bullet_size.unwrap_or(1.0)));
+            rp.size = Some(lead.size.unwrap_or(18.0) * props.bullet_size.unwrap_or(1.0));
             rp.underline = None;
             rp.strike = None;
             rp.highlight = None;
@@ -105,7 +105,7 @@ pub(crate) fn shape_para(
             if let Some(c) = &props.bullet_color {
                 rp.fill = Some(Fill::solid(c.clone()));
             }
-            rp.size = Some(props.bullet_size_points.unwrap_or(lead.size.unwrap_or(18.0) * props.bullet_size.unwrap_or(1.0)));
+            rp.size = Some(lead.size.unwrap_or(18.0) * props.bullet_size.unwrap_or(1.0));
             rp.underline = None;
             let mut st = make_style(ctx, &rp, scale, opts.prompt_color);
             let label = autonum(scheme, start_at.saturating_sub(1).saturating_add(number.unwrap_or(1)));

crates/text/src/style.rs

@@ -46,7 +46,7 @@ pub(crate) struct Style {
     pub(crate) highlight: Option<Rgba>,
     pub(crate) outline: Option<(Rgba, f64)>,
     pub(crate) link: bool,
-    pub(crate) gradient: Option<std::sync::Arc<deckcraft_model::style::Gradient>>,
+    pub(crate) gradient: Option<deckcraft_model::style::Gradient>,
     pub(crate) effects: Option<RunEffects>,
     /// "Regular", "Bold"… for the slot and fallback faces.
     pub(crate) style_name: &'static str,
@@ -136,7 +136,7 @@ pub(crate) fn make_style(ctx: &Ctx, r: &RunProps, scale: f64, prompt: Option<Rgb
             for s in &mut g.stops {
                 s.color = deckcraft_model::ColorRef::rgb(ctx.color(&s.color, None));
             }
-            (g.stops.first().map(|s| ctx.color(&s.color, None)).unwrap_or(Rgba::BLACK), 1.0, Some(std::sync::Arc::new(g)))
+            (g.stops.first().map(|s| ctx.color(&s.color, None)).unwrap_or(Rgba::BLACK), 1.0, Some(g))
         }
         Some(Fill::None) => (Rgba::TRANSPARENT, 0.0, None),
         _ => (resolve::text_color(ctx, r), 1.0, None),

crates/text/src/tests.rs

@@ -1416,16 +1416,6 @@ fn tab_stops_align_the_text_after_them() {
     assert!((l.lines[0].edges[4].0 - x0(&l) - 72.0).abs() < 0.01);
 }
 
-#[test]
-fn many_tabs_over_many_stops_lay_out_by_position() {
-    // 20,000 stops given out of order, and 2,000 tabs: each tab finds the next stop by position.
-    let mut stops: Vec<(f64, &str)> = (1..=20_000).rev().map(|k| (k as f64 * 0.05 + 30.0, "l")).collect();
-    stops.push((f64::NAN, "l"));
-    let text = "a\t".repeat(2_000);
-    let l = tabbed(&text, &stops, 1.0e6);
-    assert!((l.lines[0].edges[2].0 - l.inner.x0 - 30.05).abs() < 0.01, "{:?}", &l.lines[0].edges[..3]);
-}
-
 #[test]
 fn a_tab_past_the_end_moves_to_the_next_line() {
     // PowerPoint: "abcdefghij\tk\tl\tm…" in a narrow box puts the tab that doesn't fit on the next

crates/ui-egui/src/panels/comments.rs

@@ -130,34 +130,29 @@ fn comment_card(app: &mut SlideApp, ui: &mut Ui, slide: usize, index: usize, c:
             for r in &c.replies {
                 ui.label(egui::RichText::new(format!("↳ {}: {}", r.author, r.text)).color(t.text_dim));
             }
-            // The buttons are laid out first, from the right, so the reply field takes exactly the
-            // width they leave. A fixed allowance overflowed the card and widened the pane every
-            // frame until it stuck at its widest (#1431).
             ui.horizontal(|ui| {
-                ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                let id = ui.scope_id().with(("reply", slide, index));
-                    if ui.small_button("🗑").clicked() {
+                let mut txt: String = ui.data_mut(|d| d.get_temp(id).unwrap_or_default());
-                        let _ = app.run("slide.go", json!({"index": slide}));
+                let r = ui.add(egui::TextEdit::singleline(&mut txt).hint_text("Reply…").desired_width(ui.available_width() - 70.0));
-                        let _ = app.run("comment.delete", json!({"index": index}));
+                if r.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)) && !txt.trim().is_empty() {
-                        match app.ui.comment_focus {
+                    focus_comment(app, slide, index);
-                            Some((fs, fi)) if fs == slide && fi == index => app.ui.comment_focus = None,
+                    run(app, "comment.reply", json!({"index": index, "text": txt}));
-                            Some((fs, fi)) if fs == slide && fi > index => app.ui.comment_focus = Some((fs, fi - 1)),
+                    txt.clear();
-                            _ => {}
+                }
-                        }
+                ui.data_mut(|d| d.insert_temp(id, txt));
+                if ui.small_button(if c.resolved { "Reopen" } else { "Resolve" }).clicked() {
+                    focus_comment(app, slide, index);
+                    run(app, "comment.resolve", json!({"index": index, "resolved": !c.resolved}));
+                }
+                if ui.small_button("🗑").clicked() {
+                    let _ = app.run("slide.go", json!({"index": slide}));
+                    let _ = app.run("comment.delete", json!({"index": index}));
+                    match app.ui.comment_focus {
+                        Some((fs, fi)) if fs == slide && fi == index => app.ui.comment_focus = None,
+                        Some((fs, fi)) if fs == slide && fi > index => app.ui.comment_focus = Some((fs, fi - 1)),
+                        _ => {}
                     }
-                    if ui.small_button(if c.resolved { "Reopen" } else { "Resolve" }).clicked() {
+                }
-                        focus_comment(app, slide, index);
-                        run(app, "comment.resolve", json!({"index": index, "resolved": !c.resolved}));
-                    }
-                    let id = ui.scope_id().with(("reply", slide, index));
-                    let mut txt: String = ui.data_mut(|d| d.get_temp(id).unwrap_or_default());
-                    let r = ui.add(egui::TextEdit::singleline(&mut txt).hint_text("Reply…").desired_width(ui.available_width()));
-                    if r.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)) && !txt.trim().is_empty() {
-                        focus_comment(app, slide, index);
-                        run(app, "comment.reply", json!({"index": index, "text": txt}));
-                        txt.clear();
-                    }
-                    ui.data_mut(|d| d.insert_temp(id, txt));
-                });
             });
         });
     if focused {

crates/ui-egui/src/panels/thumbs.rs

@@ -112,21 +112,6 @@ pub fn show(app: &mut SlideApp, ui: &mut Ui) {
     }
 }
 
-/// Slide index -> the first section starting there, built once instead of searched per slide.
-fn section_starts(doc: &deckcraft_model::Presentation) -> std::collections::HashMap<usize, usize> {
-    let mut index_of = std::collections::HashMap::new();
-    for (i, s) in doc.slides.iter().enumerate() {
-        index_of.entry(s.id).or_insert(i);
-    }
-    let mut starts = std::collections::HashMap::new();
-    for (si, s) in doc.sections.iter().enumerate() {
-        if let Some(&i) = s.slides.first().and_then(|id| index_of.get(id)) {
-            starts.entry(i).or_insert(si);
-        }
-    }
-    starts
-}
-
 /// Render the scrollable thumbnail list, scrolling the current slide into view when it changes.
 fn list(app: &mut SlideApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
@@ -150,10 +135,11 @@ fn list(app: &mut SlideApp, ui: &mut Ui) {
     let ppp = ui.ctx().pixels_per_point();
     let mut budget = 3u32;
     let mut rects = vec![];
-    let section_starts = section_starts(&doc);
+    let section_starts: Vec<(usize, usize)> =
+        doc.sections.iter().enumerate().filter_map(|(si, s)| s.slides.first().and_then(|id| doc.slide_index(*id)).map(|i| (i, si))).collect();
     let mut need_more = false;
     for i in 0..doc.slides.len() {
-        if let Some(si) = section_starts.get(&i)
+        if let Some((_, si)) = section_starts.iter().find(|(start, _)| *start == i)
             && let Some(sec) = doc.sections.get(*si)
         {
             ui.add_space(4.0);
@@ -448,26 +434,6 @@ mod tests {
         h
     }
 
-    #[test]
-    fn section_starts_map_each_first_slide_to_its_first_section() {
-        let mut s = Session::with_new();
-        for _ in 0..3 {
-            s.execute("slide.new", &json!({})).unwrap();
-        }
-        let mut doc = (*s.active().unwrap().doc).clone();
-        let ids: Vec<_> = doc.slides.iter().map(|sl| sl.id).collect();
-        doc.sections = vec![
-            deckcraft_model::Section { name: "a".into(), slides: vec![ids[0], ids[1]] },
-            deckcraft_model::Section { name: "dup".into(), slides: vec![ids[0]] },
-            deckcraft_model::Section { name: "c".into(), slides: vec![ids[2]] },
-            deckcraft_model::Section { name: "empty".into(), slides: vec![] },
-        ];
-        let starts = section_starts(&doc);
-        assert_eq!(starts.get(&0), Some(&0), "the first section starting at a slide wins");
-        assert_eq!(starts.get(&2), Some(&2));
-        assert_eq!(starts.len(), 2);
-    }
-
     /// Vertical scroll offset of the thumbnail pane, as recorded each frame by `show`.
     fn thumbs_scroll(h: &Harness<'_, SlideApp>) -> f32 {
         h.state().ui.thumbs_scroll

crates/ui-egui/src/ribbon/animations.rs

@@ -1,3 +1,4 @@
+use super::transitions::option_label;
 use super::{
     Align2, AnimClass, CornerRadius, Icon, Rect, Sense, SlideApp, Tokens, Ui, big, big_button, big_button_ex, dropdown, enabled, group, icons, json,
     pos2, rows, run, theme, vec2, widgets,
@@ -80,13 +81,12 @@ pub(super) fn animations(app: &mut SlideApp, ui: &mut Ui) {
             }
         });
         let effect_rows = cur.as_ref().map(|c| animation_effect_rows(&c.effect, c.class, Some(c.option.as_str()))).unwrap_or_default();
-        let effect = cur.as_ref().map(|c| c.effect.as_str()).unwrap_or_default();
         let build = cur.as_ref().map(|c| text_build_id(c.text_build));
         let build_rows = marked_options(&["asOne", "byParagraph"], build);
         let r = big_button(ui, Icon::EffectOptions, "Effect\nOptions", !effect_rows.is_empty());
         egui::Popup::menu(&r).show(|ui| {
             for &(o, on) in &effect_rows {
-                if ui.selectable_label(on, animation_option_label(effect, o)).clicked() {
+                if ui.selectable_label(on, option_label(o)).clicked() {
                     run(app, "animation.options", json!({"option": o}));
                     ui.close();
                 }
@@ -216,70 +216,6 @@ pub(super) fn animation_effect_rows(effect: &str, class: AnimClass, current: Opt
     marked_options(opts, current)
 }
 
-fn animation_option_label(effect: &str, option: &str) -> String {
-    let direction = match option {
-        "b" => Some("From Bottom"),
-        "lb" => Some("From Bottom-Left"),
-        "l" => Some("From Left"),
-        "lt" => Some("From Top-Left"),
-        "t" => Some("From Top"),
-        "rt" => Some("From Top-Right"),
-        "r" => Some("From Right"),
-        "rb" => Some("From Bottom-Right"),
-        _ => None,
-    };
-    if matches!(effect, "fly" | "flyOut" | "wipe" | "wipeOut" | "peek" | "peekOut" | "crawl" | "crawlOut")
-        && let Some(label) = direction
-    {
-        if matches!(effect, "flyOut" | "peekOut" | "crawlOut") {
-            return label.replacen("From", "To", 1);
-        }
-        return label.into();
-    }
-
-    match (effect, option) {
-        ("float" | "floatOut", "u") => "Up".into(),
-        ("float" | "floatOut", "d") => "Down".into(),
-        ("split" | "splitOut", "horzIn") => "Horizontal In".into(),
-        ("split" | "splitOut", "horzOut") => "Horizontal Out".into(),
-        ("split" | "splitOut", "vertIn") => "Vertical In".into(),
-        ("split" | "splitOut", "vertOut") => "Vertical Out".into(),
-        ("shape" | "shapeOut", o) if o.ends_with("In") => format!("{} In", title_first(shape_option_name(o))),
-        ("shape" | "shapeOut", o) if o.ends_with("Out") => format!("{} Out", title_first(shape_option_name(o))),
-        ("wheel" | "wheelOut", "1") => "1 Spoke".into(),
-        ("wheel" | "wheelOut", n) => format!("{n} Spokes"),
-        ("box" | "boxOut" | "circle" | "diamond" | "diamondOut", "in") => format!("{} In", title_first(effect.trim_end_matches("Out"))),
-        ("box" | "boxOut" | "circle" | "diamond" | "diamondOut", "out") => format!("{} Out", title_first(effect.trim_end_matches("Out"))),
-        ("zoom" | "zoomOut", "in") => "Zoom In".into(),
-        ("zoom" | "zoomOut", "out") => "Zoom Out".into(),
-        ("strips" | "stripsOut", "lu") => "Left Up".into(),
-        ("strips" | "stripsOut", "ru") => "Right Up".into(),
-        ("strips" | "stripsOut", "ld") => "Left Down".into(),
-        ("strips" | "stripsOut", "rd") => "Right Down".into(),
-        (_, "horz") => "Horizontal".into(),
-        (_, "vert") => "Vertical".into(),
-        (_, "across") => "Across".into(),
-        (_, "down") => "Down".into(),
-        (_, "up") => "Up".into(),
-        (_, "right") => "Right".into(),
-        (_, "left") => "Left".into(),
-        (_, "clockwise") => "Clockwise".into(),
-        (_, "counterClockwise") => "Counterclockwise".into(),
-        (_, "in") => "In".into(),
-        (_, "out") => "Out".into(),
-        (_, other) => super::transitions::option_label(other),
-    }
-}
-
-fn shape_option_name(option: &str) -> &str {
-    option.strip_suffix("In").or_else(|| option.strip_suffix("Out")).unwrap_or(option)
-}
-
-fn title_first(value: &str) -> String {
-    let mut chars = value.chars();
-    chars.next().map(|c| c.to_uppercase().collect::<String>() + chars.as_str()).unwrap_or_default()
-}
-
 pub(super) fn text_build_id(build: deckcraft_model::anim::TextBuild) -> &'static str {
     match build {
         deckcraft_model::anim::TextBuild::ByParagraph => "byParagraph",
@@ -288,45 +224,3 @@ pub(super) fn text_build_id(build: deckcraft_model::anim::TextBuild) -> &'static
         deckcraft_model::anim::TextBuild::AsOne => "asOne",
     }
 }
-
-#[cfg(test)]
-mod animation_option_label_tests {
-    use super::animation_option_label;
-    use deckcraft_model::anim::ANIMATIONS;
-
-    #[test]
-    fn labels_every_animation_gallery_option_without_changing_its_code() {
-        for &(effect, _, _, _, _, options) in ANIMATIONS {
-            for &option in options {
-                let label = animation_option_label(effect, option);
-                assert!(!label.is_empty(), "{effect}/{option}");
-                assert_ne!(label, option, "raw option shown for {effect}/{option}");
-            }
-        }
-        assert_eq!(animation_option_label("fly", "lb"), "From Bottom-Left");
-        assert_eq!(animation_option_label("flyOut", "rt"), "To Top-Right");
-        assert_eq!(animation_option_label("flyOut", "b"), "To Bottom");
-        assert_eq!(animation_option_label("peekOut", "l"), "To Left");
-        assert_eq!(animation_option_label("wipe", "b"), "From Bottom");
-        assert_eq!(animation_option_label("wheel", "1"), "1 Spoke");
-        assert_eq!(animation_option_label("split", "vertOut"), "Vertical Out");
-        assert_eq!(animation_option_label("shape", "circleIn"), "Circle In");
-        assert_eq!(animation_option_label("diamond", "out"), "Diamond Out");
-        assert_eq!(animation_option_label("diamondOut", "in"), "Diamond In");
-        assert_eq!(animation_option_label("diamondOut", "out"), "Diamond Out");
-        assert_eq!(animation_option_label("strips", "lu"), "Left Up");
-        assert_eq!(animation_option_label("strips", "ru"), "Right Up");
-        assert_eq!(animation_option_label("strips", "ld"), "Left Down");
-        assert_eq!(animation_option_label("strips", "rd"), "Right Down");
-        assert_eq!(animation_option_label("crawl", "b"), "From Bottom");
-        assert_eq!(animation_option_label("crawl", "l"), "From Left");
-        assert_eq!(animation_option_label("crawl", "t"), "From Top");
-        assert_eq!(animation_option_label("crawl", "r"), "From Right");
-        assert_eq!(animation_option_label("crawlOut", "l"), "To Left");
-        assert_eq!(animation_option_label("crawlOut", "r"), "To Right");
-        assert_eq!(animation_option_label("plus", "in"), "In");
-        assert_eq!(animation_option_label("plus", "out"), "Out");
-        assert_eq!(animation_option_label("changeFontSize", "increase"), "Increase");
-        assert_eq!(animation_option_label("changeFontSize", "decrease"), "Decrease");
-    }
-}

crates/ui-egui/src/ribbon/transitions.rs

@@ -12,14 +12,11 @@ pub(super) fn transitions(app: &mut SlideApp, ui: &mut Ui) {
     let cur = app.session.active().and_then(|d| d.current_slide().and_then(|s| s.transition.clone()));
     let kind = cur.as_ref().map(|t| t.kind.clone()).unwrap_or_else(|| "none".into());
     group(ui, |ui| {
-        let playing = app.show.as_ref().is_some_and(|s| s.preview_only);
+        if big_button(ui, Icon::Preview, "Preview", true).clicked() {
-        let (resp, _) = widgets::big_button_ex(ui, Icon::Preview, "Preview", true, false, playing);
+            let from = app.session.active().map(|d| d.selection.slide).unwrap_or(0);
-        if resp.on_hover_text("Play this slide's transition").clicked() {
+            app.start_show(from, true);
-            let to = app.session.active().map(|d| d.selection.slide).unwrap_or(0);
+            if let Some(s) = app.show.as_mut() {
-            app.start_show(to, true);
+                s.preview_only = true;
-            let now = ui.input(|i| i.time);
-            if let (Some(s), Some(d)) = (app.show.as_mut(), app.session.active()) {
-                s.start_transition_preview(&d.doc, now);
             }
         }
     });

crates/ui-egui/src/show.rs

@@ -269,27 +269,6 @@ impl Show {
         }
     }
 
-    /// Play this slide's transition from the previous slide (or black for slide 0) as a preview (#1654).
-    pub fn start_transition_preview(&mut self, doc: &Presentation, now: f64) {
-        let i = self.state.slide;
-        let from = i.checked_sub(1);
-        let (kind, option, dur) = doc
-            .slides
-            .get(i)
-            .and_then(|s| s.transition.as_ref())
-            .map(|t| (t.kind.clone(), t.option.clone(), t.duration_ms as f64 / 1000.0))
-            .unwrap_or(("none".into(), String::new(), 0.0));
-        self.trans = if kind != "none" && dur > 0.0 && !doc.show.without_animation {
-            Some(Transition { old: None, from, morph: None, parts: None, start: now, kind, option, dur, reverse: false })
-        } else {
-            None
-        };
-        self.preview_only = true;
-        self.slide_start = now;
-        self.step_start = now;
-        self.step_end = now;
-    }
-
     /// Identity of the show state a queued window-point event belongs to.
     pub(crate) fn input_state(&self) -> ShowInputState {
         let bits = |v: f32| if v.is_finite() { v.to_bits() } else { 0 };

crates/ui-egui/src/show/tests.rs

@@ -1298,37 +1298,3 @@ fn a_preview_of_an_edited_presentation_is_rendered_again() {
     let tex = harness.state().1.next_tex.as_ref().map(|(d, k, _)| (std::sync::Arc::ptr_eq(d, &edited), *k));
     assert_eq!(tex, Some((true, 1)), "the preview comes from the edited presentation");
 }
-
-/// #1654: Preview on the Transitions ribbon plays the current slide's transition from the
-/// previous slide into the current slide, and exits when finished.
-#[test]
-fn transition_preview_plays_from_the_previous_slide() {
-    let mut s = deckcraft_engine::Session::with_new();
-    s.execute("slide.new", &json!({})).unwrap();
-    s.execute("transition.set", &json!({"kind": "push", "index": 1, "duration": 1000})).unwrap();
-    let doc = s.active().unwrap().doc.clone();
-    let mut show = Show::new(&doc, 1, true, false);
-    show.start_transition_preview(&doc, 10.0);
-    assert!(show.preview_only);
-    let tr = show.trans.as_ref().expect("transition preview is playing");
-    assert_eq!(tr.kind, "push");
-    assert_eq!(tr.from, Some(0), "enters from slide 0 into slide 1");
-    assert_eq!(tr.dur, 1.0);
-    assert!(!tr.reverse);
-    assert_eq!(tr.start, 10.0);
-}
-
-/// #1654: Transition preview for slide 0 plays with from = None (transitioning from black).
-#[test]
-fn transition_preview_for_first_slide_transitions_from_black() {
-    let mut s = deckcraft_engine::Session::with_new();
-    s.execute("transition.set", &json!({"kind": "fade", "index": 0, "duration": 500})).unwrap();
-    let doc = s.active().unwrap().doc.clone();
-    let mut show = Show::new(&doc, 0, true, false);
-    show.start_transition_preview(&doc, 5.0);
-    assert!(show.preview_only);
-    let tr = show.trans.as_ref().expect("fade transition preview is playing");
-    assert_eq!(tr.kind, "fade");
-    assert_eq!(tr.from, None, "slide 0 transitions from black (None)");
-    assert_eq!(tr.dur, 0.5);
-}

crates/ui-egui/src/show/ui.rs

@@ -10,7 +10,7 @@ use super::zoom::{
 };
 use super::{
     Align2, BackKey, Click, Color32, CornerRadius, Key, Layer, LinkJump, Pos2, Rect, RenderOpts, Sense, ShapeId, ShapeState, Show, ShowAction,
-    ShowState, SlideApp, Source, Stroke, TextureHandle, Ui, json, pos2, show_fills_screen, state_for, theme, vec2, viewport_visible,
+    SlideApp, Source, Stroke, TextureHandle, Ui, json, pos2, show_fills_screen, state_for, theme, vec2, viewport_visible,
 };
 use deckcraft_anim::{StepStamp, TriggerPlay};
 use deckcraft_model::Presentation;
@@ -458,17 +458,6 @@ fn draw_transition(show: &mut Show, f: &Fr, sl: &Sl, painter: &egui::Painter, te
             if tr.parts.is_none() && deckcraft_anim::uses_slide_parts(&tr.kind, &tr.option) {
                 tr.parts = Some(part_textures(ctx, doc, tr.from, idx, size));
             }
-            if tr.old.is_none()
-                && let Some(prev) = tr.from
-                && !deckcraft_anim::uses_slide_parts(&tr.kind, &tr.option)
-            {
-                let threads =
-                    if cfg!(target_arch = "wasm32") { 0 } else { std::thread::available_parallelism().map(|n| n.get().min(8) as u16).unwrap_or(0) };
-                let timeline = ShowState::timeline(doc, prev);
-                let step = timeline.steps();
-                let ci = render_frame(doc, prev, timeline, step, 0.0, size, vec![], &[], threads, &[], &[], None);
-                tr.old = Some(crate::textures::upload(ctx, "trans-old", ci));
-            }
             let aspect = doc.slide_size.width / doc.slide_size.height.max(1.0);
             let part = |k: usize| tr.parts.as_ref().and_then(|p| p.get(k).cloned().flatten());
             let parts = [part(0), part(1), part(2), part(3)];

crates/ui-egui/src/tests.rs

@@ -2361,47 +2361,3 @@ fn overdue_visible_logic_does_not_reanchor_a_later_hidden_show() {
     let _ = ctx.run_logic(&raw_at(12.0, true, false), |ctx| app.tick_hidden_show(ctx, visible_anchor + std::time::Duration::from_secs(3)));
     assert_eq!(app.show.as_ref().unwrap().state.slide, 1, "time from the full visible frame is preserved through the logic-only pass");
 }
-
-/// #1431: a comment card's reply row was wider than the pane, so the Comments pane grew every
-/// frame until it stuck at its widest and dragging its edge did nothing.
-#[test]
-fn comments_pane_keeps_its_width_and_resizes() {
-    let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1200.0, 800.0)).build_ui_state(
-        |ui, app: &mut SlideApp| {
-            app.logic(ui.ctx());
-            app.ui(ui);
-        },
-        SlideApp::new(Session::with_new(), Services::default()),
-    );
-    h.run_steps(3);
-    h.state_mut().run("comment.add", json!({"text": "Check the figures on this slide"})).unwrap();
-    h.state_mut().run("comment.add", json!({"text": "Resolved one"})).unwrap();
-    h.state_mut().run("comment.resolve", json!({"index": 1, "resolved": true})).unwrap();
-    h.state_mut().run("view.pane", json!({"pane": "comments"})).unwrap();
-    h.run_steps(30);
-    let width = h.state().ui.pane_width;
-    assert!(width < 320.0, "the pane keeps its default width, not {width}");
-    // The cards stay compact: the second one starts near the top, not below a stretched first.
-    let second = h.get_by_label("Resolved one").rect();
-    assert!(second.top() < 450.0, "the second comment sits near the top, at {second:?}");
-
-    // Drag the pane's left edge: right narrows it, left widens it.
-    let drag = |h: &mut egui_kittest::Harness<'_, SlideApp>, dx: f32| {
-        let start = egui::pos2(1200.0 - h.state().ui.pane_width - 1.0, 500.0);
-        let end = start + egui::vec2(dx, 0.0);
-        h.event(egui::Event::PointerMoved(start));
-        h.run_steps(1);
-        h.event(egui::Event::PointerButton { pos: start, button: egui::PointerButton::Primary, pressed: true, modifiers: egui::Modifiers::NONE });
-        for i in 1..=6 {
-            h.event(egui::Event::PointerMoved(start + (end - start) * (i as f32 / 6.0)));
-            h.run_steps(1);
-        }
-        h.event(egui::Event::PointerButton { pos: end, button: egui::PointerButton::Primary, pressed: false, modifiers: egui::Modifiers::NONE });
-        h.run_steps(10);
-        h.state().ui.pane_width
-    };
-    let narrow = drag(&mut h, 50.0);
-    assert!(narrow < width - 40.0, "dragging right narrows the pane: {width} -> {narrow}");
-    let wide = drag(&mut h, -150.0);
-    assert!(wide > narrow + 140.0, "dragging left widens the pane: {narrow} -> {wide}");
-}

docs/animation-parity.md

@@ -1,6 +1,6 @@
 # Transitions and animations: parity with PowerPoint
 
-> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-30 · **Change:** trivial (animation Effect Options translate stored codes into readable labels; previous: minor, going back in the show reverses the left slide's transition, #1531; previous: minor, Animation Pane ▸ Play From plays from the selected effect; previous: community PR wave 2026-10-14: interactive-deck triggers, canvas preview, the Animation Pane timeline, repeat and bounce end round-trip; duplicated rows and headers folded; previous: major, transitions measured frame by frame against PowerPoint for Windows' video export) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
+> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-29 · **Change:** minor (going back in the show reverses the left slide's transition, #1531; previous: minor, Animation Pane ▸ Play From plays from the selected effect; previous: community PR wave 2026-10-14: interactive-deck triggers, canvas preview, the Animation Pane timeline, repeat and bounce end round-trip; duplicated rows and headers folded; previous: major, transitions measured frame by frame against PowerPoint for Windows' video export) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 
 Transitions and animations are what make a deck a presentation, and the part of PowerPoint people
 notice first when it's missing. Scores roll up into [target-app-parity.md](target-app-parity.md)
@@ -65,7 +65,7 @@ In, Wipe, Zoom, Float In, Grow/Shrink, Pulse, Spin, motion lines): weighted, ~85
 | Animation feature | PowerPoint | DeckCraft |
 |---|---|---|
 | Start On Click / With Previous / After Previous, duration, delay | yes | yes |
-| Effect Options (direction, sequence by paragraph) | yes | yes; every gallery option has a readable label while retaining its stored code |
+| Effect Options (direction, sequence by paragraph) | yes | yes |
 | Effect dialog: sound, after-animation dim/hide, animate text by word/letter, smooth start/end, bounce end, repeat, rewind | yes | partly; repeat, bounce end and rewind round-trip |
 | By-paragraph text builds, sub-bullets follow parents | yes | yes; builds edited in PowerPoint (own start per paragraph, other effects in between, by 2nd-level paragraphs) import as one effect per paragraph and keep their clicks (#844) |
 | Triggers (on click of a shape) | yes | yes; played in the show: a step per click, the sequence starts over after its last step, a click completes a playing step. Separate click steps, mixed starts and paragraph builds survive PPTX save (`trigger_steps.rs`) |
@@ -94,7 +94,6 @@ In, Wipe, Zoom, Float In, Grow/Shrink, Pulse, Spin, motion lines): weighted, ~85
 
 | Date | Change | Summary |
 |---|---|---|
-| 2026-10-30 | trivial | Animation Effect Options show readable, effect-aware labels for all gallery option codes; stored values and command parameters stay unchanged |
 | 2026-10-29 | minor | Going back in the show plays the transition of the slide being left, reversed, instead of the previous slide's entrance transition (#1531); new row in the transition features. Scores unchanged |
 | 2026-10-22 | minor | Animation Pane ▸ Play From: with an effect selected, the preview starts at that effect on the play-all clock; the row says yes and the estimate drops to ~14–26 h |
 | 2026-10-15 | trivial | PPTX interactive sequences preserve later On Click effects and one click per paragraph; no change to playback or feature scores |

docs/file-format-parity.md

@@ -1,6 +1,6 @@
 # File-format parity with PowerPoint
 
-> **Last reviewed:** 2026-11-02 · **Last updated:** 2026-11-03 · **Change:** minor (cell anchorCtr, vertOverflow/horzOverflow, compatLnSpc, normalizeH, thaiDist, table rtl, run altLang and reflection transforms round-trip; Reuse Slides brings referenced custom table styles; previous: minor (native chart payloads stored in bounded ZIP members; previous: major, community PR wave 2026-10-14: seven owned PPTX corpus files, embedded fonts, EMF/WMF clip regions, threaded comments (#70), chart trendlines and workbooks (#335), SmartArt written as a diagram, tags and custom XML kept, picture export DPI; duplicated rows and headers folded; previous: trivial, lines in scaled groups, #233)) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
+> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-18 · **Change:** minor (native chart payloads stored in bounded ZIP members; previous: major, community PR wave 2026-10-14: seven owned PPTX corpus files, embedded fonts, EMF/WMF clip regions, threaded comments (#70), chart trendlines and workbooks (#335), SmartArt written as a diagram, tags and custom XML kept, picture export DPI; duplicated rows and headers folded; previous: trivial, lines in scaled groups, #233) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 
 Every format PowerPoint reads or writes, DeckCraft's support, fidelity and how it is tested.
 Gaps are itemized in [gaps.md](gaps.md#file-formats). Dimension score: **~58% ready**
@@ -23,7 +23,7 @@ PowerPoint opens and saves; Viewer = opens only).
 | `.ppt` / `.pot` / `.pps` 97–2003 binary | Editor | no | no | Owner decision; import only would be enough | none |
 | `.odp` OpenDocument | Editor | no | no | | none |
 | `.thmx` Office theme | Viewer | theme only (Design › Browse for Themes…) | no | Browse for Themes takes a `.thmx`'s colours, fonts and effects; a `.pptx` or `.potx` brings its slide master and layouts as well, and slides move to the matching layouts (#807). A `.thmx`'s own master and layouts aren't read yet | `crates/pptx/src/lib.rs` (`import_theme_tests`), `crates/engine/src/cmd/design/browse_theme_tests.rs` |
-| `.deckcraft` native (zip + JSON) | n/a | yes (also `.slidecraft`) | yes | Lossless for the DeckCraft model, forward compatible; optional table RTL direction survives two saves | `crates/format` tests |
+| `.deckcraft` native (zip + JSON) | n/a | yes (also `.slidecraft`) | yes | Lossless for the DeckCraft model, forward compatible | `crates/format` tests |
 | PDF | export | no | yes | Slides, notes pages, handouts (1–9); real-text layer with embedded subsets, links, bookmarks. Slide artwork is a raster image at print resolution, not vector | `crates/pdf` tests |
 | Outline `.rtf` / `.txt` | export (RTF), import (outline) | `.txt` and `.rtf` outline; `.md` as Markdown (headings are slides, list items bullets) (open, drop, `slide.fromOutline`) | `.txt` and `.rtf` outline | — | format + engine tests |
 | PNG / JPEG slide images | export | n/a | yes (`file.export`, `deckcraft-cli render`) | Matches the editor's renderer. PNG `pHYs` and JPEG JFIF density are `scale` × 72 dpi (default scale 2 is 144 dpi), so Preview shows the slide's real size. PNG can leave the slide background out (`transparentBackground`, Export… “Transparent background”, `deckcraft-cli render --transparent`), so only the slide's content is opaque (#784) | render, engine, UI and CLI tests |
@@ -82,12 +82,12 @@ the round trip even though DeckCraft doesn't model it.
 | Shapes: preset geometry (~180 presets), custom geometry, groups, connectors | yes | yes | Presets re-derived in `crates/geom/src/preset.rs` (and `preset/extra.rs`). Outlines, dashes, arrowheads and ink inside a group, and text, keep their size in points whatever the group's child-coordinate scale (#233). |
 | Fills: solid, gradient, picture (stretch/tile/crop), pattern, group | yes | yes | |
 | Lines: dash, compound, caps, joins, arrowheads | yes | yes | |
-| Text: runs, paragraphs, bullets, numbering, levels, autofit, columns, vertical, RTL, script fonts, fields, hyperlinks | yes | yes | Run `lang` and `altLang` are independently retained through native and PPTX saves; other round-trip tests cover `justLow`, date fields and paragraph `defRPr` (the defaults a placeholder's runs inherit, including a link). A click or hover action keeps its sound, `endSnd`, and a custom show's "Show and return". Gradient and outline on a run, autofit, columns, vertical and RTL text, tab stops and line spacing round-trip (`corpus_style.rs`) |
+| Text: runs, paragraphs, bullets, numbering, levels, autofit, columns, vertical, RTL, script fonts, fields, hyperlinks | yes | yes | Round-trip tests incl. `justLow`, date fields and paragraph `defRPr` (the defaults a placeholder's runs inherit, including a link). A click or hover action keeps its sound, `endSnd`, and a custom show's "Show and return". Gradient and outline on a run, autofit, columns, vertical and RTL text, tab stops and line spacing round-trip (`corpus_style.rs`) |
 | Effects: shadow, glow, soft edges, reflection | yes | yes | On a run, inner shadow, reflection and soft edges are kept along with the outer shadow and glow |
 | 3-D: `scene3d`, `sp3d` | kept | kept | A bevel preset with no `sp3d` of its own is written back on shapes and theme effect styles. Bevels, cameras, face lighting and extrusion sides draw approximately |
 | Text warp (`prstTxWarp`) | yes | yes | All 40 presets rendered (`crates/geom/src/warp.rs`); adjust values (`avLst`) round-trip |
 | Pictures with crop, recolour, duotone, alpha, luminance | yes | yes | |
-| Tables with styles | yes | yes | Merges, both diagonal borders and optional RTL column direction round-trip; Reuse Slides transfers definitions referenced by source tables, including grouped tables, with conflicting ids remapped |
+| Tables with styles | yes | yes | Merges and both diagonal borders round-trip |
 | Charts (`c:chartSpace`) | yes | yes | Original XML kept in `Chart.raw`. Trendlines (type, order or period, forecast, intercept, equation and R²) are read, written and drawn. A combo chart's secondary value axis is read and is not written back when the chart is rebuilt. An unchanged chart also keeps its embedded workbook and the other parts its relationships point at, under fresh `keptN` names so they never replace a part DeckCraft writes (#335); editing the chart drops that workbook instead of writing a stale one |
 | Charts (`cx:` chartex: waterfall, funnel, treemap, sunburst, histogram, Pareto, box) | yes | yes | Unchanged parts kept, with their embedded workbook (#335); edited and new ones written from the model with a plain-chart fallback. Treemap and sunburst hierarchy levels kept; region maps kept, drawn as tiles (no map geometry) |
 | SmartArt (`dgm`) | the drawing part as a group (text laid out on its `dsp:txXfrm` rectangle), and the outline from the data model (Text Pane) | as a diagram: data model from the outline; layout, quick style and colour parts (the file's own kept until the layout is switched); the group as the cached drawing | DeckCraft's layout definitions are simple; a diagram without a cached drawing isn't drawn. SmartArt kept only as XML, without its relationship parts, still loses the drawing and data parts (#203) |
@@ -119,11 +119,7 @@ the round trip even though DeckCraft doesn't model it.
 
 | Date | Change | Summary |
 |---|---|---|
-| 2026-11-02 | minor | Optional table RTL direction is read and written as `a:tblPr/@rtl`; native and two PPTX saves preserve true, false and absent values with distinguishable column text |
-| 2026-11-02 | minor | Text runs preserve alternate-language metadata in native and PPTX round trips |
-| 2026-11-03 | trivial | Reuse Slides transfers referenced custom table styles from native and PPTX sources; grouped tables, undo, native save/reopen and style-id conflicts are covered |
 | 2026-10-18 | minor | Native chart payloads use referenced ZIP members and share media byte/item limits; old inline sidecars remain readable. Synthetic tests cover multi-megabyte layout, all shape owners, shared budgets, missing/corrupt members and invalid references. Scores and milestone scope unchanged |
-| 2026-11-02 | trivial | Reflection start position, affine scale/skew, direction and fade, alignment and rotation attributes survive native and PPTX saves; rendering remains partial |
 | 2026-10-15 | trivial | Native `.deckcraft` files serialize a nonempty chart `kept` sidecar (relationships, part names, content types and bytes). Older files without it still load; empty sidecars are omitted. Headless PPTX → edit → native save/reopen → PPTX checks keep the workbook and drawing bytes; editing chart data still drops the stale workbook |
 | 2026-10-15 | trivial | PPTX interactive timing sequences keep later On Click steps and paragraph click builds (`trigger_steps.rs`); mixed starts and independent buttons survive import/edit/save/reopen |
 | 2026-10-15 | minor | A `.pptx` slide that can't be read is reported instead of dropped in silence: `file.open` and `file.openBytes` return `lostSlides`, the app shows a message and opens a repaired copy (Save asks for a new name), and `deckcraft-cli` warns on stderr (#203) |

docs/gaps.md

@@ -1,6 +1,6 @@
 # Where DeckCraft falls short of PowerPoint
 
-> **Last reviewed:** 2026-10-30 · **Last updated:** 2026-11-03 · **Change:** trivial (run alternate language and reflection transforms survive saves; reused slide contents scale to the destination, picker thumbnails remain a gap; previous: trivial (locked No Fill and no-outline click-through regression coverage added; No Fill hit-testing follows resolved fill instead of the presence of a style (#1621); scores unchanged)) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
+> **Last reviewed:** 2026-10-30 · **Last updated:** 2026-11-01 · **Change:** trivial (locked No Fill and no-outline click-through regression coverage added; No Fill hit-testing follows resolved fill instead of the presence of a style (#1621); scores unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 
 Every known shortfall, one entry each, ranked by how much it stops someone who presents with
 PowerPoint from switching. This is the work list: pick from the top. Numbers are summarized in
@@ -284,7 +284,7 @@ and starts at that effect. The pane has an advanced timeline with draggable bars
 ### Smaller missing rows
 Zoom: live thumbnails, the zoom-in animation and the native `p166:sldZm` element (3–5 h;
 `insert.zoom` makes linked pictures with Return to Zoom), reuse slides pane with thumbnails
-(1–2 h; `slide.reuseList` picks which slides of a file to insert, #1103; reused content now fits the destination size), laser pointer from the presenter window (1–2 h),
+(1–2 h; `slide.reuseList` picks which slides of a file to insert, #1103), laser pointer from the presenter window (1–2 h),
 artistic effects (3–6 h for the other 15 of 22; 7 approximated and round-tripped), remove
 background (6–10 h; needs a model or a classical matte), insert screenshot (2–3 h), record
 audio/screen and record slide show (8–12 h), compare presentations beyond accepting and rejecting each revision, or all (#850; per-object accept and reject, markers on the slide: 2–4 h), password protection (4–6 h, ECMA-376
@@ -368,9 +368,6 @@ Detail in [localization-parity.md](localization-parity.md).
 
 | Date | Change | Summary |
 |---|---|---|
-| 2026-11-02 | trivial | Run alternate-language metadata now survives native and PPTX saves; UI and proofing gaps remain; scores unchanged |
-| 2026-11-02 | trivial | PPTX reflection geometry is retained through native and PPTX resaves; no rendering parity claim |
-| 2026-11-02 | trivial | Reused slide geometry and content scale to the destination; picker thumbnails remain the reuse gap |
 | 2026-10-31 | trivial | No Fill hit-testing follows resolved fill instead of the presence of a style (#1621); scores unchanged |
 | 2026-10-30 | minor | Slide-show click targets use each shape’s own animation state; scale and rotation test added |
 | 2026-10-28 | trivial | Automatic lists now run independently of Replace text as you type; proofing gap description updated |
@@ -430,7 +427,7 @@ Detail in [localization-parity.md](localization-parity.md).
 | 2026-10-13 | minor | AutoCorrect options: case rules, fractions, ellipsis, a larger built-in list and your own entries (`text.autocorrect`, Tools ▸ AutoCorrect) |
 | 2026-10-14 | trivial | Notes spelling menu, Review › Language with Do Not Check Spelling, repeated words |
 | 2026-10-14 | trivial | Spelling squiggles in table cells and notes, and on the web |
-| 2026-10-14 | minor | Spelling squiggles while typing, Add to Dictionary, per-run language editing and compounds; run language metadata now round-trips |
+| 2026-10-14 | minor | Spelling squiggles while typing, Add to Dictionary, per-run languages and compounds |
 | 2026-10-14 | minor | Spelling checks with installed Hunspell dictionaries and suggests corrections |
 | 2026-10-13 | minor | Animation preview plays the current slide on the editor canvas; the pane gap keeps the timeline, preview from the selected effect, and the remaining effects |
 | 2026-10-14 | minor | A two-finger twist rotates the selected shapes. Pinch-zoom is still open |

docs/parity-checklist.md

@@ -2,11 +2,7 @@
 
 > **Generated:** 2026-10-14 (bullets/numbering remain D after empty-line marker review; summary by `cargo xtask parity`; rows re-scored by the 2026-10-14 community PR wave, duplicate Thesaurus, AutoCorrect, Artistic effects and Corrections rows folded; Preview in editor re-scored 2026-10-13; earlier rows re-scored 2026-10-10 against PowerPoint for Mac 16.113.4; video/animated GIF row re-scored 2026-10-11, #171) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 
-> **Last updated:** 2026-11-03 · Community PR wave 10: reflection transforms survive resaves (row stays P, rendering partial); Reuse Slides fits the destination size and brings referenced custom table styles (row stays P, picker has no thumbnails); Compress Pictures measures grouped pictures at displayed size (stays D). Scores unchanged.
+> **Last updated:** 2026-11-01 · Locked-shape and no-outline regressions added for #1621; fill row re-assessed: remains D; No Fill hit-testing now follows resolved appearance. Scores unchanged.
->
-> **Previously (2026-11-02):** Tiled picture fills keep their size in scaled groups and upright tiles (#1693); Picture and texture fill row remains P. Scores unchanged.
->
-> **Previously (2026-11-01):** Locked-shape and no-outline regressions added for #1621; fill row re-assessed: remains D; No Fill hit-testing now follows resolved appearance. Scores unchanged.
 
 The summary between `<!-- SUMMARY -->
 **Weighted breadth parity: 84%** over 191 features.
@@ -244,8 +240,4 @@ Open P0 items: Contextual tabs (Shape Format, Picture Format, Table Design/Layou
 
 | Date | Change | Summary |
 |---|---|---|
-| 2026-11-02 | trivial | Reflection transform/fade serialization retained; its P score stays because rendering remains partial |
-| 2026-11-03 | trivial | Reuse Slides transfers referenced custom table styles; row remains P because other reuse behavior is still partial, summary scores unchanged |
-| 2026-11-02 | trivial | Tiled picture fills keep their size in scaled groups and upright tiles (#1693); Picture and texture fill row remains P and summary scores are unchanged |
-| 2026-11-02 | trivial | Picture compression uses displayed dimensions through nested group transforms; Compress pictures remains D and summary scores are unchanged |
 | 2026-10-31 | trivial | No Fill interior hit-testing follows resolved fill (#1621); fill row remains D and summary scores are unchanged |

docs/slideshow-parity.md

@@ -1,6 +1,6 @@
 # Slide show and presenter view: parity with PowerPoint
 
-> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-11-02 · **Change:** minor (deleting slides removes them from custom shows; previous: minor, Set Up Slide Show ▸ Keep mouse cursor visible, #1445; previous: minor, Ctrl+wheel zooms the show around the pointer, #1286; previous: major, community PR wave 2026-10-14: interactive decks, laser pointer, See All Slides and zoom, go-to-slide number, custom show playback, presenter timer, clock, notes size and keyboard, Show Media Controls, swipe; breadth 68%; duplicated rows and headers folded; previous: major, created) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
+> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-27 · **Change:** minor (Set Up Slide Show ▸ Keep mouse cursor visible, #1445; previous: minor, Ctrl+wheel zooms the show around the pointer, #1286; previous: major, community PR wave 2026-10-14: interactive decks, laser pointer, See All Slides and zoom, go-to-slide number, custom show playback, presenter timer, clock, notes size and keyboard, Show Media Controls, swipe; breadth 68%; duplicated rows and headers folded; previous: major, created) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 
 Presenting is the job PowerPoint is hired for. This doc covers the show window, presenter view,
 rehearsal and recording. Transition and animation playback are in
@@ -33,7 +33,7 @@ ready** (estimated), **10–16 h** to parity.
 | Pen and highlighter ink | yes | pen only (Cmd+P pen, Cmd+A arrow, E erases all ink) | No highlighter, per-stroke eraser, ink colours, or keep/discard annotations prompt |
 | Laser pointer | yes | yes in the show | Cmd/Ctrl+L and the on-screen button draw the show's laser colour and leave no ink. The presenter window does not move that dot |
 | Subtitles and live captions | yes (cloud speech) | no | AI dimension |
-| Custom shows | yes | yes: Show plays that list in order and does not change Set Up; Set Up Slide Show can keep one for Play from Start | Hidden slides in the list are skipped; deleting a slide removes its ID from every custom show |
+| Custom shows | yes | yes: Show plays that list in order and does not change Set Up; Set Up Slide Show can keep one for Play from Start | Hidden slides in the list are skipped |
 | Set Up Show: loop until Esc, kiosk (browsed at a kiosk), show without animation/narration, pen colour, slides range | yes | yes, most options | Keep mouse cursor visible (DeckCraft's own, #1445) stops the show hiding a still pointer after 2.5 s, for decks with clickable choices; it is a user preference (`ui.json`, `showKeepCursor`), since PPTX has no place for it |
 | Use rehearsed timings | yes | yes | |
 
@@ -90,7 +90,6 @@ Reading View in a window with navigation: present (checklist row done).
 | 2026-10-14 | trivial | Show Media Controls hides the show's playback bar and GIF button |
 | 2026-10-14 | minor | Typing a slide number during the show shows it, and Enter goes there. Esc clears the number before it leaves the show. Checklist breadth stays 66% |
 | 2026-10-14 | minor | A custom show plays only its slides, from the Custom Shows dialog, from Set Up Slide Show, or from a click action. Checklist breadth stays 66% |
-| 2026-11-02 | minor | Deleting a slide removes it from every custom show; custom-show cleanup is undoable and survives native save/reopen |
 | 2026-10-14 | minor | Presenter view pauses and resets its timer (T, R) and changes notes size (A-/A+, brackets). The clock shows local time. Second-display placement and swap stay with #433. Checklist breadth stays 66% |
 | 2026-10-14 | minor | See All Slides (G) and click-to-zoom (Z) during the show. Presenter view opens that grid and sets black, white and zoom. Checklist breadth stays 66% |
 | 2026-10-24 | minor | Ctrl+wheel (Cmd+wheel on a Mac) zooms the show in and out around the pointer, up to 4×; the plain wheel still turns the page (#1286) |

docs/target-app-parity.md

@@ -1,6 +1,6 @@
 # DeckCraft vs Microsoft PowerPoint: parity assessment
 
-> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-11-02 · **Change:** trivial (reused slide contents fit the destination size; thumbnails remain; parity estimates unchanged) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
+> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-22 · **Change:** trivial (no break after `?`, `!`, `}`, `+` inside a word; previous: trivial, Animations shortfall: preview from the selected effect is in; before that: major, community PR wave 2026-10-14: breadth 84% over 191 features (P0 92%, P1 82%, P2 55%) after `cargo xtask parity`; area table and What works today folded to one row or bullet each; 320 engine commands; ready ~55% and stage alpha unchanged; previous: minor, hours to ~95% per audience added) · **Target:** Microsoft PowerPoint for Mac 16.113 (Microsoft 365)
 
 The authoritative answer to "how close is DeckCraft to PowerPoint, and how much work is left?".
 [ROADMAP.md](../ROADMAP.md) summarizes it; [gaps.md](gaps.md) itemizes every shortfall;
@@ -179,7 +179,7 @@ Features row of the dimension table keeps ~62% until the next full re-measure).
 | Area | Weight | Breadth (measured) | Ready (est.) | Hours | Main shortfalls | Doc |
 |---|---:|---:|---:|---|---|---|
 | Application shell | 5 | 81% | ~55% | 8–14 | No native macOS menu bar, contextual tabs and multiple-window handling thinner than PowerPoint's | [ui-parity.md](ui-parity.md) |
-| Files (commands) | 4 | 75% | ~50% | see file formats | Print, passwords, legacy and macro formats, video export; reuse content now fits destination size, but the picker still lacks thumbnails | [file-format-parity.md](file-format-parity.md) |
+| Files (commands) | 4 | 75% | ~50% | see file formats | Print, passwords, legacy and macro formats, video export; reuse slides is partial | [file-format-parity.md](file-format-parity.md) |
 | Slides and sections | 6 | 92% | ~85% | 3–5 | Zoom (summary/section/slide) is partial, copying slides between decks keeps formatting only partly | [parity-checklist.md](parity-checklist.md) |
 | Views | 4 | 98% | ~80% | 3–6 | Arrange All (Grid Options and New Window are in) | [ui-parity.md](ui-parity.md) |
 | Masters and themes | 7 | 92% | ~70% | 8–14 | Notes/Handout master view polish, effect-scheme depth, Designer suggestions | [parity-checklist.md](parity-checklist.md) |
@@ -288,7 +288,6 @@ scored done (16 open issues).
 
 | Date | Change | Summary |
 |---|---|---|
-| 2026-11-02 | trivial | Reused slide content scales to the destination; picker thumbnails remain; parity estimates unchanged |
 | 2026-10-22 | trivial | Animations shortfall: preview from the selected effect (Play From) is in. Percentages unchanged |
 | 2026-10-17 | trivial | A word no longer breaks after `?`, `!`, `}` or `+` (a URL's query wraps at the edge as in PowerPoint 2016 for Windows), as it already didn't after `/` and `\`. Headline percentages unchanged |
 | 2026-10-16 | trivial | Arrange shortfall: Align to Slide and Align Selected Objects are in the Align menu. Percentages unchanged |