mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-26 11:16:50 -06:00
aiongg
8d3b2b78da
Main's squashes of #510, #528, #420, #538 and #356 equal their PR heads; next has all of them except the two maintainer merge commitsa01bfcde(#538, ROADMAP only) and139e7c2e(#356: import-warning alert, malformed-URI assertion). Conflict: ROADMAP.md: next's log lines (main's #538 line already in next) Conflict: crates/doc/src/assets.rs: next's side (later same_file comment, Asset fields) Conflict: crates/engine/src/cmd/datamerge/fill.rs: next's side (Asset with pdf_crop) Conflict: crates/engine/src/cmd/file.rs: next's side (INDD description, Asset ..Default, crop box sizes) Conflict: crates/engine/src/cmd/interchange.rs: next's side (INDD conversion warnings, resolve_pdf_crops, grep_style_warnings) Conflict: crates/engine/src/cmd/links.rs: next's side (Asset ..Default) Conflict: crates/engine/src/cmd/mathexpr.rs: next's side (Asset ..Default) Conflict: crates/engine/src/cmd/media.rs: next's side (Asset ..Default) Conflict: crates/engine/src/cmd/style.rs: next's side Conflict: crates/engine/src/cmd/table.rs: next's side (Asset ..Default) Conflict: crates/format/src/lib.rs: next's side (pdf_crop fields and tests) Conflict: crates/idml/src/import.rs: next's side (linked_assets keyed by path, page and crop; CJK settings) Conflict: crates/idml/src/tests.rs: both (main's file:/a%bé assertion added)