chore: sync upstream (86 Commits) #12

Merged

alf merged 86 commits from chore/sync-upstream-20261027 into main 2026-10-27 20:15:18 +00:00

Conversation 0 Commits 86 Files changed 300 +83671 -82062

alf commented 2026-10-27 20:15:17 +00:00

Owner

Copy link

Upstream-Sync von upstream/main (86 Commits). Fast-Forward.

• 1abeda44 Merge pull request #1802 from dotCooCoo/fix/column-rules-span-the-text
• 5d8739b3 Merge pull request #1795 from dotCooCoo/feat/story-editor-depth-ruler
• d36e5fb6 Merge pull request #1927 from Silvertree2010/perf/export-speed
• 1db1635a Ask the composition cache once per story and page in PDF export
• d77fdf2d fix(ui): dropdown menus grow back after a search with no matches (#1917)
• 9ef2e64f Merge main into the column rule extent fix
• 50650f74 Iconic panel flyouts stay open while the canvas is in use (#1902)
• fcea4173 Hide stale Story Editor depth marks while text changes
• 17247c92 Merge main into feat/story-editor-depth-ruler
• 935b817b Merge pull request #1892 from aiongg/layout
• 446a36d0 Merge pull request #1890 from storytold/fix/nextest-0.9.150
• 42993ae6 test(engine): read only test cfgs and any pub(…) mod as test modules in the file guard
• bbb49511 refactor(epub): split lib.rs into modules
• 27e21ba1 refactor(render): split lib.rs into modules
• 08f633ae refactor(fonts): split fontdb.rs into fontdb/

Upstream-Sync von `upstream/main` (86 Commits). Fast-Forward. - 1abeda44 Merge pull request #1802 from dotCooCoo/fix/column-rules-span-the-text - 5d8739b3 Merge pull request #1795 from dotCooCoo/feat/story-editor-depth-ruler - d36e5fb6 Merge pull request #1927 from Silvertree2010/perf/export-speed - 1db1635a Ask the composition cache once per story and page in PDF export - d77fdf2d fix(ui): dropdown menus grow back after a search with no matches (#1917) - 9ef2e64f Merge main into the column rule extent fix - 50650f74 Iconic panel flyouts stay open while the canvas is in use (#1902) - fcea4173 Hide stale Story Editor depth marks while text changes - 17247c92 Merge main into feat/story-editor-depth-ruler - 935b817b Merge pull request #1892 from aiongg/layout - 446a36d0 Merge pull request #1890 from storytold/fix/nextest-0.9.150 - 42993ae6 test(engine): read only test cfgs and any pub(…) mod as test modules in the file guard - bbb49511 refactor(epub): split lib.rs into modules - 27e21ba1 refactor(render): split lib.rs into modules - 08f633ae refactor(fonts): split fontdb.rs into fontdb/

alf added 86 commits 2026-10-27 20:15:17 +00:00

Story Editor: a depth ruler beside the text, and View › Story Editor › Show/Hide Depth Ruler, as in InDesign ... 5c103c280e

The Story Editor has a vertical depth ruler between the style column
and the text. It is marked in the document's vertical ruler units with
how deep the story's text fills its frames, counted through its
columns and threaded frames, and it is shaded down to the overset
point. Paragraph spacing adds to the depth. Lines set side by side, in
the sub-columns of a split paragraph or on both sides of a wrap
object, count once. Where several marks fall on one editor row, only
the deepest is drawn. A red line crosses the text, and the ruler when
it shows, above the first character that does not fit.

View › Story Editor › Show/Hide Depth Ruler (view.storyEditorDepthRuler)
shows or hides the ruler in the Story Editor, for every story opened in
it. The ruler is shown by default, and the setting is saved with the
preferences.

Story Editor: Show/Hide Depth Ruler in Spanish ... e1ff9b9ee8

The shared table's Spanish column held the English label. It now reads
"Mostrar/ocultar regla de profundidad", and a test checks that every
interface language translates the label.

Story Editor: showing or hiding the depth ruler keeps the text's focus ... 41b7611b27

The ruler's space is allocated before the text editor, so toggling it
moved the editor's automatic widget id, and the editor lost its focus
and caret. The editor now has a fixed id.

Text frames: column rules run from the top line's ascent to the bottom line's descent ... 5f77ea123b

A column rule ran from the top of the columns to their bottom, so a frame
that the text only half fills drew its rules down to the empty bottom of
the frame. InDesign draws them from the top line's ascent to the bottom
line's descent. column_rule_rects now takes that extent from the frame's
lines, and the top and bottom insets shorten the rule from there. A frame
without lines draws no rules. Existing documents draw their column rules
at the new length, on screen, in PDF and in PowerPoint export.

Merge branch 'main' into fix/column-rules-span-the-text 00d0867d50

refactor(engine): move cmd/mod.rs to cmd.rs 8b56a75f19

refactor(engine): move cmd/datamerge/mod.rs to cmd/datamerge.rs 7445b8eee7

refactor(ui-egui): move panels/mod.rs to panels.rs 648ec777e4

refactor(color): move cms/mod.rs to cms.rs 802388109a

refactor(compose): move hyphen/mod.rs to hyphen.rs 29d10be435

refactor(ui-egui): move the tests module of dialogs.rs to dialogs/tests.rs 9e7147da93

refactor(ui-egui): move the tests module of menus.rs to menus/tests.rs a72dfe2e49

refactor(ui-egui): move the tests module of canvas.rs to canvas/tests.rs 4abd7aea8c

refactor(ui-egui): move the tests module of lib.rs to tests.rs 56905e5076

refactor(epub): move the tests module of lib.rs to tests.rs 39da80d792

refactor(tools): move the tests module of snap.rs to snap/tests.rs 6fae1b2e92

refactor(ui-egui): move the tests module of chrome.rs to chrome/tests.rs b3d11e56a7

refactor(engine): move the tests module of recovery.rs to recovery/tests.rs 37ada05f77

refactor(ui-egui): move the tests module of panels/properties.rs to panels/properties/tests.rs 2272bf0d94

refactor(engine): move the tests module of cmd/find.rs to cmd/find/tests.rs eb65f9c93a

refactor(format): move the tests module of lib.rs to tests.rs 6babccd1f8

refactor(render): move the tests module of lib.rs to tests.rs 6e078e1167

refactor(images): move the tests module of psd.rs to psd/tests.rs 7c02423416

refactor(engine): move the tests module of cmd/pdflayers.rs to cmd/pdflayers/tests.rs 9ca1c5c83a

refactor(engine): move the color_tests module of cmd/style.rs to cmd/style/color_tests.rs 8e0b6d5c9a

refactor(textimport): move the tests module of docx.rs to docx/tests.rs 53b3144ab5

refactor(engine): move the tests module of math.rs to math/tests.rs 4e40f85f9b

refactor(compose): move the border_tests module of table.rs to table/border_tests.rs 0982b3da03

refactor(engine): move the tests module of cmd/package.rs to cmd/package/tests.rs f07d0900b3

refactor(pdf): move the tests module of pdfx.rs to pdfx/tests.rs 504d0e9979

refactor(images): move the tests module of lib.rs to tests.rs 98fb372245

refactor(ui-egui): move the tests module of new_document.rs to new_document/tests.rs 7248f3afd1

refactor(engine): move the text_tests module of cmd/export.rs to cmd/export/text_tests.rs d9fb8cfbfa

refactor(ui-egui): move the tests module of toolbar.rs to toolbar/tests.rs 10829d414e

refactor(engine): move the tests module of cmd/links.rs to cmd/links/tests.rs 3b0e299180

refactor(ui-egui): move the tests module of panels/pages.rs to panels/pages/tests.rs 8d4a32667f

refactor(ui-egui): move the tests module of i18n.rs to i18n/tests.rs 16b3594f31

refactor(engine): move the tests module of cmd/variables.rs to cmd/variables/tests.rs 8ba7fd46b9

refactor(engine): move the tests module of cmd/load_styles.rs to cmd/load_styles/tests.rs 8d36acd1c0

refactor(engine): move the text_clipboard_tests module of cmd/edit.rs to cmd/edit/text_clipboard_tests.rs d4bd716ebf

refactor(doc): move the tests module of attrs.rs to attrs/tests.rs 256426ae99

refactor(ui-egui): move the tests module of prefs.rs to prefs/tests.rs 63dff1e6b5

refactor(engine): move the tests module of cmd/place_text.rs to cmd/place_text/tests.rs 2e52c9fcd0

refactor(ui-egui): move the font_menu_ui_tests module of panels.rs to panels/font_menu_ui_tests.rs 42071abc5c

refactor(designcraft): move the tests module of gpu.rs to gpu/tests.rs ab48df68c8

refactor(engine): move the loose tests_*.rs files to tests/ b0dc1578b5

Merge branch 'main' into feat/story-editor-depth-ruler ... af46697a88

# Conflicts:
#	ROADMAP.md

refactor(fonts): move the fontdb tests_*.rs files to fontdb/tests/ 09688b34d6

refactor(ui-egui): move panel_docking_tests.rs to panel_docking/tests.rs bec8b28cbc

docs(engine): name the file guard test's new path 5f53d41387

refactor(ui-egui): split canvas.rs into canvas/ 9d5dbb4b8c

ci: require nextest 0.9.150 ... 3cfaca7ef3

Use the fixed release for GHSA-vc25-qg58-w57c.

refactor(ui-egui): split menus.rs into menus/ 96295e3f58

refactor(engine): split cmd/table.rs into cmd/table/ 18e03a3035

refactor(engine): split cmd/file.rs into cmd/file/ b2f1ad1867

refactor(engine): split cmd/export.rs into cmd/export/ d93acf7120

refactor(ui-egui): split panels/properties.rs into panels/properties/ 2f7e956e8e

refactor(engine): split cmd/text.rs into cmd/text/ 7afc1af676

refactor(engine): split cmd/style.rs into cmd/style/ a1ec465207

refactor(idml): split import.rs into import/ 2c0882c6e0

refactor(idml): split export.rs into export/ bec8800b62

refactor(pdf): split export.rs into export/ f33de8f4aa

refactor(engine): split cmd/layout.rs into cmd/layout/ 8f601148b6

refactor(ui-egui): split chrome.rs into chrome/ f70c3efa3c

refactor(doc): split item.rs into item/ a24e9dffd1

refactor(doc): split table.rs into table/ bc345384f6

refactor(doc): split attrs.rs into attrs/ 2dd87273a2

refactor(ui-egui): split lib.rs into app, state, services, clock and key_names 02f595fe92

refactor(ui-egui): split app.rs into app/ 2bca3285bf

refactor(ui-egui): split i18n.rs into i18n/table.rs f15fe7aef0

refactor(doc): move the CharAttrs and ParaAttrs sets to attrs/char_attrs.rs and attrs/para_attrs.rs f553e17406

refactor(fonts): split fontdb.rs into fontdb/ 08f633ae48

refactor(render): split lib.rs into modules 27e21ba19a

refactor(epub): split lib.rs into modules bbb495111e

test(engine): read only test cfgs and any pub(…) mod as test modules in the file guard ... 42993ae680

Split files share test helpers through pub(super)/pub(crate) test modules. The guard read only `mod` and `pub mod` as a test module, so it scanned their fixtures as production code. `attr.contains("test")` also matched `#[cfg(not(test))]`, so such a module was skipped; it is scanned now.

Merge pull request #1890 from storytold/fix/nextest-0.9.150 ... 446a36d08b

ci: require nextest 0.9.150

Merge pull request #1892 from aiongg/layout ... 935b817b89

refactor: shared module layout (craft-contrib#20)

Merge main into feat/story-editor-depth-ruler ... 17247c929e

Move the depth ruler state, translations, and menu command into the split UI modules.

Hide stale Story Editor depth marks while text changes ... fcea4173be

Draw the depth ruler and overset line after composition reflects the edited
text. Add a paint-output regression for inserting a paragraph break.

Iconic panel flyouts stay open while the canvas is in use (#1902) ... 50650f74d7

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.

Merge main into the column rule extent fix 9ef2e64f9f

fix(ui): dropdown menus grow back after a search with no matches (#1917) ... d77fdf2d4c

* 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

Ask the composition cache once per story and page in PDF export ... 1db1635a88

The PDF exporter called Cache::get twice for every text frame it drew.
Each call rebuilds the cache signature of the whole story, which looks up
every frame of the story with Document::find (a linear walk over all
spreads), and the anchored-frame placements walk them again. For a story
threaded through many frames this is O(frames^2 x items) per export.

The document doesn't change during an export, so the exporter now keeps
the composition it got for each (story, page) and reuses it. The cache
still decides what to compose; the output is byte-identical.

Add examples/pdf_export.rs to designcraft-cli: File > Export PDF through
a headless session on the `designcraft-cli perf` stress document (200
pages, 1M characters in 40 threaded stories, 500 placed images). The
stress document generator moves unchanged from src/perf.rs to a small
library module (src/stress.rs) that the binary and the example share.

Ryzen 16 threads, Linux, 12 runs each, interleaved:
  main     median 3485 ms, min 3427 ms
  patched  median 2016 ms, min 1656 ms  (-42 % median, -52 % min)
The exported PDF is byte-identical (12,075,744 bytes).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Merge pull request #1927 from Silvertree2010/perf/export-speed ... d36e5fb63f

PDF export: ask the composition cache once per story and page

Merge pull request #1795 from dotCooCoo/feat/story-editor-depth-ruler ... 5d8739b3d8

Story Editor: a depth ruler beside the text, and View › Story Editor › Show/Hide Depth Ruler, as in InDesign

Merge pull request #1802 from dotCooCoo/fix/column-rules-span-the-text ... 1abeda4459

Text frames: column rules run from the top line's ascent to the bottom line's descent

alf merged commit 1abeda4459 into main 2026-10-27 20:15:18 +00:00

alf deleted branch chore/sync-upstream-20261027 2026-10-27 20:15:19 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

  

herkunft/alpha-feedback

Aus Rückmeldungen der Alpha-Tester

  

status

blockiert

Wartet auf etwas anderes

  

status

zu-testen

Gebaut, aber noch nicht im echten Einsatz geprüft

  

typ

bug

Fehler

  

typ

docs

Dokumentation

  

typ

enhancement

Verbesserung einer vorhandenen Funktion

  

typ

feature

Neue Funktion

  

typ

idea

Idee, noch nicht entschieden

No labels

herkunft/alpha-feedback

status

blockiert

status

zu-testen

typ

bug

typ

docs

typ

enhancement

typ

feature

typ

idea

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

iris/designcraft!12

No description provided.