Commit Graph
4738 Commits
Author SHA1 Message Date
FredAppsandDylan M. Taylor f405f89da4 Formats: port the craft-libs cutover follow-ups from #2734 to main (#2838)
* Formats: port the craft-libs cutover follow-ups from #2734 to main (craft-libs#778)

Brings #2734's changes (made against the release branch) to main:
IDML CDATA on write and table span parsing, DOCX plain-text accepted
changes, XLSX invalid number cells shown as written, shared CMYK JPEG
polarity, exact PPTX opacity, PDF CMYK fallback wording, and the
craft-libs re-pins. Imported DOCX built-in headings keep main's and
v0.21.0's spelling ("Heading 1"), with a test. craft-pdf, craft-prepress,
craft-cms, the krilla/hayro patches and craft-xml-dtd move to the #1322
squash merge on craft-libs main (a5ac3aa0).

Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com>

* Point the PDF dependency check at the craft-libs main pin

Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com>

* Formats: address review on the cutover follow-ups

- PDF: keep main's CMYK fallback warning. The shared decoder reads planar
  CMYK TIFFs and makes associated alpha straight, so neither falls back;
  a test now checks both keep their inks.
- DOCX plain-text import uses craft-wordmodel's Paragraph::final_text,
  which already drops tracked deletions and expands inline objects.
- IDML: a test pins numeric table spans (fractions round down, spans past
  the table or past 32 bits reach its edge, anything under 1 or not a
  number spans one cell).
- Cargo.lock: craft-rtf takes craft-codepage at bfea7d98 after the merge
  with main.

* PDF test: expect the CMYK fallback warning's main wording

---------

Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com>
2026-11-15 22:45:42 +01:00
FredApps 6dadc22329 Merge pull request #2851 from MMexicann/patch-10
fix: preserve selections when resolving tracked changes
2026-11-15 21:24:05 +01:00
Dylan M. Taylor 497b541b11 Merge pull request #2840 from storytold/extract/shared-base64-encode
Reuse shared Base64 encoding for HTML and serialization
2026-11-15 15:20:45 -05:00
gmrmad1 8ad537632e Justification: keep the spacing table out of the wide-control grid (#2525) (#2848) 2026-11-15 19:45:19 +00:00
autocraft-bot[bot] 963baa1bba Merge pull request #2845 from gmrmad1/fix/2812-fitting-crop-units
Frame Fitting Options: crop amounts follow the document's ruler unit (#2812)
2026-11-15 19:19:58 +00:00
Mex d22b67d418 fix: follow selections when resolving tracked changes 2026-11-15 20:02:25 +01:00
autocraft-bot[bot] b325589db4 Apply review fixes
- crates/ui-egui/src/control.rs
2026-11-15 18:27:49 +00:00
Madhav Agarwal 4ce1166ee2 Frame Fitting Options: crop amounts follow the document's ruler unit (#2812) 2026-11-15 23:16:37 +05:30
Mex 543ba8888d fix: preserve book style source across chapter edits (#2841)
Adjust the stored style-source index when inserting or removing earlier chapters, retaining existing source-removal fallback behavior.
2026-11-15 16:09:59 +00:00
Dylan M. Taylor 3ddc3053cf Reuse shared Base64 encoding for HTML and serialization 2026-11-15 10:30:55 -05:00
Mex ca463bab52 cli: report failures after keep-going scripts (#2836)
* cli: report failures after keep-going scripts

Keep executing requested steps while retaining the first failure in Report, so failed scripts return nonzero before save/export.

* docs: describe first script failure in Report

Describe the first failing step without assuming all callers stop immediately.

* test: cover keep-going failure reporting and output guards

Exercise failures before and after a successful step, preserve the first failure, and require both output paths to remain absent.
2026-11-15 14:59:06 +00:00
jayzed80 b2518507b5 shortcuts: run Option shortcuts on character keys in the app, not the macOS menu bar (#2710) (#2818)
Option, with or without Shift, on a letter, digit, symbol or Space types a
character on macOS, so the window takes the key before the menu bar sees
it. The bar carried such a user shortcut as its key equivalent and the
window's dispatcher left the key to the bar, so the shortcut ran nowhere.
These shortcuts now stay in the app, like modifier-less ones.
2026-11-15 07:26:31 +00:00
jayzed80 9f8e166f8d Pages: a new page takes the parent of the page it follows (#2788) (#2817) 2026-11-15 06:23:32 +00:00
.CooCoo bcebb83a93 Captions: a live caption update gives the document a new revision (#2773)
When a command leaves a live caption behind its source, the pass after
the command rewrites the caption's text but kept the document's
revision. The Pages panel thumbnails, the separations preview, the
preflight worker and the Links panel key their caches by (uid,
revision), so they kept drawing the old caption. The pass now bumps the
revision when it changes the document, as Smart Text Reflow and
auto-size already do.
2026-11-15 05:51:45 +00:00
.CooCoo 0461ef4f5e Stroke: the text Weight field keeps its value between 0 and 800 pt (#2808)
* Stroke: the text Weight field keeps its value between 0 and 800 pt

With text selected, the Stroke panel's Weight field sent the typed value
to type.char unchanged, so 2000 or -5 became the text's stroke weight.
The object Weight field keeps its value between 0 and 1000 pt. The text
field now keeps its value between 0 and 800 pt, the range of the
character style's Weight field.

* Properties: the text stroke Weight field keeps 0 to 800 pt

The Properties panel's text stroke Weight field capped typed values at
100 pt while the Stroke panel's text Weight field and the character
style's Weight field allow up to 800 pt. It now uses the same 0 to 800 pt
range.
2026-11-15 05:03:55 +00:00
.CooCoo 59c6fa1b49 Recovery: test that a write queued behind a cancelled one keeps its place (#2771)
worker::submit answers Conflict when this session's write is cancelled
and another session's write waits to follow it, so a later edit cannot
replace that waiting write. No test covered that answer. The new test
fails when the check is removed.
2026-11-15 03:14:34 +00:00
.CooCoo 147cf23a7b Tables: table.setCell records no undo step when the cells already have the values (#2778)
* Tables: table.setCell records no undo step when the cells already have the values

When every value table.setCell sets already matches the target cells, the
command leaves the document as it is: no undo step and no new revision.
Setting a cell's text to the text it already holds keeps its story, and a
stroke the chosen edges already show as their highest-priority local
stroke is not renumbered. The edited table replaces the old one directly,
so a change copies the table once, as before.

* Tables: table.setCell keeps a cell's character formats when the text is the same

A table.setCell call whose text matched a cell with more than one character format replaced the text anyway: every character took the first character's format and the call recorded an undo step. The cell's story is now left as it is when its text already matches.

* Tables: table.setCell applies a stroke when a neighbor draws the shared edge

When both copies of a shared edge had the table's highest priority and the neighboring cell won the tie, a stroke edit whose result matched the selected cell's own copy was skipped, and the edge kept the neighbor's stroke. The edit is now skipped only when the selected cell's stroke is the one drawn.

* Tables: table.setCell checks the whole drawn side before skipping a stroke

A repeated stroke edit was applied again, with a new undo step, after any other edge in the table had been edited, because the check required the edge to hold the table's highest priority. The check now compares the cell's stroke with every part of the side as drawn, so an edit elsewhere does not count, and a merged cell's side still takes the edit when a neighbor draws a different stroke along part of it.
2026-11-15 03:13:35 +00:00
.CooCoo ad4683c5ff Paste: params text gives the pasted image's size as its stored resolution (#2783)
File › Place now sizes a raster by the resolution stored in the file,
and one point per pixel only when the file stores none. edit.pasteImage
uses the same size, so its params text and comment say so, and a test
pastes a 144 ppi PNG and checks that it comes in at half its pixel size.
2026-11-15 03:11:52 +00:00
.CooCoo 83cda16bd0 Captions: live captions follow a gesture when it commits (#2786)
* Captions: live captions follow a gesture when it commits

A preview skips the live caption refresh, and committing the gesture ran
none, so a caption kept its old text until the next command. Committing
an interaction now brings live captions up to date in the same undo
step, auto-sizes the caption frames it changed, and gives the document
a new revision.

* Captions: a live caption inside a group follows its source

The refresh after a command and after a committed gesture looked for live
captions only at the top of each spread, so a document whose only live
caption was grouped never refreshed it. Both checks now look inside groups,
as the refresh itself does.

* Captions: keep the caret inside a live caption that refreshes

When a live caption's story is replaced with its source's text, the text
selection kept its old offsets. Typing into a live caption, or a source
change that shortens one, left the caret past the end of the story, and
the IME text context reported nothing. The selection is now clamped to
the refreshed story, after a command and after a committed gesture.
2026-11-15 03:09:04 +00:00
.CooCoo e37fce2a8c Compose: drop caps and vertical justification skip a grid the lines can't count (#2767)
Lines already ignore a baseline grid whose steps can't be counted in an
f64 across the column (a tiny increment, or a first grid line very far
off). Drop caps still sized themselves to that grid's line pitch, and
vertical justification still moved the lines by its steps, so the drop
cap missed line N's baseline and Bottom stopped short of the inset.

Both now use the same countable-grid check on the text area.
2026-11-15 03:05:36 +00:00
Dylan M. Taylor d5f82c2143 links: allow only web and mail URLs (#2809)
Hyperlinks and buttons accepted any scheme and passed it to the PDF exporter, so an imported file could emit file:, javascript: or UNC links that a recipient's viewer may follow. Add a shared http/https/mailto check at both command entry points and use the same check at export.
2026-11-14 17:31:42 -05:00
Dylan M. Taylor abac0a9bce MCP: cap one request line at 4 MiB (#2803)
* MCP: cap one request line at 4 MiB

The stdio server read newline-delimited requests with read_until into a
growing Vec, so a client that never sends a newline could grow it without
bound. One line now stops at 4 MiB, answers with an invalid-request error and
drops the rest of the line, then keeps serving the next request.

* mcp: only discard the remainder of a line that was actually cut

* mcp: serialize the too-long reply as JSON bytes

* mcp: format the too-long-line reply

* mcp: cover the line-cap discard and EOF paths
2026-11-14 15:42:07 -05:00
Dylan M. Taylor f5087eae96 PDF: allow only web and mail link schemes (#2804)
* PDF: allow only web and mail link schemes

Hyperlink and button URLs were written into PDF link annotations whatever
their scheme, so a document could carry javascript:, data:, file: or a custom
scheme into a reader. Only http, https, mailto and ftp targets are written
now; other strings are left out of the PDF.

* pdf: move the link-scheme test below the items it tests
2026-11-14 15:21:20 -05:00
FredApps 8b8837bcf1 Tests: a FIFO read may end or report would-block, as long as it returns (FreeBSD) 2026-11-14 16:28:03 +01:00
autocraft-bot[bot] fca649eda8 Merge pull request #2787 from dotCooCoo/fix/stroke-rejects-out-of-range-values
Stroke: object.stroke refuses out-of-range numbers and unknown names
2026-11-14 14:25:09 +00:00
autocraft-bot[bot] b5a4e784c8 Merge main into fix/stroke-rejects-out-of-range-values 2026-11-14 14:08:21 +00:00
dotCooCoo b018151978 Images: count the cached levels of an image in view once when warming
When an image in view lacked a level for one of its drawings, warm left
it to decode and counted its decode estimate, but also kept its cached
levels in the bytes of other images, so a decode that fit could be left
to the render. The levels the estimate covers (the levels drawn for a
full decode, the levels from the one read from the blocks to the one
drawn for a reduced JPEG) now count only with the image; other cached
levels stay with the other images. A JPEG without a reduced estimate
(CMYK) is counted at its full decode, and so are its levels. The
estimates are worked out only for the images that still need decoding,
after the check that two or more do.

The one-at-a-time test checks the peak against the two values the
thread timing allows: one large reservation, or one large and the small
image's.
2026-11-14 13:59:30 +00:00
dotCooCoo 3d69f25376 Images: test the decode peak of a 16-bit CMYK TIFF with alpha
A 16-bit CMYKA TIFF counts its five 16-bit samples beside the 8-bit CMYKA copy and the inks and alpha split from it, 20 bytes a pixel. The tiff encoder has no 16-bit CMYKA type, so the test defines one.
2026-11-14 13:59:30 +00:00
aiongg 7ac9cafa7e DES-10: a save waits for the open-time checks of linked files
File > Save, Save As, Save a Copy and the saves before close and quit,
asked for while the open-time link or migration checks of the document
run, wait for them and then write, so the first save of a document saved
before linked storage already writes links. The UI defers the save and
re-issues it once links.checking() turns false; the status line counts
the files left ("Checking N linked images…"), Esc saves at once.
Recovery snapshots and the control channel's file.save don't wait.
links.progress reports how many files are left.
2026-11-14 13:57:06 +00:00
aiongg bcb0711a7c Merge remote-tracking branch 'upstream/main' into perf-main 2026-11-14 13:50:31 +00:00
aiongg 357c9dcd8c DES-10: exports check kept linked bytes against the file; PDF output cache only for links
- AssetData::load_for_output uses linked bytes already in memory only while
  the file still holds them (Loader::holds: fingerprint, else hash, else the
  kept bytes); a changed file is exported from disk with the warning.
- PDF export keeps output bytes per asset only for linked assets, and tells a
  placed PDF by its bytes (a proxy by the asset's type).
- links.list reports a link outside the automation read roots as missing
  while the open-time check still runs.
2026-11-14 13:40:37 +00:00
FredApps e230c4e406 Merge pull request #2751 from AlPaka1234/fix/2743-pdf-cmyk-profile
PDF export: attach working CMYK profile as /DefaultCMYK (#2743)
2026-11-14 14:37:17 +01:00
FredApps 447d4749bc 2743: collapse image tone guard for strict clippy 2026-11-14 14:13:12 +01:00
aiongg d380fca0d0 DES-10: link placed files at once; saves make missing proxies, never hashes
A file placed from a path becomes a link immediately, with its size and
time as the fingerprint and its bytes kept resident. The background job
adds the content hash and proxy to the live document, undo history and
saved state without changing storage. Saves (file.save, saveACopy,
serialize, recovery snapshots) make the proxies still missing and write
links without a hash. An open hashes a no-hash link whose file matches by
size and time. embed:true placements hash while placing. The embed-until-
hashed path (settle_pending, settle_copy, keep_embedded) is gone.
2026-11-14 13:10:36 +00:00
aiongg 7d4e757435 DES-10 review: Links panel badge text without a copy 2026-11-14 13:00:00 +00:00
aiongg 03169f1ca5 DES-10 review: clippy (needless borrows, split preflight's modified-link check) 2026-11-14 12:57:16 +00:00
aiongg c9c0f6deb4 DES-10 review: placing returns before proxies and hashes are made
Placing from files (file.place, place.load, table and media posters)
embeds each graphic with its link record and queues its content hash
and proxy on the link-check thread; the poll links it under the same
key, in the live document, the undo history and the saved state. A
save before then hashes the pending graphics from their bytes and
writes them embedded. crop_pdf checks the crop choice and mime before
reading, and place and relink pass the bytes they already hold.
2026-11-14 12:51:26 +00:00
aiongg d41970f6f3 DES-10 review: Escape with nothing loaded leaves the place tool 2026-11-14 12:50:09 +00:00
aiongg 7a2efd9c6d DES-10 review: IDML stored previews are checked before they become proxies
A linked graphic's stored preview is decoded, re-encoded within the
proxy limits when bigger (1024 px, 512 KiB) and dropped when it doesn't
decode. It is used only when it shows the whole raster image; otherwise
(a PDF, whose preview shows its crop, or other proportions) the proxy is
made from the file, with the preview as the fallback. Graphics that stay
embedded keep no proxy.
2026-11-14 12:48:13 +00:00
aiongg f06f11b52f DES-10 review: PDF layer variants, crop boxes and tones read no file on the drawing thread
A frame that doesn't wait for images queues the work (reading a linked
file, rewriting a PDF with layers hidden, measuring a Bounding Box crop,
finding an image's tone) on a background thread and draws a stand-in:
decodes cached under a layer variant's key, else the loading box. Each
checks images::unavailable first, so a missing or modified link is read
once until the links change, and loads happen outside the caches' locks.
Kept layer variants have a 256 MiB byte budget besides the count limit.
2026-11-14 12:48:13 +00:00
aiongg 12e0e2341c Merge fixup: keep the streaming designcraft_format::write 2026-11-14 12:48:12 +00:00
aiongg 3bd9332a6c DES-10 review: export linked graphics in EPUB/HTML, PPTX, IDML and packages; cache output bytes in PDF export 2026-11-14 12:47:03 +00:00
aiongg 829e5b86c3 Merge remote-tracking branch 'upstream/main' into image-perf
# Conflicts:
#	crates/render/src/decode.rs
2026-11-14 12:47:03 +00:00
aiongg b8be148b4c DES-10 review: link status after open, preflight without reading originals
- Open queues every linked file's lookup (stat, then hash) for the background
  check instead of stating candidates on the UI thread.
- links.list, links.update and relinkFolder use the open's status only while
  its check is still running; afterwards the file is looked at as it is now.
- Preflight tells Modified from size, time and the remembered hash checks
  (the worker keeps them between passes) and the vector test from the mime
  type; it never loads a linked original.
- A modification time of 0 never vouches for a file's bytes.
- Migration keeps an unsettled time as UNVERIFIED_MTIME; recovery snapshots
  keep images not yet saved as links embedded.
- Links panel test fixture has real files, so its Embedded assertions hold.
2026-11-14 12:46:23 +00:00
aiongg b73c3dd87a Build: restore designcraft_format::write; render decode without the image crate (#2780)
* Build: restore designcraft_format::write for recovery; render decodes without naming the image crate

* Build: collapse the nested if in images tone (clippy)

* IDML export: placements in cells and footnotes embed their PDF layer choices

* Tests: Word fixtures carry the document relationships part

* PDF/X-4: untagged WebP images carry sRGB

* Images: CMYK TIFFs with other inks fall back to RGB; associated alpha keeps its inks

craft-image-codecs' TiffPage lists InkSet (storytold/craft-libs#1307), so decode_cmyk_tiff
again refuses InkSet 2 instead of reading other inks as C, M, Y and K. Associated alpha
is made straight by the decoder; the PDF tests check those inks and that alpha.

* PDF tests: CMYK fallback expects the screen's RGB; alpha images read the masked image

The RGB fallback for other inks converts through the working CMYK space, as decode_rgba
does, so the test takes its expected samples from decode_rgba. image_color_samples took the
first image stream, which for an image with alpha is its soft mask.

* Images: repin craft-image-codecs to the InkSet enum (storytold/craft-libs#1307)

* Pin craft-image-codecs to storytold/craft-libs ea1c842 (#1307)
2026-11-14 07:42:07 -05:00
aiongg 191489652c DES-10 T10: Links panel shows storage, status badges, proxy thumbnails; Embed, Unembed, Update; progress polling and migration notice 2026-11-14 12:28:44 +00:00
FredApps 11bd7d9c8d 2743: correct integrated imports and CI formatting
Remove duplicate flate2 imports introduced during integration and apply the three exact rustfmt corrections reported in main migration files. Hosted CI will validate per owner direction.
2026-11-14 13:27:46 +01:00
FredApps f07bf58d5b 2743: integrate DefaultCMYK export with shared PDF APIs
Resolve main dependency migration; retain flate2 production usage and route new PDF parsing through craft-pdf. Owner directs hosted CI validation for this integration; full local gate not run.
2026-11-14 13:17:29 +01:00
aiongg e3f14a8552 DES-10 T8: export, package and preflight handle linked assets
Export and package read a linked original from disk (hash-checked), a package copies it and keeps a link to the copy, preflight reports a missing link as an error and a modified one as a warning, and a linked alpha-wrap image opens without reading its original.
2026-11-14 11:58:21 +00:00
aiongg 9c66115fce DES-10: linked graphics from IDML, packages and file checks agree with T6 linking
IDML imports link the files they read through links::link_to_file, the
path File > Place takes, so a file read just after it was written keeps
an unverified fingerprint and its status comes from the hash instead of
reading as missing. File > Package and Links > Copy Links To point a
linked graphic's record (paths, unverified fingerprint) at its copy.
Regular-file metadata goes through io::file_metadata, which the file
guard accepts.
2026-11-14 11:56:59 +00:00