mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-26 03:06:56 -06:00
aiongg
778a270f48
Conflicts: - crates/pdf/src/text.rs run_text: the branch's two generated_text branches first, then #392's kashida branch (no text), then the cmap fallback for other inserted glyphs. - crates/compose/src/lib.rs: next's kashida PlacedGlyph (with dx) gets generated_text: None. - crates/compose/src/shape.rs hyphen_after: next's rendered_char/moji resets and generated_text = None. - crates/compose/src/ruby.rs: next's ruby module (#363); the branch's edit to the old ruby set() has nothing to apply to. - crates/pdf/src/tests.rs: tests from both. Also, so the merge compiles: next's ruby (ruby.rs annotate) and kenten (kenten.rs shape_mark) PlacedGlyph literals take generated_text: None; they map back through the font like other inserted glyphs. Kanji page numbers, composite-font note numbers and fallback-face label segments go through shape_segment's replacement and list labels through prepend_label, so they carry their generated text.