When the import refuses a file's PDF part and its editing data can't be
read either, the error named only the PDF part. It now adds "its editing
data couldn't be read either (<why>)", as layers already do
(crates/eps/src/import.rs). The reasons come from the editing data
reader (a size limit, damaged compression) and from the private data
streams (larger than 256 MB, another filter or decode parameters,
damaged zlib data). A file without editing data, and an open with pages
picked, layers off or the editing data off, keep the PDF part's error.
Part of #4366.
Clear with `ids`, which Cut uses for the objects it copied, removed each
id from the selection with its own scan of the selected objects. It now
calls Selection::remove_all once, which gives the same selection.
With 50,000 objects selected and all of them cut, the selection step
takes 5.5 ms instead of 572 ms (release build, median of 7 wall-clock
runs, measured while other builds were running). The new tests compare
the result with removing each id in turn, including Undo and Redo, and
an ignored benchmark times both.
A linked PDF or .ai file that lists the editing file among its
attachments, but whose file specification, EF dictionary or F or UF
stream can't be resolved, was taken for a file without editing data and
copied without its stored paths being checked. Under read roots,
file.package now refuses it with the error for editing data that can't
be read. Opening such a PDF is unchanged.
The plug-in export test removes its folders when it ends.
Under automation read roots, an exporter plug-in's format (plugin.<id>)
counts as an output that carries the native document, since its plug-in
is given the document's JSON. document.serialize, document.export,
document.exportSelection, Export for Screens and assets.export rows and
file.exportAs refuse it before the plug-in runs and before any file or
folder is written when the document links a JavaScript file, a linked
image or placed file, a kept relative path or a data set's image outside
the roots, with the existing errors. The JSON the plug-in is given leaves
out an Export for Screens folder outside the roots.
file.package refuses, before anything is written, a linked file whose
native document it can't read to check: a native document that doesn't
load, a PDF or .ai file that can't be opened (one that needs a password
to open, or a damaged one), and a PDF, .ai or EPS file whose editing data
doesn't load. The error, "a linked file's editing data can't be read to
check it against the read roots", names no file or folder and gets rows
in the complete-message catalogs. A PDF or EPS file without editing data
is copied as before, and packages made without read roots are unchanged.
readhexstring and readline called the one-byte file read for every input
character, copying each byte into a new vector. They now scan the bytes
left in the file in one slice and advance the file by the bytes they used.
The results are unchanged: the same bytes, the same boolean, the same next
unread byte, from the program's own file (after the whitespace that ends
the last token), a decoded buffer and a filter decoded when first read.
readhexstring stops on the digit that completes the last byte and drops a
lone digit at the end of the data; readline takes CR LF as one line ending,
leaves the byte after a lone CR unread, and leaves the line ending unread
when the line fills the string.
Tests run the new readers next to copies of the byte-at-a-time loops over
13 stream forms and several hundred inputs, comparing the result and
everything left to read; an image read through a readhexstring procedure
is compared with the same samples given as a hexadecimal string. The
import fuzz tests gain readline and a case for both operators.
data_op allows clippy::cognitive_complexity. Without the allow, clippy
rates it 54 against the limit of 30; with the old loops in place it
passes.
Object › Plug-ins › Packaging Tools › Check Fold Lines, and the Fold Lines
panel's Check button, check the fold lines of the selection, or of the
document while nothing is selected (`addon.packaging.check`).
- Cut lines bound the material: each connected piece that encloses an
area is one blank, its largest closed cut line is the outline, and a
closed cut line inside it is a hole. A slot drawn as a rectangle across
the outline leaves the same material as a notch drawn in it, and an
outline drawn as several open cut lines works too.
- Creases, partial cuts and perforations divide a blank into panels; the
pieces between the same two panels form one hinge.
- 15 issue codes, errors and warnings, each naming its lines; cut line
ends within a tolerance (0.1 pt, 0.01 to 10) are joined and reported as
a gap. With `select`, the lines the issues name are selected.
- The panel lists the issues in the interface language, with a summary
line; clicking an issue or its Select button selects its lines. The
list is kept until the document changes.
`vectorcraft_pathops::adjacency` maps paths as live_paint does and keeps,
for each edge, every input it lies on and the faces on both sides; the
blank model is `vectorcraft_three_d::fold::blanks`. The engine now depends
on vectorcraft-three-d directly.
Docs: docs/mcp.md (Check Fold Lines), crates/pathops/README.md, ROADMAP.
A Linear point picked near the end of another dimension's line landed
beside it when zoomed in: the tool's own pick skipped dimension artwork,
so that end pulled the point only within the Smart Guides tolerance,
while an anchor of the art pulls it from 8 pixels.
- With Smart Guides or Snap to Point on, a point that no anchor of the
art within 8 pixels takes lands on the end of a visible, unlocked
dimension's dimension line, or on the far end of its extension line,
within 8 pixels, with no link to that dimension. The end of an
extension line next to the point it measures is not an end, so an
anchor that a dimension already measures still takes the point.
- A point that nothing else places lands on the closest point of such
a line within 8 pixels, as it does on a segment of the art.
- With Smart Guides and Anchor/Path Labels on, a point on an anchor or
a line end shows the "anchor" label, and a point on a segment or line
shows the "path" label. A point on a line end is marked as an anchor.
- A press on a line end that moves a few pixels picks it, as a press on
an anchor does.
Docs: docs/dimensions.md, docs/target-app-parity.md.
The Character Set menu of Text Import Options now lists Shift JIS, GB2312,
Chinese Big 5, Cyrillic, GB18030, Greek, Turkish, Baltic and Central European
beside Unicode and ANSI, and `file.place {text: {characterSet}}` takes
"shiftJis", "gb2312", "chineseBig5", "cyrillic", "gb18030", "greek",
"turkish", "baltic" and "centralEuropean". Each set decodes with its WHATWG
Encoding Standard decoder from encoding_rs, which the workspace already
locks: GB2312 reads as GBK, Cyrillic as windows-1251 (x-mac-cyrillic with
platform "mac"), and Greek, Turkish, Baltic and Central European as
windows-1253, 1254, 1257 and 1250 on both platforms. A byte-order mark is
read as ordinary bytes and a malformed sequence as U+FFFD. Unicode and ANSI
read as before.
An unknown character set is an error that lists the sets, and nothing is
placed. A `text` option of the wrong type (`characterSet: 3`,
`removeLineReturns: "yes"`) is now an error instead of the default. The
dialog remembers the last set confirmed, and Show Import Options off places
with it.
A Shift-drag marquee sends every object it reaches as one select.toggle
{ids}. Each id used to scan and rebuild the selected objects, so K ids
against S selected objects took O(K*(S+K)). Selection::toggle_all and
Selection::add_all now handle the ids in one pass with a map of each id's
current slot, and the commands use them. The result is the same as
toggling or adding each id in order: an id toggled twice is selected
again at the end, and a removal clears that id's anchors, segments, key
and key anchor.
Select > Inverse looks each selectable object up in a set of the
selected ones instead of scanning the selection for each.
Selection::toggle_target, set_slices and set_guides use the same set
lookups.
crates/engine/examples/selection_bench.rs times the old per-id loops
against the new ones in one process. With 50,000 objects, toggling every
object off took 528 to 655 ms before and 2.5 to 4.6 ms after in 7 runs
(wall clock on a machine that was running other builds).
group3_tiff_rgba decodes each strip or tile with
craft_stream_codecs::decode_ccitt_raw instead of hayro-ccitt; the error
messages stay as they were. vectorcraft-engine's group3_reference test
keeps the hayro-ccitt reader as the reference: over 190 Group 3 TIFFs and
5,500 cut or edited copies the pixels and refusals match, except that a
strip or tile wider than MAX_CCITT_COLUMNS (2^20) is refused as an
overflow where hayro-ccitt ran out of data. Needs craft-libs#1772.
Object › Plug-ins › Path Precision Tools › Tangent Circle…
(`addon.pathtools.tangentCircle`) draws the circles that touch two
selected paths or compound paths at a set radius, or that touch three of
them. A circle touches a shape when it meets the outline without
crossing it, with the whole outline outside the circle or inside it: at
a smooth point it is tangent there, and at a corner or an open end it
passes through that point. Circles, ellipses at any angle and other
closed or open paths all work; the members of a compound path count as
one outline.
When every shape is a circle, the circles are found in closed form (up
to eight for three circles, the problem of Apollonius) and then moved
onto the drawn Bézier circles, which differ from true circles by up to
0.0273% of the radius. Other shapes are searched on a grid, and the
centers left are refined with Newton's method on the curves. With three
shapes, circles up to 64 times the diagonal of the box around the
shapes' anchors and handles are found.
The circles are listed by radius, then top to bottom, then left to
right. The dialog takes the radius (with two shapes; 36 pt to start)
and previews every circle found or one picked by number; OK draws them
with the current paint as one undo step, selected. No circle, more than
64 circles (shapes touched along a whole curve, such as two concentric
circles), shapes at one point or too small for the radius, more than
2000 segments and a search past its limits are errors that leave the
document unchanged.
The Tangent Circle and Circle: rows are in every catalog, and the
command's messages in the catalogs that translate messages.
Docs: docs/mcp.md (Path Precision Tools add-on),
docs/target-app-parity.md, docs/ui-parity.md and ROADMAP.
Under colored lights, a solid-color Inflate surface drew each facet over
its underlay as a fill and then a same-color round seam stroke. At a
partly covered edge pixel the two coverages add up past the facet's real
coverage, so a turned Inflate's near facets bled into the facets behind
them by up to 5 levels against the same art drawn at 3x and averaged down.
- lighting::seamed_fill turns a facet that is one closed polygon with an
area and no crossing edges into one path: the facet and the outer
outline of its round seam (lighting::footprint). solid_surface fills
that path once per channel. Other facets keep a fill and a seam stroke.
The 2 pt underlay, the surface clip and the channel groups are as
before.
- three_d_light_color::turned_colored_inflate_facets_and_seams_cover_their_edges_once
checks Inflate at X 50, Y 35 in an opaque fill: at most one channel
sample more than 3 levels off, by at most 4, and no alpha off.
- docs/three-d.md (Seams) and docs/target-app-parity.md describe it.
Under a colored lightColor or a lights list, Revolve drew each face of a
solid-color or gradient surface on its own, so where two faces'
antialiased edges met, pixels inside the surface let the background
through at 1:1.
- The faces now lie over an underlay of themselves under one clip to
their outline, as colored Inflate's facets do (lighting::sealed, split
into lighting::underlay and sealed). The surface's opacity and blending
mode apply once, to the sealed surface.
- In a group, each run of one member's faces in the shared depth order
takes its own underlay; a translucent member's run keeps its opacity,
blending mode and mask on the sealed run.
- A face with a part of a mapped graphic gives its face to the underlay
and keeps the part right after it.
- Faces in a gradient with transparent stops carry its opacity mask and
are drawn as before. Revolve (Classic) is unchanged.
- The paint-copy budget counts the underlay in validation and drawing.
Docs: docs/three-d.md (Seams), docs/target-app-parity.md.
import_fuzz builds PSD files from scratch whose image resource 1050
holds slices in version 6 (a version 16 descriptor after the first
record) and in the version 16 descriptors of versions 7 and 8. Each
sample has one user slice, one slice that follows a layer and one
generated automatically; the first two come in as user slices.
- the_sliced_psd_samples_bring_in_their_user_slices: each sample opens
with its two user slices and no warning, document.psdInfo counts 2,
and an embedded place brings 2.
- sliced_psd_samples_with_huge_counts_or_cut_short_come_in_without_their_slices:
slice counts of 10,001, 0x7fffffff and u32::MAX, data one byte
short, and data cut inside the count bring the art in without its
slices and with a warning.
- mutated_psd_slices_never_panic: mutated slice data, kept whole, cut
short with the resource length rebuilt, or with the file cut in the
resource block, never makes document.open, document.psdInfo or an
embedded file.place report an internal error.
tests_psdslices::damaged_slices_never_panic now fails when a command
reports an internal error instead of discarding the results.
Object › Plug-ins › Path Precision Tools › Common Tangents…
(`addon.pathtools.commonTangents`) adds the common tangent lines of two
selected convex closed paths as separate open paths: external (both
paths on the same side of the line), internal (the lines between them)
or all, and with Centerline the line joining the two centers. An
ellipse drawn with the Ellipse tool is measured as an exact ellipse at
any rotation and scale; any other path must be closed, have one outline
and bend the same way all around, with at most 10000 segments.
Each line runs between the points where it touches the two paths, or
covers a straight side that lies along it. Separate paths have four
tangents, overlapping paths only external ones (two for ellipses), and
a path inside the other none. Paths that touch, from outside or from inside, share
one tangent instead: a line centered on the point where they touch and
as long as the narrower path is wide along it. When there is no tangent
of the kind asked for, nothing changes and the result carries a warning
that says why. The lines take the current stroke and no fill, go
directly above the upper path and are selected, as one undo step. The
dialog has Preview.
The geometry is in vectorcraft-pathops: the tangents are the zeros of
the difference of the two outlines' support values over the normal's
angle, sampled at 720 even steps and at every angle where either
path's touching point passes to another segment, then refined, so the
work per pair is bounded.
Catalog rows for the menu item, the dialog and the messages are in
every catalog.
Docs: docs/mcp.md (Path Precision Tools add-on), docs/target-app-parity.md
and ROADMAP.
Object › Plug-ins › Path Precision Tools › Smooth Bridge… joins two
selected circles into one closed outline, like two drops of liquid
pulling apart. The outline goes around each circle on its side away from
the other and along two concave arcs, one on each side, that touch both
circles from outside, so it runs on smoothly into each circle and every
anchor is smooth.
- `addon.pathtools.bridge {radius?, keepOriginals?, ids?}`: `radius` is
the arcs' radius as a percentage of the smaller circle's radius (1 to
1000, 100 by default); a larger radius makes a wider, gentler bridge.
The outline replaces the two circles, painted as the upper one, or
with `keepOriginals` goes directly above the upper circle and the
circles stay. One undo step; the outline is selected.
- Overlapping and touching circles are joined at every radius. One
circle inside the other, circles too far apart for the radius (the
arcs would not reach both circles, or would cross), and anything other
than two circles that can be edited are refused with a message. The
message suggests a larger radius only when one up to 1000% would
bridge the circles.
- The dialog has a Radius field in percent, Keep Originals and Preview.
- `circle_of` and `smooth_bridge` in `vectorcraft-pathops` tell a
circle from other paths and build the outline.
Docs: docs/mcp.md, docs/ui-parity.md, docs/target-app-parity.md,
ROADMAP.
- Test files whose image→craft-image-codecs rewrites didn't compile against
main's newer tests go back to main's versions (engine fileio/tests.rs,
tests_tiffbmp.rs, tests/menucmds.rs, eps tests.rs); they still use the image
crate, which keeps its format features.
- craft_jxl::encode, craft_image_codecs::encode and Image::icc at d6cd7836d.
- jp2read and pdf export pass DecodeOptions, not Limits.
- EPS DCTDecode: grey JPEGs no longer use the image after moving it, and keep
main's one-channel output.
- svg keeps its direct usvg dependency for main's image href code; pdf keeps
jpeg-encoder for CMYK JPEGs.
- clippy -D warnings and rustfmt clean.
The Brushes panel menu gains Options of Selected Object…. It opens the
brush type's options dialog for the selected brushed paths, without the
Name row, and OK stores the changed values on those paths' strokes only.
The brush and its other strokes keep their settings.
- brush.objectOptions {ids?, params?, reset?} sets the settings, clears
them with reset, and returns them when given neither. It refuses
params with reset, a selection with no brushed path, brushes of
different types, a bristle brush, a field the type does not take and
a value of the wrong kind. One undo step, none when nothing changes.
- The stroke saves the settings as brush_options in the native file, and
the brush renderer, the expansion of pattern tiles whose brushes vary
at random and color conversion of Hue Shift keys read them.
- Applying another brush, removing the brush or a brush change carried
by Global Edit clears them; renaming the brush keeps them.
- Docs: docs/mcp.md, docs/ui-parity.md; i18n rows for the new strings.
Conflicts resolved in favour of main/#7664 in the 13 source files both touched
(doc/cmyk.rs, metafile/dib.rs, pdf images, svg import/files.rs, render paint and
encode tests, trace, engine load.rs), keeping main's newer TIFF/CMYK, DIB and PDF
image fixes. vectorcraft-doc stays on main's version until its CMYK reader moves
to craft-tiff. The image crate keeps its format features, and usvg, tiff,
zune-jpeg, hayro-ccitt and jpeg-encoder stay for the readers not yet moved.
Codec crates pinned to craft-libs d6cd7836d364177661b0ae17f48a0805e83a5f32.
Also fixes the compile errors CodeRabbit flagged (jp2read DecodeOptions,
filters.rs use-after-move) and the encode() arity at d6cd7836d.
effect.expandAppearance in Safe Mode left the art of a graph design in a
series out of the plug-in check unless an effect of the series group
itself would draw it. A raster effect on one of the group's fills or
strokes, such as a Gaussian Blur, also turns the whole group into an
image when it expands, art included, so a plug-in effect in that art was
expanded without drawing. Such a raster effect now keeps the art in the
check, and the command returns the Safe Mode error.