mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-26 03:06:56 -06:00
aiongg
0f6f96ae6d
Conflict: ROADMAP.md: next's FONT1-3 lines with the branch's CJK1 line Conflict: docs/cjk.md: the branch's rows, with next's aki below and Japanese composer text kept in the leading model row Conflict: crates/fonts/src/fontdb.rs: both fields (family/style aliases and the ICF cache) Conflict: crates/compose/src/ruby.rs: the branch's ruby module; its PlacedGlyph (and kenten.rs's) carry next's rendered_char Conflict: crates/compose/src/lib.rs: modules both; rtl and para_block both; the branch's grid placement (gyoudori, grid references) replaces next's snap, its paragraph-gyoudori span uses next's line_metrics with mark leading and #330's aki below advance; a wrap push moves the line by whole grid lines and its grid end with it; next's trimmed spaces and drop cap, then the branch's ruby and kenten annotation Conflict: crates/compose/src/shape.rs: next's pieces loop and StyleRuns with the branch's auto tate-chu-yoko split (after marks join their base) and fit, and Upright mode in every shape_segment call; next's label fallback passes the mode on Conflict: crates/compose/src/tests.rs: both sets of tests appended at the end Conflict: crates/idml/src/export.rs: next's metadata and text variable writers, then the branch's CJK settings writers Conflict: crates/idml/src/tests.rs: both tests Conflict: crates/ui-egui/src/dialogs.rs: the branch's Ruby dialog default section (next's duplicate characterStyleOptions default dropped); next's section arms with the branch's style_cjk::section_ui