DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Integration: #1461 drop cap box moves with vertical justification
aiongg0565eaf3805b
diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rsindex d11598865..b19833ff1 100644--- a/crates/compose/src/lib.rs+++ b/crates/compose/src/lib.rs@@ -5408,6 +5408,7 @@ fn vertical_justify(ft: &mut FrameText, f: &FrameSpec, spanned: bool, notes: &decontinue;}let _ = a;+ let before: Vec<f64> = idx.iter().map(|&i| ft.lines[i].baseline).collect();match f.opts.vertical_justification {VerticalJustification::Center => idx.iter().for_each(|&i| ft.lines[i].baseline += space / 2.0),VerticalJustification::Bottom => idx.iter().for_each(|&i| ft.lines[i].baseline += space),@@ -5449,6 +5450,16 @@ fn vertical_justify(ft: &mut FrameText, f: &FrameSpec, spanned: bool, notes: &de}_ => {}}+ // A drop cap moves with its line.+ for (&i, b) in idx.iter().zip(before) {+ let line = &mut ft.lines[i];+ let dy = line.baseline - b;+ if let Some(dc) = &mut line.drop_cap {+ dc.baseline += dy;+ dc.rect.y0 += dy;+ dc.rect.y1 += dy;+ }+ }}}diff --git a/crates/compose/src/tests.rs b/crates/compose/src/tests.rsindex b5c2f8a94..d7b87cea9 100644--- a/crates/compose/src/tests.rs+++ b/crates/compose/src/tests.rs@@ -3745,6 +3745,21 @@ fn text_x(l: &Line, from: usize) -> f64 {l.glyphs.iter().find(|g| g.len > 0 && g.byte >= from).map(|g| g.x).unwrap()}+/// Vertical justification moves the drop cap's box with its line.+#[test]+fn drop_cap_box_follows_vertical_justification() {+ let (mut d, sid, fid) = drop_doc_in(&[LOREM; 2].join(" "), Rect::new(0.0, 0.0, 300.0, 400.0), drop_cap(3, 1));+ let top = compose_story(&d, sid, &ComposeOptions::default());+ d.item_mut(fid).unwrap().text_frame_mut().unwrap().options.vertical_justification = designcraft_doc::VerticalJustification::Bottom;+ let bottom = compose_story(&d, sid, &ComposeOptions::default());+ let (a, b) = (&top.frame(fid).unwrap().lines[0], &bottom.frame(fid).unwrap().lines[0]);+ let dy = b.baseline - a.baseline;+ assert!(dy > 1.0);+ let (da, db) = (a.drop_cap.unwrap(), b.drop_cap.unwrap());+ assert!((db.baseline - da.baseline - dy).abs() < 1e-6);+ assert!((db.rect.y0 - da.rect.y0 - dy).abs() < 1e-6 && (db.rect.y1 - da.rect.y1 - dy).abs() < 1e-6);+}+#[test]fn drop_cap_spans_lines_and_indents_them() {let text = [LOREM; 2].join(" ");