mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-06 10:47:27 +00:00
Conflicts: - crates/edit/src/lib.rs: keep both `backdrop` (this branch) and main's new `background` module (#2992, page background colour for Export to Word). - crates/engine/src/lib.rs, crates/ui-egui/src/marks_ui.rs: union of the imports (main added BlockKey, block_overlapping and FontFamily). - ATTRIBUTION.toml: catalogue hashes recomputed. Main added eleven catalogues since this branch was cut (ca, ckb, fi, hi, id, ko, lo, nb, ro, sq, th), and their coverage tests require every UI literal, so the six Add Background backdrop messages are translated in them too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>