bflatastic
c45ac1a873
Merge main into merge/ui-print-optimize2
...
# Conflicts:
# crates/ui-egui/src/app/files.rs
# crates/ui-egui/src/tools/forms_ui.rs
2026-11-09 22:03:08 +07:00
bflatastic
302b61c7e3
Fit the landed changes together: the highlight test batches value edits, since a form-script event can't be batched
2026-11-09 21:43:02 +07:00
bflatastic
36e7121ab0
Merge main into merge/ui-print-optimize2
...
# Conflicts:
# crates/render/src/inspect.rs
# crates/render/src/lib.rs
2026-11-09 21:16:23 +07:00
bflatastic
16b57d6a91
Merge main into merge/xfa2
...
# Conflicts:
# crates/engine/src/tests.rs
2026-11-09 21:15:35 +07:00
bflatastic
2af11131ef
Merge main into merge/xfa2
...
# Conflicts:
# crates/automation/src/tools.rs
# crates/automation/tests/it/automation.rs
# crates/forms/src/tests.rs
# crates/ui-egui/src/tools/forms_ui.rs
# parity/acrobat-features.toml
2026-11-09 20:57:05 +07:00
bflatastic
2ce2d3cf81
Merge main into merge/ui-print-optimize2
...
# Conflicts:
# crates/automation/src/redact.rs
# crates/automation/src/tools.rs
# crates/print/src/lib.rs
# crates/render/src/inspect.rs
# crates/render/src/lib.rs
2026-11-09 20:56:15 +07:00
bflatastic
856d3fb0ac
Merge main into merge/comments-annot2
...
# Conflicts:
# crates/render/src/inspect.rs
# crates/render/src/lib.rs
# crates/ui-egui/src/canvas/page_pointer/tests.rs
# crates/ui-egui/tests/it/comments.rs
2026-11-09 20:56:09 +07:00
bflatastic
28585c01a5
Fit the landed changes together
...
- engine: the on_changes test's XfaRun literals set highlight; the script
runner reads its template before borrowing the live form for to_js; has_event
reads the paged live form, as the rest of the runner does, so focus scripts
find a page-master copy by its own SOM path.
- js: property reads compare and copy the shared (Arc<str>) node text, and the
property tests build XHost with its current signature.
- xfa: the Emitter test literal sets groups and used; a field split that is
undone also restores the names handed out; rustfmt on a merged import.
- parity: drop the use/usehref gap from form.xfa-dynamic, as prototypes are now
resolved before the template is parsed.
2026-11-09 18:46:50 +07:00
BFlat
b6cbf9bb30
Merge pull request #6710 from storytold/merge/forms-links-text2
...
Land forms, links, find and redaction-save fixes (#4496 , #4532 , #3567 , #3773 , #4470 , #4474 , #4497 , #5658 )
2026-11-09 19:45:39 +08:00
bflatastic
ab2d4382ff
Merge #5368 : M12: XFA master-page fields keep their own value on each page ( #5365 )
...
# Conflicts:
# crates/engine/src/xfa.rs
# crates/xfa/src/layout/pages.rs
# crates/xfa/src/lib.rs
# crates/xfa/src/script.rs
# crates/xfa/src/tests.rs
2026-11-09 18:38:21 +07:00
bflatastic
50f174afb7
Merge #5010 : M12: XFA scripting object model (1/3): scripts read template properties as XFA 3.3 defines them
...
# Conflicts:
# crates/engine/src/xfa.rs
# crates/js/src/xfa/host.rs
# crates/xfa/src/packets.rs
# crates/xfa/src/parse.rs
# crates/xfa/src/tests.rs
# parity/acrobat-features.toml
2026-11-09 18:30:30 +07:00
bflatastic
c1d9dd1db1
Merge #4791 : M12: a dynamic XFA form runs all its opening scripts and is laid out once, so a save no longer keeps a half-initialized form ( #4790 )
...
# Conflicts:
# crates/engine/src/xfa.rs
# crates/forms/src/tests.rs
# crates/xfa/src/data.rs
# crates/xfa/src/lib.rs
# crates/xfa/src/tests.rs
# parity/acrobat-features.toml
2026-11-09 18:26:29 +07:00
bflatastic
3ec0a629d4
Merge #5508 : M12: edit attachment descriptions
...
# Conflicts:
# crates/automation/src/dispatch.rs
# crates/automation/src/json.rs
# crates/automation/src/tools.rs
# crates/engine/src/edit.rs
# crates/engine/src/edit/labels.rs
# crates/engine/src/edit/run.rs
# crates/organize/src/import/carry.rs
# crates/ui-egui/src/dialogs.rs
2026-11-09 18:25:40 +07:00
bflatastic
a0b791853c
Merge #4784 : M6: a radio option whose export value is a number selects its own button, and its XFA data holds the item (form.fill-checkbox-radio)
2026-11-09 18:24:54 +07:00
bflatastic
dd72e2e672
Merge #2345 : M6: custom stamps can carry a line filled in when they are placed ( #1741 )
...
# Conflicts:
# ROADMAP.md
# crates/annot/src/lib.rs
2026-11-09 18:23:14 +07:00
bflatastic
3b3721405c
Merge #4401 : M6: a turned field keeps its place and its text runs along the turn ( #4296 )
2026-11-09 18:23:10 +07:00
bflatastic
6d1efb7646
Merge #4378 : M3: documents that hide the toolbar, menu bar or window controls open that way, with a key to bring them back (organize.initial-view)
...
# Conflicts:
# crates/engine/src/commands.rs
# crates/ui-egui/src/commands.rs
2026-11-09 18:23:10 +07:00
bflatastic
f0be783bd0
Merge #4608 : M12: XFA repeating rows lay out past 50, and tables in positioned containers repeat their rows ( #4607 , #4615 )
2026-11-09 18:22:55 +07:00
bflatastic
c638edf9c7
Merge #2137 : M5: comment pop-up windows on the page, with connector lines (comment.popups, comment.connector-lines)
...
# Conflicts:
# ROADMAP.md
# crates/annot/src/info.rs
# crates/annot/src/lib.rs
# crates/annot/src/modify.rs
# crates/annot/src/tests.rs
# crates/automation/src/comments.rs
# crates/automation/tests/it/automation.rs
# crates/engine/src/comments.rs
# crates/render/src/inspect.rs
# crates/render/src/inspect/annotations.rs
# crates/render/src/inspect/model.rs
# crates/render/src/inspect/tests.rs
# crates/render/src/lib.rs
# crates/ui-egui/src/tools/comments/input.rs
# crates/ui-egui/src/tools/comments/paint.rs
# crates/ui-egui/src/tools/comments/tests.rs
# crates/ui-egui/tests/it/comments.rs
2026-11-09 18:22:50 +07:00
bflatastic
8183f96b37
Merge #5973 : fix(print,engine): read the page tree once when finding which pages' text reads up
...
# Conflicts:
# crates/print/src/tests.rs
2026-11-09 18:22:45 +07:00
bflatastic
697227f901
Merge #4517 : M12: run an XFA signature field's preSign scripts before it is signed and postSign after
...
# Conflicts:
# crates/engine/src/js.rs
# crates/engine/src/tests.rs
# crates/xfa/src/fixtures.rs
# parity/acrobat-features.toml
2026-11-09 18:21:41 +07:00
bflatastic
117f3b1102
Merge #4497 : M8: after Apply redactions, Save asks where and proposes the name with _Redacted (protect.redact-filename-suffix)
2026-11-09 18:21:20 +07:00
bflatastic
70aa8e5c0c
Merge #4459 : M2: the standard 14 fonts fit the Euro to its standard width (view.render-pages)
...
# Conflicts:
# vendor/README.md
2026-11-09 18:19:55 +07:00
bflatastic
db5fdcf9bc
Merge #4359 : M12: XFA enter and exit scripts run whenever a field gains or loses focus
...
# Conflicts:
# crates/engine/src/edit/run.rs
# crates/engine/src/js.rs
# crates/ui-egui/src/editing.rs
# crates/ui-egui/src/tools/forms_ui.rs
# parity/acrobat-features.toml
2026-11-09 18:19:39 +07:00
bflatastic
88a2ab97ec
Merge #4094 : M5: a callout's arrow point, knee and text box change on their own ( #1152 )
...
# Conflicts:
# crates/annot/src/info.rs
# crates/annot/src/modify.rs
# crates/annot/src/tests.rs
# crates/automation/src/tools.rs
# crates/automation/tests/it/automation.rs
# crates/ui-egui/tests/it/comments.rs
2026-11-09 18:19:26 +07:00
bflatastic
0dda66820c
Merge #4396 : M2: layers open in the state the view auto state sets, and the Layers panel follows /Order (view.layers-panel)
...
# Conflicts:
# crates/render/src/inspect.rs
# crates/render/src/lib.rs
# vendor/README.md
2026-11-09 18:19:07 +07:00
bflatastic
65a64638fc
Merge #4365 : M5: text boxes and redaction marks without an appearance draw their default border, standard fonts, default style and outline (view.render-annotation-appearances)
...
# Conflicts:
# crates/annot/src/tests.rs
2026-11-09 18:18:11 +07:00
bflatastic
eb33f633e3
Merge #4336 : M12: screen-only and print-only XFA objects are shown and printed as the form says
...
# Conflicts:
# crates/xfa/src/layout.rs
# crates/xfa/src/pdf/strip.rs
# parity/acrobat-features.toml
2026-11-09 18:18:07 +07:00
bflatastic
af67bf1d61
Merge #2539 : M8: redaction removes Info entries and XMP that repeat the redacted text ( #2448 )
2026-11-09 18:17:39 +07:00
bflatastic
a4a600573e
Merge #1998 : Print production: Convert colours (grayscale, RGB, CMYK by the device formulas)
...
# Conflicts:
# crates/automation/tests/it/automation.rs
# crates/edit/src/lib.rs
# crates/edit/src/tests.rs
# crates/engine/src/commands.rs
# crates/engine/src/lib.rs
# crates/optimize/tests/optimize.rs
# crates/ui-egui/src/app.rs
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/lib.rs
# crates/ui-egui/src/state.rs
# crates/ui-egui/tests/it/editing.rs
2026-11-09 18:17:38 +07:00
bflatastic
de333340a5
Merge #4532 : M6: list boxes show and pick the option /I names, and a single-select list shows one value ( #4531 )
...
# Conflicts:
# crates/automation/src/tools.rs
# crates/forms/src/lib.rs
# crates/forms/src/tests.rs
# crates/forms/src/values.rs
# crates/ui-egui/src/tools/forms_ui.rs
# crates/ui-egui/tests/it/forms.rs
2026-11-09 18:17:35 +07:00
bflatastic
5af131db8e
Merge #4358 : M5: comments in an /RT /Group are one comment, with the primary's attributes ( #4357 )
...
# Conflicts:
# crates/automation/src/comments.rs
# crates/automation/tests/it/automation.rs
# crates/render/src/inspect.rs
# crates/render/src/inspect/annotations.rs
# crates/render/src/lib.rs
# crates/ui-egui/src/panels/comments_panel.rs
2026-11-09 18:17:31 +07:00
bflatastic
7976fff3c7
Merge #3589 : Forms: app.runtimeHighlight, and XFA layout:ready scripts run on opening
...
# Conflicts:
# crates/ui-egui/src/app.rs
# crates/xfa/src/lib.rs
2026-11-09 18:16:03 +07:00
bflatastic
b6ddc51ea0
Merge #1918 : Print production: Add printer marks (dialog, edit, tool)
...
# Conflicts:
# crates/engine/src/edit/run.rs
2026-11-09 18:15:36 +07:00
mtlcl410
0a12d9a1fe
Merge remote-tracking branch 'upstream/main' into lane7-4608b
...
# Conflicts:
# crates/xfa/src/layout/flow.rs
# parity/acrobat-features.toml
2026-11-09 19:13:08 +08:00
BFlat
9ee213eff7
Fix main's build and tests after the latest merges ( #6706 )
2026-11-09 19:12:07 +08:00
Osvaldo Duran Melendez and Claude Sonnet 5.5
e0dc822b9c
Merge upstream/main into pr/convert-colours
...
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com >
2026-11-09 06:10:00 -05:00
mtlcl410
cf7734b17e
Merge upstream/main into fix/standard14-euro-width
2026-11-09 19:07:08 +08:00
Osvaldo Duran Melendez and Claude Sonnet 5.5
d1da3905c8
Merge upstream/main into pr/printer-marks
...
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com >
2026-11-09 06:01:48 -05:00
mtlcl410
4f71f96058
Merge remote-tracking branch 'upstream/main' into lane9-4784b
...
# Conflicts:
# crates/automation/src/tools.rs
# crates/automation/tests/it/automation.rs
# crates/xfa/src/tests.rs
# parity/acrobat-features.toml
2026-11-09 18:57:44 +08:00
mtlcl410
61062358e6
Merge remote-tracking branch 'upstream/main' into float-5368b
...
# Conflicts:
# crates/xfa/src/lib.rs
# crates/xfa/src/model.rs
# crates/xfa/src/tests.rs
2026-11-09 18:50:26 +08:00
mtlcl410
ed6c8afdef
Merge remote-tracking branch 'upstream/main' into lane3-2539b
2026-11-09 18:49:37 +08:00
Dylan M. Taylor
8f29ed66f9
fix(engine): open linked documents without blocking and check the handle is a regular file ( #5982 )
2026-11-09 18:37:30 +08:00
pat26-dotcom
8f5373a7d1
M12: turn a layout table into Div and P tags in one call ( #4105 ) ( #4250 )
2026-11-09 18:33:01 +08:00
oracola91
12a9b23394
Create PDF from text takes Cyrillic and Greek, and reports no longer escape them ( #5403 )
2026-11-09 18:31:29 +08:00
dotCooCoo
2d29f7c370
Merge main into feat/redacted-file-name
...
# Conflicts:
# crates/automation/src/redact.rs
2026-11-09 02:27:02 -08:00
mtlcl410
e1a664220a
Merge remote-tracking branch 'upstream/main' into lane4-4401b
...
# Conflicts:
# crates/ui-egui/src/tools/forms_ui.rs
2026-11-09 18:20:39 +08:00
mtlcl410
bd74ecab92
Merge remote-tracking branch 'upstream/main' into lane3-2539b
...
# Conflicts:
# crates/redact/src/tests.rs
2026-11-09 18:20:12 +08:00
Dylan M. Taylor
5f4003e562
fix(engine): summarizing comments requires copying permission ( #6039 )
2026-11-09 18:19:15 +08:00
Dylan M. Taylor
4791327701
fix(engine): unknown permissions on an encrypted document refuse copying and printing ( #6011 )
2026-11-09 18:18:28 +08:00