moppeeer
6bc1bbff89
Merge origin/main into codex/eyedropper-text-format
2026-10-15 11:17:04 +02:00
Brandon Thomas and Claude Opus 5.5
a930276fd7
fix: integrate batched community PRs ( #170 's PPTX exporter on the page-indexed compose cache and crate::io, with a Georgian menu label; #171 : a deleted style's replacement is never based on itself)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:35:27 -04:00
Brandon Thomas
50173a5773
Merge PR #463
2026-10-15 00:35:27 -04:00
Brandon Thomas
f62985064d
Merge PR #307
2026-10-15 00:35:27 -04:00
Brandon Thomas
515b689127
Merge PR #171
2026-10-15 00:35:26 -04:00
Brandon Thomas
6132b60e9b
Merge PR #170
2026-10-15 00:35:26 -04:00
Brandon Thomas
84dbba029f
Merge IDML/text cluster
...
# Conflicts:
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
2026-10-14 23:54:49 -04:00
Brandon Thomas
afd8c0a0de
Merge PR #789
...
# Conflicts:
# crates/engine/src/cmd/style.rs
2026-10-14 23:42:34 -04:00
Brandon Thomas
450503f538
Merge EPUB/docx/datamerge cluster
2026-10-14 23:36:46 -04:00
Brandon Thomas and Claude Opus 5.5
5112019053
fix: integrate batched community PRs (quick-xml 0.41 from #687 in main's IDML attribute reader; #610 's text-link reads pass #604 's file guard; wasm-only unused re-export)
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 23:36:14 -04:00
moppeeer and Claude Opus 5.5
c9a096826b
Eyedropper: with text selected, pick up the clicked text's formatting
...
In InDesign, selecting text and clicking other text with the Eyedropper
copies that text's character and paragraph formatting onto the selection
(Typefool's grid tutorial does it at 12:04 to give body copy the header's
settings). DesignCraft's Eyedropper always ran object.matchAttributes,
copying the clicked frame's fill and stroke onto the text frame.
New command type.pickUpFormat {frame, point}: the character format
(style + overrides) under the point goes to the selected characters, its
paragraph's style and overrides to their paragraphs, in one undo step.
The Eyedropper sends it when text is selected and a text frame is clicked.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 05:34:29 +02:00
Brandon Thomas
4b88d7d29c
Merge PR #959
...
# Conflicts:
# crates/engine/src/cmd/text.rs
2026-10-14 23:31:51 -04:00
Brandon Thomas
067b339991
Merge PR #887
...
# Conflicts:
# crates/engine/src/cmd/text.rs
2026-10-14 23:31:45 -04:00
Brandon Thomas
d35887f494
Merge PR #825 (gradient text paint goes through #657 's stroke-behind-fill painting)
2026-10-14 23:31:39 -04:00
Brandon Thomas
e7d8d5be62
Merge PR #960
...
# Conflicts:
# crates/engine/src/cmd/anchors.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
# crates/ui-egui/src/icons.rs
# docs/target-app-parity.md
2026-10-14 23:17:31 -04:00
Brandon Thomas
94d0c57236
Merge PR #937
...
# Conflicts:
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
2026-10-14 23:14:44 -04:00
Brandon Thomas
47e9e576d4
Merge PR #610 (linked text files read through crate::io, so the automation roots apply)
2026-10-14 23:07:27 -04:00
Brandon Thomas
528264a4a9
Merge PR #823 (with main's radial ellipse: linear gradients go through #823 's linear_axis)
2026-10-14 23:07:06 -04:00
Brandon Thomas
0923c8247a
Merge PR #797
...
# Conflicts:
# crates/textimport/src/docx.rs
2026-10-14 22:57:54 -04:00
Brandon Thomas
0e5dac86f1
Merge PR #783
...
# Conflicts:
# crates/engine/src/cmd/datamerge/mod.rs
# crates/engine/src/cmd/export.rs
# crates/epub/src/lib.rs
2026-10-14 22:56:50 -04:00
Brandon Thomas
d4a65a5ea5
Merge PR #688
...
# Conflicts:
# crates/engine/src/cmd/paths.rs
2026-10-14 22:56:29 -04:00
Brandon Thomas and Claude Opus 5.5
8a98451d2d
fix(flex): flex.reorder clamps a huge by instead of overflowing ( #973 )
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-14 22:49:37 -04:00
Brandon Thomas
f726d40ff4
Merge PR #787
...
# Conflicts:
# crates/engine/src/cmd/export.rs
# crates/epub/src/lib.rs
2026-10-14 22:46:55 -04:00
Brandon Thomas
aa979dab79
Merge PR #785
...
# Conflicts:
# crates/engine/src/cmd/export.rs
# crates/epub/src/lib.rs
2026-10-14 22:45:44 -04:00
Brandon Thomas
9ee2eb2c7a
Merge PR #791
...
# Conflicts:
# crates/epub/src/lib.rs
2026-10-14 22:41:18 -04:00
Brandon Thomas
ee498ac68f
Merge PR #973
...
# Conflicts:
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/i18n/ar.rs
# crates/ui-egui/src/i18n/it.rs
# crates/ui-egui/src/i18n/ja.rs
# crates/ui-egui/src/i18n/pt_br.rs
# crates/ui-egui/src/i18n/uk.rs
# crates/ui-egui/src/panels/properties.rs
2026-10-14 22:38:58 -04:00
Brandon Thomas
f9b4660ca2
Merge PR #976
...
# Conflicts:
# crates/engine/src/tests.rs
2026-10-14 22:33:58 -04:00
Brandon Thomas
290ea6c19c
Merge PR #824
...
# Conflicts:
# contributors/people.toml
2026-10-14 22:33:53 -04:00
Brandon Thomas
ed3acb0f82
Merge PR #979
2026-10-14 22:05:13 -04:00
Brandon Thomas
35563d0f2f
Merge PR #978
2026-10-14 22:05:13 -04:00
Brandon Thomas
7a23e00482
Merge PR #967
2026-10-14 22:05:13 -04:00
Brandon Thomas
fddb3538fa
Merge PR #966
2026-10-14 22:05:13 -04:00
Brandon Thomas
774b07b238
Merge PR #965
2026-10-14 22:05:13 -04:00
Brandon Thomas
c5ea51ec4d
Merge PR #964
2026-10-14 22:05:13 -04:00
Brandon Thomas
88fee015ce
Merge PR #958
2026-10-14 22:05:13 -04:00
Brandon Thomas
528ae789b1
Merge PR #954
2026-10-14 22:05:13 -04:00
Brandon Thomas
2e5e3c4000
Merge PR #951
2026-10-14 22:05:13 -04:00
Brandon Thomas
6c2064ae48
Merge PR #949
2026-10-14 22:05:12 -04:00
Brandon Thomas
79a5c52e9d
Merge PR #933
2026-10-14 22:05:12 -04:00
Brandon Thomas
452b0920e6
Merge PR #917
2026-10-14 22:05:12 -04:00
Brandon Thomas
7f9598558d
Merge PR #914
2026-10-14 22:05:12 -04:00
Brandon Thomas
b14b1fd805
Merge PR #913
2026-10-14 22:05:12 -04:00
Brandon Thomas
f4333338b3
Merge PR #889
2026-10-14 22:05:12 -04:00
Brandon Thomas
411ef4c454
Merge PR #881
2026-10-14 22:05:12 -04:00
Brandon Thomas
3549d76594
Merge PR #819
2026-10-14 22:05:12 -04:00
Brandon Thomas
ebb2322671
Merge PR #812
2026-10-14 22:05:11 -04:00
Brandon Thomas
a593ae07af
Merge PR #795
2026-10-14 22:05:11 -04:00
Brandon Thomas
a666a9f00a
Merge PR #793
2026-10-14 22:05:11 -04:00
Brandon Thomas
4bd1fbab37
Merge PR #765
2026-10-14 22:05:11 -04:00
Brandon Thomas
9f5e8cebf1
Merge PR #760
2026-10-14 22:05:11 -04:00