mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-25 10:46:50 -06:00
Conflicts: - engine cmd/file.rs, cmd/interchange.rs: kept next's file.open and file.openIdml docs (content detection, INDD conversion, package parts) and added "GREP styles whose pattern can't compile" to their warnings. open_idml keeps next's conversion and import-report warnings and appends grep_style_warnings after the font warnings. - engine cmd/style.rs: style.paragraph.create/edit docs combine next's startAt and kinsoku notes with the grepStyles rule. create_para and edit_para keep next's set_json_over, continue_numbering and explicit_default_kinsoku, then call check_grep_styles. The branch's grep_style_error, check_grep_styles and grep_style_warnings follow explicit_default_kinsoku. Kept next's delete_tests and swatch_options_tests; grep_style_tests goes at the end of the file. - ui-egui dialogs.rs: kept next's style_section_edit tests and added the branch's bad-GREP-pattern test. confirm_paragraph_style_options, grep_error and the dialog status line merged without conflicts; next had not changed the OK arm they replace.