Commit Graph
10 Commits
Author SHA1 Message Date
dotCooCoo c61d27b825 Metafile import: hidden WMF records leave the scale alone, and a far stroke keeps the strokes before it
A WMF without a placeable box picks its scale from the map mode its
drawing records are played in. Lines and shapes drawn under R2_NOP or
R2_XORPEN, and PATBLT records the reader does not fill, no longer count,
with the mix mode saved and restored with SAVEDC and RESTOREDC.

An open stroke that reaches far outside the picture is left out before
it joins the strokes waiting to be joined, so the strokes drawn before
it are still added.
2026-11-14 13:39:05 -08:00
dotCooCoo 9d8407b3de Metafile import: metric WMFs are read at 96 pixels an inch, and only round solid strokes join
A WMF without a usable placeable box that draws in a metric map mode
(MM_LOMETRIC to MM_TWIPS) is read at 96 pixels an inch, the scale
craft_metafile plays those modes at, so a one-inch MM_TWIPS picture opens
at 72 pt instead of 4.8 pt. The mode that more of the drawing records the
reader plays are drawn in decides, with SAVEDC and RESTOREDC followed as
the reader follows them; a file that draws nothing goes by its last mode.

Opaque strokes drawn one after another now join into one path only when
the pen is solid with round caps and round joins. A dashed stroke keeps
its own dash phase, and flat or square caps and miter or bevel joins
stay as the separate strokes drew them.
2026-11-14 09:58:42 -08:00
dotCooCoo 6be8f3095b Metafile import: a clip that runs back over its own edges still clips
A clip path is left out only when it is one rectangle around the whole
picture. One figure through a box's four corners that runs back over its
edges encloses less than the box, and the objects under such a clip are no
longer imported unclipped.
2026-11-14 08:14:18 -08:00
dotCooCoo 9e85368a44 Metafile import: a file that reaches the most objects one file may hold says so
The reader keeps at most 200,000 objects from one file and stops reading
there. A picture that reaches that count now carries a warning that any
objects after them were not read, and objects dropped past the import's own
object limit carry a warning too.
2026-11-14 07:55:40 -08:00
dotCooCoo d5e58b0e4b Metafile import: a clip of several figures along a box's sides still clips
A clip path is left out only when it is one rectangle around the whole
picture. Two open figures along the top and bottom of a box enclose nothing,
and the objects under such a clip are no longer imported unclipped.
2026-11-14 07:46:17 -08:00
dotCooCoo f8e70c1415 Metafile import: translucent strokes stay apart, and each pattern tile is averaged once
Strokes drawn one after another with the same pen join into one path only
when the pen is opaque. A translucent stroke keeps its own opacity, so where
two of them overlap both show.

Items filled with the same pattern brush share its tile, and the tile's
average color is now worked out once per tile instead of once per item.
2026-11-14 07:35:25 -08:00
dotCooCoo 9efde43f1d Metafile import: EMF and WMF are read through craft-metafile, so EMF+ pictures open
EMF and WMF import now plays the records with the shared craft-metafile
reader (storytold/craft-libs#778, at the craft-libs rev the SVG, EPS and
DXF crates already use) and maps its picture onto the document here:
paths with their fills, strokes, caps, joins, miter limits and dashes,
clipping groups, images and point type. The EMF and WMF record players in
crates/metafile/src/import and the DIB decoder they used are removed. The
writers are unchanged, and the PICT reader keeps its own player.

What changes for a file being opened, placed or pasted, and for an EPS
file's Windows metafile preview (read when its PostScript can't be):

- An EMF that draws with EMF+ records is read from them. It opened empty,
  with a warning that EMF+ is not read. A file with both kinds of record
  is read from its EMF+ records too.
- Hatched and pattern brushes fill with the average color of the brush's
  tile, translucent where the tile has gaps. Hatches filled with the hatch
  color and pattern brushes with gray.
- Translucent fills, strokes and EMF+ text keep their alpha as opacity.
- Text keeps a stretch across from the world transform; it kept only the
  turn. Text the file clips to a rectangle is clipped to it, and an
  underlined or struck-through font gives underlined or struck-through
  type.
- A clip path whose bounding box holds the whole picture is kept unless
  it is that rectangle; a diamond or a bow tie around the picture was
  dropped.
- Images drawn with SRCAND, SRCPAINT or SRCINVERT are drawn as they look
  over white, and images drawn with other raster operations are drawn as
  a plain copy. They were left out with a warning.
- Excluded clip rectangles and the other clip region modes are applied.
  A clip path combined with RGN_OR, RGN_XOR or RGN_DIFF is ignored
  without the warning it gave.
- An image past the reader's size or pixel limits, or one that can't be
  decoded, is left out without a warning of its own. A file past the
  reader's limits (more than 32 nested clip paths, 200,000 drawn items,
  256 MiB held) is read up to that point without a warning.
- An EMF record whose size is not a multiple of 4 ends the file, with the
  "ends early" warning.

Tests: an EMF+ only picture imports its fill (it failed before), a dual
EMF+ file draws its translucent EMF+ fill and not its fallback, hatch and
pattern brush colors, clipped and underlined text, excluded clip
rectangles, a shared clipping group, an odd record size, WMF at 1440
units an inch without a placeable header and at its own units with an
inverted box, an EMF without a frame, diamond and bow-tie clips, text with a
stretch, clips nested past the stack and 200,000 clip records; the fuzz
test gains random EMF+ records.
2026-11-14 06:04:19 -08:00
dotCooCoo 71da62dab2 File formats: PICT pictures open and place
File > Open and File > Place read QuickDraw pictures, versions 1 and 2,
from .pct, .pic and .pict files, with or without the file's 512 bytes
of application data; a version 2 picture also opens by its content.
The reader plays the opcodes of Apple's Opcodes in Pictures table on
the metafile player: lines, rectangles, rounded rectangles, ovals,
arcs, polygons and regions become paths, text becomes point type in
the font the picture names, bitmaps, pixel maps and QuickTime JPEG
images become images, and the clip region clips what follows it.
Place puts the picture in one group clipped to its frame. What isn't
read comes back as warnings, and a picture cut short keeps what came
before it. PICT is not written.

Images whose transform flattens them no longer leave their pixel data
in the document. Formats whose signature starts the file are detected
before PICT, which is known by bytes 522 or 10.

Docs: docs/mcp.md, docs/file-format-parity.md, docs/target-app-parity.md.
2026-11-12 19:52:06 -08:00
dotCooCoo ac0bb3c4ce Gradients: freeform points that share a color model mix in that model
The canvas, the gradient chips and the SVG, PDF, EPS and EMF writers mixed
freeform points in display RGB, while Object > Expand and Create Gradient
Mesh mixed them in the model the points share. Points that are all CMYK,
Gray, Lab or RGB now mix in that model in those places too. Points in
different models mix as before: in display RGB, and on ink planes as the
inks of each point.

This changes how existing art looks:

- CMYK and Lab points. With the default Generic CMYK working space and no
  ink planes, halfway between C100 and K100 the canvas drew (17, 106, 139)
  and now draws (54, 118, 143).
- RGB points in a working RGB space other than sRGB mix in that space.
- On ink planes (a CMYK document that shows transparency), RGB and Lab
  points mix first and then separate.

Gray mixes keep their values, and CMYK and Gray points on ink planes draw
as before. RGB points in an sRGB working space draw as before except on
ink planes.

- PDF and EPS write a gradient whose points are all CMYK, or all Gray in a
  CMYK file, as a CMYK image. PDF's Output settings convert it as they
  convert any CMYK image.
- Darkening applies to the points before they mix.
- With Appearance of Black set to Rich, the canvas mixes a gradient with a
  pure CMYK black point in display RGB, and the point fades from RGB black.
2026-11-08 17:18:43 -08:00
aiongg 7da84565d8 refactor(metafile): move tests_*.rs to tests/<topic>.rs 2026-10-26 18:26:59 +00:00