mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-26 03:06:56 -06:00
Conflict: crates/compose/src/lib.rs: the custom boundary goes into next's shared wrap_exclusion(); free_slots keeps next's JumpObject handling outside it and takes the branch's combined BoundingBox/Contour arm Conflict: crates/engine/src/cmd/object.rs: params doc has next's content flag and the branch's custom-boundary note Conflict: crates/engine/src/tests.rs: both tests Conflict: crates/idml/src/export.rs: the boundary goes into next's text_wrap_pref() Conflict: crates/idml/src/import.rs: next's object-style-aware text_wrap() plus the branch's boundary parsing for the item's own wrap; pdf_page_in and wrap_path_of both kept Conflict: crates/idml/src/tests.rs: both sides' tests