diff --git a/crates/model/src/resolve.rs b/crates/model/src/resolve.rs index 51f50b82d..6ec0f1535 100644 --- a/crates/model/src/resolve.rs +++ b/crates/model/src/resolve.rs @@ -250,6 +250,8 @@ pub fn body(ctx: &Ctx, shape: &Shape) -> BodyProps { upright: Some(false), space_first_last: Some(false), compat_ln_spc: None, + vert_overflow: None, + horz_overflow: None, }); b } diff --git a/crates/model/src/table.rs b/crates/model/src/table.rs index 42ec5a9fe..118851ecd 100644 --- a/crates/model/src/table.rs +++ b/crates/model/src/table.rs @@ -24,6 +24,7 @@ pub struct Cell { pub v_merge: bool, pub vertical: Option, pub anchor_ctr: Option, + pub horz_overflow: Option, } impl Cell { diff --git a/crates/model/src/text.rs b/crates/model/src/text.rs index fca1dc633..f8f1be062 100644 --- a/crates/model/src/text.rs +++ b/crates/model/src/text.rs @@ -122,6 +122,45 @@ pub struct BodyProps { /// Space before the first paragraph and after the last count too (`spcFirstLastPara`). pub space_first_last: Option, pub compat_ln_spc: Option, + pub vert_overflow: Option, + pub horz_overflow: Option, +} + +#[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 { + 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::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) -> Option<&'static str> { + v.filter(|v| *v != Self::Ellipsis).map(Self::xml) + } } impl BodyProps { @@ -146,6 +185,8 @@ impl BodyProps { 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); } } diff --git a/crates/pptx/src/read/dml.rs b/crates/pptx/src/read/dml.rs index 522771f76..2d82fa36a 100644 --- a/crates/pptx/src/read/dml.rs +++ b/crates/pptx/src/read/dml.rs @@ -378,6 +378,8 @@ pub fn body_pr(b: &El) -> BodyProps { 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() { diff --git a/crates/pptx/src/read/shapes.rs b/crates/pptx/src/read/shapes.rs index 625bc1c11..b3e3d48e6 100644 --- a/crates/pptx/src/read/shapes.rs +++ b/crates/pptx/src/read/shapes.rs @@ -807,6 +807,7 @@ 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) diff --git a/crates/pptx/src/write/dml.rs b/crates/pptx/src/write/dml.rs index 1d34c3a14..8d2727cea 100644 --- a/crates/pptx/src/write/dml.rs +++ b/crates/pptx/src/write/dml.rs @@ -478,6 +478,9 @@ pub fn body_pr(w: &mut W, b: &BodyProps) { .b("upright", b.upright) .b("spcFirstLastPara", b.space_first_last) .b("compatLnSpc", b.compat_ln_spc); + .b("spcFirstLastPara", b.space_first_last) + .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); diff --git a/crates/pptx/src/write/shapes.rs b/crates/pptx/src/write/shapes.rs index b54a698e2..717f95ea1 100644 --- a/crates/pptx/src/write/shapes.rs +++ b/crates/pptx/src/write/shapes.rs @@ -748,6 +748,7 @@ fn table(w: &mut W, x: &mut Exp, o: &mut Out, t: &Table) { }), ); 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]), diff --git a/crates/pptx/tests/it/roundtrip.rs b/crates/pptx/tests/it/roundtrip.rs index eb2691894..ee8f2bc5d 100644 --- a/crates/pptx/tests/it/roundtrip.rs +++ b/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, + Action, Align, Anchor, AutoFit, BodyProps, Bullet, Caps, Hyperlink, Paragraph, Run, RunKind, RunProps, Spacing, Strike, TextBody, TextOverflow, }; use deckcraft_model::{ Background, Comment, CustomPath, CustomShow, Geom, InkStroke, MediaClip, Presentation, Section, Shape, ShapeId, ShapeKind, Slide, SlideId, @@ -561,6 +561,50 @@ fn compatible_line_spacing_mode_survives_two_pptx_round_trips() { 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();