mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-24 10:16:59 -06:00
aiongg
d4dd4287e1
Conflicts: - crates/doc/src/build.rs: kept parent_page_of/parent_page/parent_guides, sync_parent_margins and mark_differing_margins_local; inherited_guides(abs) stays as a wrapper over parent_guides for the guide commands and dialogs. Kept main's single_sided_page_shows_first_parent_page test next to differing_margins_from_older_files_stay_local. - crates/doc/src/page.rs (auto-merged): Spread::parent_page_index takes main's rule (first parent page for left and single-sided pages). - crates/engine/src/cmd/layout.rs: the parent block uses sync_parent_margins instead of main's old-margins equality check; parent accepts prefix, label or index; document pages set here become local. Main's parent_margins_change_the_parent_and_follow_unoverridden_pages stays; added applying_a_parent_gives_its_margins_and_local_margins_stay_local. - crates/tools/src/snap.rs, crates/ui-egui/src/canvas.rs: guides read through parent_guides (no per-page Vec); main's current_spread_page and current_parent_page kept. - crates/ui-egui/src/panels/properties.rs: main's parent-target margin fields. - crates/format/src/lib.rs: upgrade and merge_duplicate_assets, then mark_differing_margins_local. - crates/engine/src/tests_idml.rs: both sides' tests. - ROADMAP.md: main's file plus this PR's progress-log line.