mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-26 03:06:56 -06:00
aiongg
aadd54a926
Upstream main moved9e4f694->736acffby 10 squashes: #258, #285, #153, #280, #288, #281, #176, #299, #298, #297. New to next: #258 (datamerge test), #153 (temporary files and release inputs), #280 (warichu), #176 (PDF image conversion cache), #297 (graphics backend before the window). Already on next: #285, #288, #281, #299, #298. Conflict: ROADMAP.md: next's lines; CJK1 takes main's wording (ruby unfinished, warichu set after the line is broken) Conflict: crates/compose/src/lib.rs: list labels (#298): next's list_label structure; paragraph start / break moves: next's `go` (with #295's sub-columns) under the maintainer's #285 comment; Cursor: next's start/next_page/next_baseline with tops; line placement: #280's warichu::place right after layout_line, before next's trimmed trailing spaces and the drop cap splice (so neither is stacked and the spaces follow the closed-up end_x); caret(): next's drop-cap branch first, then #280's stacked-row metrics Conflict: crates/compose/src/tests.rs: next's tests kept; #280's tests auto-merged Conflict: crates/engine/src/cmd/text.rs: both (next's TypingFormat/typing_format, #280's warichu_cmd) Conflict: crates/idml/src/tests.rs: next's side; #280's warichu round-trip test auto-merged Conflict: crates/pdf/src/export.rs: #176's content cache and test counter with next's RasterMode (no Exporter `interpolate` field on next, so the maintainer's `mode.interpolate &= self.interpolate` is not carried); test exporter gets next's drawing_items field Conflict: crates/ui-egui/src/canvas.rs: #280's compose::highlight_quads (its RTL branch equals next's mixed-direction spans) followed by next's drop-cap highlight Conflict: crates/ui-egui/src/menus.rs: next's formatting_affects_text test kept Auto-merge duplicates removed: #288's table-style tests and #298's list test in idml tests.rs, #288's tests in doc styles.rs and #285's docx test (both files equal next's), #281's dialog tests in dialogs.rs (equals next's) and its menu_button/menu_max_height/clipped_submenu in menus.rs. contributors/people.toml takes main's (next had a duplicated [people.emanuelebonaventura] table from the9e4f694merge, which broke the ui-egui build script's TOML parse). Maintainer edits carried over: #285 break characters and Next Column through one closure (next's `go`, comment added); #281 viewport-aware menu_button in the app bar and the Paragraph menu, per-dialog widths clamped to the window (all already on next); #280 warichu after the last-line rules (layout_line with ends_para/forced_mid) and rules at each warichu row's baseline (rule_baseline in render and pdf text_rules); #176 CMYK fallback through lossless(.., mode) and its updated contract tests; #258 test fixes; #153 and #297 as landed.