Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge upstream main into drop-cap-size

Claudebeb5ac024357
diff --cc crates/compose/src/lib.rs
index 22ce254ae,d736de9c9..4a2c66397
--- a/crates/compose/src/lib.rs
+++ b/crates/compose/src/lib.rs
@@@ -1169,11 -1716,11 +1716,12 @@@ fn compose_with_db(doc: &Document, stor
drop_box = Some(DropCapBox {
end: dc.end,
baseline: baseline + dc.drop,
- rect: Rect::new(at, baseline - asc, at + dc.width, baseline + dc.drop + desc),
+ // From its line's top, or its own top when it rises above that line.
+ rect: Rect::new(at, (baseline - asc).min(baseline + dc.drop - dc.cap), at + dc.width, baseline + dc.drop + desc),
});
}
- ruby::annotate(db, &styles_tab, &mut placed, doc.settings.glyph_fallback);
+ ruby::annotate(db, &mut styles_tab, &story.text, &mut placed, doc.settings.glyph_fallback, f.vertical);
+ kenten::annotate(db, &styles_tab, &mut placed, doc.settings.glyph_fallback);
let range_end = if last { prange.end } else { glyphs.get(g0 + b.next).map(|g| g.byte).unwrap_or(prange.end) };
let range_start = glyphs.get(s).map(|g| g.byte).unwrap_or(prange.start).min(range_end);
let range_start = if line_no == 0 { prange.start } else { range_start };