moppeeer
b71f83114f
Merge remote-tracking branch 'origin/main' into hyphenation-french-italian
...
# Conflicts:
# crates/compose/Cargo.toml
# crates/compose/src/hyphen.rs
# docs/gaps.md
# docs/localization-parity.md
# docs/typography-parity.md
2026-10-30 21:56:20 +01:00
moppeeer
1fd7cff87e
Merge remote-tracking branch 'origin/main' into text-frame-options-layout
...
# Conflicts:
# crates/compose/src/tests.rs
2026-10-30 21:53:55 +01:00
aiongg
92327dcc4c
Merge track b: swatches, canvas, tools and tables PRs
...
Conflicts: engine/src/tests.rs and i18n/*.rs: adjacent additions from both sides, both kept.
2026-10-30 20:49:48 +00:00
aiongg
4638b19387
Merge PR #1257 : TOC: generate and refresh PDF bookmarks
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1257 's new test
2026-10-30 19:46:49 +00:00
aiongg
e8e80ce22c
Merge PR #1285 : TOC: keep the title field readable beside its style selector
...
crates/ui-egui/src/dialogs.rs: TOC title row by hand: the reserved-width title field (#1285 ) with its accessible name, and the style selector keeping the label-id name argument
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, applied #1285 's 450->360 viewport edits in 3 tests, appended its new test
2026-10-30 19:46:44 +00:00
aiongg
3af0c95b40
Merge PR #1286 : TOC: toggle More Options without losing hidden settings
...
crates/ui-egui/src/dialogs/tests.rs: kept HEAD, appended #1286 's new test
2026-10-30 19:46:12 +00:00
aiongg
024390eaab
Merge PR #1431 : Swatches: reference app type columns on each row (not editable, process/spot, CMYK/RGB)
2026-10-30 19:44:02 +00:00
macadminHU
745ba77fd0
HU1: document current-main integration and the depth-ruler caption
...
Updated Hungarian localization entries and added Depth Ruler caption.
2026-10-30 12:08:20 +01:00
macadminHU
53d8805bb0
Merge branch 'main' into codex/hungarian-localization
2026-10-30 11:51:47 +01:00
Brandon Thomas
e22e6038dd
Merge storytold/main into PR #1990
...
# Conflicts:
# docs/typography-parity.md
2026-10-29 21:53:38 -04:00
Youssef Azriouil
5363ef8a4c
Docs: Greek in the localization hyphenation list
...
Greek patterns are bundled on main; the localization parity list now
names them next to Dutch.
2026-10-29 15:26:14 +01:00
Youssef Azriouil
7a3e69e20a
Hyphenation: bundle the Dutch patterns
...
Enable hypher's "dutch" feature: Piet Tutelaers's hyph-nl.tex 1.1 from
hyph-utf8, MIT licensed (added to NOTICE). Dutch text, including InDesign's
nl_NL_2005, now hyphenates instead of never breaking a word.
2026-10-29 13:38:15 +01:00
moppeeer
2ee75eca11
Merge remote-tracking branch 'origin/main' into swatch-row-icons
...
# Conflicts:
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/panels/swatches.rs
# docs/target-app-parity.md
2026-10-29 12:05:41 +01:00
moppeeer
165d8c65ac
Merge remote-tracking branch 'origin/main' into paragraph-shading-indesign
...
# Conflicts:
# ROADMAP.md
# crates/doc/src/attrs.rs
# crates/idml/src/export.rs
# crates/idml/src/import.rs
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/panels/properties.rs
2026-10-29 11:50:25 +01:00
moppeeer
35c96ee866
Merge remote-tracking branch 'origin/main' into table-convert-dialogs
...
# Conflicts:
# crates/doc/src/table.rs
# crates/engine/src/cmd/table.rs
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/menus.rs
2026-10-29 11:48:24 +01:00
moppeeer
1fbe3f272a
Merge remote-tracking branch 'origin/main' into table-menu-insert
...
# Conflicts:
# crates/engine/src/cmd/table.rs
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/menus.rs
2026-10-29 11:47:24 +01:00
moppeeer
94dad76ac1
Merge remote-tracking branch 'origin/main' into codex/toc-right-indent-separator
...
# Conflicts:
# crates/idml/src/import.rs
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
2026-10-29 11:44:26 +01:00
moppeeer
c0b4746c8d
Merge remote-tracking branch 'origin/main' into codex/toc-pdf-bookmarks
...
# Conflicts:
# crates/engine/src/cmd/style.rs
# crates/idml/src/export.rs
# crates/idml/src/import.rs
# crates/ui-egui/src/dialogs.rs
2026-10-29 11:44:22 +01:00
moppeeer
f93bc980d6
Merge remote-tracking branch 'origin/main' into codex/toc-dialog-title-width
...
# Conflicts:
# crates/ui-egui/src/dialogs.rs
2026-10-29 11:44:18 +01:00
moppeeer
5bd339d28f
Merge remote-tracking branch 'origin/main' into codex/toc-more-options
...
# Conflicts:
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
2026-10-29 11:44:15 +01:00
moppeeer
6f6ddb3272
Merge remote-tracking branch 'origin/main' into codex/pages-section-marker-dialog
...
# Conflicts:
# crates/ui-egui/src/panels/pages.rs
2026-10-29 11:44:10 +01:00
moppeeer
5a4012bab8
Merge remote-tracking branch 'origin/main' into properties-anchor-points
...
# Conflicts:
# crates/tools/src/select.rs
# crates/ui-egui/src/canvas.rs
# crates/ui-egui/src/i18n.rs
# crates/ui-egui/src/panels/properties.rs
# docs/target-app-parity.md
2026-10-29 11:42:56 +01:00
moppeeer
4145fcbc44
Merge remote-tracking branch 'origin/main' into text-frame-options-layout
...
# Conflicts:
# crates/ui-egui/src/dialogs.rs
# crates/ui-egui/src/i18n.rs
# docs/target-app-parity.md
2026-10-29 11:41:36 +01:00
moppeeer
45751393ef
Merge remote-tracking branch 'origin/main' into hyphenation-french-italian
2026-10-29 11:39:17 +01:00
KnottyDyes and Claude Opus 5.5
d7bc6633e7
Compose: honor discretionary hyphens in single-line composition
...
Recognize U+00AD independently of automatic hyphenation in the greedy breaker, reusing the existing visible hyphen output. Cover both composers, zero-width unbroken soft hyphens, pattern suppression, and tagged and untagged PDF text extraction.
Fixes #1955
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-29 00:14:44 -06:00
hslrmnp27
0ecaa95206
T.DE1: merge upstream main while preserving German hyphenation
2026-10-28 14:52:15 +01:00
aiongg
2d8207ed3c
Merge pull request #1896 from Jeremy8776/feat/install-scope-policy
...
Windows installation policy: DesignCraft
2026-10-27 17:16:38 -04:00
aiongg
1abeda4459
Merge pull request #1802 from dotCooCoo/fix/column-rules-span-the-text
...
Text frames: column rules run from the top line's ascent to the bottom line's descent
2026-10-27 13:45:19 -04:00
aiongg
5d8739b3d8
Merge pull request #1795 from dotCooCoo/feat/story-editor-depth-ruler
...
Story Editor: a depth ruler beside the text, and View › Story Editor › Show/Hide Depth Ruler, as in InDesign
2026-10-27 13:44:46 -04:00
macadminHU
4a85d3b61e
Merge branch 'main' into codex/hungarian-localization
2026-10-27 18:07:17 +01:00
aiongg
d77fdf2d4c
fix(ui): dropdown menus grow back after a search with no matches ( #1917 )
...
* fix(ui): font menus grow back after a search with no matches
Every combo box is craft_ui::ComboBox (craft-libs pinned at 62bb0e1d), whose
menu follows its contents' height while open (egui#5225); clippy.toml bans
egui::ComboBox.
The Font menu splits into a header (search field, filters) and a list
(font_menu_header, font_menu_list). Font fields show it in a
craft_ui::combo::Menu and the style dialogs' Font Family combo boxes in
ComboBox::show_ui_with_header, so only the rows scroll and the search field
stays in place. The blank and Parent's Font rows sit in the header, above
the search.
* chore(deps): craft-libs 60d60d48 (dropdown fixes)
* chore(deps): craft-libs 4d7b82f7 (dropdown fixes)
* chore(deps): craft-libs 92d392cf (#387 merged)
* chore(xtask): pdf-deps expects craft-libs 92d392cf
2026-10-27 10:27:32 -04:00
dotCooCoo
9ef2e64f9f
Merge main into the column rule extent fix
2026-10-27 07:16:50 -07:00
hslrmnp27
66447c01ae
T.DE1: merge upstream main and resolve update conflicts
2026-10-27 13:33:24 +01:00
Jeremy
dfe5296522
docs(installer): note that the 32-bit all-users folder is Program Files (x86); tidy wording
2026-10-27 12:25:18 +00:00
Jeremy
01328d169a
docs(installer): describe the per-user default install location and scope
2026-10-27 12:09:02 +00:00
aiongg
50650f74d7
Iconic panel flyouts stay open while the canvas is in use ( #1902 )
...
Auto-Collapse Iconic Panels is off by default, so a flyout closes only from its icon or
another icon. The setting is saved under a new key, so preferences saved with the old
default start with it off, and Preferences > Interface > Panels shows it.
2026-10-27 01:54:50 -04:00
dotCooCoo
17247c929e
Merge main into feat/story-editor-depth-ruler
...
Move the depth ruler state, translations, and menu command into the split UI modules.
2026-10-26 21:02:19 -07:00
aiongg
f15fe7aef0
refactor(ui-egui): split i18n.rs into i18n/table.rs
2026-10-26 21:00:23 +00:00
aiongg
96295e3f58
refactor(ui-egui): split menus.rs into menus/
2026-10-26 21:00:23 +00:00
dotCooCoo
af46697a88
Merge branch 'main' into feat/story-editor-depth-ruler
...
# Conflicts:
# ROADMAP.md
2026-10-26 11:57:12 -07:00
dotCooCoo
00d0867d50
Merge branch 'main' into fix/column-rules-span-the-text
2026-10-25 21:39:36 -07:00
aiongg
f6fe64981a
Merge branch 'keymap-adoption' into keymap-shortcuts-dialog
...
# Conflicts:
# Cargo.toml
2026-10-26 03:29:29 +00:00
aiongg
ea5a706ef8
Merge remote-tracking branch 'upstream/main' into keymap-adoption
...
# Conflicts:
# Cargo.lock
2026-10-26 03:15:52 +00:00
aiongg
3fc0bf83fd
Merge branch 'keymap-adoption' into keymap-shortcuts-dialog
...
# Conflicts:
# Cargo.toml
# xtask/src/pdf_deps.rs
2026-10-26 02:06:51 +00:00
aiongg
23173b9065
Merge remote-tracking branch 'upstream/main' into keymap-adoption
...
# Conflicts:
# Cargo.lock
# Cargo.toml
# xtask/src/pdf_deps.rs
2026-10-26 02:06:25 +00:00
aiongg
2e6df922c8
Merge remote-tracking branch 'upstream/main' into print-color-separations
...
# Conflicts:
# Cargo.lock
# crates/engine/src/cmd/export.rs
2026-10-26 02:05:49 +00:00
aiongg
ada39e78d7
Keyboard Shortcuts: Assign takes a held shortcut in one step (craft-libs#352)
2026-10-26 01:39:22 +00:00
aiongg
d28271b489
Merge branch 'keymap-adoption' into keymap-shortcuts-dialog
...
# Conflicts:
# Cargo.lock
# Cargo.toml
2026-10-26 01:16:37 +00:00
aiongg
1a52593d0d
Merge remote-tracking branch 'upstream/main' into keymap-adoption
...
# Conflicts:
# Cargo.toml
2026-10-26 01:15:41 +00:00
aiongg
d90881a8a9
Merge branch 'print-color' into print-color-separations
...
# Conflicts:
# Cargo.toml
2026-10-26 01:11:35 +00:00