Past the estimated line slots the breaker assumes the whole column; the
rebreak check compares against that fallback too, so lines beside a wrap
object stay inside their segments.
(cherry picked from commit 94a06ed881)
Conflicts:
- crates/ui-egui/src/panel_docking.rs: kept #1021's window.panel.closeGroup and #1022's floating-group branch in command().
- crates/ui-egui/src/panel_docking_tests.rs: kept both sets of tests.
Conflicts:
- crates/compose/src/shape.rs: typed figures and page-number markers both go through #1012's digit_mode; the batch's inline digits block and its second mapping of the marker text are gone.
- crates/compose/src/lib.rs: the list label keeps the batch's label_chars and prepend_label; it takes the Digits of the paragraph's first run unless the number's character style sets its own.
- crates/compose/src/tests.rs: kept page_numbers_take_the_digits_option and added #1012's test.
- crates/ui-egui/src/i18n.rs: kept the batch's French strings and added the Digits: row.
- crates/ui-egui/src/panels/properties.rs: the always-shown Digits row is followed by the batch's two-column Size, Kerning, Baseline, Leading and Tracking layout.
crates/engine/src/dtd.rs: keep the branch's version; #319 already bounds DTD group nesting (with the same limit of 64) along with the entity budget and matching fixes, so this PR's DTD part is dropped. The XML element limits are taken.
crates/idml/src/import.rs: keep the branch's strict Mojikumi row reader (#129), which refuses a non-finite value; take the PR's composite-font filters.
crates/idml/src/tests.rs: the PR's test drops its Mojikumi NaN row, which #129 refuses on purpose.
Conflicts:
- crates/engine/src/cmd/edit.rs: kept the batch's copy_items and paste_origin and added #1011's preview function; kept paste_tests and added preview_tests after it.
- crates/ui-egui/src/panels/properties.rs: the axis-slider test sets the family through the batch's apply_font (FontPick), which replaced apply_font_family.
- ROADMAP.md: progress-log line moved under "Newest first."
Conflicts:
- crates/ui-egui/src/dialogs.rs: kept the branch's dialog code and added #1024's New Workspace width, Capture checkboxes and confirm params at the branch's indentation.
- crates/ui-egui/src/i18n.rs, i18n/{ar,de,it,ja,ka,pt_br,uk}.rs: kept both sides.
crates/idml/src/lib.rs: crate doc keeps the branch's feather list and adds liquid guides.
crates/idml/src/tests.rs: keep all test modules from both sides.
docs/file-format-parity.md: keep both change-log rows; status line names both changes.
ROADMAP.md: drop the blank line the union merge left inside the progress log, and a stray one further down.
Conflicts:
- crates/ui-egui/src/panels/layers.rs: kept #378's object_rows and its command list; #1083's slow-click check sits in its click branch (start the rename, or push selection.set), with the sole-selection test on the listing's selected or shown objects; added #1083's accessibility info to the object row.
crates/textimport/src/docx.rs: keep the branch's page_break_ends_its_paragraph test (already present further down); add the PR's inline content control test.
Conflicts:
- crates/engine/src/cmd/text.rs: took #1000's unit_at split of select_at; its two revision bumps use the batch's bump_revision().
- crates/tools/src/text.rs: kept the batch's preedit and table-border fields, BorderDrag and the press-time border check; #1000's `unit` replaces `unit_selected`, and the drag branch checks the border first, then #1000's unit drag.
Conflicts:
- crates/ui-egui/src/canvas.rs: took #1090's field_focused_id and begin_frame without the old IME helpers the batch's IME work replaced; the keyboard gate keeps the focus-lock filter above it and checks the menu, a field focused at frame start, and keyboard_pane.
Conflicts:
- crates/ui-egui/src/dialogs.rs: footer row keeps the branch's labels and #683's New Document Preview and adds #1062's style Preview checkbox at its start; kept style_options_preview() next to the branch's paragraph style dialog; kept both sets of tests.
- docs/ui-parity.md: kept both paragraphs; style-dialog Preview is no longer listed as a gap.
Conflicts:
- docs/target-app-parity.md: kept the batch's rows and added Greek to the hyphenation list.
- docs/typography-parity.md: kept the batch's Justification and Hyphenation rows and added Greek (hyph-el-monoton).
Conflicts:
- crates/engine/src/cmd/text.rs: kept #531's paraMixed report and used #1060's override counts (paraOverrides, charOverrides, characterStyleOverrides) in it.
- crates/ui-egui/src/panels/styles.rs: kept both row-menu items and both sets of tests; #1064's test passes #1060's new `overridden` argument.
- docs/ui-parity.md: kept both paragraphs and both change notes; Redefine Style is no longer listed as a gap (#1064).
Conflicts:
- crates/doc/src/lib.rs: DocSettings keeps the ruler origin and zero point fields and adds new_object; both defaults kept.
- crates/engine/src/cmd/style.rs: object.color keeps the batch's colour-model description, adds the nothing-selected sentence and the has_doc enable rule.
- crates/ui-egui/src/toolbar.rs: kept both tests (stroke gradient undo, new-shape colours from the proxy).
- ROADMAP.md: progress-log line moved under "Newest first." in the log's format.
Conflicts:
- crates/engine/src/cmd/style.rs: both add a test module at the top of the file; kept #1061's application_inheritance_tests and #1064's redefine_tests, one after the other.
- docs/ui-parity.md: kept both paragraphs.
The merge took next's winit patch (rust-windowing/winit#4694, the Windows mixed-DPI drag fix) and
left out main's (skylartaylor/winit 3d51077f, with_close_requested_on_terminate), so Quit from the
Dock stopped asking to save (#623, released in 0.8.0). Cargo takes one winit patch, so the batch
keeps main's until one fork holds both commits; the Windows fix (#631) follows then.
Conflicts:
- crates/engine/src/cmd/text.rs: kept the kern_pair_tests module and added pick_up_format_tests after it.
- crates/tools/src/xform.rs: the one hit test keeps its spread (`hit` is the whole `cx.hit` result) and feeds both color.sample's matchFrom and type.pickUpFormat.
- ROADMAP.md: progress-log line moved under "Newest first."
aiongg