Commit Graph
925 Commits
Author SHA1 Message Date
BFlat 62371152f3 Merge pull request #8175 from dotCooCoo/perf/legacy-ai-gradient-names
Legacy .ai: gradient and spot color names are numbered with a set and a counter per name
2026-11-17 02:49:52 +07:00
FredApps e142c5fcee Merge pull request #8159 from storytold/cutover/shared-asciihex
refactor(eps): use shared ASCIIHex decoding
2026-11-16 17:58:46 +01:00
dotCooCoo 8b323c792a Merge main into perf/legacy-ai-gradient-names 2026-11-16 08:07:51 -08:00
BFlat b86585d1b4 Merge pull request #8109 from dotCooCoo/feat/ai-graph-filled-lines
.ai graphs: Draw Filled Lines and its Line Width open live and save through the Gy record
2026-11-16 23:07:27 +07:00
BFlat e157e9c737 Merge pull request #8111 from dotCooCoo/perf/eps-readhex-readline-one-pass
EPS import: readhexstring and readline read the data in one pass
2026-11-16 23:06:11 +07:00
dotCooCoo a187449f7c Legacy .ai: gradient and spot color names are numbered with a set and a counter per name
Saving a legacy .ai file numbered a gradient definition whose name was
taken by searching every definition written so far for each number it
tried, so a document with many distinct gradients without a swatch name
spent time cubic in their count naming them. Spot color names were
numbered the same way.

Both now keep the names given in a set and, for each name, the number to
try next. Names are never given back, so every number below that counter
is still taken, and the file is the same as before: the first free
"Name 2", "Name 3" and so on, with equal gradients sharing a definition.

- New tests compare the counters with a search of the names given over
  3,000 names, and the whole written file both ways for colliding
  gradient and spot color names.
- An ignored timing test writes 1,504 gradient definitions: in release on
  Linux, the median of 7 runs took 23 ms of thread CPU time against
  1,163 ms for the search.
2026-11-16 08:02:35 -08:00
Dylan M. Taylor 7ab07b560d eps: delegate hex bodies to shared ASCIIHex decoding 2026-11-16 10:23:55 -05:00
dotCooCoo 4e8ff28cb4 .ai graphs: a filled-line series keeps no stroke, so turning Draw Filled Lines off draws its thin line
A series read from bands with unstroked markers, or bands alone, kept an
explicit no-stroke paint. With Draw Filled Lines turned off, the thin line
took that paint and was not drawn. Such a series now keeps no stroke, as a
graph drawn here does, and its thin line is drawn in the series color at
1 pt. A series whose markers carry a stroke keeps it.
2026-11-16 04:36:43 -08:00
dotCooCoo 160207e9f2 EPS import: readhexstring and readline read the data in one pass
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.
2026-11-16 03:39:00 -08:00
dotCooCoo f8fe5f06e1 .ai graphs: Draw Filled Lines and its Line Width open live and save through the Gy record
A line graph whose style record draws its lines as shapes now opens as a
live graph with Draw Filled Lines on, and its lineShapeWidth becomes the
Line Width (3 pt reads as the default). The flag is ignored when the
points are not connected, as the published file format specification
says (printed pp. 147-148). Saving writes both values in the Gy record.

- Widths from 0.01 to 100 pt are kept. A wider Line Width, a width under
  0.01 pt with filled lines, and filled lines without connected points
  are saved as the graph's art with the existing warning.
- In a filled-line series, a filled path with the thin black band
  outline is read as a band and does not set the series stroke. A
  filled path with another outline must be a square marker or legend
  swatch; otherwise the graph keeps its art as plain objects.
- The reader in crates/eps/src/import/ai/read/graph.rs reads each value
  the writer in crates/eps/src/ai_graph.rs writes; the save-then-open
  tests cover the default, 8 pt and 150 pt widths in both .ai forms.
2026-11-16 03:32:59 -08:00
FredApps 808ebc5bac fix(ci): keep pdf-deps on the craft-libs pin, and classify tests for Sonar
xtask pdf-deps still expected craft-pdf and the patched hayro/krilla
backends at main's 9be9a637 revision after this branch pinned them to
a499742a. Point REV at that pin (still on craft-libs main). Classify
test files in sonar-project.properties the way craft-libs does, so the
quality gate measures the product. Give the EPS operation-budget test
the same 300s cap as the other budget tests; under instrumented coverage
it overran the old 120s cap, while the Ubuntu gate finished in time.
2026-11-16 11:31:29 +01:00
FredApps 46ddf177e3 fix(codecs): keep the remaining decodes within the project's limits
A stored texture longer than the codec's default 2^18-pixel side still
reads back, and a gray PNG is not expanded to RGBA just to get its
levels. The AI writer and the EPS scene refuse an oversized image from
its header, then decode within MAX_IMAGE_PIXELS, keeping the pixels at
their stored depth. Flatten's see-through check uses ImageBlob's
allowance, and links.unembed decodes within MAX_RASTER_ALLOC.
2026-11-16 07:50:43 +01:00
FredApps 3e72836b00 Merge remote-tracking branch 'origin/main' into feat/cutover-remaining-codecs 2026-11-16 07:08:15 +01:00
BFlat 5d2a54b70f Merge pull request #8028 from dotCooCoo/fix/ai-save-unpainted-clip-object-dictionary
.ai save: a cut clipping object keeps its name, opacity mask and visibility variables
2026-11-16 12:54:49 +07:00
FredApps bfe5c253f4 Merge remote-tracking branch 'origin/main' into feat/cutover-remaining-codecs
# Conflicts:
#	crates/engine/src/cmd/menucmds.rs
2026-11-16 06:35:17 +01:00
dotCooCoo 1e5d3d5240 .ai save: a cut clipping object keeps its name, opacity mask and variables
A clipping object written as art cut to it (a group, an image, a symbol
instance, a live object, type, or a path inside art already cut to
another clipping object) lost its name, opacity mask and variable
bindings in the editing data: no written object carried its dictionary,
and a painted one put its name on each of its fill and stroke objects.

The unpainted path that carried its text wrap options now carries its
whole dictionary, in the form the .ai reader reads (art_dictionary in
crates/eps/src/import/ai/read/document.rs). Its fills and strokes keep
only the opacity mask they are drawn through. The path is admitted by
the object count, so at the object limit its dictionary is never left
on the object before it, and a path whose dictionary comes out empty is
taken out again.
2026-11-15 19:48:00 -08:00
dotCooCoo bbefef0d65 Merge main into feat/graph-filled-line-width 2026-11-15 18:36:02 -08:00
FredApps be428f3fcf engine: keep the image size checks and depth of main through the cutover
Remove Background and Color Mask check the image's size from its header
again before decoding ("an image of W × H pixels is too large to change"),
and Crop Image's trim and Remove Background read a file that can't hold
the pixels its header declares as unreadable, as on main. The test helper
reading Remove Background's output keeps 16-bit samples.

The HEIF and JPEG XL readers and their tests go back to main's (heic-rs and
jxl-oxide): the craft-heif and craft-jxl versions failed eight of their
tests (resolution axes after a quarter turn, the container's mirror and
crop, refusing a grid of cropped tiles, 16-bit samples, the decode
allowance). Moving them stays to do.
2026-11-16 03:33:57 +01:00
BFlat b5451a0cc0 Merge pull request #7584 from dotCooCoo/fix/ai-save-clip-object-wrap
.ai save: a clipping object written cut keeps its text wrap options
2026-11-16 09:32:27 +07:00
BFlat 9db3bc5ba4 Merge pull request #7952 from dotCooCoo/fix/emf-svg-symbol-art-live-effects
Export: live effects in symbol art apply in EMF, WMF and SVG
2026-11-16 08:11:28 +07:00
FredApps d2b8ebfd95 Merge origin/main into feat/cutover-remaining-codecs 2026-11-16 01:57:11 +01:00
dotCooCoo 31fdb815d2 Merge main into fix/ai-save-clip-object-wrap 2026-11-15 16:06:03 -08:00
BFlat 87b936d80a Merge pull request #7970 from dotCooCoo/feat/ai-save-wrapped-area-type-live
.ai save: area type wrapped by plain paths, compound paths or groups stays type
2026-11-16 06:55:50 +07:00
FredApps 721d7bf4d8 refactor(eps): read CCITTFaxDecode through craft-stream-codecs
EPS fax images decode with craft_stream_codecs::decode_ccitt_raw instead
of hayro-ccitt directly. With EndOfBlock the rows end at the end-of-block
code whatever Rows says (rows 0), as before. Needs craft-libs#1772
(rows on bytes exactly as EncodedByteAlign says).
2026-11-16 00:21:12 +01:00
dotCooCoo 4a816d626f Merge main into fix/emf-svg-symbol-art-live-effects 2026-11-15 13:42:39 -08:00
dotCooCoo ec9c558456 .ai save: area type wrapped by plain paths, compound paths or groups stays type
Area type with wrap shapes was always written as outlines in the editing
data for other apps. It is now written as type when the reader works the
same wrap out again from the objects above it: each wrap object is a path
of one subpath, a compound path of visible members, or an unclipped group
of such objects, with no paint, or a solid fill, a plain solid stroke or
both, without effects, art style, opacity mask or clipping, with an
offset within -1000 to 1000 pt; the type's stored shapes match the ones
those objects give it; and the shapes of all area type stay within the
2,000,000 anchors the reader copies. Each frame of a thread is checked on
its own. When art is left out at the object limit, such type is written
as outlines again. Other wrapped area type stays outlines.

The reader recomputes the wrap with resolve_wrap after reading
(resolve_text_wrap in crates/eps/src/import/native/build.rs) and reads the
options with text_wrap in crates/eps/src/import/ai/read/document.rs; the
round-trip tests check the reopened characters, frame, wrap shapes and
wrap objects. resolve_wrap's layer walk is shared through a new
wrap_sources so the check follows the same traversal.
2026-11-15 12:56:22 -08:00
dotCooCoo 5412c911cf Graph Type: Draw Filled Lines takes a Line Width
Graph Type has a Line Width field next to Draw Filled Lines, and
`graph.setType` takes `lineWidth` in points (0.01 to 1000; 3 when the
graph sets none). Filled lines are drawn at that width, and the width is
kept through save and open. A graph stores a width only when it is not
3 pt, and a graph with a width of its own is written to .ai as its art.
`graph.setType` with options that leave the graph as it is records no
undo step.
2026-11-15 12:39:45 -08:00
dotCooCoo d4bbacc3eb Export: live effects in symbol art apply in EMF, WMF and SVG
EMF, WMF and SVG wrote a symbol instance from its symbol's art as stored,
so live effects inside that art were missing: a square moved 100 pt by a
Transform effect stayed in place in the file while the canvas drew it
moved. Art whose own place is off the artboard was left out even when
the effect moved it onto it.

These exports now call bake_document_placing_symbols, as PDF, print, EPS
and DXF do: each instance of a symbol whose art needs baking is written
as that art placed by the instance and then baked, so an instance that
scales or turns its art does not scale what its effects do. EMF and SVG
clip 9-slice cells and WMF does not, as each places other instances. In
SVG those instances are written as groups; instances of symbols without
such effects still share one <symbol>. Preserve Editing still embeds the
document with its live effects.

WrittenLayers gains hidden_objects. SVG sets it with Hidden Layers on,
since it then writes hidden objects too, so a hidden instance is written
hidden with its effects applied. The other exporters leave it off.

An SVG instance nested in another instance's art was shared through
<use> when the def allowed its own transform, while the <use> writes
that transform after the outer instances'. A stroked symbol nested in a
scaled instance then drew its stroke at double weight. The check now
uses the transform the <use> writes.
2026-11-15 10:57:09 -08:00
dotCooCoo c0db7a8426 .ai save: envelopes on a large canvas stay editable
The editing copy of a large canvas wrote every envelope as its drawn
art. It now writes warp, mesh and top object envelopes live at 1/10 of
their size with the rest of the art, under the same checks as on a
normal canvas, and the reader opens them at their size from the editing
data alone or beside the PDF part.

Read from the editing data alone, a Large Canvas copy also gets:
- an envelope's saved box size compared with its contents at the
  declared scale, so a bounds margin kept with Distort Appearance is no
  longer lost;
- every path's stroke weight, dashes and dash offset at the declared
  scale, not at 1/10.
2026-11-15 10:33:11 -08:00
FredApps b652c6697c fix(codecs): keep main's behaviour where the cutover changed it
- EPS CCITTFaxDecode goes back to hayro-ccitt (main's filters.rs and data.rs):
  craft-stream-codecs decodes /K -1 /Columns 70 data to other rows
  (eps import::tests_images::ccitt_fax_images_draw). DCTDecode is main's again.
- The AI editing writer decodes through the image crate again: going through
  RGBA8 lost 16-bit sources, so their 8-bit warning disappeared
  (ai_editing::tests::sixteen_bit_images_are_written_at_eight_bits).
- Crop Image refuses an image over its allowance by header size again, with
  main's "an image of W × H pixels is too large to draw" message.
- Test fixes: colorized_images writes its gray PNGs gray again, and the PDF
  16→8-bit test expects rounding, as the 8-bit copy is made.
2026-11-15 19:01:25 +01:00
FredApps 59ddf705b9 fix(codecs): read image sizes from headers for PNG, JPEG and TIFF again
craft_image_codecs::probe_size only reads WebP, EXR and the GIF/BMP/TGA family;
for PNG, JPEG and TIFF it returns Unsupported. The cutover used it for header
sizes, so DXF export left every PNG out (cad tests), plugin objects lost PNG
pixels, and EPS image-mask and SVG import fell back to decoding whole images to
learn their size. vectorcraft_doc::header_size reads PNG's IHDR and a JPEG's
frame through craft-image-codecs and other formats through the image crate's
header readers, as main does, without decoding pixels. The SVG filter's JPEG
size comes from jpeg_info instead of a full decode.
2026-11-15 18:35:21 +01:00
FredApps 31658546a8 fix(codecs): build the cutover against craft-libs d6cd7836d
- 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.
2026-11-15 18:05:45 +01:00
FredApps 5d492ebad2 Merge #7664 (fix/restore-codec-cutover-ci) into feat/cutover-remaining-codecs
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.
2026-11-15 17:35:43 +01:00
BFlat bd67a010f6 Merge pull request #7827 from dotCooCoo/feat/ai-export-writes-kinsoku-kinsoku-shori-type
.ai export: paragraphs keep Kinsoku, Kinsoku Shori Type, Burasagari and Bunri-Kinshi
2026-11-15 22:45:05 +07:00
BFlat 9c2f6ec53d Merge pull request #7838 from dotCooCoo/feat/ai-save-nested-envelope-editable
.ai import: an envelope straight in another envelope's contents block opens live inside it
2026-11-15 22:44:56 +07:00
BFlat b389d3e5bc Merge pull request #7830 from dotCooCoo/fix/a-symbol-instance-written-as-its-art-reads-back
.ai save: live art written as a group keeps wrapping type by its bounds
2026-11-15 20:45:41 +07:00
dotCooCoo 6fc0ef4596 .ai import: an envelope straight in another envelope's contents block opens live inside it
An envelope record that lies in an outer envelope's AIDeformArtKey
block (X= ... X+) with no group around it now opens as a live envelope
inside the live outer one, and an object's own dictionary there (its
name) applies to it. Each envelope is still compared with its own drawn
art: an inner one that doesn't match keeps its drawn art as the outer
envelope's contents, and an outer one that doesn't match keeps its own.

- An envelope record in an opacity mask's art reads as part of the
  mask; its block's X+ no longer ends the mask's art, which failed the
  import.
- Envelopes still waiting for their XP when a dictionary ends keep
  their drawn art, so a stray XP in a later container cannot take them.
2026-11-15 04:54:40 -08:00
BFlat 8138a6e973 Merge pull request #7814 from dotCooCoo/feat/editing-one-anchor-copies-the-whole-anchor-list
Paths: editing one anchor of a long path keeps one chunk of anchors for undo
2026-11-15 17:31:01 +07:00
dotCooCoo c1b756e633 .ai save: the bounds rectangle of live art written as a group goes below its art
The unpainted rectangle that carries the text wrap options of a symbol
instance, blend, mesh, repeat, placed document, intertwine or envelope
written as a group of its art is now the group's first member. Area type
below the object still wraps by its bounds after reopening, and area type
in the art itself is not wrapped by the rectangle, so art that holds area
type no longer keeps the options on its group and wraps by its members.
2026-11-15 02:02:29 -08:00
dotCooCoo 028c8b5e99 Merge main into feat/ai-export-writes-kinsoku-kinsoku-shori-type 2026-11-15 01:41:30 -08:00
dotCooCoo 8183b4054a Merge main into fix/a-symbol-instance-written-as-its-art-reads-back 2026-11-15 01:41:25 -08:00
BFlat 0d277bc12e Merge pull request #7808 from dotCooCoo/fix/image-codes-created-inside-a-rolled-back-node
EPS: art left out at the page limit releases the images it encoded
2026-11-15 16:39:29 +07:00
BFlat c93b96ba1b Merge pull request #7783 from dotCooCoo/fix/opacity-mask-art-inside-symbols-pattern-tiles
.ai editing data: opacity mask art in symbols and pattern tiles keeps live effects
2026-11-15 15:46:39 +07:00
dotCooCoo 5de563faf1 .ai save: live art written as a group keeps wrapping type by its bounds
A symbol instance written as its art, and a blend, mesh, repeat, placed
document, intertwine or envelope written as a group of its art, wrapped
area type below it by its bounds before saving but by the members of
that art after reopening, because the group carried the text wrap
options. The group now ends with an unpainted rectangle at the object's
bounds that carries the options, as type written as outlines does, and
the group keeps the object's name, transparency, lock and visibility
without options of its own. Art holding shown area type written as
type keeps the options on its group; area type in an envelope does not
count. An object without finite bounds keeps the options on its group.
Without room for the rectangle within the object limit, the options are
left out with the limit's warning.
2026-11-15 00:46:34 -08:00
BFlat 7e7d229ac9 Merge pull request #7782 from dotCooCoo/fix/a-colorized-warped-image-decodes-its-coverage
Legacy .ai: a colorized warped image works out its coverage once
2026-11-15 15:44:35 +07:00
dotCooCoo b8b002a662 Merge main into feat/editing-one-anchor-copies-the-whole-anchor-list 2026-11-15 00:21:39 -08:00
dotCooCoo 456910f03f Merge main into fix/image-codes-created-inside-a-rolled-back-node 2026-11-15 00:01:54 -08:00
BFlat 6fe176f997 Merge pull request #7428 from dotCooCoo/feat/ai-save-nested-envelope
.ai save: type in an envelope stays editable
2026-11-15 14:42:55 +07:00
dotCooCoo 42658d2efc Merge main into fix/image-codes-created-inside-a-rolled-back-node 2026-11-14 22:55:46 -08:00
BFlat 0cef4fa727 Merge pull request #7743 from dotCooCoo/fix/legacy-ai-artboard
.ai import: legacy PostScript .ai files open on their own artboard
2026-11-15 13:50:00 +07:00