mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-08 08:20:13 +00:00
.ai save: the editing copy keeps live effects
Squashed from #6150 onto main.
This commit is contained in:
dotCooCoo
@@ -253,7 +253,7 @@ The scores are self-assessed from our code against public documentation;
|
||||
[target-app-parity.md](docs/target-app-parity.md#how-this-was-measured-2026-10-10) explains how far to trust them.
|
||||
|
||||
**What's missing:**
|
||||
- reliable exchange of .ai files (layer structure in real files; the editing copy a save writes leaves out live effects and writes symbols and live objects as their art);
|
||||
- reliable exchange of .ai files (layer structure in real files; the editing copy a save writes keeps live effects only on paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports (see [docs/file-format-parity.md](docs/file-format-parity.md)), leaves out other objects' effects other than geometry effects, and writes live objects as their art);
|
||||
- an interaction-fidelity pass covering every tool's modifiers and small behaviours;
|
||||
- 3D and Materials beyond the initial live Revolve (Extrude & Bevel, Inflate, Rotate, materials);
|
||||
- filter thumbnails and a preview area inside the Effect Gallery (the gallery itself and all 57 Photoshop-style raster filters, approximated, are in);
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ and the work list in [`docs/gaps.md`](docs/gaps.md).
|
||||
**Why alpha:** the core workflows exist end to end (drawing and path editing, Pathfinder, paint and appearance,
|
||||
type, SVG/PDF/EPS, print, export) and feature depth is ~75%, but a professional can't yet switch: Illustrator's
|
||||
own `.ai` files open with a wrong layer structure in real cases and are saved back with an editing copy that
|
||||
leaves out live effects and writes symbols and live objects as their art, the interaction details have never been checked side by side, and some machines fail to start the
|
||||
keeps live effects only on paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports (see [docs/file-format-parity.md](docs/file-format-parity.md)), and writes live objects as their art, the interaction details have never been checked side by side, and some machines fail to start the
|
||||
app. Beta needs those closed (the beta list in [gaps.md](docs/gaps.md)). It passes the core-workflow
|
||||
gate: all six core workflows (path drawing and editing, paint and style, type, layers/artboards/export, print
|
||||
production, file exchange) work end to end on macOS with save and reopen, and only the last is partial, without
|
||||
|
||||
@@ -109,7 +109,7 @@ pub const AI_OPTIONS: &[FormatOption] = &[
|
||||
name: "editingData",
|
||||
ty: "boolean",
|
||||
default: "true",
|
||||
description: "also carry an editing copy of the artwork in the form other apps that open .ai files read: layers and sublayers, groups, compound paths, paths, fills and strokes, colors, linear and radial gradients, patterns on a grid of tiles, swatches, artboards and which one is active, the transparency of objects and layers, objects' opacity masks, clipping groups and layers clipped by a path, embedded images with their pixels, and linked images as placed files with a preview, with type, other patterns, symbols, other clipping objects and live objects as plain filled and stroked paths, freeform gradients, gradients along or across a stroke and gradients of more than 256 stops as their average color, gradients that dither or mix perceptually as classic ones, and gradient stops linked to global process colors as their colors (written only with every artboard, as Preserve Editing is)",
|
||||
description: "also carry an editing copy of the artwork in the form other apps that open .ai files read: layers and sublayers, groups, compound paths, paths, fills and strokes, colors, linear and radial gradients, patterns on a grid of tiles, swatches, artboards and which one is active, the transparency of objects and layers, objects' opacity masks, clipping groups and layers clipped by a path, embedded images with their pixels, linked images as placed files with a preview, point type, area type and type on a path as text, and symbols and their instances, with other type, other patterns, other clipping objects, other symbol instances and live objects as plain filled and stroked paths, freeform gradients, gradients along or across a stroke and gradients of more than 256 stops as their average color, gradients that dither or mix perceptually as classic ones, and gradient stops linked to global process colors as their colors (written only with every artboard, as Preserve Editing is)",
|
||||
},
|
||||
FormatOption {
|
||||
name: "aiVersion",
|
||||
|
||||
@@ -488,7 +488,7 @@ fn an_ai_file_opens_from_its_vectorcraft_document_when_the_editing_copy_differs(
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 200, "height": 100})).unwrap();
|
||||
let id = s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 40, "height": 30})).unwrap()["id"].as_u64().unwrap();
|
||||
s.execute("effect.apply", &json!({"effect": "stylize.dropShadow", "ids": [id]})).unwrap();
|
||||
s.execute("effect.apply", &json!({"effect": "blur.gaussian", "ids": [id]})).unwrap();
|
||||
let r = s.execute("document.export", &json!({"format": "ai"})).unwrap();
|
||||
assert!(r["warnings"].to_string().contains("live effects"), "{r}");
|
||||
let bytes = b64(&r);
|
||||
|
||||
@@ -3845,6 +3845,91 @@ proptest! {
|
||||
survive("mutated .ai symbols", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, false, 1.0).0))?;
|
||||
survive("mutated .ai symbols, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, true, 1.0).0))?;
|
||||
}
|
||||
|
||||
/// A `.ai` whose art styles, as the writer writes them, are damaged: the styles, the style
|
||||
/// list, a styled object's drawn look, the object on `%_` lines and its `1 (style) XW`, cut
|
||||
/// short or edited.
|
||||
#[test]
|
||||
fn ai_written_styles_never_panic(cut in 0usize..STYLES_FUZZ_CHARS, edits in prop::collection::vec((0usize..STYLES_FUZZ_CHARS, prop::sample::select(vec!['0', '9', '-', '.', ' ', '\n', '(', ')', '/', ':', ';', ',', '%', '_', 'u', 'U', 'X', 'W'])), 0..12)) {
|
||||
let text = mutate_text(styles_text(), cut, &edits);
|
||||
let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(&text)].concat();
|
||||
survive("mutated .ai art styles", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, false, 1.0).0))?;
|
||||
survive("mutated .ai art styles, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, true, 1.0).0))?;
|
||||
}
|
||||
}
|
||||
|
||||
/// The range of [`ai_written_styles_never_panic`]'s cuts and edits: past the end of [`styles_text`].
|
||||
const STYLES_FUZZ_CHARS: usize = 64_000;
|
||||
|
||||
/// The editing data VectorCraft writes for a document with a drop shadow on a path, a gradient fill
|
||||
/// and a width profile on others, a stroked even-odd path with an opacity mask and Pathfinder › Add
|
||||
/// on a group.
|
||||
fn styles_text() -> &'static str {
|
||||
static TEXT: std::sync::OnceLock<String> = std::sync::OnceLock::new();
|
||||
TEXT.get_or_init(|| {
|
||||
use vectorcraft_color::{Color, Gradient, GradientKind, GradientPaint, GradientStop, Paint};
|
||||
use vectorcraft_doc::{Appearance, AppearanceItem, Node, NodeKind, OpacityMask, StrokeLayer, WidthProfile};
|
||||
use vectorcraft_geom::{FillRule, Rect, shapes};
|
||||
let mut doc = Document::new(200.0, 100.0);
|
||||
let layer = doc.layers[0].id;
|
||||
let fx = |id: &str| vectorcraft_render::effects::new_effect(id, &json!({})).unwrap();
|
||||
let mut ap = Appearance::basic(Paint::solid(Color::BLACK), Paint::solid(Color::WHITE), 2.0);
|
||||
ap.effects = vec![fx("stylize.dropShadow")];
|
||||
let shaded = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(10.0, 10.0, 50.0, 40.0)), ap.clone());
|
||||
doc.insert(Some(layer), usize::MAX, shaded).unwrap();
|
||||
let ramp = Gradient::new(GradientKind::Linear, vec![GradientStop::new(0.0, Color::WHITE), GradientStop::new(1.0, Color::BLACK)]);
|
||||
let mut graded = Appearance::basic(Paint::Gradient(Box::new(GradientPaint::new(ramp))), Paint::None, 0.0);
|
||||
graded.effects = vec![fx("stylize.outerGlow")];
|
||||
let n = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(10.0, 50.0, 50.0, 90.0)), graded);
|
||||
doc.insert(Some(layer), usize::MAX, n).unwrap();
|
||||
let mut tapered = StrokeLayer::new(Paint::solid(Color::BLACK), 4.0);
|
||||
tapered.profile = Some(WidthProfile { points: vec![(0.0, 1.0, 0.5), (1.0, 0.0, 1.0)] });
|
||||
let profiled = Appearance { items: vec![AppearanceItem::Stroke(tapered)], effects: vec![fx("stylize.roundCorners")], contents_index: None };
|
||||
let n = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(100.0, 10.0, 150.0, 40.0)), profiled);
|
||||
doc.insert(Some(layer), usize::MAX, n).unwrap();
|
||||
let mut stroked = Appearance::basic(Paint::None, Paint::solid(Color::WHITE), 2.0);
|
||||
stroked.effects = vec![fx("stylize.dropShadow")];
|
||||
let mut odd = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(100.0, 50.0, 150.0, 90.0)), stroked);
|
||||
if let NodeKind::Path { rule, .. } = &mut odd.kind {
|
||||
*rule = FillRule::EvenOdd;
|
||||
}
|
||||
let mask_art = Node::path(
|
||||
doc.alloc_id(),
|
||||
shapes::rectangle(Rect::new(100.0, 50.0, 150.0, 70.0)),
|
||||
Appearance::basic(Paint::solid(Color::gray(0.0)), Paint::None, 0.0),
|
||||
);
|
||||
odd.extras_mut().mask = Some(Box::new(OpacityMask::new(mask_art, false)));
|
||||
doc.insert(Some(layer), usize::MAX, odd).unwrap();
|
||||
let square = |doc: &mut Document, x: f64| {
|
||||
Node::path(
|
||||
doc.alloc_id(),
|
||||
shapes::rectangle(Rect::new(x, 50.0, x + 30.0, 80.0)),
|
||||
Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 0.0),
|
||||
)
|
||||
};
|
||||
let (a, b) = (square(&mut doc, 60.0), square(&mut doc, 80.0));
|
||||
let mut merged = Node::group(doc.alloc_id(), vec![std::sync::Arc::new(a), std::sync::Arc::new(b)]);
|
||||
merged.appearance = Appearance { effects: vec![fx("pathfinder.add")], ..Appearance::default() }.into();
|
||||
doc.insert(Some(layer), usize::MAX, merged).unwrap();
|
||||
let out = vectorcraft_eps::export_ai_editing(&doc, &vectorcraft_eps::AiEditingOptions::default()).unwrap();
|
||||
String::from_utf8(out.program).unwrap()
|
||||
})
|
||||
}
|
||||
|
||||
/// The data [`ai_written_styles_never_panic`] damages, as it is, opens with its styles live, and the
|
||||
/// property's cuts and edits reach all of it.
|
||||
#[test]
|
||||
fn the_written_styles_fuzz_data_opens_live() {
|
||||
let text = styles_text();
|
||||
assert!(text.chars().count() < STYLES_FUZZ_CHARS, "{}", text.chars().count());
|
||||
for mark in ["%AI9_BeginArtStyles", "%AI5_BeginLayer", "\n6 () XW", "\n1 (Anon", "(BSLeftWidthsArray)", "0 /Bool (UseEvenOdd)", "Bb"] {
|
||||
assert!(text.contains(mark), "{mark}");
|
||||
}
|
||||
let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(text)].concat();
|
||||
let (d, warnings, layered) = vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, true, 1.0);
|
||||
assert!(layered, "{warnings:?}");
|
||||
let art = d.layers[0].children().unwrap();
|
||||
assert_eq!(art.iter().map(|n| n.appearance.effects.len()).collect::<Vec<_>>(), [1, 1, 1, 1, 1]);
|
||||
}
|
||||
|
||||
/// Editing data with symbols (S2's art holds an instance of S1, F's holds non-native art), the
|
||||
|
||||
@@ -98,7 +98,8 @@
|
||||
//! a preview of at most 256 pixels a side between `%AI26_BeginPlacedObjectPreview` and its end
|
||||
//! (`w h rowBytes 32 17 `, then rows of premultiplied ARGB), each in versioned content, `~`,
|
||||
//! `%AI5_EndPlace`. The box is the file's pixels at art space's origin on the canvas; the matrix
|
||||
//! takes it into art space. In opacity masks and pattern tiles, linked images are embedded.
|
||||
//! takes it into art space. In opacity masks, pattern tiles and symbols, linked images are
|
||||
//! embedded.
|
||||
//! - Type: a text object `/AI11Text :` naming its story and frame (`/StoryIndex`, `/FrameIndex`),
|
||||
//! for area type and type on a path with its frame's path (`/Art :` … `; /ConfiningPath ,`), and
|
||||
//! the text document after the document data (`%AI11_BeginTextDocument`, see
|
||||
@@ -107,30 +108,66 @@
|
||||
//! the alignment, indents, spacing, hyphenation and direction of each paragraph, and the frame:
|
||||
//! point type's point and matrix, area type's frame, rows, columns, gutters and first baseline,
|
||||
//! type on a path's path and span, vertical type, and the frames a threaded story flows through.
|
||||
//! - Symbols, as the reader reads them ([`crate::import`]'s `.ai` reader, `read.rs`): every symbol
|
||||
//! of the document defined in the setup after the patterns, in a non-printing block
|
||||
//! (`%AI14_BeginSymbol`, `(name)`, `0 A`, `0 Xw`, `0 Ae`, the art in the symbol's space with y
|
||||
//! down, the registration point as `AI13PatternRegistrationType` 1 to 9 from the top left, row by
|
||||
//! row (VectorCraft's numbering, in the order the scripting reference lists the points), in the
|
||||
//! art's dictionary, `%AI10_EndSymbol`), each after those its art uses; the symbol
|
||||
//! list after the palette (`%AI24_BeginSymbolList`, the names in the Symbols panel's order,
|
||||
//! `%AI24_EndSymbolList`); each instance as `/SymbolInstance :`, `(name) /SymbolRef ,`, the
|
||||
//! matrix taking the art to art space as `a b c d tx ty /RTransformMatrix`, `;`, then its name
|
||||
//! and opacity mask and a state block as a group's with its opacity and blending mode (an
|
||||
//! instance with isolation, knockout or knockout shape of its own is written as its art). The
|
||||
//! definitions are at most the reader's 4,096. In a symbol's art, an instance's matrix and
|
||||
//! a gradient's take the art to the canvas's space turned y up about art space's origin there.
|
||||
//! - Art styles, as the reader reads them (`style.rs`, `read/ops.rs`): a path, compound path or
|
||||
//! group with live effects is written as its drawn look (`u`, its vector art as its geometry
|
||||
//! effects leave it, without shadows, glows or feathers, `U`, its transparency, `0 0 Xd`,
|
||||
//! `6 () XW`), then the object itself on `%_` lines (its points painted
|
||||
//! with nothing, or with its gradient fill; a group with its members) with its name and opacity
|
||||
//! mask, then `1 (style) XW`. The styles are written in a non-printing block after the symbols
|
||||
//! (`%AI9_BeginArtStyles`, each `/KnownStyle :` with its name and a filter tree: a chain of the
|
||||
//! stack of fills and strokes with the contents among them, the effects and the blend filter). A
|
||||
//! fill filter fills by the non-zero rule (`0 /Bool (UseEvenOdd)`), so a filled object that fills by
|
||||
//! the even-odd rule is written as its drawn look. A style is written only when the reader reads it
|
||||
//! back as the object's appearance.
|
||||
//!
|
||||
//! Lines end in CR LF. Strings are written in UTF-8. Art space is ruler space: y up, its origin at
|
||||
//! the first artboard's top-left corner. On the canvas ([`CANVAS_SIZE`] points square, y down) the
|
||||
//! artboards together are centered; each artboard's `RulerOrigin` is its top-left corner there, and
|
||||
//! `%AI3_TemplateBox` holds the canvas's center in art space. What the form above can't hold is written as plain filled and stroked paths, each such
|
||||
//! loss a warning: type the text document can't hold (in opacity masks, pattern tiles and art cut to
|
||||
//! a clipping object, mirrored, turned or unevenly scaled area type and type on a path, inline graphics, ruby,
|
||||
//! loss a warning: type the text document can't hold (in opacity masks, pattern tiles, symbols and
|
||||
//! art cut to a clipping object, mirrored, turned or unevenly scaled area type and type on a path, inline graphics, ruby,
|
||||
//! gradient or pattern paint, an appearance of its own) as its outlines and its inline graphics'
|
||||
//! art, the character and paragraph attributes the text document doesn't hold, freeform gradients, gradients
|
||||
//! along or across a stroke and gradients without stops, with more than 256 stops or without extent
|
||||
//! as their average color
|
||||
//! (gradients that dither or mix perceptually are written as classic ones, and gradient stops linked
|
||||
//! to global process colors as their colors), pattern fills whose tiles aren't a grid, whose art reaches past
|
||||
//! the tile or is painted with patterns as their tiles cut to the shape, clipping groups and clipping layers whose clipping object isn't a path,
|
||||
//! the tile or is painted with patterns, and pattern fills in symbols, as their tiles cut
|
||||
//! to the shape, clipping groups and clipping layers whose clipping object isn't a path,
|
||||
//! and the clipping groups inside them, as their art cut to that object (its fill cut too, its
|
||||
//! stroke not; an image in a clipping group of the region it is cut to), images that can't be
|
||||
//! decoded or have more than 33,554,432 pixels as their outlines filled mid gray, images of 16 bits
|
||||
//! a channel at 8 bits, linked images in opacity masks and pattern tiles as embedded images,
|
||||
//! symbols and live objects (placed documents included) as their art (symbol art past
|
||||
//! [`vectorcraft_doc::MAX_SYMBOL_NODES`] objects in all left out), strokes a plain line can't draw
|
||||
//! a channel at 8 bits, linked images in opacity masks, pattern tiles and symbols as embedded images,
|
||||
//! symbol instances with a fill, appearance changes, isolation, knockout or knockout shape of their
|
||||
//! own, instances of symbols with 9-slice guides or pattern paint, instances in pattern tiles or in art cut to a
|
||||
//! clipping object, instances scaled almost flat, instances that turn, mirror or scale symbols holding
|
||||
//! type, live objects, instances written as their art, shapes with rounded live corners or strokes
|
||||
//! written as outlines or brush art,
|
||||
//! instances that scale their symbol more than 100 times, instances on the layers of a large canvas
|
||||
//! and instances of
|
||||
//! symbols past 4,096 as their art (symbol art past [`vectorcraft_doc::MAX_SYMBOL_NODES`] objects
|
||||
//! in all left out), instances of symbols the document doesn't have as empty groups, symbols' 9-slice
|
||||
//! guides, export types and dynamic type left out, live objects (placed documents included) as their art,
|
||||
//! strokes a plain line can't draw
|
||||
//! as their filled outlines, several fills or strokes as a group of a path for each, freeform
|
||||
//! gradient swatches, gradient swatches of more than 256 stops, swatches of patterns written as
|
||||
//! tiles and the placement of pattern swatches that move, turn or scale their pattern, the opacity and blending modes of single fills and strokes, opacity masks on
|
||||
//! layers and opacity masks nested too deep, and live effects other than geometry effects left out.
|
||||
//! layers and opacity masks nested too deep, and, on objects written without an art style, live
|
||||
//! effects other than geometry effects left out; graphic styles, links to them and every art style
|
||||
//! on a large canvas are left out.
|
||||
//!
|
||||
//! The data streams hold the program compressed with Zstandard after `%AI24_ZStandard_Data`, with
|
||||
//! the version numbers of the newest files users sent ([`private_data`]).
|
||||
@@ -207,11 +244,15 @@ pub fn export_ai_editing(doc: &Document, o: &AiEditingOptions) -> Result<AiEditi
|
||||
if !(board.is_finite() && board.width() > 0.0 && board.height() > 0.0) {
|
||||
return Err("the document has no artboard".into());
|
||||
}
|
||||
// Artboards that don't fit on the canvas are written on a large canvas, at 1/scale.
|
||||
let scale = canvas_scale(doc);
|
||||
// The objects that may keep their effects in an art style, as they are before baking (not on
|
||||
// a large canvas, whose scale the styles' strokes and effects would need).
|
||||
let styled = writer::styled_objects(doc);
|
||||
let graphic_styles = writer::has_graphic_styles(doc);
|
||||
// Live geometry effects as their result, as the PDF part draws them.
|
||||
let baked = baked(doc);
|
||||
let doc = baked.as_ref().unwrap_or(doc);
|
||||
// Artboards that don't fit on the canvas are written on a large canvas, at 1/scale.
|
||||
let scale = canvas_scale(doc);
|
||||
let reduced = (scale != 1.0).then(|| {
|
||||
let mut d = doc.clone();
|
||||
crate::import::scale_document(&mut d, 1.0 / scale, true);
|
||||
@@ -227,6 +268,8 @@ pub fn export_ai_editing(doc: &Document, o: &AiEditingOptions) -> Result<AiEditi
|
||||
}
|
||||
d
|
||||
});
|
||||
// Symbols are defined at their own size, whatever the canvas.
|
||||
let symbol_doc = doc;
|
||||
let doc = reduced.as_ref().unwrap_or(doc);
|
||||
let board = doc.artboards.first().map_or(board, |a| a.rect);
|
||||
// The document is y down; art space is ruler space: y up, its origin the first artboard's
|
||||
@@ -234,10 +277,23 @@ pub fn export_ai_editing(doc: &Document, o: &AiEditingOptions) -> Result<AiEditi
|
||||
let to_art = Affine::new([1.0, 0.0, 0.0, -1.0, -board.x0, board.y0]);
|
||||
let origin = ruler_origin(doc, to_art);
|
||||
let mut w = Writer::new(doc, to_art, origin);
|
||||
// On a large canvas the layers' symbol instances are written as their art.
|
||||
w.symbols_live = scale == 1.0;
|
||||
w.symbol_doc = symbol_doc;
|
||||
w.reserve_swatch_gradients();
|
||||
if scale == 1.0 {
|
||||
w.styled = styled;
|
||||
} else if !styled.is_empty() {
|
||||
w.warnings.push(writer::LARGE_CANVAS_STYLES.to_string());
|
||||
}
|
||||
if graphic_styles {
|
||||
w.warnings.push(writer::GRAPHIC_STYLES.to_string());
|
||||
}
|
||||
for layer in &doc.layers {
|
||||
w.layer(layer);
|
||||
}
|
||||
// The symbols no instance uses too; their art adds definitions.
|
||||
w.symbols();
|
||||
// The palette first: its gradient and pattern swatches add definitions.
|
||||
let mut palette = String::new();
|
||||
w.palette(&mut palette);
|
||||
@@ -256,7 +312,10 @@ pub fn export_ai_editing(doc: &Document, o: &AiEditingOptions) -> Result<AiEditi
|
||||
let mut s = header.clone();
|
||||
s.push_str("%%BeginProlog\n%%EndProlog\n%%BeginSetup\n");
|
||||
w.definitions(&mut s);
|
||||
w.symbol_definitions(&mut s);
|
||||
w.art_styles(&mut s);
|
||||
s.push_str(&palette);
|
||||
w.symbol_list(&mut s);
|
||||
artboards(&mut s, doc, to_art, origin, &library);
|
||||
if !w.texts.is_empty() {
|
||||
s.push_str(&w.texts.section(doc));
|
||||
|
||||
+2207
-13
File diff suppressed because it is too large
Load Diff
@@ -17,15 +17,23 @@ use crate::ps;
|
||||
|
||||
mod images;
|
||||
mod paints;
|
||||
mod styles;
|
||||
mod symbols;
|
||||
mod texts;
|
||||
mod variables;
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) use styles::same_appearance;
|
||||
pub(super) use styles::{GRAPHIC_STYLES, LARGE_CANVAS_STYLES, has_graphic_styles, styled_objects};
|
||||
|
||||
pub(super) use images::PAYLOAD;
|
||||
#[cfg(test)]
|
||||
pub(super) use images::{IMAGE_DEPTH, IMAGES, LINKS_EMBEDDED};
|
||||
#[cfg(test)]
|
||||
pub(super) use paints::{GRADIENT_MIX, GRADIENT_SHAPES, GRADIENTS, STOP_LINKS, SWATCH_PLACEMENT, free_gradient_name};
|
||||
#[cfg(test)]
|
||||
pub(super) use symbols::{MISSING_SYMBOL, SYMBOL_ART, SYMBOL_COUNT, SYMBOL_OPTIONS};
|
||||
#[cfg(test)]
|
||||
pub(super) use texts::TYPE_ATTRIBUTES;
|
||||
#[cfg(test)]
|
||||
pub(super) use variables::{ACTIVE, BINDINGS, LIMITS, VALUES};
|
||||
@@ -35,14 +43,14 @@ pub(super) use variables::{ACTIVE, BINDINGS, LIMITS, VALUES};
|
||||
/// [`vectorcraft_doc::MAX_DEPTH`].
|
||||
const MAX_NEST: u32 = 8;
|
||||
|
||||
pub(super) const TYPE: &str = "type in opacity masks, pattern tiles and art cut to a clipping object, mirrored type, area type and type on a path that is turned or unevenly scaled or whose frame or path has several parts, area type in an open frame, type on an open path whose ends meet, area type that flows around a text wrap, type of only white space, threads of type on a path, threads whose frames differ in orientation or hold a frame written as outlines, type of sizes past what the reader reads, stories past what the reader reads (1,048,576 bytes a story, 16,777,216 bytes in all, and the size of text document it reads), and type with inline graphics, ruby, gradient or pattern paint, or fills, strokes, effects or an opacity mask of the object's own, is written as its outlines in the editing data for other apps";
|
||||
pub(super) const PATTERNS: &str = "pattern fills whose tiles aren't a grid or whose art reaches past the tile, pattern fills in another pattern's tile and pattern fills nested more than 8 deep are written as their tiles cut to the shape in the editing data for other apps";
|
||||
pub(super) const TYPE: &str = "type in opacity masks, pattern tiles, symbols and art cut to a clipping object, mirrored type, area type and type on a path that is turned or unevenly scaled or whose frame or path has several parts, area type in an open frame, type on an open path whose ends meet, area type that flows around a text wrap, type of only white space, threads of type on a path, threads whose frames differ in orientation or hold a frame written as outlines, type of sizes past what the reader reads, stories past what the reader reads (1,048,576 bytes a story, 16,777,216 bytes in all, and the size of text document it reads), and type with inline graphics, ruby, gradient or pattern paint, or fills, strokes, effects or an opacity mask of the object's own, is written as its outlines in the editing data for other apps";
|
||||
pub(super) const PATTERNS: &str = "pattern fills whose tiles aren't a grid or whose art reaches past the tile, pattern fills in another pattern's tile or in a symbol, and pattern fills nested more than 8 deep are written as their tiles cut to the shape in the editing data for other apps";
|
||||
pub(super) const PATTERN_TILES: &str = "pattern fills with more tiles than a fill places are written filled gray in the editing data for other apps";
|
||||
pub(super) const CLIPPING: &str = "clipping groups and clipping layers whose clipping object isn't a path, and the clipping groups inside them, are written as their art cut to that object in the editing data for other apps";
|
||||
pub(super) const CLIP_PAINT: &str = "the fills and strokes of clipping paths that a plain fill and line can't draw are written as paths of their own inside the clipping (fills under the clipped art, strokes over it) in the editing data for other apps";
|
||||
pub(super) const CLIP_PAINT_MASKS: &str = "the opacity masks of clipping paths whose fills and strokes are written as paths of their own stay on the clipping path, not on those paths, in the editing data for other apps";
|
||||
pub(super) const LIVE: &str =
|
||||
"symbols, blends, envelopes, meshes, repeats, placed documents and intertwines are written as their art in the editing data for other apps";
|
||||
"blends, envelopes, meshes, repeats, placed documents and intertwines are written as their art in the editing data for other apps";
|
||||
const STROKES: &str = "strokes a plain line can't draw (inside or outside the path, variable width, dots, dashes fitted to corners, gradients, patterns, arrowheads) are written as filled outlines, and brushed strokes as their brush's art, in the editing data for other apps";
|
||||
pub(super) const ITEM_TRANSPARENCY: &str =
|
||||
"the opacity and blending modes of single fills and strokes are left out of the editing data for other apps";
|
||||
@@ -172,6 +180,57 @@ pub(super) struct Writer<'a> {
|
||||
bound: Vec<(vectorcraft_doc::NodeId, String, Vec<String>)>,
|
||||
/// The text document: the stories of the type written as text.
|
||||
pub(super) texts: texts::TextDoc,
|
||||
/// Symbol instances on the layers may be written as instances ([`Self::live_instance`]); false
|
||||
/// on a large canvas, where they are written as their art.
|
||||
pub(super) symbols_live: bool,
|
||||
/// The document symbols are defined from: on a large canvas, the document at its own size
|
||||
/// (symbols' art is in its own space, which the canvas's scale doesn't change).
|
||||
pub(super) symbol_doc: &'a Document,
|
||||
/// A symbol's art is being written ([`Self::define_symbol`]).
|
||||
in_symbol: bool,
|
||||
/// The document → the space an instance's `RTransformMatrix` takes its symbol's art to: art
|
||||
/// space, and in a symbol's art the canvas's turned y up about art space's origin there.
|
||||
instance_space: Affine,
|
||||
/// The symbol definitions written (`%AI14_BeginSymbol` … `%AI10_EndSymbol`), each after those
|
||||
/// its art uses, and their names.
|
||||
symbol_defs: Vec<String>,
|
||||
defined_symbols: HashSet<String>,
|
||||
/// The symbols whose definitions are being written.
|
||||
defining_symbols: Vec<String>,
|
||||
/// Whether each symbol's own art paints with a pattern, and the symbols its instances use
|
||||
/// ([`Self::symbol_own_patterns`]).
|
||||
pattern_symbols: HashMap<String, (bool, Vec<String>)>,
|
||||
/// Whether each symbol's art paints with a pattern, nested symbols included
|
||||
/// ([`Self::symbol_paints_pattern`]).
|
||||
patterned_symbols: HashMap<String, bool>,
|
||||
/// Pattern tiles were written in the art being written ([`Self::define_symbol`] starts it over
|
||||
/// for each symbol's art).
|
||||
wrote_pattern: bool,
|
||||
/// The symbols whose definitions hold pattern tiles: a brushed stroke's brush art or a live
|
||||
/// object's art can paint with a pattern that the symbol's own objects don't name.
|
||||
pattern_written: HashSet<String>,
|
||||
/// Art that draws as it should only where it is was written in the art being written
|
||||
/// ([`Self::define_symbol`] starts it over for each symbol's art): a stroke as its outline or its
|
||||
/// brush's art, type as its outlines, a live object or a symbol instance as its art, or a shape
|
||||
/// with rounded live corners.
|
||||
wrote_fixed: bool,
|
||||
/// The symbols whose definitions hold such art, nested symbols' included
|
||||
/// ([`Self::keeps_scale`]).
|
||||
fixed_symbols: HashSet<String>,
|
||||
/// The largest scale a live instance in the art being written applies, nested symbols' scales
|
||||
/// included, and that of each symbol's definition.
|
||||
inner_scale: f64,
|
||||
symbol_scales: HashMap<String, f64>,
|
||||
/// The entries a symbol's dictionary adds to its art's dictionary, and the art's id.
|
||||
root_entries: Option<(vectorcraft_doc::NodeId, String)>,
|
||||
/// The objects that may be written with an art style, as they were before baking, by id
|
||||
/// ([`styles::styled_objects`]).
|
||||
pub(super) styled: HashMap<NodeId, Arc<Node>>,
|
||||
/// The art styles written ([`styles`]).
|
||||
styles: styles::Styles,
|
||||
/// An object's drawn look is being written: no object in it is written with a style, and its
|
||||
/// effects are the style's.
|
||||
in_look: bool,
|
||||
}
|
||||
|
||||
impl<'a> Writer<'a> {
|
||||
@@ -208,6 +267,25 @@ impl<'a> Writer<'a> {
|
||||
next: HashMap::new(),
|
||||
brushes: None,
|
||||
symbol_nodes: 0,
|
||||
symbols_live: true,
|
||||
symbol_doc: doc,
|
||||
in_symbol: false,
|
||||
instance_space: to_art,
|
||||
symbol_defs: vec![],
|
||||
defined_symbols: HashSet::new(),
|
||||
defining_symbols: vec![],
|
||||
pattern_symbols: HashMap::new(),
|
||||
patterned_symbols: HashMap::new(),
|
||||
wrote_pattern: false,
|
||||
pattern_written: HashSet::new(),
|
||||
wrote_fixed: false,
|
||||
fixed_symbols: HashSet::new(),
|
||||
inner_scale: 1.0,
|
||||
symbol_scales: HashMap::new(),
|
||||
root_entries: None,
|
||||
styled: HashMap::new(),
|
||||
styles: styles::Styles::default(),
|
||||
in_look: false,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -396,6 +474,9 @@ impl<'a> Writer<'a> {
|
||||
|
||||
/// Warn when `n` has effects the data leaves out.
|
||||
fn effects(&mut self, n: &Node) {
|
||||
if self.in_look {
|
||||
return;
|
||||
}
|
||||
let items = n.appearance.items.iter().filter(|i| i.visible()).flat_map(|i| i.effects());
|
||||
if n.appearance.effects.iter().chain(items).any(|e| e.visible) {
|
||||
self.warn(EFFECTS);
|
||||
@@ -407,6 +488,20 @@ impl<'a> Writer<'a> {
|
||||
if let NodeKind::Layer { .. } = n.kind {
|
||||
return self.write_layer(n, &[]);
|
||||
}
|
||||
if self.in_symbol {
|
||||
self.wrote_fixed |= symbols::redrawn(n);
|
||||
}
|
||||
// On the layers, outside art cut to a clipping object: with its art style, when it has one.
|
||||
if !self.in_look
|
||||
&& self.hidden == 0
|
||||
&& self.nest == 0
|
||||
&& self.clip.is_none()
|
||||
&& !self.in_symbol
|
||||
&& let Some(orig) = self.styled.get(&n.id).cloned()
|
||||
&& let Some(name) = self.object_style(n, &orig)
|
||||
{
|
||||
return self.styled_object(n, &orig, &name);
|
||||
}
|
||||
self.effects(n);
|
||||
self.state(n.locked, !n.visible);
|
||||
let xy = Xy::of(n);
|
||||
@@ -435,10 +530,18 @@ impl<'a> Writer<'a> {
|
||||
NodeKind::Compound { rule, .. } => self.shape(n, &compound_path(n), *rule, xy),
|
||||
NodeKind::Text(_) => self.text(n, xy),
|
||||
NodeKind::Image(im) => self.image(im, xy),
|
||||
NodeKind::SymbolInstance { symbol, xf } if self.live_instance(n, symbol, *xf) => self.symbol_instance(symbol, *xf, xy),
|
||||
NodeKind::SymbolInstance { symbol, xf } => {
|
||||
self.warn(LIVE);
|
||||
self.line("u");
|
||||
// The canvas places an instance inside a symbol's art where the outer instance puts
|
||||
// it (9-slice guides, stains and patterns included), and this art doesn't move with it.
|
||||
self.wrote_fixed |= self.in_symbol;
|
||||
let doc = self.doc;
|
||||
if doc.symbols.iter().any(|s| &s.name == symbol) {
|
||||
self.warn(symbols::SYMBOL_ART);
|
||||
} else {
|
||||
self.warn(symbols::MISSING_SYMBOL);
|
||||
}
|
||||
self.line("u");
|
||||
if let Some(sym) = doc.symbols.iter().find(|s| &s.name == symbol)
|
||||
&& self.nest < MAX_NEST
|
||||
{
|
||||
@@ -506,7 +609,8 @@ impl<'a> Writer<'a> {
|
||||
|
||||
/// `n`'s `/ArtDictionary`, after it, when it has a name (`AI10_ArtUID`, see [`Self::take_id`]),
|
||||
/// is bound to variables ([`Self::bound_variables`]; without a name, it gets an XML id and an
|
||||
/// empty `AIArtName`) or has an opacity mask (`AI9_Mask`, see [`Self::mask`]).
|
||||
/// empty `AIArtName`), has an opacity mask (`AI9_Mask`, see [`Self::mask`]), or is a symbol's
|
||||
/// art (its symbol's entries first, see [`Self::define_symbol`]).
|
||||
fn dictionary(&mut self, n: &Node) {
|
||||
let name = n.name.as_deref().filter(|s| !s.is_empty());
|
||||
let placed = std::mem::take(&mut self.placed);
|
||||
@@ -518,10 +622,17 @@ impl<'a> Writer<'a> {
|
||||
self.warn(DEEP_MASKS);
|
||||
mask = None;
|
||||
}
|
||||
if name.is_none() && mask.is_none() && bound.is_empty() {
|
||||
let entries = match &self.root_entries {
|
||||
Some((id, _)) if *id == n.id => self.root_entries.take().map(|(_, e)| e),
|
||||
_ => None,
|
||||
};
|
||||
if name.is_none() && mask.is_none() && bound.is_empty() && entries.is_none() {
|
||||
return;
|
||||
}
|
||||
self.body.push_str("%_/ArtDictionary :\n");
|
||||
if let Some(e) = entries {
|
||||
self.body.push_str(&e);
|
||||
}
|
||||
if name.is_some() || !bound.is_empty() {
|
||||
let id = self.take_id(name.unwrap_or("XMLID"));
|
||||
let _ = writeln!(self.body, "%_/XMLUID : {} ; (AI10_ArtUID) ,", ps::bytes(id.as_bytes()));
|
||||
@@ -775,6 +886,7 @@ impl<'a> Writer<'a> {
|
||||
AppearanceItem::Stroke(s) if self.direct_stroke(s) => self.path_object(path, rule, None, Some(s), xy),
|
||||
AppearanceItem::Stroke(s) => {
|
||||
self.warn(STROKES);
|
||||
self.wrote_fixed = true;
|
||||
if self.brush_art(path, s, xy) {
|
||||
return;
|
||||
}
|
||||
@@ -836,6 +948,7 @@ impl<'a> Writer<'a> {
|
||||
let flat = FillLayer { paint: Paint::solid(Color::gray(0.5)), ..f.clone() };
|
||||
return self.path_object(path, rule, Some(&flat), None, xy);
|
||||
}
|
||||
self.wrote_pattern = true;
|
||||
let outer = self.clip.clone();
|
||||
let region = self.cut(path, rule);
|
||||
self.clip = Some(region);
|
||||
@@ -874,6 +987,7 @@ impl<'a> Writer<'a> {
|
||||
self.plain_object(®ion, FillRule::NonZero, fill, None, own);
|
||||
}
|
||||
if let Some(s) = stroke {
|
||||
self.wrote_fixed = true;
|
||||
let outline = stroke::outline_region(path, rule, s);
|
||||
let region = self.cut(&outline, FillRule::NonZero);
|
||||
let fill = FillLayer { overprint: s.overprint, ..FillLayer::new(s.paint.clone()) };
|
||||
@@ -937,13 +1051,13 @@ impl<'a> Writer<'a> {
|
||||
// ---------- type ----------
|
||||
|
||||
/// Type `n`: a text object stub naming its story in the text document ([`texts`]) when the
|
||||
/// text document can hold it, outside opacity masks, pattern tiles and art cut to a clipping
|
||||
/// object; else its outlines ([`Self::outlined_text`]). A frame of threaded area type names the
|
||||
/// story of its thread, which its first frame holds.
|
||||
/// text document can hold it, outside opacity masks, pattern tiles, symbols' art and art cut to
|
||||
/// a clipping object; else its outlines ([`Self::outlined_text`]). A frame of threaded area type
|
||||
/// names the story of its thread, which its first frame holds.
|
||||
fn text(&mut self, n: &Node, xy: Xy) {
|
||||
let NodeKind::Text(t) = &n.kind else { return };
|
||||
let doc = self.doc;
|
||||
let placed = if self.hidden > 0 || self.clip.is_some() {
|
||||
let placed = if self.hidden > 0 || self.clip.is_some() || self.in_symbol {
|
||||
None
|
||||
} else if let Some(thread) = doc.text_threads.iter().find(|th| th.contains(&n.id)) {
|
||||
// A thread is checked for what it loses, in every frame, when its story is written.
|
||||
|
||||
@@ -13,7 +13,7 @@ use crate::ps;
|
||||
pub(in crate::ai_editing) const IMAGES: &str = "images that can't be decoded or have more than 33,554,432 pixels are written as their outlines filled mid gray in the editing data for other apps";
|
||||
pub(in crate::ai_editing) const IMAGE_DEPTH: &str = "images of 16 bits a channel are written at 8 bits a channel in the editing data for other apps";
|
||||
pub(in crate::ai_editing) const LINKS_EMBEDDED: &str =
|
||||
"linked images in opacity masks and pattern tiles are written as embedded images in the editing data for other apps";
|
||||
"linked images in opacity masks, pattern tiles and symbols are written as embedded images in the editing data for other apps";
|
||||
|
||||
/// The most pixels an image is written with: as many as the reader reads.
|
||||
pub(super) const MAX_PIXELS: u64 = 1 << 25;
|
||||
@@ -94,7 +94,7 @@ impl Samples {
|
||||
impl Writer<'_> {
|
||||
/// Image object `im` of transparency `xy`: embedded, a raster ([`Self::raster`]); linked, a
|
||||
/// placed file with a preview ([`Self::placed_file`]), except in a part of the data written on
|
||||
/// `%_` lines. One whose pixels can't be read is its outline filled mid gray. Where the art is
|
||||
/// `%_` lines and in a symbol's art. One whose pixels can't be read is its outline filled mid gray. Where the art is
|
||||
/// cut to a clipping path, the image is in a clipping group of that path.
|
||||
pub(super) fn image(&mut self, im: &ImageObject, xy: Xy) {
|
||||
let doc = self.doc;
|
||||
@@ -120,7 +120,7 @@ impl Writer<'_> {
|
||||
let fit =
|
||||
Affine::scale_non_uniform(f64::from(im.width.max(1)) / f64::from(samples.width), f64::from(im.height.max(1)) / f64::from(samples.height));
|
||||
match &im.link {
|
||||
Some(link) if self.hidden == 0 => {
|
||||
Some(link) if self.hidden == 0 && !self.in_symbol => {
|
||||
// Cut to a region, the placed file is in a clipping group.
|
||||
self.placed = cut.is_none();
|
||||
self.placed_file(link, &samples, (im.width.max(1), im.height.max(1)), im.xf);
|
||||
@@ -158,9 +158,12 @@ impl Writer<'_> {
|
||||
/// `[matrix] 0 0 w h w h 8 type alpha reserved 1 0 4 4 0 0`, `%%BeginData:` counting `XI`, its
|
||||
/// line end and the color samples, `XI`, the color samples then the alpha channel in binary,
|
||||
/// `%%EndData`, `XH`, `%AI5_EndRaster`, `N`. The matrix is an art-space matrix applied to the
|
||||
/// pixels with their rows running downwards, `(u, -v)`, as §8.1's image matrix.
|
||||
/// pixels with their rows running downwards, `(u, -v)`, as §8.1's image matrix; in a symbol's
|
||||
/// art (outside a pattern's tile in it), a matrix in the canvas's space turned y up about art
|
||||
/// space's origin there, as an instance's matrix in it is.
|
||||
fn raster(&mut self, s: &Samples, xf: Affine) {
|
||||
let m = matrix(self.to_art * xf * Affine::FLIP_Y);
|
||||
let space = if self.in_symbol && self.defining.is_empty() { self.instance_space } else { self.to_art };
|
||||
let m = matrix(space * xf * Affine::FLIP_Y);
|
||||
let (w, h) = (s.width, s.height);
|
||||
let alpha = u8::from(s.alpha.is_some());
|
||||
let mut payload = Vec::with_capacity(2 + s.color.len() + s.alpha.as_ref().map_or(0, Vec::len));
|
||||
@@ -237,7 +240,7 @@ fn matrix(m: Affine) -> String {
|
||||
}
|
||||
|
||||
/// `v` rounded to ten decimals, without trailing zeros (0 when not finite).
|
||||
fn precise(v: f64) -> String {
|
||||
pub(super) fn precise(v: f64) -> String {
|
||||
let r = (v * 1e10).round() / 1e10;
|
||||
if !r.is_finite() {
|
||||
return if v.is_finite() { format!("{}", v + 0.0) } else { "0".into() };
|
||||
|
||||
@@ -103,6 +103,22 @@ impl Writer<'_> {
|
||||
name
|
||||
}
|
||||
|
||||
/// The gradient definitions' state, for [`Self::gradient_rollback`]: their count, which ones the
|
||||
/// art uses, and the next name's number.
|
||||
pub(super) fn gradient_mark(&self) -> (usize, Vec<bool>, u64) {
|
||||
(self.gradients.len(), self.gradients.iter().map(|d| d.used).collect(), self.next_gradient)
|
||||
}
|
||||
|
||||
/// The gradient definitions as they were at `mark` ([`Self::gradient_mark`]).
|
||||
pub(super) fn gradient_rollback(&mut self, mark: (usize, Vec<bool>, u64)) {
|
||||
let (len, used, next) = mark;
|
||||
self.gradients.truncate(len);
|
||||
for (d, u) in self.gradients.iter_mut().zip(used) {
|
||||
d.used = u;
|
||||
}
|
||||
self.next_gradient = next;
|
||||
}
|
||||
|
||||
/// `p` as the paint of a fill or stroke whose gradient is placed on `bounds`: a gradient is
|
||||
/// placed there (it then no longer depends on the shape it paints, which may be cut); one the
|
||||
/// data can't hold is its average color, with a warning.
|
||||
@@ -222,24 +238,11 @@ impl Writer<'_> {
|
||||
/// last stop; a radial one's `… Bm` (the unit circle onto its extent ellipse).
|
||||
fn instance(&mut self, g: &GradientPaint, stroke: bool, clip: bool, path: &BezPath) {
|
||||
let Some(geom) = g.geom else { return };
|
||||
let name = self.define_gradient(&g.gradient, g.swatch.as_deref());
|
||||
self.line(if stroke { "1 Bb" } else { "Bb" });
|
||||
self.instance_head(g, clip, path);
|
||||
let m = self.grad_space;
|
||||
let u = geom.end - geom.start;
|
||||
let radial = g.gradient.kind == GradientKind::Radial;
|
||||
let place = placement(&geom, radial, &(self.canvas * path.clone()), self.canvas);
|
||||
if radial {
|
||||
let c = m * geom.start;
|
||||
let off = geom.focal.map_or(Vec2::ZERO, |f| m * f - c);
|
||||
let (angle, fraction) = if off.hypot() > 1e-9 { place.focal } else { (0.0, 0.0) };
|
||||
let off = if fraction > 0.0 { off } else { Vec2::ZERO };
|
||||
ps::push_nums(&mut self.body, &[off.x, off.y, angle, fraction]);
|
||||
self.line("Bh");
|
||||
}
|
||||
let _ = write!(self.body, "{} {} ", u8::from(!clip), ps::bytes(name.as_bytes()));
|
||||
ps::push_nums(&mut self.body, &place.bg);
|
||||
ps::push_nums(&mut self.body, &place.transform.as_coeffs());
|
||||
self.line("1 Bg");
|
||||
// The unit vector along the gradient, and across it as long.
|
||||
let frame = |from: f64, to: f64| {
|
||||
let p = geom.start + u * from;
|
||||
@@ -267,6 +270,28 @@ impl Writer<'_> {
|
||||
matrix(frame(last, last + CAP / len), "Bc");
|
||||
}
|
||||
|
||||
/// A gradient instance's focal point (`Bh`, radial gradients only) and its `Bg` line, as
|
||||
/// [`Self::instance`] writes them; also what a fill's art style holds after its `Bb`.
|
||||
pub(super) fn instance_head(&mut self, g: &GradientPaint, clip: bool, path: &BezPath) {
|
||||
let Some(geom) = g.geom else { return };
|
||||
let name = self.define_gradient(&g.gradient, g.swatch.as_deref());
|
||||
let m = self.grad_space;
|
||||
let radial = g.gradient.kind == GradientKind::Radial;
|
||||
let place = placement(&geom, radial, &(self.canvas * path.clone()), self.canvas);
|
||||
if radial {
|
||||
let c = m * geom.start;
|
||||
let off = geom.focal.map_or(Vec2::ZERO, |f| m * f - c);
|
||||
let (angle, fraction) = if off.hypot() > 1e-9 { place.focal } else { (0.0, 0.0) };
|
||||
let off = if fraction > 0.0 { off } else { Vec2::ZERO };
|
||||
ps::push_nums(&mut self.body, &[off.x, off.y, angle, fraction]);
|
||||
self.line("Bh");
|
||||
}
|
||||
let _ = write!(self.body, "{} {} ", u8::from(!clip), ps::bytes(name.as_bytes()));
|
||||
ps::push_nums(&mut self.body, &place.bg);
|
||||
ps::push_nums(&mut self.body, &place.transform.as_coeffs());
|
||||
self.line("1 Bg");
|
||||
}
|
||||
|
||||
/// A gradient definition: `%AI5_BeginGradient: (name)`, `(name) type stops Bd` (type 0 linear,
|
||||
/// 1 radial), `[`, each stop on a `%_` line (`color style opacity 6 midpoint rampPoint Bs`), a
|
||||
/// linear gradient's from the last to the first and a radial one's from the first to the last,
|
||||
@@ -341,9 +366,10 @@ impl Writer<'_> {
|
||||
|
||||
/// Can pattern `name` be written as a definition and painted with from here: the document has
|
||||
/// it, its tiles make a grid, its art is within its tile and holds something, and it isn't used
|
||||
/// in another pattern's tile or nested more than [`MAX_NEST`] deep?
|
||||
/// in another pattern's tile or a symbol's art (the reader keeps no symbol whose art paints with
|
||||
/// a pattern) or nested more than [`MAX_NEST`] deep?
|
||||
pub(super) fn pattern_writable(&self, name: &str) -> bool {
|
||||
if !self.defining.is_empty() || self.nest >= MAX_NEST {
|
||||
if !self.defining.is_empty() || self.nest >= MAX_NEST || self.in_symbol {
|
||||
return false;
|
||||
}
|
||||
if self.patterns.iter().any(|p| p.name == name) {
|
||||
@@ -389,9 +415,12 @@ impl Writer<'_> {
|
||||
self.line("n\n%_/ArtDictionary :\n%_1 /Bool (AIPattern_Editor_Backing_Tile_Rect) ,\n%_;\n%_");
|
||||
self.nest += 1;
|
||||
self.hidden += 1;
|
||||
// The tile's effects are its own, not those of a drawn look that first uses it.
|
||||
let in_look = std::mem::take(&mut self.in_look);
|
||||
for a in &def.art {
|
||||
self.node(a);
|
||||
}
|
||||
self.in_look = in_look;
|
||||
self.hidden -= 1;
|
||||
self.nest -= 1;
|
||||
let art;
|
||||
|
||||
@@ -0,0 +1,684 @@
|
||||
//! Art styles: objects with live effects a plain path can't hold, written as their drawn look, the
|
||||
//! object itself on `%_` lines and `1 (style) XW`, and the styles they name in
|
||||
//! `%AI9_BeginArtStyles` (see [`crate::ai_editing`] for the form). Each style is read back before it
|
||||
//! is written ([`crate::import::read_art_style`]: the `.ai` reader's style parser and its reading of
|
||||
//! a graphic style, with the object's own gradient): one that reads back differently is not
|
||||
//! written, and the object is written as its drawn look alone.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::fmt::Write;
|
||||
use std::sync::Arc;
|
||||
|
||||
use serde_json::Value;
|
||||
use vectorcraft_color::{BlendMode, Paint};
|
||||
use vectorcraft_doc::{Appearance, AppearanceItem, Document, Effect, FillLayer, Knockout, Node, NodeId, NodeKind, StrokeLayer};
|
||||
use vectorcraft_geom::{BezPath, FillRule, Rect, Shape};
|
||||
|
||||
use super::{Writer, Xy, blend_code, compound_path, hide};
|
||||
use crate::ai_ops;
|
||||
use crate::ps;
|
||||
|
||||
pub(in crate::ai_editing) const LARGE_CANVAS_STYLES: &str = "on a large canvas, no art styles or graphic styles are written: objects with live effects are written with their geometry effects applied to the artwork, where they can no longer be edited, and their other effects are left out of the editing data for other apps";
|
||||
pub(in crate::ai_editing) const GRAPHIC_STYLES: &str = "graphic styles and links to them are left out of the editing data for other apps";
|
||||
|
||||
/// Does `doc` have graphic styles other than a new document's, or an object in its layers, opacity
|
||||
/// masks or symbols linked to a graphic style?
|
||||
pub(in crate::ai_editing) fn has_graphic_styles(doc: &Document) -> bool {
|
||||
fn linked(n: &Node) -> bool {
|
||||
n.extras().graphic_style.is_some()
|
||||
|| n.extras().mask.as_ref().is_some_and(|m| linked(&m.art))
|
||||
|| n.children().is_some_and(|c| c.iter().any(|m| linked(m)))
|
||||
}
|
||||
doc.graphic_styles != Document::new(1.0, 1.0).graphic_styles || doc.layers.iter().any(|l| linked(l)) || doc.symbols.iter().any(|s| linked(&s.art))
|
||||
}
|
||||
|
||||
/// The objects of `doc`'s layers that may be written with an art style ([`Writer::styled_object`]),
|
||||
/// by id: paths and compound paths with points and groups, with live effects, without Opacity &
|
||||
/// Mask Define Knockout Shape (the reader takes an object's transparency from its look, which
|
||||
/// doesn't carry it). A group's members are paths, compound paths or such groups, none with effects
|
||||
/// or anything baking changes.
|
||||
pub(in crate::ai_editing) fn styled_objects(doc: &Document) -> HashMap<NodeId, Arc<Node>> {
|
||||
fn walk(nodes: &[Arc<Node>], out: &mut HashMap<NodeId, Arc<Node>>) {
|
||||
for n in nodes {
|
||||
if candidate(n) {
|
||||
out.insert(n.id, n.clone());
|
||||
continue;
|
||||
}
|
||||
// Baking a container with effects of its own changes its members, which keep their ids:
|
||||
// they are written as baking left them.
|
||||
if let NodeKind::Layer { children, .. } | NodeKind::Group { children, .. } = &n.kind
|
||||
&& !bakes_members(n)
|
||||
{
|
||||
walk(children, out);
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut out = HashMap::new();
|
||||
walk(&doc.layers, &mut out);
|
||||
out
|
||||
}
|
||||
|
||||
/// Does container `n` need baking for what it has itself, whatever its members hold?
|
||||
fn bakes_members(n: &Node) -> bool {
|
||||
let mut own = n.clone();
|
||||
if let Some(children) = own.children_mut() {
|
||||
children.clear();
|
||||
}
|
||||
vectorcraft_effects::needs_bake(&own)
|
||||
}
|
||||
|
||||
/// Whether `n` may be written with an art style ([`styled_objects`]).
|
||||
fn candidate(n: &Node) -> bool {
|
||||
if n.appearance.effects.is_empty() || n.knockout_shape {
|
||||
return false;
|
||||
}
|
||||
match &n.kind {
|
||||
NodeKind::Path { path, guide: false, clipping: false, .. } => has_points(path),
|
||||
NodeKind::Compound { .. } => has_points(&compound_path(n)),
|
||||
NodeKind::Group { children, clip: false } => !n.is_compound_shape() && children.iter().all(|c| plain_member(c)),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Does `path` write anything ([`Writer::plain_object`] skips subpaths without points)?
|
||||
fn has_points(path: &vectorcraft_geom::PathData) -> bool {
|
||||
path.subpaths.iter().any(|sp| !sp.anchors.is_empty())
|
||||
}
|
||||
|
||||
/// A member of a group written with an art style: written as it is, and read back as it is.
|
||||
fn plain_member(n: &Node) -> bool {
|
||||
let quiet = n.appearance.effects.is_empty() && n.appearance.items.iter().all(|i| i.effects().is_empty()) && !vectorcraft_effects::needs_bake(n);
|
||||
quiet
|
||||
&& match &n.kind {
|
||||
NodeKind::Path { guide: false, .. } | NodeKind::Compound { .. } => true,
|
||||
NodeKind::Group { children, .. } => children.iter().all(|c| plain_member(c)),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// The art styles objects name, each with its text after its name (`/ActiveStyle :` to `/Def ;`).
|
||||
#[derive(Default)]
|
||||
pub(in crate::ai_editing) struct Styles {
|
||||
/// Every style, in the order written: its name and text.
|
||||
known: Vec<(String, String)>,
|
||||
/// The name of each style by its text.
|
||||
by_text: HashMap<String, String>,
|
||||
next_anon: u64,
|
||||
}
|
||||
|
||||
impl Styles {
|
||||
/// The name of an object style of `text`: a style with the same text already written, else a
|
||||
/// new one named `Anon` and a number.
|
||||
fn object_style(&mut self, text: String) -> String {
|
||||
if let Some(name) = self.by_text.get(&text) {
|
||||
return name.clone();
|
||||
}
|
||||
self.next_anon += 1;
|
||||
let name = format!("Anon {}", self.next_anon);
|
||||
self.by_text.insert(text.clone(), name.clone());
|
||||
self.known.push((name.clone(), text));
|
||||
name
|
||||
}
|
||||
}
|
||||
|
||||
/// One style as the reader's section holds it: `/KnownStyle :`, `(name) /Name ,`, its text.
|
||||
fn known_style(name: &str, text: &str) -> String {
|
||||
format!("/KnownStyle :\n{} /Name ,\n{text}", ps::bytes(name.as_bytes()))
|
||||
}
|
||||
|
||||
/// The number transparency's `Xy` gives the blending mode a live effect's `mode` names (any case,
|
||||
/// spaces and dashes ignored).
|
||||
fn mode_code(mode: &str) -> Option<u8> {
|
||||
let key: String = mode.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
|
||||
BlendMode::ALL.iter().find(|m| format!("{m:?}").to_ascii_lowercase() == key).map(|m| blend_code(*m))
|
||||
}
|
||||
|
||||
/// A filter's `Xy` line: `mode opacity isolate knockout shape Xy`.
|
||||
fn xy_line(s: &mut String, xy: Xy) {
|
||||
let knockout = match xy.knockout {
|
||||
Knockout::Off => 0,
|
||||
Knockout::On => 1,
|
||||
Knockout::Neutral => 2,
|
||||
};
|
||||
let _ = write!(s, "{} ", blend_code(xy.blend));
|
||||
ps::push_num(s, f64::from(xy.opacity));
|
||||
let _ = writeln!(s, " {} {knockout} {} Xy", u8::from(xy.isolate), u8::from(xy.shape));
|
||||
}
|
||||
|
||||
/// The line style of a paint style that isn't a stroke's.
|
||||
const NO_LINE: &str = "0 J 0 j 1 w 10 M []0 d\n";
|
||||
|
||||
/// A basic filter's start: its name and kind numbers (`1 0` for an effect, `0 0` for the
|
||||
/// style's own filters), `/Visible` and the dictionary's start.
|
||||
fn basic(s: &mut String, name: &str, effect: bool, visible: bool) {
|
||||
let _ = write!(s, "/BasicFilter :\n{} {} 0 /Filter ,\n{} /Visible ,\n", ps::bytes(name.as_bytes()), u8::from(effect), u8::from(visible));
|
||||
}
|
||||
|
||||
/// The filter that stands for the object's contents in its stack.
|
||||
const CONDUIT: &str = "/BasicFilter :\n(Conduit Filter) 0 0 /Filter ,\n1 /Visible ,\n;\n /Part ,\n";
|
||||
|
||||
/// A basic filter's end.
|
||||
const END_BASIC: &str = "; /Dict ;\n /Part ,\n";
|
||||
|
||||
/// The blend filter of transparency `xy`.
|
||||
fn blend_filter(s: &mut String, xy: Xy) {
|
||||
basic(s, "Blend Style Filter", false, true);
|
||||
s.push_str("/Dictionary : /NotRecorded ,\n/BlendStyle : ");
|
||||
xy_line(s, xy);
|
||||
s.push_str(NO_LINE);
|
||||
s.push_str("0 XR\n/Def ; \n (BlendStyle) ,\n");
|
||||
s.push_str(END_BASIC);
|
||||
}
|
||||
|
||||
/// A live effect's dictionary entries.
|
||||
#[derive(Default)]
|
||||
struct Entries(String);
|
||||
|
||||
impl Entries {
|
||||
fn real(&mut self, key: &str, v: f64) {
|
||||
ps::push_num(&mut self.0, v);
|
||||
let _ = writeln!(self.0, " /Real {} ,", ps::bytes(key.as_bytes()));
|
||||
}
|
||||
|
||||
fn int(&mut self, key: &str, v: i64) {
|
||||
let _ = writeln!(self.0, "{v} /Int {} ,", ps::bytes(key.as_bytes()));
|
||||
}
|
||||
|
||||
fn bool(&mut self, key: &str, v: bool) {
|
||||
let _ = writeln!(self.0, "{} /Bool {} ,", u8::from(v), ps::bytes(key.as_bytes()));
|
||||
}
|
||||
}
|
||||
|
||||
/// `p`'s entry `key` as a number.
|
||||
fn num(p: &Value, key: &str) -> Option<f64> {
|
||||
p.get(key)?.as_f64().filter(|v| v.is_finite())
|
||||
}
|
||||
|
||||
/// `p`'s entry `key` as text, for comparing: lower case, letters and digits only.
|
||||
fn word(p: &Value, key: &str) -> Option<String> {
|
||||
Some(p.get(key)?.as_str()?.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase())
|
||||
}
|
||||
|
||||
/// `p`'s entry `key` as a switch.
|
||||
fn flag(p: &Value, key: &str) -> Option<bool> {
|
||||
p.get(key)?.as_bool()
|
||||
}
|
||||
|
||||
impl Writer<'_> {
|
||||
/// What `paint` writes with [`Self::color`] (a color, a spot or global color), as a string.
|
||||
fn color_ops(&mut self, paint: &Paint, stroke: bool) -> String {
|
||||
let saved = std::mem::take(&mut self.body);
|
||||
self.color(paint, stroke);
|
||||
std::mem::replace(&mut self.body, saved)
|
||||
}
|
||||
|
||||
/// A fill style holding a color, as an effect's entry `key` or a fill's own.
|
||||
fn fill_style(&mut self, s: &mut String, color: vectorcraft_color::Color, key: &str) {
|
||||
let ops = self.color_ops(&Paint::solid(color), false);
|
||||
let _ = write!(s, "/FillStyle : 0 O\n{ops}0 1 0 0 0 Xy\n{NO_LINE}0 XR\n0 1 Xd\n/Def ; \n {} ,\n", ps::bytes(key.as_bytes()));
|
||||
}
|
||||
|
||||
/// A fill's basic filter: a color, or a gradient placed on the object's outline (`on`: the
|
||||
/// object's own outline and rule), filling by the non-zero rule. `None` for other paint.
|
||||
fn fill_filter(&mut self, s: &mut String, f: &FillLayer, visible: bool, on: Option<(&BezPath, FillRule)>) -> Option<()> {
|
||||
if f.overprint {
|
||||
return None;
|
||||
}
|
||||
// A color comes before the paint state, a gradient's instance after it.
|
||||
let (color, gradient) = match &f.paint {
|
||||
Paint::Solid { .. } => (self.color_ops(&f.paint, false), String::new()),
|
||||
Paint::Gradient(_) => {
|
||||
let (path, _) = on?;
|
||||
let Paint::Gradient(placed) = self.placed(&f.paint, path.bounding_box()) else { return None };
|
||||
(String::new(), format!("Bb\n{}0 BB\n", self.gradient_bg(&placed, path)?))
|
||||
}
|
||||
Paint::Pattern { .. } | Paint::None => return None,
|
||||
};
|
||||
basic(s, "Fill Style Filter", false, visible);
|
||||
let _ = write!(
|
||||
s,
|
||||
"/Dictionary : /NotRecorded ,\n0 /Bool (UseEvenOdd) ,\n/FillStyle : 0 O\n{color}0 1 0 0 0 Xy\n{NO_LINE}0 XR\n0 1 Xd\n{gradient}"
|
||||
);
|
||||
s.push_str("/Def ; \n (FillStyle) ,\n");
|
||||
s.push_str(END_BASIC);
|
||||
Some(())
|
||||
}
|
||||
|
||||
/// A stroke's basic filter: a color, its line style, and its width profile as the arrays
|
||||
/// `BSVariableWidthTValuesArray`, `BSLeftWidthsArray` and `BSRightWidthsArray`. `None` for
|
||||
/// other paint.
|
||||
fn stroke_filter(&mut self, s: &mut String, st: &StrokeLayer, visible: bool) -> Option<()> {
|
||||
if !matches!(st.paint, Paint::Solid { .. }) || st.overprint {
|
||||
return None;
|
||||
}
|
||||
let ops = self.color_ops(&st.paint, true);
|
||||
basic(s, "Stroke Style Filter", false, visible);
|
||||
s.push_str("2 /FillOrStroke ,\n/Dictionary : /NotRecorded ,\n/StrokeStyle : 0 R\n");
|
||||
s.push_str(&ops);
|
||||
s.push_str("0 1 0 0 0 Xy\n");
|
||||
ai_ops::line_style(s, st);
|
||||
s.push_str("0 XR\n1 0 Xd\n/Def ; \n (StrokeStyle) ,\n");
|
||||
if let Some(p) = &st.profile {
|
||||
let array = |s: &mut String, key: &str, values: &mut dyn Iterator<Item = f64>| {
|
||||
s.push_str("/Array :");
|
||||
for v in values {
|
||||
s.push(' ');
|
||||
ps::push_num(s, v);
|
||||
s.push_str(" /Real ,");
|
||||
}
|
||||
let _ = writeln!(s, " ; {} ,", ps::bytes(key.as_bytes()));
|
||||
};
|
||||
array(s, "BSVariableWidthTValuesArray", &mut p.points.iter().map(|q| q.0));
|
||||
array(s, "BSLeftWidthsArray", &mut p.points.iter().map(|q| q.1));
|
||||
array(s, "BSRightWidthsArray", &mut p.points.iter().map(|q| q.2));
|
||||
}
|
||||
s.push_str(END_BASIC);
|
||||
Some(())
|
||||
}
|
||||
|
||||
/// A gradient instance's focal point (`Bh`, radial gradients only) and its `flag (name) x y
|
||||
/// angle length a b c d tx ty 1 Bg` line for placed gradient `g` on `path`, as a fill's style
|
||||
/// holds them ([`Self::instance_head`]).
|
||||
fn gradient_bg(&mut self, g: &vectorcraft_color::GradientPaint, path: &BezPath) -> Option<String> {
|
||||
let saved = std::mem::take(&mut self.body);
|
||||
self.instance_head(g, false, path);
|
||||
let line = std::mem::replace(&mut self.body, saved);
|
||||
(!line.is_empty()).then_some(line)
|
||||
}
|
||||
|
||||
/// An appearance item's basic filter. `None` for an item with transparency or effects of its
|
||||
/// own, which the reader doesn't read on an object.
|
||||
fn item_filter(&mut self, s: &mut String, item: &AppearanceItem, on: Option<(&BezPath, FillRule)>) -> Option<()> {
|
||||
if item.opacity() < 1.0 || item.blend() != BlendMode::Normal || !item.effects().is_empty() {
|
||||
return None;
|
||||
}
|
||||
match item {
|
||||
AppearanceItem::Fill(f) => self.fill_filter(s, f, item.visible(), on),
|
||||
AppearanceItem::Stroke(st) => self.stroke_filter(s, st, item.visible()),
|
||||
}
|
||||
}
|
||||
|
||||
/// The text of a style of appearance `ap` and transparency `xy` (after its name): the chain
|
||||
/// of its stack (the fills and strokes that paint, the top one first, the contents among them
|
||||
/// where the appearance puts them), its effects and its blend filter. A gradient fill is
|
||||
/// placed on the outline of `on`, and a fill fills by its rule (`None`: the non-zero rule, on no
|
||||
/// object). `None` when a fill, stroke or effect isn't one written here.
|
||||
pub(super) fn style_text(&mut self, ap: &Appearance, xy: Xy, on: Option<(&BezPath, FillRule)>) -> Option<String> {
|
||||
let mut s = String::from(
|
||||
"/ActiveStyle :\n/CompoundFilter :\n(Chain Style Filter) 0 0 /Filter ,\n1 /Visible ,\n\
|
||||
/CompoundFilter :\n(Stack Style Filter) 0 0 /Filter ,\n1 /Visible ,\n",
|
||||
);
|
||||
let ci = ap.contents_index.unwrap_or(0).min(ap.items.len());
|
||||
let painting: Vec<(usize, &AppearanceItem)> = ap.items.iter().enumerate().filter(|(_, i)| !i.paint().is_none()).collect();
|
||||
let below = painting.iter().filter(|(at, _)| *at < ci).count();
|
||||
// Listed top first: the contents go above the `below` fills and strokes under them.
|
||||
for (written, (_, item)) in painting.iter().rev().enumerate() {
|
||||
if painting.len() - written == below {
|
||||
s.push_str(CONDUIT);
|
||||
}
|
||||
self.item_filter(&mut s, item, on)?;
|
||||
}
|
||||
if below == 0 {
|
||||
s.push_str(CONDUIT);
|
||||
}
|
||||
s.push_str(";\n /Part ,\n");
|
||||
for e in &ap.effects {
|
||||
s.push_str(&self.effect_filter(e)?);
|
||||
}
|
||||
blend_filter(&mut s, xy);
|
||||
s.push_str(";\n\n/Execution ;\n /Def ;\n");
|
||||
Some(s)
|
||||
}
|
||||
|
||||
/// A live effect's basic filter, with the settings the reader reads
|
||||
/// ([`crate::import`]'s `.ai` reader, `style.rs`), in the units it reads them in. `None` for an
|
||||
/// effect, or a setting, that isn't written here.
|
||||
fn effect_filter(&mut self, e: &Effect) -> Option<String> {
|
||||
let p = vectorcraft_effects::merged_params(&e.id, &e.params);
|
||||
let mut d = Entries::default();
|
||||
let id = e.id.as_str();
|
||||
let name = if id.starts_with("stylize.") { self.stylize_entries(id, &p, &mut d)? } else { Self::path_entries(id, &p, &mut d)? };
|
||||
let mut s = String::new();
|
||||
basic(&mut s, name, true, e.visible);
|
||||
s.push_str("/Dictionary : /NotRecorded ,\n");
|
||||
s.push_str(&d.0);
|
||||
s.push_str(END_BASIC);
|
||||
Some(s)
|
||||
}
|
||||
|
||||
/// A Stylize effect's entries ([`Self::effect_filter`]) and its filter's name.
|
||||
fn stylize_entries(&mut self, id: &str, p: &Value, d: &mut Entries) -> Option<&'static str> {
|
||||
Some(match id {
|
||||
"stylize.dropShadow" => {
|
||||
d.int("blnd", i64::from(mode_code(p.get("mode")?.as_str()?)?));
|
||||
d.real("opac", num(p, "opacity")? / 100.0);
|
||||
let darkness = word(p, "shade").as_deref() == Some("darkness");
|
||||
if darkness {
|
||||
d.real("dark", num(p, "darkness")?);
|
||||
}
|
||||
d.real("vert", num(p, "y")?);
|
||||
d.real("horz", num(p, "x")?);
|
||||
d.real("blur", num(p, "blur")? / 2.0);
|
||||
let color = vectorcraft_effects::color_param(p, vectorcraft_color::Color::BLACK);
|
||||
self.fill_style(&mut d.0, color, "sclr");
|
||||
d.int("csrc", i64::from(darkness));
|
||||
"Adobe Drop Shadow" // brand-ok: the filter's name in the files
|
||||
}
|
||||
"stylize.innerGlow" => {
|
||||
d.int("blnd", i64::from(mode_code(p.get("mode")?.as_str()?)?));
|
||||
d.real("opac", num(p, "opacity")? / 100.0);
|
||||
d.real("blur", num(p, "blur")?);
|
||||
let color = vectorcraft_effects::color_param(p, vectorcraft_color::Color::WHITE);
|
||||
self.fill_style(&mut d.0, color, "gclr");
|
||||
d.int("gtyp", i64::from(word(p, "source").as_deref() == Some("edge")));
|
||||
"Adobe Inner Glow" // brand-ok: the filter's name in the files
|
||||
}
|
||||
"stylize.outerGlow" => {
|
||||
d.int("blnd", i64::from(mode_code(p.get("mode")?.as_str()?)?));
|
||||
d.real("opac", num(p, "opacity")? / 100.0);
|
||||
d.real("blur", num(p, "blur")? / 2.0);
|
||||
let color = vectorcraft_effects::color_param(p, vectorcraft_color::Color::BLACK);
|
||||
self.fill_style(&mut d.0, color, "sclr");
|
||||
"Adobe Outer Glow" // brand-ok: the filter's name in the files
|
||||
}
|
||||
"stylize.feather" => {
|
||||
d.real("Radius", num(p, "radius")?);
|
||||
"Adobe Fuzzy Mask" // brand-ok: the filter's name in the files
|
||||
}
|
||||
"stylize.roundCorners" => {
|
||||
d.real("radius", num(p, "radius")?);
|
||||
"Adobe Round Corners" // brand-ok: the filter's name in the files
|
||||
}
|
||||
"stylize.scribble" => {
|
||||
d.real("Angle", num(p, "angle")?);
|
||||
d.real("EdgeOverlap", num(p, "overlap")?);
|
||||
d.real("EdgeOverlapVariation", num(p, "overlapVariation")?);
|
||||
d.real("StrokeWidth", num(p, "strokeWidth")?);
|
||||
d.real("Scribbliness", num(p, "curviness")? / 100.0);
|
||||
d.real("ScribbleVariation", num(p, "curvinessVariation")? / 100.0);
|
||||
d.real("Spacing", num(p, "spacing")?);
|
||||
d.real("SpacingVariation", num(p, "spacingVariation")?);
|
||||
"Adobe Scribble Fill" // brand-ok: the filter's name in the files
|
||||
}
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
/// Convert to Shape's, a Path effect's or Pathfinder › Add's entries ([`Self::effect_filter`])
|
||||
/// and its filter's name.
|
||||
fn path_entries(id: &str, p: &Value, d: &mut Entries) -> Option<&'static str> {
|
||||
Some(match id {
|
||||
"convertToShape.rectangle" | "convertToShape.roundedRectangle" | "convertToShape.ellipse" => {
|
||||
let shape = match id {
|
||||
"convertToShape.rectangle" => 0,
|
||||
"convertToShape.roundedRectangle" => 1,
|
||||
_ => 2,
|
||||
};
|
||||
let relative = flag(p, "relative")?;
|
||||
d.int("Shape", shape);
|
||||
d.real("Absolute", if relative { 0.0 } else { 1.0 });
|
||||
d.real("AbsWidth", num(p, "width")?);
|
||||
d.real("AbsHeight", num(p, "height")?);
|
||||
d.real("RelWidth", num(p, "extraW")? / 2.0);
|
||||
d.real("RelHeight", num(p, "extraH")? / 2.0);
|
||||
if shape == 1 {
|
||||
d.real("CornerRadius", num(p, "radius")?);
|
||||
}
|
||||
"Adobe Shape Effects" // brand-ok: the filter's name in the files
|
||||
}
|
||||
"path.offsetPath" => {
|
||||
d.real("ofst", num(p, "offset")?);
|
||||
let joins = match word(p, "joins")?.as_str() {
|
||||
"round" => 0,
|
||||
"bevel" => 1,
|
||||
"miter" => 2,
|
||||
_ => return None,
|
||||
};
|
||||
d.int("jntp", joins);
|
||||
d.real("mlim", num(p, "miterLimit")?);
|
||||
"Adobe Offset Path" // brand-ok: the filter's name in the files
|
||||
}
|
||||
"path.outlineObject" => "Adobe Outline Type", // brand-ok: the filter's name in the files
|
||||
"path.outlineStroke" => "Adobe Outline Stroke", // brand-ok: the filter's name in the files
|
||||
"pathfinder.add" => {
|
||||
d.int("Command", 0);
|
||||
d.bool("ConvertCustom", true);
|
||||
d.bool("ExtractUnpainted", true);
|
||||
d.real("Mix", 0.5);
|
||||
d.real("Precision", 10.0);
|
||||
d.bool("RemovePoints", false);
|
||||
d.real("TrapAspect", 1.0);
|
||||
d.bool("TrapConvertCustom", false);
|
||||
d.real("TrapMaxTint", 1.0);
|
||||
d.bool("TrapReverse", false);
|
||||
d.real("TrapThickness", 0.25);
|
||||
d.real("TrapTint", 0.4);
|
||||
d.real("TrapTintTolerance", 0.05);
|
||||
"Adobe Pathfinder" // brand-ok: the filter's name in the files
|
||||
}
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
/// The style object `orig` (`n` before baking) is written with; `None` when the reader wouldn't
|
||||
/// read the object as it is with it. A gradient fill is placed on `n`'s outline, as the object
|
||||
/// draws it. A style that isn't written leaves no gradient definition or warning behind.
|
||||
pub(super) fn object_style(&mut self, n: &Node, orig: &Node) -> Option<String> {
|
||||
if let NodeKind::Group { children, .. } = &orig.kind
|
||||
&& bakes_members(orig)
|
||||
&& !children.iter().all(|c| self.member_keeps_outline(c))
|
||||
{
|
||||
return None;
|
||||
}
|
||||
let graded = orig.appearance.items.iter().any(|i| matches!(i.paint(), Paint::Gradient(_)));
|
||||
let saved = (graded.then(|| self.gradient_mark()), self.warnings.len());
|
||||
let path = drawn_outline(n, orig);
|
||||
let rule = object_rule(orig);
|
||||
let text = self.style_text(&orig.appearance, Xy::of(orig), path.as_ref().map(|p| (p, rule))).filter(|t| object_reads(orig, t));
|
||||
let Some(text) = text else {
|
||||
if let Some(mark) = saved.0 {
|
||||
self.gradient_rollback(mark);
|
||||
}
|
||||
self.warnings.truncate(saved.1);
|
||||
return None;
|
||||
};
|
||||
Some(self.styles.object_style(text))
|
||||
}
|
||||
|
||||
/// Is member `m` of a styled group whose effects change its members' outlines (and each of its
|
||||
/// own members) written on the outline those effects draw on: every fill and stroke as the
|
||||
/// object paints it ([`Self::direct`], [`Self::direct_stroke`]), not as filled outlines, brush
|
||||
/// art or pattern tiles, and no gradient that fits its object, which the effects would fit to
|
||||
/// the new outline?
|
||||
fn member_keeps_outline(&self, m: &Node) -> bool {
|
||||
let items_keep = m.appearance.items.iter().all(|i| match i {
|
||||
AppearanceItem::Fill(f) => f.paint.is_none() || self.direct(&f.paint),
|
||||
AppearanceItem::Stroke(s) => s.paint.is_none() || self.direct_stroke(s),
|
||||
});
|
||||
items_keep && m.children().is_none_or(|c| c.iter().all(|c| self.member_keeps_outline(c)))
|
||||
}
|
||||
|
||||
/// Object `n` (as baking left it; `orig` before baking) with the style `name`: its lock and
|
||||
/// hidden state; its drawn look (a group of its vector art as baking left it, without shadows,
|
||||
/// glows or feathers, the object's transparency
|
||||
/// after the group's end, `0 0 Xd`, `6 () XW`); the object itself on `%_` lines (a path's or
|
||||
/// compound path's points painted with nothing, or with its gradient fill when its style has
|
||||
/// one; a group with its members), its name and opacity mask; then `1 (name) XW`.
|
||||
pub(super) fn styled_object(&mut self, n: &Node, orig: &Node, name: &str) {
|
||||
self.state(orig.locked, !orig.visible);
|
||||
let xy = Xy::of(orig);
|
||||
let was = self.in_look;
|
||||
self.in_look = true;
|
||||
self.line("u");
|
||||
let mut look = n.clone();
|
||||
(look.name, look.opacity, look.blend, look.isolate, look.knockout, look.knockout_shape) =
|
||||
(None, 1.0, BlendMode::Normal, false, Knockout::Neutral, false);
|
||||
if look.extras().mask.is_some() {
|
||||
look.extras_mut().mask = None;
|
||||
}
|
||||
match &look.kind {
|
||||
NodeKind::Group { children, clip: false } => {
|
||||
for c in children.clone() {
|
||||
self.node(&c);
|
||||
}
|
||||
}
|
||||
_ => self.node(&look),
|
||||
}
|
||||
self.line("U");
|
||||
self.write_xy(xy);
|
||||
self.line("0 0 Xd\n6 () XW");
|
||||
self.in_look = was;
|
||||
// The object, on `%_` lines, in its own state (the look's members may have changed it).
|
||||
self.state(orig.locked, !orig.visible);
|
||||
let saved = std::mem::take(&mut self.body);
|
||||
self.hidden += 1;
|
||||
let fit = drawn_outline(n, orig).map(|p| p.bounding_box());
|
||||
match &orig.kind {
|
||||
NodeKind::Path { path, rule, .. } => self.styled_outline(orig, path, *rule, fit, xy),
|
||||
NodeKind::Compound { rule, .. } => self.styled_outline(orig, &compound_path(orig), *rule, fit, xy),
|
||||
NodeKind::Group { children, .. } => {
|
||||
self.line("u");
|
||||
for c in children {
|
||||
self.node(c);
|
||||
}
|
||||
self.line("U");
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
self.dictionary(orig);
|
||||
self.hidden -= 1;
|
||||
let part = std::mem::replace(&mut self.body, saved);
|
||||
hide(&part, &mut self.body);
|
||||
self.block_end = usize::MAX;
|
||||
let _ = writeln!(self.body, "1 {} XW", ps::bytes(name.as_bytes()));
|
||||
}
|
||||
|
||||
/// A styled path's or compound path's points: painted with nothing, or with its gradient fill
|
||||
/// (which its style's gradient fill is), placed on `fit` (the outline's bounds when `None`).
|
||||
fn styled_outline(&mut self, orig: &Node, path: &vectorcraft_geom::PathData, rule: vectorcraft_geom::FillRule, fit: Option<Rect>, xy: Xy) {
|
||||
let bounds = fit.unwrap_or_else(|| path.to_bezpath().bounding_box());
|
||||
let gradient = orig.appearance.items.iter().find_map(|i| match i {
|
||||
AppearanceItem::Fill(f) if matches!(f.paint, Paint::Gradient(_)) => Some(f),
|
||||
_ => None,
|
||||
});
|
||||
match gradient {
|
||||
Some(f) => {
|
||||
let fill = FillLayer { paint: self.placed(&f.paint, bounds), ..f.clone() };
|
||||
self.plain_object(path, rule, Some(&fill), None, xy.object());
|
||||
}
|
||||
None => self.plain_object(path, rule, None, None, xy.object()),
|
||||
}
|
||||
}
|
||||
|
||||
/// The art styles written, in a non-printing block: `%AI9_BeginArtStyles`, each style,
|
||||
/// `%AI9_EndArtStyles`.
|
||||
pub(in crate::ai_editing) fn art_styles(&self, s: &mut String) {
|
||||
if self.styles.known.is_empty() {
|
||||
return;
|
||||
}
|
||||
s.push_str("%AI5_Begin_NonPrinting\nNp\n%AI9_BeginArtStyles\n");
|
||||
for (name, text) in &self.styles.known {
|
||||
s.push_str(&known_style(name, text));
|
||||
}
|
||||
s.push_str("%AI9_EndArtStyles\n%AI5_End_NonPrinting--\n");
|
||||
}
|
||||
}
|
||||
|
||||
/// The outline a path's or compound path's style places a gradient fill on.
|
||||
fn object_outline(n: &Node) -> Option<BezPath> {
|
||||
match &n.kind {
|
||||
NodeKind::Path { path, .. } => Some(path.to_bezpath()),
|
||||
NodeKind::Compound { .. } => Some(compound_path(n).to_bezpath()),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// The outline a styled path or compound path draws: `n`'s, as baking left it, when it is still a
|
||||
/// path or compound path, else `orig`'s.
|
||||
fn drawn_outline(n: &Node, orig: &Node) -> Option<BezPath> {
|
||||
object_outline(orig)?;
|
||||
object_outline(n).or_else(|| object_outline(orig))
|
||||
}
|
||||
|
||||
/// The fill rule of a path or compound path (a group's is the default).
|
||||
fn object_rule(n: &Node) -> FillRule {
|
||||
match &n.kind {
|
||||
NodeKind::Path { rule, .. } | NodeKind::Compound { rule, .. } => *rule,
|
||||
_ => FillRule::NonZero,
|
||||
}
|
||||
}
|
||||
|
||||
/// Does the reader read object `n` written with style text `text` as it is: a path or compound
|
||||
/// path with a style it reads on any object, filled by the non-zero rule when the style fills it,
|
||||
/// or a group with no fills or strokes of its own?
|
||||
fn object_reads(n: &Node, text: &str) -> bool {
|
||||
let section = known_style("x", text);
|
||||
let own = n.appearance.fill().map(|f| &f.paint).filter(|p| matches!(p, Paint::Gradient(_)));
|
||||
let Some(mut read) = crate::import::read_art_style(section.as_bytes(), "x", own) else { return false };
|
||||
let group = matches!(n.kind, NodeKind::Group { .. });
|
||||
if !read.simple || (group && !read.appearance.items.is_empty()) || (!group && read.pathfinder) {
|
||||
return false;
|
||||
}
|
||||
if !group {
|
||||
let filled = n.appearance.items.iter().any(|i| matches!(i, AppearanceItem::Fill(_)) && !i.paint().is_none());
|
||||
if filled && object_rule(n) == FillRule::EvenOdd {
|
||||
return false;
|
||||
}
|
||||
// A path's contents are nothing: the reader keeps the object's own.
|
||||
read.appearance.contents_index = n.appearance.contents_index;
|
||||
}
|
||||
same_appearance(&read.appearance, &n.appearance)
|
||||
}
|
||||
|
||||
/// Do appearances `a` and `b` draw the same, as the reader reads one written from the other: the
|
||||
/// fills and strokes that paint, within the written numbers' precision, and the effects with
|
||||
/// their settings filled in from their defaults (blending modes in any case, colors as colors).
|
||||
pub(in crate::ai_editing) fn same_appearance(a: &Appearance, b: &Appearance) -> bool {
|
||||
let norm = |ap: &Appearance| -> Value {
|
||||
let mut ap = ap.clone();
|
||||
let ci = ap.contents_index.unwrap_or(0).min(ap.items.len());
|
||||
let below = ap.items.iter().take(ci).filter(|i| !i.paint().is_none()).count();
|
||||
ap.items.retain(|i| !i.paint().is_none());
|
||||
ap.contents_index = (below > 0).then_some(below);
|
||||
for e in ap.effects.iter_mut().chain(ap.items.iter_mut().flat_map(|i| i.effects_mut().iter_mut())) {
|
||||
e.params = normalized_params(e);
|
||||
}
|
||||
serde_json::to_value(&ap).unwrap_or(Value::Null)
|
||||
};
|
||||
near(&norm(a), &norm(b))
|
||||
}
|
||||
|
||||
/// Effect `e`'s settings with its defaults filled in, its blending mode in lower case and its color as
|
||||
/// `#rrggbb`.
|
||||
fn normalized_params(e: &Effect) -> Value {
|
||||
let mut p = vectorcraft_effects::merged_params(&e.id, &e.params);
|
||||
if let Some(m) = word(&p, "mode") {
|
||||
p["mode"] = Value::String(m);
|
||||
}
|
||||
if p.get("color").is_some() {
|
||||
p["color"] = Value::String(vectorcraft_effects::color_param(&p, vectorcraft_color::Color::BLACK).to_hex());
|
||||
}
|
||||
for key in ["shade", "source", "joins", "points", "orientation"] {
|
||||
if let Some(w) = word(&p, key) {
|
||||
p[key] = Value::String(w);
|
||||
}
|
||||
}
|
||||
p
|
||||
}
|
||||
|
||||
/// How far apart two numbers may read in [`near`]: a number written to 4 decimals, then converted
|
||||
/// from a fraction to a percentage (`5e-3`) or from radians to degrees (`3e-3`).
|
||||
const NEAR: f64 = 6e-3;
|
||||
|
||||
/// JSON values equal but for numbers within the written numbers' precision.
|
||||
fn near(a: &Value, b: &Value) -> bool {
|
||||
match (a, b) {
|
||||
(Value::Number(x), Value::Number(y)) => match (x.as_f64(), y.as_f64()) {
|
||||
(Some(x), Some(y)) => (x - y).abs() <= NEAR,
|
||||
_ => x == y,
|
||||
},
|
||||
(Value::Array(x), Value::Array(y)) => x.len() == y.len() && x.iter().zip(y).all(|(x, y)| near(x, y)),
|
||||
(Value::Object(x), Value::Object(y)) => x.len() == y.len() && x.iter().all(|(k, v)| y.get(k).is_some_and(|w| near(v, w))),
|
||||
_ => a == b,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,339 @@
|
||||
//! Symbols: their definitions, the symbol list and their instances (see [`crate::ai_editing`] for
|
||||
//! the form).
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::fmt::Write;
|
||||
|
||||
use vectorcraft_color::Paint;
|
||||
use vectorcraft_doc::{Knockout, Node, NodeKind, SymbolExportType};
|
||||
use vectorcraft_geom::Affine;
|
||||
|
||||
use super::{MAX_NEST, Writer, Xy};
|
||||
use crate::import::MAX_SYMBOLS;
|
||||
use crate::ps;
|
||||
|
||||
pub(in crate::ai_editing) const SYMBOL_ART: &str = "symbol instances with a fill, appearance changes, isolation, knockout or knockout shape of their own, instances of symbols with 9-slice guides or pattern paint, instances in pattern tiles or in art cut to a clipping object, instances scaled almost flat, instances that turn, mirror or scale symbols holding type, live objects, instances written as their art, shapes with rounded live corners or strokes written as outlines or brush art, instances that scale their symbol more than 100 times, instances on the layers of a large canvas and instances of symbols past 4,096 are written as their art in the editing data for other apps";
|
||||
pub(in crate::ai_editing) const SYMBOL_OPTIONS: &str =
|
||||
"the 9-slice guides, export types and dynamic type of symbols are left out of the editing data for other apps";
|
||||
pub(in crate::ai_editing) const MISSING_SYMBOL: &str =
|
||||
"symbol instances of symbols the document doesn't have are written as empty groups in the editing data for other apps";
|
||||
/// The most an instance may scale its symbol's art, nested instances' scales included: the art's
|
||||
/// numbers are written to four decimals, so a scale of 100 places them within 0.005 pt.
|
||||
const MAX_SCALE: f64 = 100.0;
|
||||
pub(in crate::ai_editing) const SYMBOL_COUNT: &str = "symbols past 4,096 are left out of the editing data for other apps";
|
||||
|
||||
/// Whether the canvas works `n` itself (not its children) out again after placing an instance:
|
||||
/// type, live objects and shapes with rounded live corners, whose strokes, steps and corners depend
|
||||
/// on where the instance puts them.
|
||||
pub(super) fn redrawn(n: &Node) -> bool {
|
||||
let rounded = |l: &vectorcraft_doc::LiveShape| match l {
|
||||
vectorcraft_doc::LiveShape::Rectangle { radii, .. } => radii.iter().any(|r| *r > 0.0),
|
||||
vectorcraft_doc::LiveShape::Polygon { radii, .. } | vectorcraft_doc::LiveShape::Path { radii, .. } => radii.iter().any(|r| *r > 0.0),
|
||||
vectorcraft_doc::LiveShape::Ellipse { .. } | vectorcraft_doc::LiveShape::Line { .. } => false,
|
||||
};
|
||||
match &n.kind {
|
||||
NodeKind::Path { live: Some(l), .. } => rounded(l),
|
||||
NodeKind::Text(_)
|
||||
| NodeKind::Blend { .. }
|
||||
| NodeKind::Envelope { .. }
|
||||
| NodeKind::Mesh(_)
|
||||
| NodeKind::Repeat(_)
|
||||
| NodeKind::PlacedDocument(_)
|
||||
| NodeKind::Intertwine { .. } => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
impl Writer<'_> {
|
||||
/// Whether instance `n` of symbol `symbol`, placed by `xf`, is written as an instance: not on the
|
||||
/// layers of a large canvas, in a pattern's tile or in art cut to a clipping object, without a
|
||||
/// fill or appearance changes of its own (which stain or change the art it draws) and without
|
||||
/// isolation, knockout or knockout shape of its own (which an instance's transparency doesn't
|
||||
/// hold), of a symbol without 9-slice guides and without pattern paint in its art (the canvas
|
||||
/// keeps an instance's pattern tiles where the document puts them, and a definition's art moves
|
||||
/// with each instance) whose definition can be written ([`Self::define_symbol`]), by a matrix
|
||||
/// that keeps the art's area as it is written and scales it as the definition allows
|
||||
/// ([`Self::keeps_scale`]).
|
||||
pub(super) fn live_instance(&mut self, n: &Node, symbol: &str, xf: Affine) -> bool {
|
||||
let own = vectorcraft_brush::stain(n).is_some() || !n.extras().symbol_overrides.is_empty();
|
||||
let group_state = n.isolate || n.knockout != Knockout::Neutral || n.knockout_shape;
|
||||
// The matrix as written (to ten decimals) must still keep the art's area.
|
||||
let m = Affine::new((self.instance_space * xf).as_coeffs().map(|v| (v * 1e10).round() / 1e10));
|
||||
(self.symbols_live || self.in_symbol)
|
||||
&& self.defining.is_empty()
|
||||
&& self.clip.is_none()
|
||||
&& !own
|
||||
&& !group_state
|
||||
&& self.doc.symbol_nine_slice(symbol).is_none()
|
||||
&& m.as_coeffs().iter().all(|v| v.is_finite())
|
||||
&& m.determinant().abs() >= 1e-12
|
||||
&& self.define_symbol(symbol)
|
||||
&& !self.symbol_paints_pattern(symbol)
|
||||
&& self.keeps_scale(symbol, xf)
|
||||
}
|
||||
|
||||
/// Whether instance matrix `xf` places symbol `symbol`'s definition as the canvas draws the
|
||||
/// instance. A definition holding art the canvas works out again after placing an instance
|
||||
/// ([`redrawn`], strokes written as outlines or brush art, and instances written as their art)
|
||||
/// takes only matrices that move it;
|
||||
/// any other takes a scale up to [`MAX_SCALE`], nested instances' scales included. A live
|
||||
/// instance in a symbol's art passes both to that symbol.
|
||||
fn keeps_scale(&mut self, symbol: &str, xf: Affine) -> bool {
|
||||
let [a, b, c, d, ..] = xf.as_coeffs();
|
||||
let fixed = self.fixed_symbols.contains(symbol);
|
||||
let scale = a.hypot(b).max(c.hypot(d)) * self.symbol_scales.get(symbol).copied().unwrap_or(1.0);
|
||||
let keeps = if fixed { (a - 1.0).abs() < 1e-9 && b.abs() < 1e-9 && c.abs() < 1e-9 && (d - 1.0).abs() < 1e-9 } else { scale <= MAX_SCALE };
|
||||
if keeps && self.in_symbol {
|
||||
self.wrote_fixed |= fixed;
|
||||
self.inner_scale = self.inner_scale.max(scale);
|
||||
}
|
||||
keeps
|
||||
}
|
||||
|
||||
/// Whether the art of symbol `name`, an opacity mask in it or the art of a symbol it holds an
|
||||
/// instance of, at any depth, fills or strokes something (type included) with a pattern, or its
|
||||
/// definition holds pattern tiles. Worked out once a symbol, after it is defined.
|
||||
fn symbol_paints_pattern(&mut self, name: &str) -> bool {
|
||||
if self.pattern_written.contains(name) {
|
||||
return true;
|
||||
}
|
||||
if let Some(known) = self.patterned_symbols.get(name) {
|
||||
return *known;
|
||||
}
|
||||
let mut seen = HashSet::from([name.to_string()]);
|
||||
let mut todo = vec![name.to_string()];
|
||||
let mut found = false;
|
||||
while let Some(next) = todo.pop() {
|
||||
let (own, used) = self.symbol_own_patterns(&next);
|
||||
if own {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
for u in used {
|
||||
if seen.insert(u.clone()) {
|
||||
todo.push(u);
|
||||
}
|
||||
}
|
||||
}
|
||||
self.patterned_symbols.insert(name.to_string(), found);
|
||||
found
|
||||
}
|
||||
|
||||
/// Whether the art of symbol `name` or an opacity mask in it fills or strokes something (type
|
||||
/// included) with a pattern, and the symbols its instances and inline graphics there use; looked
|
||||
/// at once a symbol.
|
||||
fn symbol_own_patterns(&mut self, name: &str) -> (bool, Vec<String>) {
|
||||
if let Some(known) = self.pattern_symbols.get(name) {
|
||||
return known.clone();
|
||||
}
|
||||
let doc = self.symbol_doc;
|
||||
let mut own = false;
|
||||
let mut used = vec![];
|
||||
if let Some(sym) = doc.symbols.iter().find(|s| s.name == name) {
|
||||
let pattern = |p: &Paint| matches!(p, Paint::Pattern { .. });
|
||||
vectorcraft_doc::swatches::walk_with_masks(&sym.art, &mut |m| {
|
||||
own |= vectorcraft_doc::pattern::uses_pattern(m, None);
|
||||
match &m.kind {
|
||||
NodeKind::Text(t) => {
|
||||
own |= t.runs.iter().any(|r| pattern(&r.style.fill) || pattern(&r.style.stroke));
|
||||
// Inline graphics are written as their symbols' art.
|
||||
used.extend(t.runs.iter().filter_map(|r| r.inline.as_ref()).map(|art| art.symbol.clone()));
|
||||
}
|
||||
NodeKind::SymbolInstance { symbol, .. } => used.push(symbol.clone()),
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
}
|
||||
self.pattern_symbols.insert(name.to_string(), (own, used.clone()));
|
||||
(own, used)
|
||||
}
|
||||
|
||||
/// An instance of `symbol` placed by `xf`, of transparency `xy`: `/SymbolInstance :`, `(name)
|
||||
/// /SymbolRef ,`, the matrix taking the symbol's art to art space (in a symbol's art, to the
|
||||
/// canvas's space turned y up about art space's origin there) as `a b c d tx ty
|
||||
/// /RTransformMatrix` (to ten decimals), `;`, then its state block as a group's: `Xy`, `0 0 Xd`
|
||||
/// and `6 () XW` when it has transparency, else `9 () XW`. Its dictionary goes between the two.
|
||||
pub(super) fn symbol_instance(&mut self, symbol: &str, xf: Affine, xy: Xy) {
|
||||
let m = self.instance_space * xf;
|
||||
let _ = write!(self.body, "/SymbolInstance :\n{} /SymbolRef ,\n", ps::bytes(symbol.as_bytes()));
|
||||
for v in m.as_coeffs() {
|
||||
self.body.push_str(&super::images::precise(v));
|
||||
self.body.push(' ');
|
||||
}
|
||||
self.body.push_str("/RTransformMatrix\n;\n");
|
||||
// An instance with isolation, knockout or knockout shape of its own is written as its art
|
||||
// ([`Self::live_instance`]); these are the values of the others.
|
||||
let xy = Xy { isolate: false, knockout: Knockout::Neutral, shape: false, ..xy };
|
||||
self.block_start = self.body.len();
|
||||
if xy == Xy::PLAIN {
|
||||
self.line("9 () XW");
|
||||
} else {
|
||||
self.write_xy(xy);
|
||||
self.line("0 0 Xd\n6 () XW");
|
||||
}
|
||||
self.block_end = self.body.len();
|
||||
}
|
||||
|
||||
/// Write symbol `name`'s definition, once: `%AI14_BeginSymbol`, `(name)`, `0 A`, `0 Xw`, `0 Ae`,
|
||||
/// the art in the symbol's space (y down: its numbers are the symbol's own) as a group (`u` …
|
||||
/// `U`; art that isn't a group, or is a plain group of one object, in a group of its own), the
|
||||
/// symbol's registration point (`AI13PatternRegistrationType`, 1 to 9 from the top left, row by
|
||||
/// row) in that group's dictionary, `9 () XW`, `%AI10_EndSymbol`. Linked images in the
|
||||
/// art are embedded. The symbols its art's instances use are defined first, and the art is
|
||||
/// written from the top of the nesting whatever the instance that asks for it, so a definition
|
||||
/// is the same wherever its first instance lies. False when it can't be: the document doesn't
|
||||
/// have the symbol, it is being written (its art holds an instance of itself), it is reached
|
||||
/// through more than [`MAX_NEST`] definitions being written, or the definitions written and
|
||||
/// being written leave no place under [`MAX_SYMBOLS`].
|
||||
pub(super) fn define_symbol(&mut self, name: &str) -> bool {
|
||||
if self.defined_symbols.contains(name) {
|
||||
return true;
|
||||
}
|
||||
let doc = self.symbol_doc;
|
||||
let Some(sym) = doc.symbols.iter().find(|s| s.name == name) else { return false };
|
||||
if self.defining_symbols.iter().any(|d| d == name) || self.defining_symbols.len() >= MAX_NEST as usize {
|
||||
return false;
|
||||
}
|
||||
// The reader keeps no more definitions than this, and each definition being written takes
|
||||
// one when it ends.
|
||||
if self.symbol_defs.len() + self.defining_symbols.len() >= MAX_SYMBOLS {
|
||||
self.warn(SYMBOL_COUNT);
|
||||
return false;
|
||||
}
|
||||
if sym.dynamic || doc.symbol_export_type(name) != SymbolExportType::default() || doc.symbol_nine_slice(name).is_some() {
|
||||
self.warn(SYMBOL_OPTIONS);
|
||||
}
|
||||
self.defining_symbols.push(name.to_string());
|
||||
let mut used = vec![];
|
||||
vectorcraft_doc::swatches::walk_with_masks(&sym.art, &mut |m| {
|
||||
if let NodeKind::SymbolInstance { symbol, .. } = &m.kind {
|
||||
used.push(symbol.as_str());
|
||||
}
|
||||
});
|
||||
for u in used {
|
||||
self.define_symbol(u);
|
||||
}
|
||||
if self.symbol_defs.len() + self.defining_symbols.len() > MAX_SYMBOLS {
|
||||
self.defining_symbols.pop();
|
||||
self.warn(SYMBOL_COUNT);
|
||||
return false;
|
||||
}
|
||||
// The art is written in the symbol's space, from the state `0 A` and `0 Xw` set, from the
|
||||
// document at its own size.
|
||||
let origin = self.canvas_origin;
|
||||
let about_origin = Affine::new([1.0, 0.0, 0.0, -1.0, -origin.0, origin.1]);
|
||||
let page_doc = std::mem::replace(&mut self.doc, doc);
|
||||
let saved = (
|
||||
std::mem::take(&mut self.body),
|
||||
(self.to_art, self.grad_space, self.canvas, self.instance_space),
|
||||
self.state.replace((false, false)),
|
||||
self.gs.replace(Xy::OPAQUE),
|
||||
self.clip.take(),
|
||||
(self.block_start, self.block_end),
|
||||
(std::mem::replace(&mut self.in_symbol, true), std::mem::take(&mut self.hidden)),
|
||||
self.root_entries.take(),
|
||||
std::mem::take(&mut self.wrote_pattern),
|
||||
(std::mem::take(&mut self.wrote_fixed), std::mem::replace(&mut self.inner_scale, 1.0)),
|
||||
);
|
||||
// Gradients' matrices and instances' matrices are written about the canvas point of art
|
||||
// space's origin, y up; `Bg` places a gradient on the art as it lies in the symbol's space.
|
||||
(self.to_art, self.grad_space, self.canvas, self.instance_space) = (Affine::IDENTITY, about_origin, Affine::IDENTITY, about_origin);
|
||||
self.block_end = usize::MAX;
|
||||
let registration = u16::from(doc.symbol_registration(name).0.min(8)) + 1;
|
||||
let entries = format!("%_{registration} /Int (AI13PatternRegistrationType) ,\n");
|
||||
// The canvas draws a symbol's art even when its root is hidden, so the root is written shown.
|
||||
let shown;
|
||||
let root: &Node = if sym.art.visible {
|
||||
&sym.art
|
||||
} else {
|
||||
let mut a = (*sym.art).clone();
|
||||
a.visible = true;
|
||||
shown = a;
|
||||
&shown
|
||||
};
|
||||
// A definition holds a group: art of another kind, and a plain group of one object (which
|
||||
// the reader takes for that group), are written in one.
|
||||
let wrap = !matches!(root.kind, NodeKind::Group { clip: false, .. }) || crate::import::symbol_art_member(root).is_some();
|
||||
let nest = std::mem::replace(&mut self.nest, 1);
|
||||
if wrap {
|
||||
self.line("u");
|
||||
self.node(root);
|
||||
let _ = write!(self.body, "U\n%_/ArtDictionary :\n{entries}%_;\n%_\n9 () XW\n");
|
||||
} else {
|
||||
// A group always writes its dictionary ([`Self::dictionary`]), which takes the entries.
|
||||
self.root_entries = Some((root.id, entries));
|
||||
self.node(root);
|
||||
}
|
||||
self.nest = nest;
|
||||
// Objects the writing doesn't pass through one by one (clipping paths, a clipping group's
|
||||
// own path) count as well.
|
||||
vectorcraft_doc::swatches::walk_with_masks(&sym.art, &mut |m| self.wrote_fixed |= redrawn(m));
|
||||
if self.wrote_pattern {
|
||||
self.pattern_written.insert(name.to_string());
|
||||
}
|
||||
if self.wrote_fixed {
|
||||
self.fixed_symbols.insert(name.to_string());
|
||||
}
|
||||
if self.inner_scale > 1.0 {
|
||||
self.symbol_scales.insert(name.to_string(), self.inner_scale);
|
||||
}
|
||||
let art;
|
||||
(
|
||||
art,
|
||||
(self.to_art, self.grad_space, self.canvas, self.instance_space),
|
||||
self.state,
|
||||
self.gs,
|
||||
self.clip,
|
||||
(self.block_start, self.block_end),
|
||||
(self.in_symbol, self.hidden),
|
||||
self.root_entries,
|
||||
self.wrote_pattern,
|
||||
(self.wrote_fixed, self.inner_scale),
|
||||
) = saved;
|
||||
self.doc = page_doc;
|
||||
let art = std::mem::replace(&mut self.body, art);
|
||||
self.defining_symbols.pop();
|
||||
let text = format!("%AI14_BeginSymbol\n{}\n0 A\n0 Xw\n0 Ae\n{art}%AI10_EndSymbol\n", ps::bytes(name.as_bytes()));
|
||||
self.defined_symbols.insert(name.to_string());
|
||||
self.symbol_defs.push(text);
|
||||
true
|
||||
}
|
||||
|
||||
/// Every symbol of the document defined, in its order (those its art uses before it): the
|
||||
/// Symbols panel keeps the ones no instance uses too, and on a large canvas all of them.
|
||||
pub(in crate::ai_editing) fn symbols(&mut self) {
|
||||
let doc = self.symbol_doc;
|
||||
for s in &doc.symbols {
|
||||
self.define_symbol(&s.name);
|
||||
}
|
||||
}
|
||||
|
||||
/// The symbol definitions, in the setup after the patterns: `%AI5_Begin_NonPrinting`, `Np`, each
|
||||
/// definition, `%AI5_End_NonPrinting--`.
|
||||
pub(in crate::ai_editing) fn symbol_definitions(&self, s: &mut String) {
|
||||
if self.symbol_defs.is_empty() {
|
||||
return;
|
||||
}
|
||||
s.push_str("%AI5_Begin_NonPrinting\nNp\n");
|
||||
for d in &self.symbol_defs {
|
||||
s.push_str(d);
|
||||
}
|
||||
s.push_str("%AI5_End_NonPrinting--\n");
|
||||
}
|
||||
|
||||
/// The symbol list, after the palette: the names of the symbols defined in the document's order
|
||||
/// (the Symbols panel's), between `%AI24_BeginSymbolList` and `%AI24_EndSymbolList` in a
|
||||
/// non-printing block.
|
||||
pub(in crate::ai_editing) fn symbol_list(&self, s: &mut String) {
|
||||
if self.symbol_defs.is_empty() {
|
||||
return;
|
||||
}
|
||||
s.push_str("%AI5_Begin_NonPrinting\nNp\n%AI24_BeginSymbolList\n");
|
||||
for sym in &self.symbol_doc.symbols {
|
||||
if self.defined_symbols.contains(&sym.name) {
|
||||
let _ = writeln!(s, "{}", ps::bytes(sym.name.as_bytes()));
|
||||
}
|
||||
}
|
||||
s.push_str("%AI24_EndSymbolList\n%AI5_End_NonPrinting--\n");
|
||||
}
|
||||
}
|
||||
@@ -70,7 +70,7 @@ use graphics::{GState, Out};
|
||||
use interp::{Fault, Interp};
|
||||
use obj::PsError;
|
||||
|
||||
pub(crate) use ai::MAX_GRADIENT_STOPS;
|
||||
pub(crate) use ai::{MAX_GRADIENT_STOPS, MAX_SYMBOLS, read_art_style, symbol_art_member};
|
||||
pub(crate) use ate::{MAX_BYTES as MAX_TEXT_DOCUMENT, MAX_FRAMES, MAX_SEGMENTS, MAX_STORY, MAX_VALUES as MAX_TEXT_VALUES};
|
||||
pub use native::{AiLayers, ai_alone, ai_alone_on_page, ai_layers_alone, ai_opened_artboard, is_loss, layered_ai, layered_ai_from};
|
||||
pub(crate) use native::{MAX_TEXT, scale_document};
|
||||
|
||||
@@ -44,7 +44,7 @@ pub use read::{
|
||||
BindingRef, Brushes, IMAGE_TOO_LARGE, PaletteSwatches, Structure, active_artboard, artboards, bindings_note, brushes, graphic_styles, palette,
|
||||
read, read_beside, variables,
|
||||
};
|
||||
pub(crate) use read::{join_and, slot_frame, slot_of};
|
||||
pub(crate) use read::{MAX_SYMBOLS, join_and, read_art_style, slot_frame, slot_of, symbol_art_member};
|
||||
|
||||
pub(crate) use read::is_look_slot;
|
||||
|
||||
|
||||
@@ -138,6 +138,7 @@ pub use document::{
|
||||
BindingRef, Brushes, PaletteSwatches, VariableRead, active_artboard, artboards, bindings_note, brushes, graphic_styles, palette, variables,
|
||||
};
|
||||
pub(crate) use document::{slot_frame, slot_of};
|
||||
pub(crate) use ops::read_art_style;
|
||||
pub use types::IMAGE_TOO_LARGE;
|
||||
use types::{BLEND_BUDGET, BrushArtColors, FLIP, Frame, GState, Graph, Kind, PatternHead, PendingEnvelope, Place, Raster, SymbolHead};
|
||||
#[cfg(test)]
|
||||
@@ -147,6 +148,10 @@ pub(super) use types::{blend_mode, blend_name};
|
||||
#[path = "legacy_text.rs"]
|
||||
mod legacy_text;
|
||||
|
||||
// The `.ai` writer defines symbols as this reader keeps them.
|
||||
pub(crate) use directives::symbol_art_member;
|
||||
pub(crate) use types::MAX_SYMBOLS;
|
||||
|
||||
/// What the editing data holds: the document of its art, and where its art space is.
|
||||
#[derive(Debug)]
|
||||
pub struct Structure {
|
||||
|
||||
@@ -1156,6 +1156,37 @@ pub(super) fn appearance_from_art_style(st: &crate::import::ai::style::ArtStyle)
|
||||
Some(Appearance { items, effects: st.effects.clone(), contents_index: st.contents_index })
|
||||
}
|
||||
|
||||
/// What the reader makes of art style `name` in `section` (the text between `%AI9_BeginArtStyles`
|
||||
/// and its end), for writers that check a style before they write it.
|
||||
#[derive(Clone, Debug)]
|
||||
pub(crate) struct StyleRead {
|
||||
/// The style's appearance: a gradient fill is the object's own gradient.
|
||||
pub appearance: Appearance,
|
||||
/// An object other than type is read with it ([`crate::import::ai::style::ArtStyle::simple`]).
|
||||
pub simple: bool,
|
||||
/// It has Effect › Pathfinder effects, which only a group with no fills or strokes is read with.
|
||||
pub pathfinder: bool,
|
||||
}
|
||||
|
||||
/// Art style `name` of `section` as the reader reads it ([`StyleRead`]): [`appearance_from_art_style`],
|
||||
/// with a style's one gradient fill as `own_gradient`, the object's own gradient, as [`styled`] reads
|
||||
/// it on objects other than type. `None` when the section doesn't define it, the reader doesn't read
|
||||
/// it, or it paints with a pattern, a brush or a gradient that isn't the object's own.
|
||||
pub(crate) fn read_art_style(section: &[u8], name: &str, own_gradient: Option<&Paint>) -> Option<StyleRead> {
|
||||
use crate::import::ai::style::StyleItem;
|
||||
let mut st = crate::import::ai::style::art_styles(section).remove(name)?;
|
||||
if st.items.iter().filter(|i| matches!(i, StyleItem::Gradient { .. })).count() == 1 {
|
||||
let own = own_gradient?;
|
||||
for item in &mut st.items {
|
||||
if matches!(item, StyleItem::Gradient { .. }) {
|
||||
*item = StyleItem::Fill(own.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
let appearance = appearance_from_art_style(&st)?;
|
||||
Some(StyleRead { appearance, simple: st.simple, pathfinder: st.pathfinder })
|
||||
}
|
||||
|
||||
/// A style's stroke as an appearance item (`None` for a fill).
|
||||
fn stroke_layer(item: &crate::import::ai::style::StyleItem) -> Option<AppearanceItem> {
|
||||
let crate::import::ai::style::StyleItem::Stroke { paint, width, cap, join, miter, dash, profile, brush } = item else { return None };
|
||||
|
||||
@@ -41,7 +41,7 @@ pub(crate) const FLIP: Affine = Affine::new([1.0, 0.0, 0.0, -1.0, 0.0, 0.0]);
|
||||
pub(super) const MAX_PATTERNS: usize = 4096;
|
||||
|
||||
/// Most symbol definitions read (instances of others come in as the page draws them).
|
||||
pub(super) const MAX_SYMBOLS: usize = 4096;
|
||||
pub(crate) const MAX_SYMBOLS: usize = 4096;
|
||||
|
||||
/// Most names a symbol list orders.
|
||||
pub(super) const MAX_LISTED: usize = 4 * MAX_SYMBOLS;
|
||||
|
||||
@@ -1186,3 +1186,32 @@ fn convert_to_shape_settings_that_arent_read_keep_the_drawn_look() {
|
||||
format!("/KnownStyle :\n(Odd) /Name ,\n/ActiveStyle :\n{}", compound("Chain Style Filter", &[compound("Stack Style Filter", &[item])]));
|
||||
assert!(!art_styles(data.as_bytes())["Odd"].plain);
|
||||
}
|
||||
|
||||
/// A style as a writer checks it: the reader's appearance, with a gradient fill as the object's own,
|
||||
/// and nothing for styles it doesn't read.
|
||||
#[test]
|
||||
fn a_style_is_read_as_a_writer_checks_it() {
|
||||
let read = |data: &str, own: Option<&Paint>| crate::import::read_art_style(data.as_bytes(), "Odd", own);
|
||||
let style = |kids: &[String]| format!("/KnownStyle :\n(Odd) /Name ,\n/ActiveStyle :\n{}", compound("Chain Style Filter", kids));
|
||||
let gradient = fill("Bb\n1 (G) 0 0 0 1 1 0 0 1 0 0 1 Bg\n0 BB");
|
||||
let stack = compound("Stack Style Filter", std::slice::from_ref(&gradient));
|
||||
let data = style(&[stack, blend(1, 0.5)]);
|
||||
let own = Paint::solid(vectorcraft_color::Color::WHITE);
|
||||
let got = read(&data, Some(&own)).unwrap();
|
||||
assert_eq!(got.appearance.items.len(), 1);
|
||||
assert_eq!(got.appearance.items[0].paint(), &own);
|
||||
assert!(got.simple && !got.pathfinder);
|
||||
// A gradient that isn't the object's own, a pattern, another name, two gradients: nothing.
|
||||
assert!(read(&data, None).is_none());
|
||||
let pattern = style(&[compound("Stack Style Filter", &[fill("(Dots) 0 0 1 1 0 0 0 0 0 [1 0 0 1 0 0] p")])]);
|
||||
assert!(read(&pattern, None).is_none());
|
||||
assert!(crate::import::read_art_style(data.as_bytes(), "Even", Some(&own)).is_none());
|
||||
assert!(read(&style(&[compound("Stack Style Filter", &[gradient.clone(), gradient])]), Some(&own)).is_none());
|
||||
// Damaged text: every cut of the style, and stray bytes, without a panic.
|
||||
for cut in 0..data.len() {
|
||||
let _ = read(data.get(..cut).unwrap_or_default(), Some(&own));
|
||||
}
|
||||
for junk in ["(", ")", ";", "/KnownStyle :\n(Odd) /Name ,\n;;;;", "/KnownStyle :\n(Odd) /Name ,\n/Array : 1 /Real , ; (x) ,"] {
|
||||
let _ = read(junk, Some(&own));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ from the public specifications, and users' own `.ai` files are used locally only
|
||||
| | Illustrator | VectorCraft | Notes |
|
||||
|---|---:|---:|---|
|
||||
| Formats opened or placed | ~30 | 29 | missing: FreeHand, CorelDRAW, DWG, HEIC/HEIF, PICT, PS |
|
||||
| Formats saved (Save As) | 6 (AI, AIT, PDF, EPS, SVG, SVGZ) | 6 + native | `.ai` written PDF-compatible (with an editing copy of the art: layers, groups, paths, colors, gradients, patterns, images, type, artboards, transparency, opacity masks, clipping) or as legacy version 7 (layers and groups, one artboard per file) |
|
||||
| Formats saved (Save As) | 6 (AI, AIT, PDF, EPS, SVG, SVGZ) | 6 + native | `.ai` written PDF-compatible (with an editing copy of the art: layers, groups, paths, colors, gradients, patterns, images, type, symbols, artboards, transparency, opacity masks, clipping) or as legacy version 7 (layers and groups, one artboard per file) |
|
||||
| Formats exported | ~16 | 17 | missing: DWG, 3D (OBJ/USDA/glTF); extra: GIF/PNG-8 palette export, DXF up to 2018, layered PSD |
|
||||
| **Overall (weighted by use)** | | **~75%** | `.ai` and PDF dominate the weighting |
|
||||
|
||||
@@ -76,21 +76,42 @@ private editing data. VectorCraft:
|
||||
RGB or CMYK ink amounts, and their alpha channel) and linked images as placed files with their path, their folder
|
||||
relative to the document's and a preview; images that can't be decoded or have more than 33,554,432 pixels are
|
||||
written as their outlines filled mid gray, images of 16 bits a channel at 8 bits, and linked images in opacity
|
||||
masks and pattern tiles as embedded images, each with a warning. Point type, area type (with its rows, columns,
|
||||
masks, pattern tiles and symbols as embedded images, each with a warning. Every symbol is written as a symbol
|
||||
definition (its art, its registration point and its place in the Symbols panel's order, nested symbols included)
|
||||
and its instances as symbol instances with their matrix, name, hide, lock, opacity, blending mode and opacity
|
||||
mask; instances with a fill, appearance changes, isolation, knockout or knockout shape of their own, instances of
|
||||
symbols with 9-slice guides or pattern paint, instances in pattern tiles or in art cut to a clipping object,
|
||||
instances scaled almost flat, instances that turn, mirror or scale symbols holding type, live objects,
|
||||
instances written as their art, shapes with rounded live corners or strokes written as outlines or brush art,
|
||||
instances that scale their symbol more than 100 times and instances on the layers of a large canvas are written as their art, pattern fills in a
|
||||
symbol's art are written as their tiles cut to the shape, symbols past 4,096 are written only as their
|
||||
instances' art, and symbols' 9-slice guides, export types and dynamic type are left out, each with a
|
||||
warning. Paths, compound paths and groups with live effects keep them as art styles: the drawn look, the object
|
||||
itself and the style it names, for a fill and a stroke at most in solid colors or the object's gradient (a stroke
|
||||
with its variable-width profile), filled by the non-zero rule, with Drop Shadow, Inner Glow, Outer Glow, Feather,
|
||||
Round Corners, Scribble, Convert to Shape, Offset Path, Outline Object or Outline Stroke, and groups with Pathfinder ›
|
||||
Add. Groups keep them when their members are paths, compound paths or such groups, without effects of their own; when the
|
||||
group's effects change its members' outlines, a member's strokes are plain lines, and its fills are not pattern
|
||||
fills written as tiles or gradients that fit their object. The look holds the object's vector art, without the shadow, glow or feather. Other objects with
|
||||
live effects are written as their vector art with their geometry effects applied, and their other effects, such as
|
||||
Drop Shadow, the glows and Feather, are left out with a warning. Graphic styles and links to them are left out with a warning. No art style is written on a large
|
||||
canvas.
|
||||
Point type, area type (with its rows, columns,
|
||||
gutters and first baseline, threaded frames included) and type on a path are written as text: a text object for
|
||||
each, naming its story in the text document, with the characters, fonts, sizes, leading, tracking, baseline shift,
|
||||
scales, solid fills and strokes, capitals and paragraph alignment, indents, spacing and direction; other character
|
||||
and paragraph attributes are left out with a warning. Type in opacity masks, pattern tiles and art cut to a
|
||||
and paragraph attributes are left out with a warning. Type in opacity masks, pattern tiles, symbols and art cut to a
|
||||
clipping object, mirrored type, turned or unevenly scaled area type and type on a path, area type in an open frame,
|
||||
type on an open path whose ends meet, area type that flows around a text wrap, type of only white space, threads of
|
||||
type on a path, threads whose frames differ in orientation, type and stories past the sizes VectorCraft's reader reads, and
|
||||
type with inline graphics, ruby, gradient or pattern paint or an appearance or opacity mask of its own, other patterns, symbols, other clipping objects and live
|
||||
type with inline graphics, ruby, gradient or pattern paint or an appearance or opacity mask of its own, other patterns, other clipping objects and live
|
||||
objects (placed documents included) are written as plain filled and stroked paths, and freeform gradients, gradients along
|
||||
or across a stroke and gradients without stops, with more than 256 stops or without extent as their average
|
||||
color, each with a warning. Gradients that dither or mix their colors perceptually are written as classic
|
||||
gradients, and gradient stops linked to global process colors as their colors, each with a warning. The opacity
|
||||
and blending mode of single fills and strokes, opacity masks on layers, the placement of pattern swatches that
|
||||
move, turn or scale their pattern, and effects other than geometry effects are left out.
|
||||
move, turn or scale their pattern, and the effects of objects written without an art style, other than geometry
|
||||
effects, are left out.
|
||||
The editing copy also holds the document's variables, data sets, the data set shown and the variables' lock as
|
||||
the variable library the reader reads, with the objects bound to visibility variables, the type bound to text
|
||||
variables and the linked images bound to image variables. Bindings to layers, to type written as outlines and to
|
||||
|
||||
+2
-1
@@ -203,7 +203,8 @@ from G14 and the budget run of G15: **~170–270 h** one agent, ~50–80 h wall
|
||||
of 14), open speed on large files (#758), live effects, Scatter, Art, Pattern and Bristle brushes on paths, a
|
||||
path's own Calligraphic brush settings, and symbols as live objects (#637; plain art styles read Drop Shadow, Outer Glow and Feather as live effects; pattern fills and global colours are read since #1025, placed (linked) files since #1264). A PDF-compatible `.ai` carries an editing copy of the art in the form
|
||||
VectorCraft's reader reads (layers, groups, paths, colors, gradients, patterns, images, transparency, opacity masks,
|
||||
clipping and type as text), with live effects left out and symbols and live objects written as their art
|
||||
clipping, type as text and symbols), with live effects kept only on paths, compound paths and groups that
|
||||
qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, other objects' effects other than geometry effects left out, and live objects written as their art
|
||||
([file-format-parity.md](file-format-parity.md)). Save As
|
||||
`.ai` › Version: Legacy (version 7) writes the PostScript form from the published version 7 specification,
|
||||
keeping layers (names, order, visibility, lock), groups, compound paths, clipping groups, gradients and
|
||||
|
||||
+1
-1
@@ -89,7 +89,7 @@ Checked 2026-10-10 from the code, tests and open issues; no workflow fails, so V
|
||||
| Set type: point and area type, Character and Paragraph styles, threading, outlines | yes | type core 80%; styles, threading, Create Outlines and font matching tested ([type-parity.md](type-parity.md)); justification options missing (not blocking) | 0 |
|
||||
| Organise layers and artboards and export assets (Export for Screens, SVG, PNG, PDF per artboard) | yes | Layers panel rework, Artboards panel and tool, Export for Screens and Asset Export done; Art Optimized supersample closes ghost borders (#983 / #1037) | 0 |
|
||||
| Print production: CMYK and spot colour, bleed and marks, PDF/X out, separations preview | yes | PDF/X-1a/3/4, presets, marks and bleed, ICC output intent, Separations Preview, Print with PostScript output | 0 |
|
||||
| Exchange files with Illustrator users: open their `.ai`/EPS/PDF, hand back a file they can open | partial (doesn't block alpha) | `.ai`, EPS and PDF open as editable art, but real files can get the wrong layer structure (#951); Save As `.ai` is PDF-compatible with an editing copy of the art (layers, groups, paths, colors, gradients, patterns, images, transparency, opacity masks, clipping and type as text, with live effects left out and symbols and live objects written as their art; #868), or legacy version 7, which keeps layers, groups and type as text, one artboard per file, and waits for users' testing. EPS legacy mesh corners, vector opacity masks and raster print-page comparison now preserve editable art under synthetic regressions. This is the beta main-format gap ([gaps.md](gaps.md) G9) | 10–20 (for beta) |
|
||||
| Exchange files with Illustrator users: open their `.ai`/EPS/PDF, hand back a file they can open | partial (doesn't block alpha) | `.ai`, EPS and PDF open as editable art, but real files can get the wrong layer structure (#951); Save As `.ai` is PDF-compatible with an editing copy of the art (layers, groups, paths, colors, gradients, patterns, images, transparency, opacity masks, clipping, type as text and symbols, with live effects kept only on paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports ([file-format-parity.md](file-format-parity.md)), other objects' effects other than geometry effects left out, and live objects written as their art; #868), or legacy version 7, which keeps layers, groups and type as text, one artboard per file, and waits for users' testing. EPS legacy mesh corners, vector opacity masks and raster print-page comparison now preserve editable art under synthetic regressions. This is the beta main-format gap ([gaps.md](gaps.md) G9) | 10–20 (for beta) |
|
||||
|
||||
Hindi interface follow-up (2026-11-06): the catalog and zero/one plural rule are implemented;
|
||||
native wording review, layout checks and a web Devanagari font remain. [Notes](localization-hi.md).
|
||||
|
||||
@@ -202,7 +202,7 @@ dominate; 3D, graphs and automation are specialist). They sum to 105. Feature de
|
||||
| Layers, artboards, document setup | 5 | 78% | Selected-artboard deletion is consistent across panel actions (all-selected retains artboard 1); history prunes removed indices while preserving valid multiselection; remaining: 30.0's artboard locking and colours and managing artboards from the canvas, Layers panel row context menus and Collect for Export (click-to-fit objects is done, #1227) | 5–8 | estimated (lowered from 82%: target moved); Artboard deletion keys keep artwork and the first of an all-selected set; Artboard Options' Show Center Mark and Show Cross Hairs draw on the canvas only (exports and print leave them out), regression-tested; Artboard Options' Show Video Safe Areas and Video Ruler Pixel Aspect Ratio (per artboard, native format) are done ([video display options](#evidence-what-ships-today-by-area)), score unchanged |
|
||||
| View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged); document-tab artwork hover/copy and lossless transfer tested (2026-10-22; score/hours unchanged); cached canvas reprojection preserves scale during resize, rotation and DPI changes (regression and contributor original-file evidence below; scores/hours unchanged); cached canvas dimensions match the renderer limit before cache-key creation, view construction and worker submission (regression evidence below) |
|
||||
| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), no writing of Illustrator's editing data (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`; the distance from the path under Align to Path comes from VectorCraft's font metrics, and the fit under Gravity does not reproduce the file's layout), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. |
|
||||
| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects and with symbols and live objects as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. |
|
||||
| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. |
|
||||
| View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged); document-tab artwork hover/copy and lossless transfer tested (2026-10-22; score/hours unchanged); cached canvas reprojection preserves scale during resize, rotation and DPI changes (regression and contributor original-file evidence below; scores/hours unchanged) |
|
||||
| View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged) |
|
||||
| Guides, grids, smart guides, snapping, rulers | 3 | 80% | "intersect" smart guides for a moved selection's anchors (drawn points and dragged anchors snap to intersections, #1658), distance readouts while drawing | 4–7 | estimated (lowered from 85%: target moved); new ruler-guide Alt orientation implemented; video rulers (View › Rulers › Show Video Rulers, #2849) done, score unchanged |
|
||||
@@ -283,8 +283,9 @@ The discounts, with the evidence:
|
||||
ones are about structure, not missing art: layers flattened or multiplied (#951: 109 layers instead of 14;
|
||||
#868), guides lost (#779), slower opening (#758), live effects, brushes and symbols as their drawn look
|
||||
(#637). VectorCraft's PDF-compatible `.ai` carries an editing copy of the art (layers, groups, paths, colors,
|
||||
gradients, patterns, images, transparency, opacity masks, clipping and type as text), with live effects left out
|
||||
and symbols and live objects written as their art; the legacy `.ai` of version 7 it also writes keeps layers, groups and type as text (one
|
||||
gradients, patterns, images, transparency, opacity masks, clipping, type as text and symbols), with live effects kept only
|
||||
on paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, other objects' effects other than geometry
|
||||
effects left out, and live objects written as their art; the legacy `.ai` of version 7 it also writes keeps layers, groups and type as text (one
|
||||
artboard per file, no transparency) but hasn't been tested by users yet (#868). That blocks beta (the main-format rule) for people who hand files back to Illustrator users,
|
||||
but it doesn't stop someone opening and reworking their own archive.
|
||||
- **Interaction fidelity (×0.9).** Pen, Direct Selection, smart guides and snapping are deep
|
||||
@@ -1252,6 +1253,8 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
|
||||
At a precision of 9 decimals or fewer, SVG export writes each number from an integer when the integer rounds it as the decimal formatter does; the formatter still writes values halfway between two written numbers and values too large for the integer. Exporting one path of 200,000 anchors takes a median of 43.4 ms instead of 167.0 ms on Windows 11, and 20,000 rectangles 81.4 ms instead of 141.4 ms, with the same SVG (`crates/svg/src/lib.rs`).
|
||||
SVG import reads each `<circle>` and `<ellipse>` as the ellipse VectorCraft draws: four smooth anchors on the axes, starting at the right, with handles of the standard length, so an ellipse exported as `<ellipse>` comes back with the anchors it was written from and draws the same (`circles_and_ellipses_import_as_the_ellipse_drawn` in `crates/svg/tests/it/basic_shapes.rs`, `filled_ellipse_on_the_artboard_edge_survives_visually` in `prop_svg.rs`).
|
||||
SVG import keeps attributes in other applications' XML namespaces (`plotter:pen="2"`) on the objects and layers they belong to, as it keeps their `data-*` attributes: copies, duplicates and `.vectorcraft` files keep them, and SVG export writes them back with each namespace declared once on the root (the rest of #522; `crates/svg/tests/it/foreign_attributes.rs`, `tests/attributes.rs`).
|
||||
A PDF-compatible `.ai` saved with Include Editing Data for Other Apps defines every symbol in its editing copy with its art, registration point and place in the Symbols panel's order, and writes its instances as symbol instances, which VectorCraft's `.ai` reader opens as symbols and instances again (`symbols_and_their_instances_are_read_back` in `crates/eps/src/ai_editing/tests.rs`; [file-format-parity.md](file-format-parity.md) lists the instances written as their art).
|
||||
A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes eligible paths, compound paths and groups with live effects with an art style when the writer supports their appearance and effects (not a filled path that uses the even-odd rule, and none on a large canvas), which VectorCraft's `.ai` reader opens as the same appearance with its effects live (`objects_with_live_effects_are_read_back` and `every_effect_setting_written_on_an_object_is_read_back` in `crates/eps/src/ai_editing/tests.rs`; [file-format-parity.md](file-format-parity.md) lists the objects written without one and the effects they lose).
|
||||
A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes point type, area type and type on a path as type in its editing copy, and objects next to it keep their own transparency (`crates/eps/src/ai_editing/tests.rs`, `cmd::fileio::tests_pdfedit::type_comes_back_from_the_editing_copy`; [file-format-parity.md](file-format-parity.md) lists what is written as outlines).
|
||||
A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps the document's variables, data sets and the bindings of objects to variables in its editing copy, in the form the variable library reader above reads, so they come back when the file is opened. Bindings to layers, to type written as outlines, to graphs and to linked images written as other objects, data set values of graphs, and variables, data sets, bindings and values past the writer's limits are left out with a warning (#6024; `crates/eps/src/ai_editing/tests.rs` `variables_data_sets_and_bindings_are_read_back`; `crates/eps/src/ai_editing/writer/variables.rs` lists what is left out).
|
||||
In a `.ai` or EPS opened from its editing data, type has its text object's opacity, blend mode and knockout shape flag, whether it is made from the file's text document or taken from the page, and type made from the text document takes its text object's lock. Where such type has transparency and comes in with other art (the rest of its look, or page type and strokes that go with it), a group of them has it. Where the page draws its type, or the strokes around it, with transparency that is neither its text object's nor its text object's combined with that of the objects around it, the page's type and strokes keep their own instead (`crates/eps/src/import/tests_native.rs`). Where the page draws type of no text object over text objects made from the text document, with their words in any case, that type is theirs as the page draws it and is left out; the page's other type of no text object goes only to text objects whose type the text document can't make, or else is left out with a warning.
|
||||
|
||||
Reference in New Issue
Block a user