aiongg
7d601b5903
Integration: #864 drops the Controlled by Parent rule from the menus and the Objects Move with Page checkbox (neither has an effect yet)
...
(cherry picked from commit 47b51d6377
2026-10-14 09:38:25 +02:00
moppeeer
3f1eb00bb3
Merge branch 'codex/page-tool' into codex/page-tool-control-panel
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 09:38:16 +02:00
moppeeer
65dbf3c3a2
Merge remote-tracking branch 'origin/main' into codex/page-tool
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 09:37:32 +02:00
moppeeer and Claude Opus 5.5
678de9462d
Gradient stops: parse_color reads the {model, …} form the panel now sends, and still takes {gray: 0–100}
...
Follow-up to aiongg's ba95ae2dnoreply@anthropic.com >
2026-10-14 09:36:12 +02:00
moppeeer and Claude Opus 5.5
bf22391581
Gradient text test: make the cell's gradient swatch with object.gradient (swatch.create's gradient form is #763 's)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 09:33:07 +02:00
aiongg
87682c3674
Integration: #836 a grey stop beside a CMYK stop exports as the K ink, keeping the PDF shading in DeviceCMYK
...
(cherry picked from commit f28456d9d3
2026-10-14 09:18:00 +02:00
aiongg
121d2a37c0
Integration: #826 grey stops keep their value (model form); a stale ramp drag can't index past the stops
...
(cherry picked from commit ba95ae2dae
2026-10-14 09:18:00 +02:00
aiongg
57c997634f
Integration: #825 PDF table-cell and footnote text lays a gradient across its own lines, as on screen
...
(cherry picked from commit 14e98419ad
2026-10-14 09:18:00 +02:00
aiongg
06ed9bb4f5
Integration: #588 CMYK ink passes cull items to the area they cover
...
(cherry picked from commit b3551e3ce6
2026-10-14 09:15:54 +02:00
moppeeer
16d8027d89
Merge remote-tracking branch 'origin/main' into codex/page-tool-liquid-guides
2026-10-14 09:13:24 +02:00
moppeeer
25dadce9c8
Merge remote-tracking branch 'origin/main' into codex/fitting-shortcuts
2026-10-14 09:13:08 +02:00
moppeeer
ed6bcae877
Merge remote-tracking branch 'origin/main' into codex/gradient-cmyk-blend
2026-10-14 09:12:51 +02:00
moppeeer
f6cbcac5ed
Merge remote-tracking branch 'origin/main' into codex/essentials-classic-workspace
2026-10-14 09:12:35 +02:00
moppeeer
25fb0c7f87
Merge remote-tracking branch 'origin/main' into codex/gradient-panel-layout
2026-10-14 09:12:19 +02:00
moppeeer
1faaebef25
Merge remote-tracking branch 'origin/main' into codex/gradient-text
2026-10-14 09:12:03 +02:00
moppeeer
2a293c1b3a
Merge remote-tracking branch 'origin/main' into codex/wrap-panel-offsets
2026-10-14 09:11:16 +02:00
moppeeer
6f3f32a445
Merge remote-tracking branch 'origin/main' into codex/effects-on-pasted-into
2026-10-14 09:10:42 +02:00
moppeeer
7f1d9f2b2e
Merge remote-tracking branch 'origin/main' into codex/copy-placed-graphic
2026-10-14 09:10:24 +02:00
moppeeer
fb11ea99cb
Merge remote-tracking branch 'origin/main' into codex/ungroup-real-groups
2026-10-14 09:10:07 +02:00
moppeeer
69f77874e7
Merge remote-tracking branch 'origin/main' into codex/outlines-per-line
2026-10-14 09:09:16 +02:00
skylar taylor-barrick
c68cb357e9
fix(pdf): preserve writer integration with main (PDFW)
...
Retain the PDF writer adoption and upstream text-threading changes. Keep both roadmap entries and use the accepted-socket fixture comment from main.
2026-10-14 00:18:33 -06:00
Brandon Thomas
43a46c04bf
Merge PR #843
2026-10-14 01:54:43 -04:00
Brandon Thomas
80663cccfd
Merge PR #846
2026-10-14 01:54:43 -04:00
Brandon Thomas
b30b67dae3
Merge PR #834
2026-10-14 01:54:42 -04:00
Brandon Thomas
0421455b22
Merge PR #854
2026-10-14 01:54:41 -04:00
Brandon Thomas
9dc2068580
Merge PR #857
2026-10-14 01:54:41 -04:00
Brandon Thomas
21472519c0
Merge PR #858
2026-10-14 01:54:40 -04:00
Brandon Thomas
c1ce6f77bf
Merge PR #860
2026-10-14 01:54:39 -04:00
Brandon Thomas
af6992dc65
Merge PR #837
2026-10-14 01:54:39 -04:00
Brandon Thomas
986c5487e9
Merge PR #849
2026-10-14 01:54:38 -04:00
Brandon Thomas
d34384574c
Merge PR #853
2026-10-14 01:54:37 -04:00
Brandon Thomas
d83184f8b3
Merge PR #863
2026-10-14 01:54:37 -04:00
LabDennis
ff5d866ff3
chore(sync): merge upstream main into PR #854
2026-10-14 06:51:45 +02:00
aiongg
4f97e08cd0
Merge upstream main 0f4f382b ( #84 squash)
...
# Conflicts:
# Cargo.lock
# ROADMAP.md
# crates/compose/src/lib.rs
# crates/compose/src/overlay.rs
# crates/compose/src/shape.rs
# crates/compose/src/tests.rs
# crates/doc/src/attrs.rs
# crates/doc/src/edit.rs
# crates/doc/src/item.rs
# crates/doc/src/slice.rs
# crates/engine/src/cmd/edit.rs
# crates/engine/src/cmd/file.rs
# crates/engine/src/cmd/mod.rs
# crates/engine/src/cmd/notes.rs
# crates/engine/src/cmd/object.rs
# crates/engine/src/cmd/place_text.rs
# crates/engine/src/cmd/style.rs
# crates/engine/src/cmd/text.rs
# crates/engine/src/cmd/thread.rs
# crates/engine/src/lib.rs
# crates/engine/src/tests.rs
# crates/engine/src/tests_idml.rs
# crates/fonts/src/fontdb.rs
# crates/fonts/src/tests_vertical.rs
# crates/fonts/src/vertical.rs
# crates/format/src/lib.rs
# crates/geom/src/corners.rs
# crates/idml/src/export.rs
# crates/idml/src/import.rs
# crates/idml/src/tests.rs
# crates/mcp/src/backend.rs
# crates/tools/src/select.rs
# crates/tools/src/snap.rs
# crates/tools/src/tests.rs
# crates/tools/src/text.rs
# crates/ui-egui/src/canvas.rs
# crates/ui-egui/src/control.rs
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/uk.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/menus.rs
# crates/ui-egui/src/panels/swatches.rs
# crates/ui-egui/src/toolbar.rs
# docs/gaps.md
# docs/roadmap.md
# docs/target-app-parity.md
2026-10-14 04:25:38 +00:00
aiongg
8403fabeae
Integration: #84 renaming a swatch (Add to Swatches, Swatch Options) refuses stories nested deeper than 32 levels before the shared rename_swatch_refs walk
2026-10-14 04:25:26 +00:00
aiongg
8e2c62e08a
Integration: #84 control-channel paste and IME use the control queue with keys and clicks; click count 1-255 checked inside the pending-event budget, which counts the control queue
2026-10-14 04:24:39 +00:00
aiongg
2f6b62a831
Merge #84 (final head 9b7a0ec6): Text editing, snapping and text threading
...
# Conflicts:
# ROADMAP.md
# crates/engine/src/cmd/edit.rs
# crates/engine/src/cmd/style.rs
# crates/engine/src/cmd/text.rs
# crates/engine/src/cmd/thread.rs
# crates/geom/src/corners.rs
# crates/idml/src/import.rs
# crates/idml/src/tests.rs
# crates/mcp/src/backend.rs
# crates/tools/src/select.rs
# crates/tools/src/tests.rs
# crates/ui-egui/src/canvas.rs
# crates/ui-egui/src/control.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/menus.rs
# crates/ui-egui/src/toolbar.rs
# docs/gaps.md
# docs/target-app-parity.md
2026-10-14 04:19:26 +00:00
zydvc26s67-web
0a0a6ce5dd
Merge remote-tracking branch 'origin/main' into zydvc26s67-web-paragraph-styles-save-delete
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-13 20:58:27 -07:00
0f4f382b0e
feat(text): improve editing, snapping, and threading
...
Add multi-click text selection, pending caret formatting and clipboard support, text-aware colour controls, guide/grid snapping, and frame threading with loaded-port interactions.
Include the layout, drop-cap and IDML updates carried from #83 , with safeguards for generated and linked stories, external text references, local IDs, locked frames and atomic colour edits.
Fixes #23 .
Co-authored-by: Sean Hammond <sean.hammond@und.edu >
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-13 21:41:46 -06:00
aiongg
1c788654bf
Merge t15-b: #863 #860 #869 #870 , new heads of #802 #319 #829 #589 #490 #562 , #643 's test
...
# Conflicts:
# ROADMAP.md
# crates/engine/src/tests.rs
2026-10-14 02:02:22 +00:00
aiongg
41f5099700
Integration: #870 i18n rows next already has (pt-BR, Arabic, French Apply Parent to Pages) stay next's, no duplicate keys
2026-10-14 01:59:13 +00:00
aiongg
4ced37c0aa
Integration: #869 duplicateSpread's params doc parses (no comma inside the to? text)
2026-10-14 01:55:54 +00:00
skylar taylor-barrick
9b7a0ec66d
fix(text): preserve document state while threading and formatting
...
Merge current main into the text editing and layout work, retaining the original contributor commits. Preserve generated and linked stories, incoming text references, local IDs and locked frames when threading.
Keep pending formatting and text colours consistent, isolate deferred control clipboard input, and handle inherited IDML frame properties with bounded column allocations. Add focused state-preservation and round-trip regressions and correct the socket and swatch test fixtures.
M2; refs #84 .
2026-10-13 19:54:50 -06:00
aiongg
0ceff048d8
Merge t15-a: #868 #862 #864 #866 #867
2026-10-14 01:54:16 +00:00
aiongg
1c3af71eb7
Integration: cargo fmt
2026-10-14 01:41:51 +00:00
aiongg
a6ec09afb2
Integration: #643 's test (an empty Effects field path sets nothing)
2026-10-14 01:41:17 +00:00
aiongg
1c1449c207
Merge #867 : Liquid Layout panel (Auto-Fit, Object Constraints); Create Alternate Layout in the Layout menu
...
# Conflicts:
# ROADMAP.md
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/panels/interactive.rs
2026-10-14 01:41:00 +00:00
aiongg
b52b9a99fc
Integration: ROADMAP lines for #869 and #870 describe the integration fixes
2026-10-14 01:40:50 +00:00
aiongg
49a5cb87bb
Integration: #490 drop its second Quit DesignCraft row (already in the Czech table)
2026-10-14 01:40:38 +00:00
aiongg
3e97c8fd58
Merge #562 : IDML: anchored objects take unset settings from their object style; left-aligned X offsets read in the layout's direction (new head)
...
# Conflicts:
# ROADMAP.md
2026-10-14 01:40:29 +00:00
aiongg