Commit Graph
472 Commits
Author SHA1 Message Date
BFlat 1f84febb08 Merge pull request #8169 from dotCooCoo/fix/symbol-lookup-index
Symbols: render and SVG/PDF export find each instance's symbol in one index
2026-11-18 03:23:44 +07:00
Dylan M. Taylor 23ba5c8d47 SVG: use the shared standard Base64 encoder (#8280) 2026-11-16 22:22:39 -05:00
BFlat 05c7e0d559 Merge pull request #8071 from dotCooCoo/feat/type-on-path-desired-spacing
Type: type on a path takes Justification's Desired spacing and glyph scaling
2026-11-17 08:18:47 +07:00
dotCooCoo dd05a39106 Merge main into feat/type-on-path-desired-spacing 2026-11-16 10:46:53 -08:00
dotCooCoo 173b73a776 Merge main into perf/svg-glyph-shared-document 2026-11-16 10:42:26 -08:00
dotCooCoo 1143546a0a Symbols: keep per-object measuring in the export walks; live walks and SVG import use the index
The export walks for type and fonts and the artboard crop shared one
SymbolBoxes for every object. A SymbolBoxes also holds measuring budgets
(effect reaches, 9-slice placements), so in a large document objects late
in a walk could be measured by estimates where main measured them exactly.
SymbolBoxes::unmeasured makes new boxes that share the name index, and each
object is measured in boxes of its own again.

- The live-object walk (render/src/live.rs) finds symbols through the
  frame's SymbolBoxes.
- SVG export's filter regions measure each object in unmeasured boxes, and
  the region boxes share the writer's index.
- SVG import keeps each imported symbol's index, so a symbol whose art
  holds instances no longer scans or indexes the list again.
- Object › Rasterize's clipping mask is left as it is on main, with
  drawn_outline_with removed.
- The symbol-read-count feature of vectorcraft-doc gives other crates'
  tests vectorcraft_doc::symbols_read. New tests check that a frame, an SVG
  export, a PDF export, the type walk and the artboard crop read the symbol
  list once among 2,000 symbols and 300 instances with drop shadows.
2026-11-16 09:07:50 -08:00
dotCooCoo 52b4b03920 Symbols: render and SVG/PDF export find each instance's symbol in one index
Drawing or exporting a symbol instance looked its symbol up by scanning
the document's symbol list, so a document with many instances and many
symbols spent most of a frame or an export on name comparisons. The
renderer, the SVG and PDF writers and the export walks now find symbols
through SymbolBoxes::symbol, which builds the name index once per frame,
export or walk and returns the first symbol of a name as before.

- Renderer: plain instances, inline graphics, instances with object
  effects (their art and the symbol budget) and the effect bounds.
- SVG export: instance art, symbol defs and their reuse check, and the
  paint reach of filter regions.
- PDF export: instance art, inline graphics and the brush search of
  knockout masks.
- Export warnings and artboard crops measured what each object paints
  with new symbol boxes per object, which built the name index again for
  every instance. painted_bounds_with and drawn_outline_with take the
  boxes once; Object › Rasterize's clipping mask uses them too.
2026-11-16 07:24:45 -08:00
FredApps 631441ce86 svg: write the document wrapper through craft-svg (#778, #789)
The XML declaration, DOCTYPE entity subset and root <svg> open now go
through SvgWriter. Mapping and the rest of the document stay in the app.
Width and height stay unitless in one place so #7105 can rebase.
2026-11-16 13:10:03 +01:00
dotCooCoo cbf0ce838b Type: type on a path takes Justification's Desired spacing and glyph scaling
Each paragraph of type on a path now sets its glyphs at its Desired word
spacing, letter spacing and glyph scaling, as point and area type do. The
spaced glyphs feed the steps along the path, alignment, the hangs and the
overflow, so text after a wider gap starts further along and a right or
centered line is aligned by its spaced length. Minimum and Maximum are not
used, vertical type is not glyph scaled, and a list marker keeps its width.

This changes existing documents: type on a path whose paragraphs carry
non-default Desired values now spaces differently and can overflow where
it did not.

SVG export writes such type as outlines with a warning, since a
<textPath> places its characters at their own advances.

Docs: docs/mcp.md, docs/type-parity.md, docs/gaps.md,
docs/target-app-parity.md.
2026-11-15 23:59:19 -08:00
dotCooCoo 069f6963c6 SVG glyphs: a glyph from a shared SVG document reads only what it refers to
A font's SVG table can keep many glyphs in one document. Each glyph's art
was read by handing the importer the whole document, with every other
glyph moved into defs. The importer now gets the glyph's element and only
what it refers to: elements named by its effective link (plain href, else
xlink:href) or by url(#id) in attributes, style attributes and sheets,
what those refer to in turn, the start and end tags of the elements
holding them, and every <style> sheet. A document whose references or
sheets cannot be followed this way (a DTD, xml:base, an id used twice, a
missing or escaped reference, a link to another file, a sheet with
sibling, attribute or pseudo-class selectors or at-rules) is read whole,
as before. Each element is queued at most once.

The color check now runs on the reduced text, so a glyph with fixed
colors no longer counts as using the text's color because another glyph
of its document uses currentColor. A glyph nested under an element that
gives a namespace prefix (or the default namespace) another URI than the
root does keeps its own after it is lifted out.

For 50 glyphs of a 2,000-glyph document (278 KB), thread CPU time went
from 547 ms to 113 ms (medians of 9 runs, the two paths alternating in
one process).
2026-11-15 22:18:48 -08: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
FredApps 48d4afe4ec svg: SVG import decodes its images through craft-image-codecs
The decoding File › Open, Place and the renderer share moves to
vectorcraft-doc (decode.rs: decode_image, decoded_layout), and SVG
import's images read through it: the size from the header against the
allowance first, then the pixels as stored with the profile the file
embeds (a TIFF's still read by the TIFF reader).

decoded_pixels_are_those_the_image_crate_read compares PNG, GIF, WebP,
TIFF and BMP at each depth the image crate writes with its pixels, and
JPEG within two steps.
2026-11-16 06:06:34 +01:00
BFlat 5cb5a1895c Merge pull request #7869 from dotCooCoo/feat/kurikaeshi-moji-shori
Paragraph: Kurikaeshi Moji Shori draws a repeat mark that starts a line as the character it repeats
2026-11-16 08:12:54 +07:00
FredApps d2b8ebfd95 Merge origin/main into feat/cutover-remaining-codecs 2026-11-16 01:57:11 +01:00
dotCooCoo 6c5229c851 Merge main into feat/kurikaeshi-moji-shori 2026-11-15 13:43:06 -08:00
dotCooCoo 4a816d626f Merge main into fix/emf-svg-symbol-art-live-effects 2026-11-15 13:42:39 -08:00
BFlat 47d3a5340e Merge pull request #7897 from dotCooCoo/fix/svg-shared-images-skip-hidden-pieces
SVG: hidden pieces of a cut image put no shared image in the defs
2026-11-16 04:28:36 +07:00
BFlat c36cd8dfa5 Merge pull request #7933 from dotCooCoo/fix/svg-import-png-keeps-icc-profile
SVG import: a raster stored again as PNG keeps its ICC profile
2026-11-16 04:27:48 +07:00
FredApps caa62aa79f Merge remote-tracking branch 'origin/main' into work7669 2026-11-15 21:06:46 +01:00
dotCooCoo ad275a9291 Merge main into feat/kurikaeshi-moji-shori 2026-11-15 11:59:36 -08:00
dotCooCoo 9392619884 SVG: placed symbol art with live effects writes no duplicate ids
Instances of a symbol whose art has live effects are written as that art placed by each
instance, so a named object in the art appeared once per instance with the same node id and
the same XML id. Symbols' art now takes no name ids, as in an instance that has its own copy
of the art; the instances keep theirs.
2026-11-15 11:31:02 -08:00
dotCooCoo 3a00d5d154 Merge main into fix/emf-svg-symbol-art-live-effects 2026-11-15 10:57:59 -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 831e539ecc SVG export: a drawn repeat mark in scaled type keeps its character's width
In horizontally scaled type, live SVG text stretched the character a
repeat mark is drawn as (Kurikaeshi Moji Shori) to the mark's advance with
textLength, so a reader narrowed or widened it whenever the two glyphs'
widths differ. Its textLength now takes the width the canvas draws that
character at; the text after it is still placed anew.
2026-11-15 10:54:05 -08:00
dotCooCoo f92a366e3c Merge main into fix/svg-import-absolute-ltr-character 2026-11-15 10:48:48 -08:00
dotCooCoo 250b642812 Merge main into fix/svg-import-png-keeps-icc-profile 2026-11-15 10:48:38 -08:00
dotCooCoo d154d72890 SVG import: absolutely placed characters one text object cannot place import as a group
SVG reorders right-to-left characters only within a text chunk, while one
text object reorders the whole line. In
<text x="100 160 220" direction="rtl">אbג</text> the left-to-right b is
drawn right before ג with no kerning between them, so ג stayed where the
line put it and the import warned.

When kerning cannot put every absolutely placed character on its x, the
text is now cut before each such character and each piece is placed
again, and the text imports as a group of point type objects named after
the element. A text one object can place stays one object. A split text
in a clip path clips by the outlines of all its objects.
2026-11-15 10:48:26 -08:00
dotCooCoo 2d361e2ad7 SVG import: a raster stored again as PNG keeps its ICC profile
An image that SVG import writes again as PNG (a TIFF, or a PNG, JPEG,
GIF or WebP whose orientation turns it) now keeps the ICC profile its
file carries, as an iCCP chunk, when the profile's color space is the
stored samples': gray for gray samples, RGB for RGB ones. Open and
Place already keep it. Profiles of another color space, ones too short
to be a profile, and the profile of a TIFF whose own reader converts
its pixels to RGBA are left out, and the image still imports. Sample
types a PNG doesn't hold are stored as 8-bit RGBA, as Open and Place
store them.
2026-11-15 10:47:47 -08:00
BFlat 39336f44d9 Merge pull request #7863 from dotCooCoo/feat/diacritic-position
Type: Adjust Horizontal and Vertical Diacritic Position move marks off their letters
2026-11-16 01:34:36 +07:00
dotCooCoo 9548a669a0 SVG export: type on a path that starts with a drawn repeat mark is outlined
Type on a path whose frame starts with a repeat mark drawn as the
character it repeats is now written as outlines with a warning, as other
type on a path that a <textPath> cannot reproduce is. With Kurikaeshi
Moji Shori off it stays live text.
2026-11-15 10:18:45 -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
dotCooCoo 73502e83ac SVG: hidden pieces of a cut image put no shared image in the defs
The pieces a Warp effect cuts an image into share one <image> in the
defs. The writer counted every piece, hidden ones included, so pieces
the file leaves out (hidden, or in a hidden clip group) still put an
<image> into the defs, with the linked file's path under Images: Link.
A confined caller's read-root check looks only at the art the file
draws and did not refuse it.

Image sharing and the colorized-image counts now walk only the art the
writer draws: hidden layers and objects only with hidden layers kept,
and never a template layer's art.
2026-11-15 09:06:13 -08: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
dotCooCoo f9a2abad18 Paragraph: Kurikaeshi Moji Shori draws a line-start repeat mark as the character it repeats
Paragraph panel menu > Kurikaeshi Moji Shori (text.setFormat
{kurikaeshiMojiShori}) is a paragraph attribute, off by default, saved
only when on and carried by paragraph styles. On, a repeat mark (々, ゝ,
ゞ, ヽ, ヾ) that starts a line of point or area type is drawn as the
character it repeats, with the mark's width, and the text keeps the
mark. Threaded type looks back into the frames before when a paragraph
continues. Live SVG text writes the drawn character and places the
text after it.
2026-11-15 07:02:27 -08:00
dotCooCoo 9afdbe2b03 SVG import: a blur that differs by direction is kept as its SVG filter
A feGaussianBlur or feDropShadow whose blur is not the same in every
direction in the document came in as an even Gaussian Blur or Drop
Shadow of the mean standard deviation. That covers two different
standard deviations (stdDeviation="4 1") and an even one in a skewed or
unevenly scaled user space. An SVG Filters effect in such a user space
is exported live under that transform, so on reopening its blur lost
the difference between directions.

Such a filter is now kept as an SVG Filters effect, which draws it as
it is. A blur in a turned, flipped or evenly scaled user space still
becomes the live effect, and a filter that no SVG Filters effect can
keep still comes in as the nearest even effect, as before.
2026-11-15 06:41:20 -08:00
dotCooCoo f90ac94876 Merge main into feat/diacritic-position 2026-11-15 06:18:24 -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
BFlat 1387328255 Merge pull request #7731 from dotCooCoo/feat/svg-filter-user-space-matrix
SVG Filters: a filter on a turned or skewed object is kept on import and drawn
2026-11-15 17:30:29 +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 7c1eb52111 Merge main into feat/diacritic-position 2026-11-14 22:55:52 -08:00
dotCooCoo 0384726c7a Type: Adjust Horizontal and Vertical Diacritic Position move marks off their letters
The Character panel shows Adjust Horizontal and Adjust Vertical Diacritic
Position with the Middle Eastern options. text.setFormat and
text.setRangeStyle take diacriticHorizontal and diacriticVertical, in
thousandths of an em from -1000 to 1000. Positive values move the
characters' mark glyphs (GDEF class 3) right and up, and the letters keep
their places. An Arabic harakat or a Hebrew point styled apart from its
letter takes its own values without splitting the shaping cluster.

Character styles and Character Style Options carry both values. They are
saved only when set, and SVG export writes such type as outlines.

Docs: docs/mcp.md, docs/type-parity.md, docs/target-app-parity.md.
2026-11-14 22:54:10 -08:00
BFlat 4ca206fea9 Merge pull request #7749 from dotCooCoo/fix/svg-textpath-pathlength
SVG import: textPath startOffset follows the path's pathLength
2026-11-15 13:49:33 +07:00
dotCooCoo 7104cd05f3 Merge main into feat/editing-one-anchor-copies-the-whole-anchor-list 2026-11-14 22:05:53 -08:00
BFlat ba350c2e9f Merge pull request #7745 from dotCooCoo/fix/svg-css-not-rule-budget
SVG import: :not() rules test only the rules indexed for the element
2026-11-15 12:37:19 +07:00
dotCooCoo a5493a1cd0 Paths: editing one anchor of a long path keeps one chunk of anchors for undo
A subpath's anchors are now an `Anchors` list held in chunks of up to
256 anchors behind `Arc`s. Copying a path copies the chunk table and
shares the chunks, and editing one anchor copies only the chunk that
holds it, so the undo step of a one-anchor edit no longer keeps a copy
of every anchor of the path. Inserting or removing an anchor copies the
chunk it is in and rebuilds the table. Reads and edits follow the Vec
and slice methods the code used; files write and read each subpath's
anchors as one list, as before, within the same anchor read budget.

The undo memory estimate counts only the chunks the other version of
the path does not hold, and the renderer's kept paths compare only the
chunks an edit copied when they look for moved anchors.

Moving one anchor of an open path of 10,000 or 200,000 anchors
(path.moveAnchor, path.setHandle, path.moveAnchors, a nudge) keeps at
most 48 KiB in its undo and redo steps, where it kept 56 bytes per
anchor.
2026-11-14 21:25:15 -08:00
dotCooCoo 9762e124fc SVG import: textPath startOffset follows the path's pathLength
A startOffset given as a length now counts in the units of the
referenced element's pathLength, so pathLength="100" on a path 400
long puts startOffset="50" at 200. A percentage stays a share of the
computed length. A pathLength of 0 keeps an offset of 0 at the start
and puts any other offset past the end, and an offset too large to
scale starts at the path's end instead of its start.

https://www.w3.org/TR/SVG2/text.html#TextLayoutAlgorithm
https://www.w3.org/TR/SVG2/paths.html#PathLengthAttribute
2026-11-14 21:14:20 -08:00
BFlat 511f36ed4c Merge pull request #7721 from dotCooCoo/fix/glyph-forms-review
Type: glyph forms and width forms follow the OpenType rules
2026-11-15 11:37:33 +07:00
BFlat 23be0cf916 Merge pull request #7634 from dotCooCoo/fix/svg-data-url-decode-bounded
SVG import: image data URLs are decoded once each, within 512 MB per import
2026-11-15 11:36:57 +07:00