mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-24 10:16:59 -06:00
Conflicts: - crates/compose/src/lib.rs: kept main's line placement (line_metrics with first baseline tops, baseline grid snap) and this branch's leading model and Aki Below advance. The Hyphenation Zone check uses Composer::single_line(), so the Japanese single-line composer gets the zone too. - crates/idml/src/tests.rs: kept both tests at the conflict (composer kinds, text stroke alignment). Also resolved: - crates/idml/src/import.rs: removed the package scan for a Japanese composer and the drop of [No paragraph style]'s leading model; the import keeps the file's leading model and the composer kind, and compose applies the model per paragraph. - crates/idml/src/tests.rs: the default-leading-model test lays out the document and checks Roman spacing under the non-Japanese composers and the Aki Below spacing under the Japanese ones; a new test round-trips a Japanese composer document.