aiongg
acfdc0cb5f
Merge PR #2500 : Resolve installed fonts by PostScript face name
...
Test-font pins: #3389 's kept, #2500 's dropped (layout tests.rs, tests_pages.rs, render lib.rs). crates/fonts/src/fontdb.rs: #2500 's PostScript-name match moved into #3078 's family_paths.
2026-10-22 01:50:29 +00:00
aiongg
22124867d0
Merge PR #1249 : Ribbon: names for screen readers on the tab strip's drawn buttons ( #1110 )
...
crates/ui-egui/src/ribbon.rs: main's Share button (already named) kept; the » button's "More tabs" name added in main's restructured strip; both sides' tests kept. i18n: "More tabs" rows added after main's.
2026-10-22 01:50:03 +00:00
aiongg
65421603e8
Merge PR #2984 : #2959 : show the formatting mini toolbar with text context menus
...
crates/ui-egui/src/canvas.rs: #2984 's context-menu open logic, opened also by #3419 's equation options strip (eq_strip).
2026-10-22 01:49:36 +00:00
aiongg
ec988829c9
Merge PR #1800 : Layout: paragraph borders take their room and same-bordered paragraphs join in one shaded box
...
crates/layout/src/lib.rs: #1800 's border room in the keep-with-next lookahead, with #2431 's list counters passed to next_first_line.
2026-10-22 01:49:08 +00:00
aiongg
5dc68481ed
Integration: track t09
...
crates/ui-egui/src/backstage.rs: t03's bidi_display on the Recent names over t09's borrowed name/path. people.toml: union. Tests: both tracks' tests kept whole. Docs: status lines combined, rows unioned or word-merged.
2026-10-22 01:48:25 +00:00
aiongg
e1e258e4d9
Integration: track t08
...
contributors/people.toml: union. crates/layout/src/tests.rs: both tracks' tests kept whole. Docs: status lines combined, rows unioned or word-merged.
2026-10-22 01:47:56 +00:00
aiongg
3581f80251
Integration: track t07
...
# Conflicts:
# ROADMAP.md
# docs/file-format-parity.md
# docs/gaps.md
# docs/layout-parity.md
2026-10-22 01:47:46 +00:00
aiongg
04b3881e3e
Integration: track t06
...
docs/gaps.md row 4: one row (t06 had kept a second, older copy of it); t05's #1840 and t06's #2964 clauses both in, main's #2963 clause kept. docs/recovery.md: t06's retry sentence with t01's base64 size text. Test files: both tracks' tests kept whole.
2026-10-22 01:47:34 +00:00
aiongg
16d1c8a933
Integration: track t05
...
crates/pdf/src/lib.rs: t01's vector_text kept before t05's watermark (box area signature). Test files and canvas.rs tests: both tracks' tests kept whole. Docs: status lines combined, rows unioned or word-merged.
2026-10-22 01:46:47 +00:00
aiongg
0d3b8eb0cb
Integration: track t04
...
crates/formats/src/odt.rs: t01's Body::new/take_blocks kept; take_blocks finishes tables with t04's TableB::finish (column widths). Test files: both tracks' tests kept whole. Docs: status lines combined, rows unioned or word-merged.
2026-10-22 01:46:17 +00:00
aiongg
86df1e70ce
Integration: track t03
...
# Conflicts:
# ROADMAP.md
# crates/formats/src/html.rs
# docs/gaps.md
# docs/ui-parity.md
2026-10-22 01:44:54 +00:00
aiongg
245b5bd8d0
Integration: track t02
...
Docs: status lines combined (t02's entries first); log rows unioned; file-format-parity .rtf row from t02 (#1653 , duplicate .rtf row dropped as t02 did), .odt row word-merged.
2026-10-22 01:44:01 +00:00
aiongg
674e0cef5b
Integration: track t01
2026-10-22 01:42:06 +00:00
aiongg
3017804459
Integration: cargo fmt
2026-10-22 01:40:29 +00:00
aiongg
520f54cb81
Integration: cargo fmt
2026-10-22 01:34:26 +00:00
aiongg
d4debe0592
Integration: cargo fmt
2026-10-22 01:34:25 +00:00
aiongg
3bf53830c5
Integration: #1728 close the layout test the merge resolution left open
2026-10-22 01:34:15 +00:00
aiongg
5c260a16fd
Integration: cargo fmt
2026-10-22 01:31:48 +00:00
aiongg
ed2ecefac2
Integration: #3257 separate its Find-box test from #2407 's recent-files test (auto-merge interleaved them)
2026-10-22 01:29:54 +00:00
aiongg
789256d2d1
Integration: #2453 drawing_payload test builds the shape fill as a Fill
2026-10-22 01:29:12 +00:00
aiongg
406694ea58
Integration: #3429 the based-on-chain test's doc comment back above its test
2026-10-22 01:25:08 +00:00
aiongg
ef00b55870
Merge PR #3429 : #3415 : banded rows shade the same rows in the reference app and WordCraft (table style band sizes)
...
crates/docx/tests/fixtures.rs: union, keeps main's shape-gradient test and the PR's band-size tests.
ROADMAP.md, docs/file-format-parity.md: main's status lines with this change added to the newest; log rows from both sides in date order.
2026-10-22 01:25:02 +00:00
aiongg
d015988e93
Integration: #2334 test a formula string result continued in a CONTINUE record
2026-10-22 01:25:01 +00:00
aiongg
c91ac7f68f
Merge PR #3291 : #2428 : the table's move and resize handles show while the caret is in it
...
ROADMAP.md, docs/ui-parity.md: main's status lines with this change added to the newest; log rows from both sides in date order.
2026-10-22 01:24:49 +00:00
aiongg
31ba42a013
Integration: #3419 doc comments back on their own items (EquationFrame and its test above them)
2026-10-22 01:24:36 +00:00
aiongg
c7d5a949a7
Merge PR #3232 : #2038 : a click below a floating table goes to the text, not its last row
...
ROADMAP.md, docs/layout-parity.md: main's status lines with this change added to the newest; log rows from both sides in date order.
2026-10-22 01:24:36 +00:00
aiongg
7b95c59980
Merge PR #3419 : Equations: the equation being edited is framed as in the reference app
...
Doc status lines keep main's and add the PR's entry; log rows unioned: docs/ui-parity.md
2026-10-22 01:24:20 +00:00
aiongg
0255a44d9a
Merge PR #3389 : M2.1: stabilize font and shadow geometry checks
...
docs/gaps.md: status line keeps main's and adds the PR's entry; main's last log row kept above the PR's new section.
2026-10-22 01:24:20 +00:00
aiongg
f62c6f99ed
Merge PR #3202 : Layout: justified lines shrink their spaces by the reference app's measured limits
...
Doc status lines keep main's and add the PR's entry; log rows unioned: docs/layout-parity.md
2026-10-22 01:24:10 +00:00
aiongg
61570835bc
Merge PR #3156 : Watermark: the text fills its shape's box, as the reference app's textpath does
...
crates/docx/src/read/story.rs: main's vml_opacity with the PR's box size.
crates/pdf/src/tests.rs: both sides' tests kept; the glyph_frames helper both #3155 and #3156 add stays once.
2026-10-22 01:24:10 +00:00
aiongg
412fc47300
Merge PR #3231 : i18n: File › Home greeting in every interface language
...
crates/ui-egui/src/i18n/{de,et,ja,pt-br,sr,sr-latn,uk,zh-hans,zh-hant}.tsv: union by key, no duplicates.
docs/localization-parity.md: main's status line with this change added; both progress-log rows.
2026-10-22 01:24:08 +00:00
aiongg
eb5d0b74ed
Merge PR #3205 : #2802 : Delete on whole table cells leaves one empty paragraph in each
...
ROADMAP.md: main's status lines with this change added to the newest; progress-log rows from both sides in date order.
2026-10-22 01:23:54 +00:00
aiongg
f90a9896ad
Merge PR #3481 : fix(engine): toggle off style-inherited lists ( #3459 )
...
ROADMAP.md, docs/gaps.md, docs/typing-parity.md: status lines and revision histories carry both sides.
2026-10-22 01:23:52 +00:00
aiongg
e311bd410f
Merge PR #3155 : Text: scaled letters (w:w) are stretched, not spaced out
...
crates/pdf/src/tests.rs: both sides' new tests kept.
2026-10-22 01:23:50 +00:00
aiongg
d985d0ecce
Merge PR #3289 : M15: fix Russian ё ordering and decomposed Cyrillic keys
...
ROADMAP.md: status line and revision history carry both sides.
docs/gaps.md, docs/localization-parity.md: status lines carry both sides.
2026-10-22 01:23:41 +00:00
aiongg
f9d0295d98
Merge PR #3068 : Rendering reuses one render context, so typing starts no threads ( #3027 )
...
Doc status lines keep main's and add the PR's entry; log rows unioned: ROADMAP.md
2026-10-22 01:23:41 +00:00
aiongg
6336f7b521
Merge PR #2947 : Render: fade dimmed headers and footers as one layer
...
crates/render/src/lib.rs: imports keep main's Paint and take the PR's page_layers (page_display moves to the test imports).
2026-10-22 01:23:41 +00:00
aiongg
92b36ceae0
Merge PR #2557 : #1681 : HTML export and import keep furigana (ruby)
...
docs/file-format-parity.md: main's status line with this change added; both progress-log rows, this one first.
docs/localization-parity.md: main's status line with this change added.
2026-10-22 01:23:40 +00:00
aiongg
9cd24539bd
Merge PR #2549 : #1653 : RTF import decodes the East Asian multibyte code pages (932/936/949/950)
...
docs/file-format-parity.md: main's status line with this change added.
2026-10-22 01:23:23 +00:00
aiongg
b7776ee6ac
Merge PR #2739 : Layout: a line can break after a hyphen before a digit, like the reference app ( #2712 )
...
crates/layout/src/tests.rs: both sides' new tests kept.
2026-10-22 01:23:22 +00:00
aiongg
a05c650a16
Merge PR #3391 : ODT: table column widths are read, so a resized column survives a save
...
crates/formats/src/odt.rs: StyleInfo keeps both cell_valign (#2416 ) and column_width.
ROADMAP.md, docs/file-format-parity.md, docs/gaps.md: main's status lines kept; the PR's log rows added.
2026-10-22 01:23:19 +00:00
aiongg
2dc0e4adf7
Merge PR #3440 : A document with many content controls saves in the time they take
...
ROADMAP.md: status line once (this change first, then main's); progress-log entries and history rows union
docs/file-format-parity.md: status line once; history rows union in date order
docs/gaps.md: status line once (this change first, then main's)
2026-10-22 01:23:17 +00:00
aiongg
5b19acb4ec
Merge PR #3193 : ODT: read an embedded equation's own MathML instead of its undecodable metafile preview
...
ROADMAP.md: progress log carries both sides.
docs/file-format-parity.md: ODT row keeps #873 's headers and footers and adds #3193 's formula objects.
2026-10-22 01:23:17 +00:00
aiongg
423fc3f50d
Merge PR #2691 : Equation arrays: centre &-less rows (First Property of Radicals, #2617 )
...
crates/layout/src/math.rs: main already centres &-less rows (#2617 ); kept main's code and added the PR's two tests.
ROADMAP.md: main already has the #2617 log row; the PR's duplicate row dropped.
2026-10-22 01:23:13 +00:00
aiongg
57205e310a
Merge PR #2392 : PDF export: lam-alef drawn as two glyphs at the same x extracts in reading order ( #2310 )
...
ROADMAP.md: main's status lines, with this change added to the newest.
docs/file-format-parity.md: main's status line with this change added; PDF export row keeps main's outline note and adds the lam-alef note.
2026-10-22 01:23:07 +00:00
aiongg
264bfdaed3
Merge PR #3333 : M15: correct Cuban and Peruvian Spanish decimal separators
...
ROADMAP.md, docs/gaps.md, docs/localization-parity.md: main's status lines kept; the PR's log rows and gaps note added.
2026-10-22 01:23:06 +00:00
aiongg
d64ce28903
Merge PR #3204 : DOCX: majorBidi/minorBidi theme fonts follow the theme font language
...
docs/file-format-parity.md: status line once (this change first, then main's); history rows union
2026-10-22 01:23:01 +00:00
aiongg
9c3df446ff
Merge PR #3247 : #1899 : a picture cropped to a sliver is drawn at the size the file gives
...
crates/metafile/src/lib.rs: re-export both TextLayout (#1915 ) and crop_window.
ROADMAP.md, docs/layout-parity.md: main's status lines kept; the PR's log rows added.
2026-10-22 01:22:55 +00:00
aiongg
c37c693b46
Merge PR #3190 : #2986 : Search and three other boxes stop resetting the input method every frame
...
ROADMAP.md: status line, progress log and revision history carry both sides.
2026-10-22 01:22:54 +00:00
aiongg
1c757ece6b
Merge PR #3199 : Signature lines stay signable after saving a .docx
...
ROADMAP.md: status line once (this change first, then main's); progress-log rows union in date order
docs/file-format-parity.md: status line once; VML row merged word by word (main's #1500 fill text plus the PR's signature-line text)
2026-10-22 01:22:51 +00:00