Preserve Josef Mlčůch’s PSD placement work and tests while adapting resource lookup to the current shared zero-copy HeadView and ResolutionInfo. Keep current main decoding and sanity limits.
View › Story Editor › Show/Hide Style Name Column shows or hides the
column of paragraph style names. The column width can be dragged
between 40 and 400 points, and the bar follows the pointer back from
those limits. The setting is remembered.
Document tabs that overflow the bar scroll (trackpad, wheel, or arrows), keep the active tab in view, and list every open document in a menu.
Fixes#2358.
Adds Cell Options › Diagonal Lines so cells can be drawn with diagonal lines. The dialog applies only to the cells and document it opened for, and PowerPoint export writes the diagonals as cell borders. Includes Swedish catalog rows for the new strings.
* 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>
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.
object.stroke clamped tint, gapTint, weight and miterLimit into range
and skipped an align, cap, join, start or end value it could not read,
so a bad value still reported a change. It now refuses a tint or gap
tint outside 0 to 1, a weight outside 0 to 1000 pt, a miter limit
outside 1 to 500, a gapOverprint that is not true or false, and a name
the stroke does not have, with or without a selection, and leaves the
document as it was. The Stroke panel's Weight and Miter Limit fields
keep their values in those ranges.
The IDML story writer skipped the endnote reference character, so an
exported body story lost every endnote's place: "an endnote here. End."
with nothing between "here" and the full stop. The endnote frame's
story was written with its numbers as text, so nothing linked the
listed endnote back to where it was referenced.
Each reference is now written as its own superscript character range
holding the endnote's number, formatted by Endnote Options (start,
style, prefix and suffix) as the endnote frame lists it. IDML's
Endnote / EndnoteRange elements are not written yet.
The Text Frame Options dialog filled its fields from the document's
ruler unit but never set the dialog's own unit, so it stayed at picas.
The spinner fields (Top, Bottom, Left, Right, a non-rectangular frame's
Inset, the column width and gutter, Paragraph Spacing Limit) showed
their values in picas whatever Preferences > Units & Increments said,
and a bare number typed in any measure field, Min under First Baseline
included, was read as picas.
The dialog now takes the document's horizontal ruler unit when it opens
and keeps it while open, as the Rectangle dialog does (#1964).
Fixes#2743.
Attach /DefaultCMYK [/ICCBased ...] referencing the CMYK working space profile on every page, inherited /Pages resource dict, Form XObject, SMask form, tiling pattern, and Type3 font resource scope outside PDF/X-1a and PDF/A-2b. Plain print exports and booklets embed one shared Flate-compressed /N 4 ICC profile stream without adding /OutputIntents or /Trapped; PDF/X-4 reuses the catalog GTS_PDFX /DestOutputProfile stream; RGB-blend documents attach /DefaultCMYK only when content or resources use DeviceCMYK.
A placed PSD took 72 ppi for its natural size, so a 300 ppi file came in
four times larger than in the reference app. `raster_resolution` (#1991)
now reads a PSD's ResolutionInfo image resource (1005, 16.16 fixed
point), so a PSD is placed at its own ppi like JPEG, PNG, TIFF, WebP and
BMP; without a usable value (missing, shorter than its 16 bytes,
damaged, not positive) it stays at 72 ppi. The image-resource walk that
found the ICC profile (1039) now finds any resource by id, and both use
it.
Documents already holding a PSD keep their placed size; only new
placements (and Data Merge / table cell images) use the new size.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* Compose: count endnote, anchored object and cross-reference marks once per story
Each paragraph of a story with endnotes, anchored objects or
cross-references counted the marks before it from the story start, so
composing the story read its text once per paragraph. The marks before
each paragraph are now counted in one pass when composition starts.
* Compose: test cross-reference mark counts past the first paragraph
The mark-count fixture now puts a cross-reference in every paragraph, so the
test checks nonzero cross-reference counts and that each paragraph shows its
own cross-reference's text.
---------
Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com>
Footnote text is addressed as a cell, so with the insertion point in a
footnote the table commands (Insert Row, Delete Column, Merge Cells,
Table Options, Select Table, table styles) were enabled and then failed
with "no table 18446744073709551615". They are now disabled with "place
the insertion point in a table", as the cell commands already were. The
caret's footnote offset is no longer looked up in the main story either,
where it could land on a table's paragraph. table.get and the other
commands that take any selection report the same message instead of the
footnote address. A call that names a table still runs.
* Properties: Text Frame section shows inset spacing and vertical justification
Properties › Text Frame now shows the frame's inset spacing under the
columns: Top and Bottom, a link that makes all four the same, then Left
and Right. A non-rectangular frame shows one Inset, the distance its text
keeps from the outline. Four buttons set Vertical Justification to Top,
Center, Bottom or Justify. Type on a path shows neither.
The section also shows with the Type tool in a frame. There it changes
the frame that shows the insertion point, or every frame that holds part
of the selected text, as Object › Text Frame Options does.
* Properties: one Inset for a non-rectangular frame keeps the other sides
The single Inset sets only the top inset, the one kept from the
outline. A rectangular frame that holds part of the same selected text
keeps its own sides.
* Properties: the one Inset field and the composer share the frame outline test
FrameOutline::of_item builds an item's outline with its corner options
applied. The composer uses it to keep the top inset from the outline,
and the Properties panel uses it to decide whether a frame shows one
Inset, so the two give the same answer for every frame.
* Text Frame Options: frames taken while typing stay with their document
OK is refused when another document became active after the dialog opened, so the saved frame ids do not change frames in that document.
* Properties: the inset link starts linked again after Revert
The link's state is kept per document state instead of per document, so
a frame with equal insets in the reverted document starts linked.
* Text Frame Options: frames taken while typing are refused after Revert
Revert keeps the document's id but replaces its state, so a new frame
can reuse a saved frame id. The dialog now ties the frames to the
document state, and OK is refused after Revert as it is in another
document.
* Properties: the one Inset of a non-rectangular frame sets all four sides
The composer bounds a shaped frame's text by its rectangle less all four
insets as well as by the outline, so a single Inset that changed only the
top left hidden sides in place: lowering a uniform 96 pt inset to 0 kept
text overset. When every frame the field changes is shaped, it now sets
all four sides. With a rectangular frame among them, only the top inset
changes and each frame keeps its other sides.
* Fix text frame dialog merge resolution
* Keep text frame preview targets fixed
* Fix target field key inference
* Tests: Text Frame Options show four sides for text through an oval and a rectangle
With the Type tool and text selected through an oval and a threaded
rectangle, with the oval as the caret's stored frame, the dialog shows
the four inset sides, a changed Top leaves the rectangle's other sides
as they were, and the link stays off while the rectangle's sides are
uneven.
* Properties: the inset link starts off when another frame has uneven sides
With selected text that runs through several frames, the link of Text
Frame > Inset Spacing started linked when the frame the section shows had
four equal insets, and a changed Top then set all four sides of every
frame. The link now starts linked only when every frame the field changes
has four equal insets. Its state is kept for that set of frames, so a link
turned on for one frame does not carry over to selected text that also
runs through a frame with uneven sides.
---------
Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com>
Center, Bottom and Justify tested every moved line except the last against
the frame's outline down to its descent, so an outline that narrows under an
earlier line held the text higher by that line's descent. Each moved line is
now tested from its top down to its baseline, and its descenders may cross
the outline, as the last line's already did. Above footnotes and in vertical
frames the descenders still stay inside.