mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-17 00:54:44 +00:00
Merge main into fix/shadow-validation-builds-its-shadow-geometry
This commit is contained in:
Generated
+1
@@ -6930,6 +6930,7 @@ name = "vectorcraft-ui-egui"
|
||||
version = "0.24.1"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"chrono",
|
||||
"craft-keymap",
|
||||
"craft-ui",
|
||||
"craft-update",
|
||||
|
||||
+145
-11
@@ -266,6 +266,7 @@ pub fn hit_test_visible_skipping(doc: &Document, p: Point, opt: HitOptions, skip
|
||||
/// (`opt.scope`) or on a locked artboard. On a layer whose Preview is off it counts by its
|
||||
/// outline, as a click there hits it.
|
||||
pub fn selected_hidden_at(doc: &Document, p: Point, opt: HitOptions, selected: &[NodeId]) -> Option<NodeId> {
|
||||
let _walk = ArtWalk::open();
|
||||
let symbols = doc.symbol_boxes();
|
||||
let locks = doc.locked_artboards();
|
||||
selected.iter().rev().copied().find(|&id| {
|
||||
@@ -322,6 +323,7 @@ fn path_options(nodes: &[&Node], chain: &[NodeId], opt: HitOptions) -> Option<Hi
|
||||
/// The objects under `p` that [`Hit::top_object`] picks in `scope` (isolation mode), topmost
|
||||
/// first: what clicks there select, one below the other (Cmd/Ctrl-click selects behind).
|
||||
pub fn objects_at(doc: &Document, p: Point, opt: HitOptions, scope: Option<NodeId>) -> Vec<NodeId> {
|
||||
let walk = ArtWalk::open();
|
||||
let opt = HitOptions { scope: scope.or(opt.scope), ..opt };
|
||||
// Normally one hit test per *object* suffices: layers and sublayers aren't selectable,
|
||||
// while a group (including a clipping group) is selected as one object. Repeatedly
|
||||
@@ -337,6 +339,7 @@ pub fn objects_at(doc: &Document, p: Point, opt: HitOptions, scope: Option<NodeI
|
||||
for layer in doc.layers.iter().rev() {
|
||||
// Malformed files may contain non-layer roots; let the general traversal handle them.
|
||||
if !layer.is_layer() {
|
||||
walk.restart();
|
||||
return objects_at_repeated(doc, p, opt, scope);
|
||||
}
|
||||
if !layer.visible || layer.locked || layer.is_template() || doc.pattern_edit.as_ref().is_some_and(|e| e.layer != layer.id) {
|
||||
@@ -344,7 +347,9 @@ pub fn objects_at(doc: &Document, p: Point, opt: HitOptions, scope: Option<NodeI
|
||||
}
|
||||
if !objects_at_layer(layer, p, opt, &symbols, &mut tops, &mut seen) {
|
||||
// An envelope in Edit Contents may expose objects *within* a top-level group.
|
||||
// The repeated traversal handles that mixed hierarchy precisely.
|
||||
// The repeated traversal handles that mixed hierarchy precisely, with the whole
|
||||
// limit of symbol art to walk.
|
||||
walk.restart();
|
||||
return objects_at_repeated(doc, p, opt, scope);
|
||||
}
|
||||
}
|
||||
@@ -429,6 +434,7 @@ pub const MAX_LOCKED_AT: usize = 20;
|
||||
/// out. While a pattern is edited only its tile layer is searched, and in isolation mode
|
||||
/// (`opt.scope`) only what is inside the isolated group or object.
|
||||
pub fn locked_objects_at(doc: &Document, p: Point, opt: HitOptions) -> Vec<NodeId> {
|
||||
let _walk = ArtWalk::open();
|
||||
let symbols = doc.symbol_boxes();
|
||||
let mut out = Vec::new();
|
||||
if let Some(scope) = opt.scope
|
||||
@@ -506,6 +512,7 @@ fn object_hit(n: &Node, p: Point, opt: HitOptions, symbols: &SymbolBoxes, editab
|
||||
/// an isolated group on one ([`crate::LockedArtboards::holds`]). Symbol instances are measured by their art
|
||||
/// ([`Node::geometric_bounds_with`]), and are also hit outside that box where their art paints.
|
||||
fn hit_test_skipping(doc: &Document, p: Point, opt: HitOptions, skip: &dyn Fn(NodeId) -> bool, editable_only: bool) -> Option<Hit> {
|
||||
let _walk = ArtWalk::open();
|
||||
let finish = |mut h: Hit| {
|
||||
h.contents_of = h.ancestry.iter().rev().copied().find(|a| doc.node(*a).is_some_and(edits_contents));
|
||||
h.layers = h.ancestry.iter().take_while(|a| doc.node(**a).is_some_and(Node::is_layer)).count();
|
||||
@@ -1059,9 +1066,10 @@ fn hit_leaf(n: &Node, p: Point, opt: HitOptions, symbols: &SymbolBoxes) -> Optio
|
||||
n.geometric_bounds_with(symbols).filter(|b| b.inflate(opt.tol, opt.tol).contains(p)).map(|_| HitKind::Bounds)
|
||||
}
|
||||
// A symbol instance is hit within its bounds, and outside them where its art paints
|
||||
// ([`instance_art_hit`]).
|
||||
// ([`instance_art_hit`]). In the art of another instance walked outside that instance's
|
||||
// bounds, it is hit only where its own art paints ([`ArtOnly`]).
|
||||
NodeKind::SymbolInstance { .. } => {
|
||||
if n.geometric_bounds_with(symbols).is_some_and(|b| b.inflate(opt.tol, opt.tol).contains(p)) {
|
||||
if !ArtOnly::on() && n.geometric_bounds_with(symbols).is_some_and(|b| b.inflate(opt.tol, opt.tol).contains(p)) {
|
||||
return Some(HitKind::Bounds);
|
||||
}
|
||||
instance_art_hit(n, p, opt, symbols)
|
||||
@@ -1172,6 +1180,15 @@ impl<'a> InstanceArt<'a> {
|
||||
whole.or_else(|| self.map.as_ref()?.one_cell_with(n, &self.boxes))
|
||||
}
|
||||
|
||||
/// How many objects placing the whole art makes: the objects of the art with their opacity
|
||||
/// masks' art ([`Node::count_with_masks`]), or, through the guides, the most that
|
||||
/// [`crate::NineSliceMap::most_placed_with`] counts.
|
||||
fn size(&self) -> u64 {
|
||||
self.map
|
||||
.as_ref()
|
||||
.map_or_else(|| u64::try_from(self.art.count_with_masks()).unwrap_or(u64::MAX), |m| m.most_placed_with(&self.art, &self.boxes))
|
||||
}
|
||||
|
||||
/// Object `n` of the art placed on the canvas as it is drawn, clip groups included: moved by
|
||||
/// `whole` when an object around it is moved as one piece ([`Self::whole`]). `None` when
|
||||
/// placing it through the guides could make more than [`crate::MAX_SYMBOL_NODES`] objects, as
|
||||
@@ -1219,6 +1236,7 @@ fn moved(n: &Node, xf: vectorcraft_geom::Affine) -> Node {
|
||||
/// layer, is tested in outline ([`HitOptions::outline`]), as the canvas draws it. `None` when `inst` is not a symbol instance or
|
||||
/// no editable object of its art is under `p`.
|
||||
pub fn symbol_part_at(doc: &Document, inst: &Node, p: Point, opt: HitOptions) -> Option<Vec<u32>> {
|
||||
let _walk = ArtWalk::open();
|
||||
let art = InstanceArt::of(doc, inst)?;
|
||||
let symbols = doc.symbol_boxes();
|
||||
let mut path = vec![];
|
||||
@@ -1250,7 +1268,7 @@ impl FindPart<'_> {
|
||||
/// What a click at `p` hits on object `n` of the art, with `path` the child indices that lead
|
||||
/// to what it hits. `outline`: the view is in Outline, or a layer around `n` has Preview off.
|
||||
fn find(&self, n: &Node, path: &mut Vec<u32>, whole: Option<vectorcraft_geom::Affine>, outline: bool) -> Option<HitKind> {
|
||||
if !n.visible || !self.whole_instance && (n.locked || n.is_template()) || self.skips_guide(n) {
|
||||
if !n.visible || !self.whole_instance && (n.locked || n.is_template()) || self.skips_guide(n) || !ArtWalk::take(1) {
|
||||
return None;
|
||||
}
|
||||
let outline = outline || previews_off(n);
|
||||
@@ -1298,17 +1316,120 @@ impl FindPart<'_> {
|
||||
/// Outline, [`HitOptions::outline`]): its strokes, and the art that the live geometry effects of a
|
||||
/// clipping path in it show past the art's box. `None` for an instance of a missing symbol, of a
|
||||
/// symbol that holds an instance of itself or nests too deep ([`SymbolBoxes::art`]), and of art past
|
||||
/// the 9-slice object limit ([`InstanceArt::of`]).
|
||||
/// the 9-slice object limit ([`InstanceArt::of`]), when `p` is outside the instance's reach
|
||||
/// ([`Node::reach_bounds_with`]), and once the click has visited as many objects of symbol art as
|
||||
/// [`ArtWalk`] allows.
|
||||
fn instance_art_hit(n: &Node, p: Point, opt: HitOptions, symbols: &SymbolBoxes) -> Option<HitKind> {
|
||||
let NodeKind::SymbolInstance { symbol, .. } = &n.kind else { return None };
|
||||
if opt.outline || symbols.art(symbol).is_none() {
|
||||
if opt.outline || symbols.art(symbol).is_none() || !n.reach_bounds_with(symbols).is_some_and(|b| b.inflate(opt.tol, opt.tol).contains(p)) {
|
||||
return None;
|
||||
}
|
||||
let _walk = ArtWalk::open();
|
||||
if ArtWalk::used_up() {
|
||||
return None;
|
||||
}
|
||||
let art = InstanceArt::of(symbols.document(), n)?;
|
||||
#[cfg(test)]
|
||||
ARTS_WALKED.with(|c| c.set(c.get() + 1));
|
||||
let opt = HitOptions { clip_outlines: false, ..opt };
|
||||
let _art_only = ArtOnly::set();
|
||||
FindPart { art: &art, p, opt, symbols, whole_instance: true }.find(&art.art, &mut vec![], None, false)
|
||||
}
|
||||
|
||||
thread_local! {
|
||||
/// Whether a symbol instance's art is being walked outside the instance's box ([`ArtOnly`]).
|
||||
static ART_ONLY: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
|
||||
}
|
||||
|
||||
/// While a guard lives, a symbol instance is hit ([`hit_leaf`]) and touched by a marquee
|
||||
/// ([`marquee_with`]) only where its own art is, by the same rule at every level, and not anywhere
|
||||
/// in its box. [`instance_art_hit`] and the marquee's walk of an instance's art hold one: they walk
|
||||
/// the art outside the instance's box, where the box of an instance nested in the art can reach
|
||||
/// past it over empty space.
|
||||
struct ArtOnly {
|
||||
was: bool,
|
||||
}
|
||||
|
||||
impl ArtOnly {
|
||||
fn set() -> Self {
|
||||
Self { was: ART_ONLY.replace(true) }
|
||||
}
|
||||
|
||||
fn on() -> bool {
|
||||
ART_ONLY.get()
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for ArtOnly {
|
||||
fn drop(&mut self) {
|
||||
ART_ONLY.set(self.was);
|
||||
}
|
||||
}
|
||||
|
||||
thread_local! {
|
||||
/// How many more objects of symbol art the click or marquee under way may visit ([`ArtWalk`]),
|
||||
/// `None` outside one.
|
||||
static ART_WALK_LEFT: std::cell::Cell<Option<u64>> = const { std::cell::Cell::new(None) };
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
thread_local! {
|
||||
/// The number of objects [`ArtWalk::open`] allows on this thread in place of
|
||||
/// [`crate::MAX_SYMBOL_NODES`].
|
||||
static ART_WALK_LIMIT: std::cell::Cell<Option<u64>> = const { std::cell::Cell::new(None) };
|
||||
/// How many symbol instances' art clicks and marquees walked on this thread.
|
||||
static ARTS_WALKED: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
}
|
||||
|
||||
/// The objects of symbol art that one click or one marquee may visit: [`crate::MAX_SYMBOL_NODES`]
|
||||
/// in all, the art of the instances nested in that art included, at every level. The first
|
||||
/// [`ArtWalk::open`] of a click or a marquee sets the limit, and the walks opened while its guard
|
||||
/// lives share it. Once the limit is used up, an instance is no longer hit or touched outside its
|
||||
/// box; inside its box it still is.
|
||||
struct ArtWalk {
|
||||
outermost: bool,
|
||||
}
|
||||
|
||||
impl ArtWalk {
|
||||
fn open() -> Self {
|
||||
let walk = Self { outermost: ART_WALK_LEFT.get().is_none() };
|
||||
walk.restart();
|
||||
walk
|
||||
}
|
||||
|
||||
/// For the outermost guard, sets what is left back to the whole limit.
|
||||
fn restart(&self) {
|
||||
if self.outermost {
|
||||
#[cfg(test)]
|
||||
let limit = ART_WALK_LIMIT.get().unwrap_or(crate::MAX_SYMBOL_NODES);
|
||||
#[cfg(not(test))]
|
||||
let limit = crate::MAX_SYMBOL_NODES;
|
||||
ART_WALK_LEFT.set(Some(limit));
|
||||
}
|
||||
}
|
||||
|
||||
/// Is nothing left?
|
||||
fn used_up() -> bool {
|
||||
ART_WALK_LEFT.get() == Some(0)
|
||||
}
|
||||
|
||||
/// Takes `n` objects from what is left. `false` when fewer are left, and nothing is left after.
|
||||
fn take(n: u64) -> bool {
|
||||
let Some(left) = ART_WALK_LEFT.get() else { return true };
|
||||
let rest = left.checked_sub(n);
|
||||
ART_WALK_LEFT.set(Some(rest.unwrap_or(0)));
|
||||
rest.is_some()
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for ArtWalk {
|
||||
fn drop(&mut self) {
|
||||
if self.outermost {
|
||||
ART_WALK_LEFT.set(None);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Is `n` below a layer whose Preview is off, so that the canvas draws it in outline? As for clicks
|
||||
/// ([`path_options`]), the Preview of the isolated container `scope` and of the layers around it
|
||||
/// does not count.
|
||||
@@ -1502,6 +1623,7 @@ fn previews_off(n: &Node) -> bool {
|
||||
}
|
||||
|
||||
fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, whole_compounds: bool, outline: bool) -> Vec<NodeId> {
|
||||
let _walk = ArtWalk::open();
|
||||
let mut out = Vec::new();
|
||||
// The objects the marquee may touch ([`Top`]).
|
||||
let tops: Vec<Top> = match scope.and_then(|s| doc.node(s)) {
|
||||
@@ -1613,8 +1735,9 @@ fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, wh
|
||||
NodeKind::Compound { children, .. } => children.iter().any(|c| c.visible && touches(c, s, r, scope, whole_compounds, outline)),
|
||||
NodeKind::Repeat(spec) => spec.expand(Some(s.document())).iter().any(|copy| touches(copy, s, r, scope, whole_compounds, outline)),
|
||||
// A symbol instance is touched by its box, and outside it where the live geometry
|
||||
// effects of a clipping path in its art show the art.
|
||||
NodeKind::SymbolInstance { .. } => box_touches(n, s, r) || !outline && instance_art_touches(n, s, r, whole_compounds),
|
||||
// effects of a clipping path in its art show the art. In the art of another instance
|
||||
// walked outside that instance's box, it is touched only by its own art ([`ArtOnly`]).
|
||||
NodeKind::SymbolInstance { .. } => !ArtOnly::on() && box_touches(n, s, r) || !outline && instance_art_touches(n, s, r, whole_compounds),
|
||||
_ => box_touches(n, s, r),
|
||||
}
|
||||
}
|
||||
@@ -1628,15 +1751,26 @@ fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, wh
|
||||
}
|
||||
/// Does the marquee `r` touch the art of symbol instance `n` placed as the canvas draws it, as
|
||||
/// it touches a group of that art? Only for art whose clipping paths have live geometry effects
|
||||
/// ([`SymbolBoxes::art`]), and only when `r` meets the instance's reach
|
||||
/// ([`Node::reach_bounds_with`]): elsewhere the art lies within the instance's box.
|
||||
/// ([`SymbolBoxes::art`]), or for any art while [`ArtOnly`] is on, and only when `r` meets the
|
||||
/// instance's reach ([`Node::reach_bounds_with`]): elsewhere the art lies within the instance's
|
||||
/// box. Not once the marquee has placed as many objects of symbol art as [`ArtWalk`] allows.
|
||||
fn instance_art_touches(n: &Node, s: &SymbolBoxes, r: Rect, whole_compounds: bool) -> bool {
|
||||
let NodeKind::SymbolInstance { symbol, .. } = &n.kind else { return false };
|
||||
let meets = |b: Rect| b.x0 <= r.x1 && r.x0 <= b.x1 && b.y0 <= r.y1 && r.y0 <= b.y1;
|
||||
if s.art(symbol).is_none_or(|a| a.reshaped.is_none()) || !n.reach_bounds_with(s).is_some_and(meets) {
|
||||
if s.art(symbol).is_none_or(|a| a.reshaped.is_none() && !ArtOnly::on()) || !n.reach_bounds_with(s).is_some_and(meets) {
|
||||
return false;
|
||||
}
|
||||
let _walk = ArtWalk::open();
|
||||
if ArtWalk::used_up() {
|
||||
return false;
|
||||
}
|
||||
let Some(art) = InstanceArt::of(s.document(), n) else { return false };
|
||||
if !ArtWalk::take(art.size()) {
|
||||
return false;
|
||||
}
|
||||
#[cfg(test)]
|
||||
ARTS_WALKED.with(|c| c.set(c.get() + 1));
|
||||
let _art_only = ArtOnly::set();
|
||||
art.place(&art.art, None).is_some_and(|placed| placed.visible && touches(&placed, s, r, None, whole_compounds, false))
|
||||
}
|
||||
fn collect_leaves(n: &Node, s: &SymbolBoxes, r: Rect, scope: Option<NodeId>, whole_compounds: bool, outline: bool, out: &mut Vec<NodeId>) {
|
||||
|
||||
@@ -1961,6 +1961,185 @@ fn a_symbol_instance_is_hit_on_the_stroke_of_its_art_past_its_box() {
|
||||
assert_eq!(at(108.0, HitOptions { outline: true, ..HitOptions::default() }), None, "Outline view");
|
||||
}
|
||||
|
||||
/// Outside a symbol instance's box, an instance nested in its art counts where its own art is, not
|
||||
/// anywhere in its box: a click or a marquee on empty space in the nested box, where a moved
|
||||
/// clipping path shows the art past the outer box, selects nothing, and on art drawn there it
|
||||
/// selects the outer instance.
|
||||
#[test]
|
||||
fn a_nested_symbol_instances_box_past_the_outer_box_is_not_a_hit() {
|
||||
set_clip_region(moved_clip_region);
|
||||
// `Two` draws squares at the corners of 0..200 × 0..100, and with `middle` one at 140..160 ×
|
||||
// 40..60. The outer symbol clips an instance of it to 0..100 × 0..100, which `test.move` moves
|
||||
// to 100..200: the outer box is 0..100, the nested box 0..200.
|
||||
let build = |middle: bool| {
|
||||
let mut d = Document::new(600.0, 400.0);
|
||||
let l = d.layers[0].id;
|
||||
let square = |d: &mut Document, r: Rect| Arc::new(Node::path(d.alloc_id(), shapes::rectangle(r), Appearance::default_art()));
|
||||
let mut squares = vec![square(&mut d, Rect::new(0.0, 0.0, 10.0, 10.0)), square(&mut d, Rect::new(190.0, 90.0, 200.0, 100.0))];
|
||||
if middle {
|
||||
squares.push(square(&mut d, Rect::new(140.0, 40.0, 160.0, 60.0)));
|
||||
}
|
||||
group_symbol(&mut d, "Two", squares);
|
||||
let (mut mask, _) = half_clipped(&mut d);
|
||||
mask.appearance.effects.push(test_move());
|
||||
let nested = instance_of(&mut d, "Two");
|
||||
let mut clip = Node::group(d.alloc_id(), vec![Arc::new(mask), nested]);
|
||||
clip.set_clips(true);
|
||||
group_symbol(&mut d, "Outer", vec![Arc::new(clip)]);
|
||||
let inst = d.alloc_id();
|
||||
d.insert(Some(l), 0, Node::new(inst, NodeKind::SymbolInstance { symbol: "Outer".into(), xf: vectorcraft_geom::Affine::IDENTITY })).unwrap();
|
||||
(d, inst)
|
||||
};
|
||||
let at = |d: &Document, x: f64, y: f64| hit_test(d, Point::new(x, y), HitOptions::default()).map(|h| h.leaf);
|
||||
let inside = Rect::new(145.0, 45.0, 155.0, 55.0);
|
||||
let (d, inst) = build(false);
|
||||
assert_eq!(at(&d, 150.0, 50.0), None, "empty space in the nested box");
|
||||
assert!(marquee(&d, inside, None, false).is_empty(), "marquee on empty space in the nested box");
|
||||
assert_eq!(at(&d, 195.0, 95.0), Some(inst), "on the nested art past the outer box");
|
||||
assert_eq!(at(&d, 50.0, 50.0), Some(inst), "in the outer box");
|
||||
let (d, inst) = build(true);
|
||||
assert_eq!(at(&d, 150.0, 50.0), Some(inst), "on the nested art");
|
||||
// Across the middle square's left edge.
|
||||
assert_eq!(marquee(&d, Rect::new(135.0, 45.0, 145.0, 55.0), None, false), [inst], "marquee on the nested art");
|
||||
}
|
||||
|
||||
/// Adds the symbol `Clipped`: a clip group whose clipping path's region `test.move` moves to
|
||||
/// 100..200 × 0..100, past the 0..100 box, over a 0..200 × 0..100 rectangle shown when `shown`.
|
||||
/// A click at (150, 50) hits an instance of it on the rectangle, or, with the rectangle hidden,
|
||||
/// walks its art and finds nothing.
|
||||
fn clipped_symbol(d: &mut Document, shown: bool) {
|
||||
set_clip_region(moved_clip_region);
|
||||
let (mut mask, mut art) = half_clipped(d);
|
||||
mask.appearance.effects.push(test_move());
|
||||
art.visible = shown;
|
||||
let mut clip = Node::group(d.alloc_id(), vec![Arc::new(mask), Arc::new(art)]);
|
||||
clip.set_clips(true);
|
||||
let root = Node::group(d.alloc_id(), vec![Arc::new(clip)]);
|
||||
d.symbols.push(crate::Symbol { dynamic: false, name: "Clipped".into(), art: Arc::new(root) });
|
||||
}
|
||||
|
||||
/// A symbol named `name` whose art is a group of `members`.
|
||||
fn group_symbol(d: &mut Document, name: &str, members: Vec<Arc<Node>>) {
|
||||
let root = Node::group(d.alloc_id(), members);
|
||||
d.symbols.push(crate::Symbol { dynamic: false, name: name.into(), art: Arc::new(root) });
|
||||
}
|
||||
|
||||
/// An instance of the symbol named `symbol`, not moved.
|
||||
fn instance_of(d: &mut Document, symbol: &str) -> Arc<Node> {
|
||||
Arc::new(Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: symbol.into(), xf: vectorcraft_geom::Affine::IDENTITY }))
|
||||
}
|
||||
|
||||
/// 30 small squares at the origin, which a click at (150, 50) passes by.
|
||||
fn far_squares(d: &mut Document) -> Vec<Arc<Node>> {
|
||||
(0..30).map(|_| Arc::new(Node::path(d.alloc_id(), shapes::rectangle(Rect::new(0.0, 0.0, 1.0, 1.0)), Appearance::default_art()))).collect()
|
||||
}
|
||||
|
||||
/// Runs `f` with [`ArtWalk`] allowing `limit` objects, and returns its result with how many
|
||||
/// leaves [`hit_leaf`] tested and how many instances' art was walked meanwhile.
|
||||
fn with_art_limit<R>(limit: u64, f: impl FnOnce() -> R) -> (R, usize, usize) {
|
||||
ART_WALK_LIMIT.with(|c| c.set(Some(limit)));
|
||||
LEAVES_TESTED.with(|c| c.set(0));
|
||||
ARTS_WALKED.with(|c| c.set(0));
|
||||
let r = f();
|
||||
ART_WALK_LIMIT.with(|c| c.set(None));
|
||||
(r, LEAVES_TESTED.with(std::cell::Cell::get), ARTS_WALKED.with(std::cell::Cell::get))
|
||||
}
|
||||
|
||||
/// One click visits at most the art walk's limit of objects in a chain of nested symbol
|
||||
/// instances, though each level's art alone is well within it. A click on the art of an
|
||||
/// instance nested in another is still found.
|
||||
#[test]
|
||||
fn a_click_walks_a_chain_of_nested_symbol_instances_within_one_limit() {
|
||||
// Level 0 is `Clipped`; each level above holds an instance of the level below and 30 squares:
|
||||
// 32 objects to visit at each level.
|
||||
let chain = |shown: bool| {
|
||||
let mut d = Document::new(600.0, 400.0);
|
||||
let l = d.layers[0].id;
|
||||
clipped_symbol(&mut d, shown);
|
||||
for level in 1..12 {
|
||||
let below = if level == 1 { "Clipped".to_string() } else { format!("Level {}", level - 1) };
|
||||
let mut members = vec![instance_of(&mut d, &below)];
|
||||
members.extend(far_squares(&mut d));
|
||||
group_symbol(&mut d, &format!("Level {level}"), members);
|
||||
}
|
||||
let inst = instance_of(&mut d, "Level 11");
|
||||
let id = inst.id;
|
||||
d.insert(Some(l), 0, Arc::unwrap_or_clone(inst)).unwrap();
|
||||
(d, id)
|
||||
};
|
||||
let at = |d: &Document, x: f64| hit_test(d, Point::new(x, 50.0), HitOptions::default()).map(|h| h.leaf);
|
||||
// Without one limit for the click, the miss walks the art of all 12 levels.
|
||||
let (d, inst) = chain(false);
|
||||
let (hit, _, arts) = with_art_limit(100, || at(&d, 150.0));
|
||||
assert_eq!(hit, None);
|
||||
assert!(arts <= 4, "{arts} levels walked");
|
||||
assert_eq!(with_art_limit(100, || at(&d, 50.0)).0, Some(inst), "in the box");
|
||||
// Past the limit, a click that the art would take finds only the box.
|
||||
let (d, inst) = chain(true);
|
||||
assert_eq!(with_art_limit(100, || at(&d, 150.0)).0, None, "past the limit");
|
||||
assert_eq!(at(&d, 150.0), Some(inst), "within the limit");
|
||||
// Two levels: a click on the inner instance's art is found within the limit.
|
||||
let mut d = Document::new(600.0, 400.0);
|
||||
let l = d.layers[0].id;
|
||||
clipped_symbol(&mut d, true);
|
||||
let inner = instance_of(&mut d, "Clipped");
|
||||
group_symbol(&mut d, "Outer", vec![inner]);
|
||||
let inst = instance_of(&mut d, "Outer");
|
||||
let id = inst.id;
|
||||
d.insert(Some(l), 0, Arc::unwrap_or_clone(inst)).unwrap();
|
||||
assert_eq!(with_art_limit(100, || at(&d, 150.0)).0, Some(id), "nested");
|
||||
}
|
||||
|
||||
/// One click, and one marquee, visit at most the art walk's limit of objects in art that repeats
|
||||
/// one nested instance many times, though the art of each instance alone is well within it. A
|
||||
/// click on one of the nested instances' art is still found.
|
||||
#[test]
|
||||
fn a_click_and_a_marquee_walk_repeated_nested_symbol_instances_within_one_limit() {
|
||||
// 50 instances of `Clipped` in one symbol's art, its rectangle shown when `shown`.
|
||||
let repeated = |shown: bool| {
|
||||
let mut d = Document::new(600.0, 400.0);
|
||||
let l = d.layers[0].id;
|
||||
clipped_symbol(&mut d, shown);
|
||||
let members = (0..50).map(|_| instance_of(&mut d, "Clipped")).collect();
|
||||
group_symbol(&mut d, "Repeated", members);
|
||||
let inst = instance_of(&mut d, "Repeated");
|
||||
let id = inst.id;
|
||||
d.insert(Some(l), 0, Arc::unwrap_or_clone(inst)).unwrap();
|
||||
(d, id)
|
||||
};
|
||||
let (d, inst) = repeated(false);
|
||||
// Without one limit for the click, the miss walks the art of all 51 instances. The outer art
|
||||
// takes 1 object of the 100, and each nested instance with its art 4.
|
||||
let (hit, _, arts) = with_art_limit(100, || hit_test(&d, Point::new(150.0, 50.0), HitOptions::default()).map(|h| h.leaf));
|
||||
assert_eq!(hit, None);
|
||||
assert!(arts <= 26, "{arts} instances' art walked");
|
||||
// Select Behind over 60 instances of `Clipped` on the layer shares one limit too: each walk
|
||||
// takes 3 objects of the 100.
|
||||
let mut stack = Document::new(600.0, 400.0);
|
||||
let l = stack.layers[0].id;
|
||||
clipped_symbol(&mut stack, false);
|
||||
for _ in 0..60 {
|
||||
let inst = instance_of(&mut stack, "Clipped");
|
||||
stack.insert(Some(l), 0, Arc::unwrap_or_clone(inst)).unwrap();
|
||||
}
|
||||
let (behind, _, arts) = with_art_limit(100, || objects_at(&stack, Point::new(150.0, 50.0), HitOptions::default(), None));
|
||||
assert!(behind.is_empty());
|
||||
assert!(arts <= 34, "Select Behind: {arts} instances' art walked");
|
||||
// Without one limit for the marquee, it places the art of all 51 instances, inside the moved
|
||||
// region (within each instance's reach and outside its box). Placing the outer art takes 51
|
||||
// objects of the 100, and each nested art 4.
|
||||
let inside = Rect::new(140.0, 40.0, 160.0, 60.0);
|
||||
let (touched, _, arts) = with_art_limit(100, || marquee(&d, inside, None, false));
|
||||
assert!(touched.is_empty());
|
||||
assert!(arts <= 14, "{arts} instances' art placed");
|
||||
assert_eq!(with_art_limit(100, || marquee(&d, Rect::new(40.0, 40.0, 60.0, 60.0), None, false)).0, [inst], "in the box");
|
||||
// A click and a marquee on the nested instances' art are found within the limit.
|
||||
let (d, inst) = repeated(true);
|
||||
assert_eq!(with_art_limit(100, || hit_test(&d, Point::new(150.0, 50.0), HitOptions::default()).map(|h| h.leaf)).0, Some(inst), "click");
|
||||
let edge = Rect::new(140.0, -5.0, 160.0, 5.0);
|
||||
assert_eq!(with_art_limit(100, || marquee(&d, edge, None, false)).0, [inst], "marquee across the art's edge");
|
||||
}
|
||||
|
||||
/// In a dynamic symbol's art that placing through its 9-slice guides could make more than
|
||||
/// [`crate::MAX_SYMBOL_NODES`] objects of, Direct Selection picks and outlines nothing, as the
|
||||
/// canvas draws nothing of it. At the art's natural size the same art is picked.
|
||||
|
||||
+31
-3
@@ -281,7 +281,13 @@ fn node_bytes(n: &Node, other: Option<&Node>, counted: &mut HashSet<usize>) -> u
|
||||
});
|
||||
}
|
||||
b += match &n.kind {
|
||||
NodeKind::Path { path, live, .. } => path_bytes(path) + boxed(live),
|
||||
NodeKind::Path { path, live, .. } => {
|
||||
let was = other.and_then(|o| match &o.kind {
|
||||
NodeKind::Path { path, .. } => Some(path),
|
||||
_ => None,
|
||||
});
|
||||
path_bytes_besides(path, was) + boxed(live)
|
||||
}
|
||||
NodeKind::Layer { children, .. }
|
||||
| NodeKind::Group { children, .. }
|
||||
| NodeKind::Compound { children, .. }
|
||||
@@ -298,8 +304,30 @@ fn node_bytes(n: &Node, other: Option<&Node>, counted: &mut HashSet<usize>) -> u
|
||||
}
|
||||
|
||||
fn path_bytes(p: &PathData) -> usize {
|
||||
let anchors: usize =
|
||||
p.subpaths.iter().map(|s| if s.anchors.capacity() == 0 { 0 } else { ALLOC + s.anchors.capacity() * size_of::<Anchor>() }).sum();
|
||||
path_bytes_besides(p, None)
|
||||
}
|
||||
|
||||
/// [`path_bytes`] without the anchor chunks that `other` (another version of the path) holds too:
|
||||
/// a version made by changing one anchor shares every chunk but the one it changed.
|
||||
fn path_bytes_besides(p: &PathData, other: Option<&PathData>) -> usize {
|
||||
let mut shared: Vec<usize> =
|
||||
other.map(|o| o.subpaths.iter().flat_map(|s| s.anchors.chunk_allocations()).map(|(id, _)| id).collect()).unwrap_or_default();
|
||||
shared.sort_unstable();
|
||||
let chunk = ALLOC + ARC + size_of::<Vec<Anchor>>() + ALLOC;
|
||||
let anchors: usize = p
|
||||
.subpaths
|
||||
.iter()
|
||||
.map(|s| {
|
||||
let table = s.anchors.table_bytes();
|
||||
let own: usize = s
|
||||
.anchors
|
||||
.chunk_allocations()
|
||||
.filter(|(id, _)| shared.binary_search(id).is_err())
|
||||
.map(|(_, capacity)| chunk + capacity * size_of::<Anchor>())
|
||||
.sum();
|
||||
if table == 0 { own } else { ALLOC + table + own }
|
||||
})
|
||||
.sum();
|
||||
anchors + if p.subpaths.capacity() == 0 { 0 } else { ALLOC + p.subpaths.capacity() * size_of::<SubPath>() }
|
||||
}
|
||||
|
||||
|
||||
@@ -17,22 +17,52 @@ pub enum Justify {
|
||||
JustifyAll,
|
||||
}
|
||||
|
||||
/// Paragraph composer (Paragraph panel menu): how lines are broken.
|
||||
/// Paragraph composer (Paragraph panel menu): how lines are broken, and whether complex scripts
|
||||
/// (Indic, Arabic, Hebrew) are shaped. `SingleLine` and `EveryLine` are the Middle Eastern & South
|
||||
/// Asian composers: they shape complex scripts with the font's layout tables, as all type is set
|
||||
/// here, and are what documents saved before the four composers existed use. The `Standard`
|
||||
/// composers break lines the same way but set a complex script glyph by glyph as the font maps its
|
||||
/// characters, with no conjuncts, marks placed or joining forms: what fonts that keep a script's
|
||||
/// glyphs on Latin character codes (legacy ANSI Indic fonts) need.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub enum Composer {
|
||||
/// Break each line as soon as it is full.
|
||||
/// Middle Eastern & South Asian Single-line Composer: break each line as soon as it is full.
|
||||
SingleLine,
|
||||
/// Total fit over the whole paragraph (Illustrator's default): justified lines get even word
|
||||
/// spacing, ragged lines an even rag.
|
||||
/// Middle Eastern & South Asian Every-line Composer: total fit over the whole paragraph
|
||||
/// (Illustrator's default): justified lines get even word spacing, ragged lines an even rag.
|
||||
#[default]
|
||||
EveryLine,
|
||||
/// Standard Single-line Composer: [`Composer::SingleLine`]'s breaks, complex scripts not shaped.
|
||||
StandardSingleLine,
|
||||
/// Standard Every-line Composer: [`Composer::EveryLine`]'s breaks, complex scripts not shaped.
|
||||
StandardEveryLine,
|
||||
}
|
||||
|
||||
impl Composer {
|
||||
fn is_default(&self) -> bool {
|
||||
*self == Self::default()
|
||||
}
|
||||
|
||||
/// Does this composer break lines one at a time (as opposed to a total fit)?
|
||||
pub fn is_single_line(self) -> bool {
|
||||
matches!(self, Self::SingleLine | Self::StandardSingleLine)
|
||||
}
|
||||
|
||||
/// Does this composer shape complex scripts ([`Composer::SingleLine`], [`Composer::EveryLine`])?
|
||||
pub fn shapes_complex_scripts(self) -> bool {
|
||||
matches!(self, Self::SingleLine | Self::EveryLine)
|
||||
}
|
||||
|
||||
/// The same shaping with the other line breaking (`single_line`: one line at a time).
|
||||
pub fn with_breaking(self, single_line: bool) -> Self {
|
||||
match (single_line, self.shapes_complex_scripts()) {
|
||||
(true, true) => Self::SingleLine,
|
||||
(true, false) => Self::StandardSingleLine,
|
||||
(false, true) => Self::EveryLine,
|
||||
(false, false) => Self::StandardEveryLine,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A paragraph's hyphenation options (Paragraph panel menu › Hyphenation…): which words automatic
|
||||
|
||||
@@ -859,7 +859,7 @@ pub fn effect_catalog() -> Vec<EffectInfo> {
|
||||
crate::SVG_FILTER,
|
||||
"SVG Filter",
|
||||
&["Effect", "SVG Filters"],
|
||||
"{name: string (the filter's id), xml: string (one SVG <filter> element with an id and 1..64 primitives, at most 64 KB), scale: number 0.001..1000 (1; points per unit of the filter's user space), origin: [x, y] pt ([0, 0]; where the filter's user space starts in the document)} runs the SVG filter on the object's pixels, its lengths in points times scale, at the Document Raster Effects resolution or finer; svgFilter.apply applies one of the document's filters (svgFilter.list)",
|
||||
"{name: string (the filter's id), xml: string (one SVG <filter> element with an id and 1..64 primitives, at most 64 KB), scale: number 0.001..1000 (1; points per unit of the filter's user space), origin: [x, y] pt ([0, 0]; where the filter's user space starts in the document), axes?: [a, b, c, d] (absent or [1, 0, 0, 1]: the document's axes, and not null; the document directions of one unit along the filter's x axis [a, b] and y axis [c, d] before scale, each -1000..1000, with a·d - b·c at least 0.001 from 0; a turned, skewed or unevenly scaled user space, as SVG import gives a filtered element under a rotate, skew or uneven scale; the filter's offsets, blurs and region run along these axes; moving, turning or skewing the object moves origin and leaves axes)} runs the SVG filter on the object's pixels, its lengths in points times scale, at the Document Raster Effects resolution or finer; svgFilter.apply applies one of the document's filters (svgFilter.list)",
|
||||
json!({"scale": 1.0, "origin": [0.0, 0.0]}),
|
||||
));
|
||||
v
|
||||
|
||||
@@ -171,7 +171,7 @@ pub(crate) fn validate_in(doc: Option<&Document>, n: &Node, id: &str, p: &Value)
|
||||
}
|
||||
}
|
||||
}
|
||||
let casting = shapes.iter().filter(|s| surface_item(&s.items).is_some_and(|i| paint_of(i).1 * s.opacity > 0.0));
|
||||
let casting = shapes.iter().filter(|s| surface_item(&s.items).is_some_and(|i| crate::solids::shadow::casts(paint_of(i).1 * s.opacity)));
|
||||
return check_shadow(p, casting.map(|s| &s.path), b, options);
|
||||
}
|
||||
let (path, _) = object_profile(n, "Revolve")?;
|
||||
@@ -350,8 +350,8 @@ fn geometry(path: &PathData, fx: &[Effect], ctx: &GeomContext) -> PathData {
|
||||
|
||||
/// The shadow of Revolve `fx` cast by the surface of `path` in `item`'s paint about the axis of
|
||||
/// `b`, revolved with `options`, as dark as `item` is opaque and in its blending mode; `None` with
|
||||
/// the shadow off, when `item` is fully transparent or when it casts nothing, and an error when
|
||||
/// the surface it is cast from is past the limits.
|
||||
/// the shadow off, when `item` is fully transparent or its opacity is not a finite number, or when
|
||||
/// it casts nothing, and an error when the surface it is cast from is past the limits.
|
||||
///
|
||||
/// `kept` holds the faces the surface drawn kept for its shadow ([`surface`]); without them the
|
||||
/// surface is swept again for its shadow alone.
|
||||
@@ -366,7 +366,7 @@ fn shadow_of(
|
||||
) -> Result<Option<Node>, String> {
|
||||
let Some(settings) = crate::solids::shadow::options(&merged_params(&fx.id, &fx.params)) else { return Ok(None) };
|
||||
let (_, opacity, blend) = paint_of(item);
|
||||
if opacity <= 0.0 {
|
||||
if !crate::solids::shadow::casts(opacity) {
|
||||
return Ok(None);
|
||||
}
|
||||
let mut caster = vectorcraft_three_d::ShadowCaster::new();
|
||||
@@ -377,7 +377,7 @@ fn shadow_of(
|
||||
/// Does Revolve `fx` cast a shadow, so a surface in paint as opaque as `opacity` keeps the faces
|
||||
/// its shadow is cast from ([`surface`])?
|
||||
fn casts(fx: &Effect, opacity: f32) -> bool {
|
||||
opacity > 0.0 && crate::solids::shadow::options(&merged_params(&fx.id, &fx.params)).is_some()
|
||||
crate::solids::shadow::casts(opacity) && crate::solids::shadow::options(&merged_params(&fx.id, &fx.params)).is_some()
|
||||
}
|
||||
|
||||
/// Add the surface of `path` about the axis of `b` to `caster`: the faces it kept when it was
|
||||
@@ -420,9 +420,9 @@ fn group_shadow(
|
||||
for s in shapes {
|
||||
let kept = kept.next().flatten();
|
||||
let Some((_, opacity, blend)) = surface_item(&s.items).map(paint_of) else { continue };
|
||||
// A member whose surface is fully transparent casts nothing.
|
||||
// A member whose surface is fully transparent, or whose opacity is not a finite number, casts nothing.
|
||||
let ink = crate::solids::shadow::Ink { opacity: opacity * s.opacity, blend };
|
||||
if ink.opacity <= 0.0 {
|
||||
if !ink.casts() {
|
||||
continue;
|
||||
}
|
||||
let faces = cast_surface(&mut caster, &s.path, b, options, kept)?;
|
||||
@@ -1861,6 +1861,55 @@ mod tests {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A surface whose fill, or whose member, is at NaN or infinite opacity casts no shadow, as one
|
||||
/// at 0 % does, whether the shadow is cast from the surface drawn or swept for it alone; the
|
||||
/// member beside it still casts its part.
|
||||
#[test]
|
||||
fn a_surface_whose_opacity_is_not_a_finite_number_casts_no_shadow() {
|
||||
let fx = crate::new_effect(REVOLVE, &json!({"shadow": true})).unwrap();
|
||||
let group = |opacity: f32| {
|
||||
let mut other = profile_node();
|
||||
other.id = NodeId(2);
|
||||
other.transform(Affine::translate((120.0, 0.0)), false);
|
||||
other.opacity = opacity;
|
||||
let mut g = Node::group(NodeId(9), vec![Arc::new(profile_node()), Arc::new(other)]);
|
||||
g.appearance.effects.push(fx.clone());
|
||||
g
|
||||
};
|
||||
let group_shadows = |g: &Node| {
|
||||
let shapes = members(g, "").unwrap();
|
||||
let b = union_bounds(&shapes).unwrap();
|
||||
let options = shared_options(&shapes, fx_options(&fx)).unwrap();
|
||||
let kept: Vec<Option<SolidFaces>> = shapes
|
||||
.iter()
|
||||
.map(|s| {
|
||||
let (paint, opacity, blend) = paint_of(surface_item(&s.items).unwrap());
|
||||
let cast = casts(&fx, opacity * s.opacity);
|
||||
surface(None, g, &s.path, b, options, &fx, paint, opacity, blend, false, &mut Copies::default(), cast).unwrap().2
|
||||
})
|
||||
.collect();
|
||||
[group_shadow(g.id, &fx, &shapes, b, options, kept).unwrap(), group_shadow(g.id, &fx, &shapes, b, options, vec![]).unwrap()]
|
||||
.map(|art| format!("{art:?}"))
|
||||
};
|
||||
let expected = group_shadows(&group(0.0));
|
||||
for bad in [f32::NAN, f32::INFINITY] {
|
||||
let mut n = profile_node();
|
||||
if let AppearanceItem::Fill(f) = &mut n.appearance.items[0] {
|
||||
f.opacity = bad;
|
||||
}
|
||||
let (path, _) = profile(&n).unwrap();
|
||||
let b = path.bounds().unwrap();
|
||||
let item = surface_item(&n.appearance.items).unwrap();
|
||||
assert!(!casts(&fx, bad), "{bad}: the surface keeps no faces for a shadow");
|
||||
let (_, kept) = object_surface(None, &n, &path, &fx, item, false, &mut Copies::default()).unwrap();
|
||||
assert_eq!(shadow_of(n.id, &fx, &path, item, b, fx_options(&fx), kept).unwrap(), None, "{bad} drawn");
|
||||
assert_eq!(shadow_of(n.id, &fx, &path, item, b, fx_options(&fx), None).unwrap(), None, "{bad} alone");
|
||||
let shadows = group_shadows(&group(bad));
|
||||
assert!(!expected[0].is_empty() && expected[0] != "[]", "the opaque member casts");
|
||||
assert_eq!(shadows, expected, "{bad}: only the opaque member casts");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
@@ -1504,8 +1504,8 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result<Option<
|
||||
let view = view_options(p);
|
||||
let mut caster = vectorcraft_three_d::ShadowCaster::new();
|
||||
// The faces each solid of visible art added, with its member's scopes and its ink (opacity
|
||||
// and blending mode), in order. A fully transparent fill or stroke (or member) casts nothing
|
||||
// and does not place the plane.
|
||||
// and blending mode), in order. A fill or stroke (or member) that is fully transparent, or whose
|
||||
// opacity is not a finite number, casts nothing and does not place the plane ([`shadow::Ink::casts`]).
|
||||
let mut cast: Vec<shadow::Cast> = vec![];
|
||||
let ink = |item: &AppearanceItem, member: f32| {
|
||||
let (_, opacity, blend) = paint_of(item, member);
|
||||
@@ -1513,7 +1513,7 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result<Option<
|
||||
};
|
||||
if id == ROTATE {
|
||||
for s in shapes {
|
||||
for item in s.items.iter().filter(|i| ink(i, s.opacity).opacity > 0.0) {
|
||||
for item in s.items.iter().filter(|i| ink(i, s.opacity).casts()) {
|
||||
let (area, rule) = region(&s.path, s.rule, item);
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + 1));
|
||||
@@ -1527,7 +1527,7 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result<Option<
|
||||
// Inflate's eye is placed for every shape together, as the solids are.
|
||||
let added: Vec<Result<std::ops::Range<usize>, String>> = if id == INFLATE {
|
||||
let shapes: Vec<(&PathData, FillRule)> = parts.iter().map(|(_, _, area, rule, _, _)| (area, *rule)).collect();
|
||||
let casts: Vec<bool> = inks.iter().map(|i| i.opacity > 0.0).collect();
|
||||
let casts: Vec<bool> = inks.iter().map(|i| i.casts()).collect();
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + shapes.len()));
|
||||
#[cfg(test)]
|
||||
@@ -1537,15 +1537,15 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result<Option<
|
||||
let mut added = vec![];
|
||||
for ((_, _, area, rule, _, _), ink) in parts.iter().zip(&inks) {
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + usize::from(ink.opacity > 0.0)));
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + usize::from(ink.casts())));
|
||||
#[cfg(test)]
|
||||
SOLID_GEOMETRY_BUILT.with(|n| n.set(n.get() + usize::from(ink.opacity > 0.0)));
|
||||
added.push(if ink.opacity > 0.0 { caster.extrude(area, *rule, bounds, extrude_options(p), view) } else { Ok(0..0) });
|
||||
SOLID_GEOMETRY_BUILT.with(|n| n.set(n.get() + usize::from(ink.casts())));
|
||||
added.push(if ink.casts() { caster.extrude(area, *rule, bounds, extrude_options(p), view) } else { Ok(0..0) });
|
||||
}
|
||||
added
|
||||
};
|
||||
for (((item, _, _, _, scopes, _), ink), faces) in parts.iter().zip(inks).zip(added) {
|
||||
if ink.opacity <= 0.0 {
|
||||
if !ink.casts() {
|
||||
continue;
|
||||
}
|
||||
// A stroke whose own solid is past the limits is left out; past the shadow's limit for
|
||||
@@ -1584,7 +1584,7 @@ fn cast_built<'a>(id: &str, p: &Value, shapes: &'a [Profile], built: Vec<Option<
|
||||
}
|
||||
for ((s, item), kept) in items.into_iter().zip(built) {
|
||||
let ink = ink(item, s.opacity);
|
||||
if ink.opacity <= 0.0 {
|
||||
if !ink.casts() {
|
||||
continue;
|
||||
}
|
||||
let Some(kept) = kept else { continue };
|
||||
@@ -1599,7 +1599,7 @@ fn cast_built<'a>(id: &str, p: &Value, shapes: &'a [Profile], built: Vec<Option<
|
||||
for ((item, member, _, _, scopes, _), kept) in parts.iter().zip(built) {
|
||||
let ink = ink(item, *member);
|
||||
// A fully transparent solid, or a stroke's solid left out of the art, casts nothing.
|
||||
let Some(kept) = kept.filter(|_| ink.opacity > 0.0) else { continue };
|
||||
let Some(kept) = kept.filter(|_| ink.casts()) else { continue };
|
||||
// A stroke whose own solid is past the limits is left out; past the shadow's limit for all
|
||||
// the solids together, the shadow is refused.
|
||||
let faces = match caster.add_solid(kept) {
|
||||
|
||||
@@ -50,6 +50,19 @@ pub(crate) struct Ink {
|
||||
pub(crate) blend: BlendMode,
|
||||
}
|
||||
|
||||
impl Ink {
|
||||
/// Whether art in this ink casts part of a shadow ([`casts`]).
|
||||
pub(crate) fn casts(self) -> bool {
|
||||
casts(self.opacity)
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether art at `opacity` casts part of a shadow: its opacity is a finite number above zero.
|
||||
/// Art at zero, negative, NaN or infinite opacity casts nothing.
|
||||
pub(crate) fn casts(opacity: f32) -> bool {
|
||||
opacity.is_finite() && opacity > 0.0
|
||||
}
|
||||
|
||||
/// The shadow of the faces in `caster` as a path of object `id`, cast by art in `ink`: filled
|
||||
/// black at [`SHADOW_OPACITY`] times its opacity, in its blending mode, with the nonzero rule;
|
||||
/// `None` when it casts nothing.
|
||||
|
||||
@@ -374,3 +374,63 @@ fn the_check_casts_no_shadow_in_wireframe_mode() {
|
||||
assert_eq!(SOLIDS_BUILT.with(std::cell::Cell::get) - start, solids, "{id}");
|
||||
}
|
||||
}
|
||||
|
||||
/// The opacity of each part of the shadow of `n` (its 3D effect's shadow on) and the shadow's art,
|
||||
/// as [`cast_shadow`] casts it from solids built for the shadow alone and as [`cast_built`] casts
|
||||
/// it from the faces the solids drawn kept.
|
||||
fn cast_parts(n: &Node) -> [(Vec<f32>, String); 2] {
|
||||
let (_, fx) = solid(&n.appearance.effects).unwrap();
|
||||
let shapes = if is_container(n) {
|
||||
members(n, "").unwrap()
|
||||
} else {
|
||||
let (path, rule) = profile(n).unwrap();
|
||||
vec![Profile { path, rule, items: solid_paint_sources(n).1, opacity: 1.0, scopes: vec![] }]
|
||||
};
|
||||
let p = crate::merged_params(&fx.id, &fx.params);
|
||||
let (_, built) = surfaces_for(None, n, fx, &shapes, true).unwrap();
|
||||
[cast_shadow(&fx.id, &p, &shapes), cast_built(&fx.id, &p, &shapes, built)].map(|c| {
|
||||
let (caster, settings, cast) = c.unwrap().unwrap();
|
||||
let inks = cast.iter().map(|(_, ink, _)| ink.opacity).collect();
|
||||
(inks, format!("{:?}", shadow::scoped_art(n.id, &caster, settings, cast, has_masks(&shapes))))
|
||||
})
|
||||
}
|
||||
|
||||
/// A fill, a stroke or a member whose opacity is NaN or infinite casts no part of the shadow, as one
|
||||
/// at 0 % does, whether the shadow is cast from solids built for it or from the solids drawn; the
|
||||
/// art beside it still casts its part.
|
||||
#[test]
|
||||
fn art_whose_opacity_is_not_a_finite_number_casts_no_shadow() {
|
||||
// The art with opacity `opacity` in one place: a square's stroke, the fill of a group's second
|
||||
// member, and a group's second member.
|
||||
let objects = |opacity: f32| {
|
||||
let mut fill = square_node(2, 200.0);
|
||||
for item in &mut fill.appearance.items {
|
||||
if let AppearanceItem::Fill(f) = item {
|
||||
f.opacity = opacity;
|
||||
}
|
||||
}
|
||||
let mut member = square_node(2, 200.0);
|
||||
member.opacity = opacity;
|
||||
[
|
||||
stroked_square(1, 0.0, opacity),
|
||||
Node::group(NodeId(9), vec![Arc::new(square_node(1, 0.0)), Arc::new(fill)]),
|
||||
Node::group(NodeId(9), vec![Arc::new(square_node(1, 0.0)), Arc::new(member)]),
|
||||
]
|
||||
};
|
||||
for id in [EXTRUDE, INFLATE, ROTATE] {
|
||||
for bad in [f32::NAN, f32::INFINITY] {
|
||||
for (i, (mut n, mut clear)) in objects(bad).into_iter().zip(objects(0.0)).enumerate() {
|
||||
n.appearance.effects.push(crate::new_effect(id, &json!({"shadow": true})).unwrap());
|
||||
clear.appearance.effects.push(crate::new_effect(id, &json!({"shadow": true})).unwrap());
|
||||
let expected = cast_parts(&clear);
|
||||
for (k, (inks, shadow)) in cast_parts(&n).into_iter().enumerate() {
|
||||
assert_eq!(inks, vec![1.0], "{id} {bad} object {i} cast {k}: only the opaque art casts");
|
||||
assert_eq!(shadow, expected[k].1, "{id} {bad} object {i} cast {k}");
|
||||
}
|
||||
let mut opacities = vec![];
|
||||
art(&n, id).unwrap().walk(&mut |c| opacities.extend(shadow_opacity(c)));
|
||||
assert_eq!(opacities, vec![0.5], "{id} {bad} object {i}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
//! Effect › SVG Filters (`svg.filter`): an SVG `<filter>` element applied as a live raster effect.
|
||||
//! The filter runs on the object's pixels as SVG 1.1 describes it
|
||||
//! (<https://www.w3.org/TR/SVG11/filters.html>), drawn by resvg. Its lengths are in points times
|
||||
//! the effect's `scale`, its user space starts at the effect's `origin`, its object bounding box is the box of the drawn pixels, and it runs at the
|
||||
//! the effect's `scale`, its user space starts at the effect's `origin`, its axes point as the effect's `axes` say (a turned or
|
||||
//! skewed user space), its object bounding box is the box of the drawn pixels, and it runs at the
|
||||
//! Document Raster Effects resolution when the view shows the object at a finer one.
|
||||
|
||||
use std::sync::Arc;
|
||||
@@ -1224,13 +1225,16 @@ fn region_length(v: Option<&str>, default: f64, user: bool) -> Length {
|
||||
}
|
||||
|
||||
/// An SVG filter effect: the filter's XML, how many points one of its units is, where its user
|
||||
/// space's origin lies in the document, and its region.
|
||||
/// space's origin lies in the document, which way its axes point, and its region.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct SvgFilterFx {
|
||||
/// The filter as it is drawn and written ([`rebuilt`]).
|
||||
xml: Arc<str>,
|
||||
scale: f64,
|
||||
origin: Vec2,
|
||||
/// The directions of the user space's axes in the document, before `scale` ([`axes_param`]):
|
||||
/// the identity unless the user space is turned, skewed or scaled unevenly.
|
||||
axes: Affine,
|
||||
/// Its region (filter effects region): x, y, width, height.
|
||||
region: [Length; 4],
|
||||
/// Is the region in user space with a length measured against the object's box? It is then
|
||||
@@ -1250,11 +1254,92 @@ fn origin_param(p: &Value) -> Vec2 {
|
||||
Vec2::new(at(0), at(1))
|
||||
}
|
||||
|
||||
/// The largest magnitude of an entry of an SVG filter effect's `axes`.
|
||||
pub const MAX_AXIS: f64 = 1000.0;
|
||||
|
||||
/// The smallest magnitude of the determinant of an SVG filter effect's `axes`.
|
||||
pub const MIN_AXES_DET: f64 = 0.001;
|
||||
|
||||
/// The `axes` of an SVG filter effect's parameters `p`: `[a, b, c, d]`, the document directions
|
||||
/// of one unit along the filter's x axis (`[a, b]`) and its y axis (`[c, d]`), before `scale`.
|
||||
/// The identity when absent; `None` when it isn't four numbers from -[`MAX_AXIS`] to [`MAX_AXIS`]
|
||||
/// whose determinant is at least [`MIN_AXES_DET`] across ([`valid_axes`]).
|
||||
fn axes_param(p: &Value) -> Option<Affine> {
|
||||
match p.get("axes") {
|
||||
None | Some(Value::Null) => Some(Affine::IDENTITY),
|
||||
Some(v) => valid_axes(v),
|
||||
}
|
||||
}
|
||||
|
||||
/// `v` as the linear map of an SVG filter effect's `axes` ([`axes_param`]), when it is one.
|
||||
pub fn valid_axes(v: &Value) -> Option<Affine> {
|
||||
let n: Vec<f64> = v.as_array()?.iter().map(Value::as_f64).collect::<Option<_>>()?;
|
||||
axes_of(<[f64; 4]>::try_from(n).ok()?)
|
||||
}
|
||||
|
||||
/// `[a, b, c, d]` as the linear map of an SVG filter effect's `axes`, when the effect takes it ([`valid_axes`]).
|
||||
fn axes_of([a, b, c, d]: [f64; 4]) -> Option<Affine> {
|
||||
let det = a * d - b * c;
|
||||
([a, b, c, d].iter().all(|v| v.is_finite() && v.abs() <= MAX_AXIS) && det.abs() >= MIN_AXES_DET).then(|| Affine::new([a, b, c, d, 0.0, 0.0]))
|
||||
}
|
||||
|
||||
/// A filter's user space as the SVG filter effect stores it ([`user_space`]).
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub struct UserSpace {
|
||||
/// The effect's `scale`.
|
||||
pub scale: f64,
|
||||
/// The effect's `origin`.
|
||||
pub origin: [f64; 2],
|
||||
/// The effect's `axes`; `None` when the axes are the document's.
|
||||
pub axes: Option<[f64; 4]>,
|
||||
}
|
||||
|
||||
/// `ts`, a user space mapped to the document, as the SVG filter effect's `scale` (the square root
|
||||
/// of its area scale), `origin` and, when it turns, skews or scales unevenly, `axes`. `None` when
|
||||
/// it can't be stored: not finite, `scale` outside 0.001..1000, or `axes` the effect refuses
|
||||
/// ([`valid_axes`]).
|
||||
pub fn user_space(ts: Affine) -> Option<UserSpace> {
|
||||
let [a, b, c, d, e, f] = ts.as_coeffs();
|
||||
if ![a, b, c, d, e, f].iter().all(|v| v.is_finite()) {
|
||||
return None;
|
||||
}
|
||||
let scale = ts.determinant().abs().sqrt();
|
||||
if !(0.001..=1000.0).contains(&scale) {
|
||||
return None;
|
||||
}
|
||||
let even = b == 0.0 && c == 0.0 && a > 0.0 && (a - d).abs() <= 1e-9 * a.max(1.0);
|
||||
if even {
|
||||
return Some(UserSpace { scale: a, origin: [e, f], axes: None });
|
||||
}
|
||||
let axes = [a, b, c, d].map(|v| v / scale);
|
||||
axes_of(axes)?;
|
||||
Some(UserSpace { scale, origin: [e, f], axes: Some(axes) })
|
||||
}
|
||||
|
||||
/// The longest a unit vector becomes under the linear part of `a` (its largest singular value).
|
||||
fn stretch(a: Affine) -> f64 {
|
||||
let [a, b, c, d, _, _] = a.as_coeffs();
|
||||
let sum = a * a + b * b + c * c + d * d;
|
||||
let det = a * d - b * c;
|
||||
(0.5 * (sum + (sum * sum - 4.0 * det * det).max(0.0).sqrt())).sqrt()
|
||||
}
|
||||
|
||||
/// The share of a raster pixel, `space.px` points wide, that a pixel of the Document Raster Effects
|
||||
/// resolution is (at most 1).
|
||||
fn raster_resolution(space: &PixelSpace) -> f64 {
|
||||
if space.line.is_finite() && space.line > 0.0 && space.px.is_finite() && space.px > 0.0 { (space.px / space.line).min(1.0) } else { 1.0 }
|
||||
}
|
||||
|
||||
/// How many times the raster's pixels a turned filter's canvas may hold ([`SvgFilterFx::turned_canvas`]).
|
||||
const TURNED_ROOM: f64 = 4.0;
|
||||
|
||||
impl SvgFilterFx {
|
||||
/// The effect's parameters `p` (defaults merged in): `xml`, the `<filter>` element, `scale`
|
||||
/// and `origin`. `None` when `xml` isn't a filter [`check`] takes, however the effect came to
|
||||
/// hold it (an opened file, a script): the object is then drawn, printed and exported without it.
|
||||
/// The effect's parameters `p` (defaults merged in): `xml`, the `<filter>` element, `scale`,
|
||||
/// `origin` and `axes`. `None` when `xml` isn't a filter [`check`] takes, or `axes` isn't
|
||||
/// valid ([`axes_param`]), however the effect came to hold it (an opened file, a script): the
|
||||
/// object is then drawn, printed and exported without it.
|
||||
pub(crate) fn parse(p: &Value) -> Option<Self> {
|
||||
let axes = axes_param(p)?;
|
||||
let xml = checked(text(p, "xml", ""))?;
|
||||
let (wrapped, _) = wrap(&xml);
|
||||
let doc = roxmltree::Document::parse(&wrapped).ok()?;
|
||||
@@ -1273,7 +1358,17 @@ impl SvgFilterFx {
|
||||
let (window, blur) = (largest(&["radius", "kernelUnitLength"]), largest(&["stdDeviation"]));
|
||||
let box_units = f.attribute("primitiveUnits").is_some_and(|u| u.trim() == "objectBoundingBox");
|
||||
let scale = num(p, "scale", 1.0).clamp(1e-3, 1e3);
|
||||
Some(Self { xml, scale, origin: origin_param(p), region, measured, window, blur, box_units })
|
||||
Some(Self { xml, scale, origin: origin_param(p), axes, region, measured, window, blur, box_units })
|
||||
}
|
||||
|
||||
/// The filter's user space → the document: moved to `origin`, scaled by `scale`, along `axes`.
|
||||
pub fn to_doc(&self) -> Affine {
|
||||
Affine::translate(self.origin) * Affine::scale(self.scale) * self.axes
|
||||
}
|
||||
|
||||
/// The box of `bounds` (document units) in the filter's user space.
|
||||
fn user_box(&self, bounds: Rect) -> Rect {
|
||||
self.to_doc().inverse().transform_rect_bbox(bounds)
|
||||
}
|
||||
|
||||
/// The filter's region in its user space for an object whose box there is `b`: lengths in user
|
||||
@@ -1308,11 +1403,11 @@ impl SvgFilterFx {
|
||||
with_attributes(xml, &[("x", r.x0), ("y", r.y0), ("width", r.width()), ("height", r.height())])
|
||||
}
|
||||
|
||||
/// The filter as SVG output writes it (one unit a point, [`Self::in_points`]) for an object
|
||||
/// whose box in the document is `bounds`: in its SVG 1.1 form ([`svg11`]), `None` when SVG 1.1
|
||||
/// can't hold it ([`Self::writes_as_svg11`]).
|
||||
pub fn written_xml(&self, bounds: Rect) -> Option<String> {
|
||||
let out = self.with_region(&self.svg11_form()?, (bounds - self.origin).scale_from_origin(1.0 / self.scale))?;
|
||||
/// The filter as SVG output writes it, in its user space ([`Self::to_doc`]), for an object
|
||||
/// whose box in that user space is `user_box`: in its SVG 1.1 form ([`svg11`]), `None` when SVG
|
||||
/// 1.1 can't hold it ([`Self::writes_as_svg11`]).
|
||||
pub fn written_xml(&self, user_box: Rect) -> Option<String> {
|
||||
let out = self.with_region(&self.svg11_form()?, user_box)?;
|
||||
(written_len(&out) <= MAX_WRITTEN_XML).then_some(out)
|
||||
}
|
||||
|
||||
@@ -1345,10 +1440,11 @@ impl SvgFilterFx {
|
||||
if !(space.px.is_finite() && space.px > 0.0) {
|
||||
return 1.0;
|
||||
}
|
||||
let mut s: f64 = if space.line.is_finite() && space.line > 0.0 { (space.px / space.line).min(1.0) } else { 1.0 };
|
||||
// A length spans length × scale / px raster pixels, or a fraction of the box.
|
||||
let mut s = raster_resolution(space);
|
||||
// A length spans at most length × scale × the axes' stretch / px raster pixels, or a fraction of the box.
|
||||
let reach = self.scale * stretch(self.axes);
|
||||
for (length, most) in [(self.window, MAX_WINDOW_PX), (self.blur, MAX_BLUR_PX)] {
|
||||
let px = if self.box_units { length * box_px.max(0.0) } else { length * self.scale / space.px };
|
||||
let px = if self.box_units { length * box_px.max(0.0) } else { length * reach / space.px };
|
||||
if px * s > most {
|
||||
s = most / px;
|
||||
}
|
||||
@@ -1374,15 +1470,21 @@ impl SvgFilterFx {
|
||||
self.measured
|
||||
}
|
||||
|
||||
/// Does one unit of the filter's user space measure one point (its `scale` is 1)?
|
||||
pub fn in_points(&self) -> bool {
|
||||
self.scale == 1.0
|
||||
/// Is the filter's user space the document's, only moved: one unit a point, its axes the
|
||||
/// document's (`scale` 1, no `axes`)?
|
||||
pub fn moves_only(&self) -> bool {
|
||||
self.scale == 1.0 && self.axes == Affine::IDENTITY
|
||||
}
|
||||
|
||||
/// Can SVG import store the filter's user space ([`Self::to_doc`]) again ([`user_space`])? Its
|
||||
/// `scale` and `axes` together can scale it past what one of them holds alone.
|
||||
pub fn opens_again(&self) -> bool {
|
||||
user_space(self.to_doc()).is_some()
|
||||
}
|
||||
|
||||
/// How far beyond `bounds` (document units) the filter can draw: its region's reach past them.
|
||||
pub fn outset(&self, bounds: Rect) -> f64 {
|
||||
let b = (bounds - self.origin).scale_from_origin(1.0 / self.scale);
|
||||
let region = self.region_in(b).scale_from_origin(self.scale) + self.origin;
|
||||
let region = self.to_doc().transform_rect_bbox(self.region_in(self.user_box(bounds)));
|
||||
let reach = [bounds.x0 - region.x0, bounds.y0 - region.y0, region.x1 - bounds.x1, region.y1 - bounds.y1].into_iter().fold(0.0, f64::max);
|
||||
if reach.is_finite() { reach.min(MAX_OUTSET) } else { 0.0 }
|
||||
}
|
||||
@@ -1397,20 +1499,40 @@ impl SvgFilterFx {
|
||||
}
|
||||
// Art that draws no pixels still has a box: the whole raster stands for it.
|
||||
let (x0, y0, x1, y1) = drawn_box(data, w, h).unwrap_or((0, 0, w, h));
|
||||
let s = self.resolution(space, (x1 - x0).max(y1 - y0) as f64);
|
||||
let (sw, sh) = ((w as f64 * s).ceil().max(1.0) as u32, (h as f64 * s).ceil().max(1.0) as u32);
|
||||
let Some(png) = png_of(data, w, x0, y0, x1, y1).map(Arc::new) else { return };
|
||||
let k = self.scale;
|
||||
// Filter user space → the small canvas, and the image's pixels → filter user space.
|
||||
let outer = Affine::scale(s) * space.to_doc.inverse() * Affine::translate(self.origin) * Affine::scale(k);
|
||||
let place = Affine::scale(1.0 / k) * Affine::translate(-self.origin) * space.to_doc * Affine::translate(Vec2::new(x0 as f64, y0 as f64));
|
||||
let b = place.transform_rect_bbox(Rect::new(0.0, 0.0, (x1 - x0) as f64, (y1 - y0) as f64));
|
||||
let user = self.to_doc();
|
||||
// Filter user space → the small canvas, and the small canvas → the raster's pixels.
|
||||
let (sw, sh, outer, back) = if self.axes == Affine::IDENTITY {
|
||||
let s = self.resolution(space, (x1 - x0).max(y1 - y0) as f64);
|
||||
let (sw, sh) = ((w as f64 * s).ceil().max(1.0) as u32, (h as f64 * s).ceil().max(1.0) as u32);
|
||||
(sw, sh, Affine::scale(s) * space.to_doc.inverse() * user, Affine::scale(1.0 / s))
|
||||
} else {
|
||||
// The canvas measures the costly lengths in its own pixels.
|
||||
let drawn = Rect::new(x0 as f64, y0 as f64, x1 as f64, y1 as f64);
|
||||
let Some(canvas) = self.turned_canvas(w, h, raster_resolution(space), drawn, space) else { return };
|
||||
canvas
|
||||
};
|
||||
// The source as an image, its size, and the map from its pixels to filter user space. The
|
||||
// object's box in user space is the image's box there, which resvg measures the region and
|
||||
// a primitive's lengths in the object's box against. In a turned or skewed user space the
|
||||
// source is first drawn onto the canvas's pixels, whose rows and columns run along the user
|
||||
// space's axes, and cut to the pixels it draws there: the image then lies along those axes,
|
||||
// and its box is the box of the art in the user space, not of the raster's box turned into it.
|
||||
let source = if self.axes == Affine::IDENTITY {
|
||||
let place = user.inverse() * space.to_doc * Affine::translate(Vec2::new(x0 as f64, y0 as f64));
|
||||
png_of(data, w, x0, y0, x1, y1).map(|png| (png, x1 - x0, y1 - y0, place))
|
||||
} else {
|
||||
on_canvas(data, w, h, sw, sh, outer * user.inverse() * space.to_doc)
|
||||
.map(|(png, cx, cy, iw, ih)| (png, iw, ih, outer.inverse() * Affine::translate(Vec2::new(cx as f64, cy as f64))))
|
||||
};
|
||||
let Some((png, iw, ih, place)) = source else { return };
|
||||
let png = Arc::new(png);
|
||||
let b = place.transform_rect_bbox(Rect::new(0.0, 0.0, iw as f64, ih as f64));
|
||||
let Some(drawn) = self.drawn_xml(b).and_then(|xml| with_id(&xml, DRAWN_ID)) else { return };
|
||||
let svg = format!(
|
||||
"<svg xmlns=\"{SVG_NS}\" xmlns:xlink=\"{XLINK_NS}\" width=\"{sw}\" height=\"{sh}\" viewBox=\"0 0 {sw} {sh}\"><defs>{drawn}</defs><g transform=\"{}\"><g filter=\"url(#{DRAWN_ID})\"><image width=\"{}\" height=\"{}\" preserveAspectRatio=\"none\" transform=\"{}\" xlink:href=\"data:image/png;base64,{}\"/></g></g></svg>",
|
||||
matrix(outer),
|
||||
x1 - x0,
|
||||
y1 - y0,
|
||||
iw,
|
||||
ih,
|
||||
matrix(place),
|
||||
base64(&png)
|
||||
);
|
||||
@@ -1420,19 +1542,65 @@ impl SvgFilterFx {
|
||||
}
|
||||
let Some(mut small) = tiny_skia::Pixmap::new(sw, sh) else { return };
|
||||
resvg::render(&tree, tiny_skia::Transform::identity(), &mut small.as_mut());
|
||||
let out = if s < 1.0 {
|
||||
let out = if back == Affine::IDENTITY {
|
||||
small
|
||||
} else {
|
||||
let Some(mut full) = tiny_skia::Pixmap::new(w as u32, h as u32) else { return };
|
||||
let paint = tiny_skia::PixmapPaint { quality: tiny_skia::FilterQuality::Bilinear, ..Default::default() };
|
||||
let up = (1.0 / s) as f32;
|
||||
full.draw_pixmap(0, 0, small.as_ref(), &paint, tiny_skia::Transform::from_scale(up, up), None);
|
||||
let [a, b, c, d, e, f] = back.as_coeffs().map(|v| v as f32);
|
||||
full.draw_pixmap(0, 0, small.as_ref(), &paint, tiny_skia::Transform::from_row(a, b, c, d, e, f), None);
|
||||
full
|
||||
} else {
|
||||
small
|
||||
};
|
||||
if out.data().len() == data.len() {
|
||||
data.copy_from_slice(out.data());
|
||||
}
|
||||
}
|
||||
|
||||
/// The canvas a filter whose user space is turned, skewed or scaled unevenly runs on, for a
|
||||
/// `w` × `h` raster lying in the document as `space` says, at resolution `s`
|
||||
/// ([`raster_resolution`]), whose art draws within `drawn` (raster pixels): its axes are the user
|
||||
/// space's, so the filter's offsets, blurs and other lengths run along them as SVG 1.1 measures
|
||||
/// them, and it covers what the raster shows. Along each of its axes its pixels are about as
|
||||
/// large as the raster's at `s`, and coarser when it would hold more than [`TURNED_ROOM`] times
|
||||
/// as many pixels as the raster does at `s`, and when a morphology radius or kernel unit would
|
||||
/// span more than 32 of its pixels or a blur's standard deviation more than 512 (a length in the
|
||||
/// object's box measured against the art's box on the canvas). Returns its size, the map from
|
||||
/// user space to it, and the map from it to the raster's pixels; `None` when the spaces can't
|
||||
/// be measured.
|
||||
fn turned_canvas(&self, w: usize, h: usize, s: f64, drawn: Rect, space: &PixelSpace) -> Option<(u32, u32, Affine, Affine)> {
|
||||
let to_px = space.to_doc.inverse() * self.to_doc();
|
||||
let from_px = to_px.inverse();
|
||||
let ub = from_px.transform_rect_bbox(Rect::new(0.0, 0.0, w as f64, h as f64));
|
||||
let most = ((w as f64 * s).ceil().max(1.0) * (h as f64 * s).ceil().max(1.0) * TURNED_ROOM).max(1.0);
|
||||
// Canvas pixels a unit along each axis of the user space: as many as the raster's at `s`.
|
||||
let [a, b, c, d, _, _] = to_px.as_coeffs();
|
||||
let (mut qx, mut qy) = (s * a.hypot(b), s * c.hypot(d));
|
||||
let pixels = ub.width() * qx * ub.height() * qy;
|
||||
if pixels > most {
|
||||
let k = (most / pixels).sqrt();
|
||||
(qx, qy) = (qx * k, qy * k);
|
||||
}
|
||||
// A length along an axis spans length × q canvas pixels, or length × the art's box on the
|
||||
// canvas along that axis: both shrink with q.
|
||||
let art = from_px.transform_rect_bbox(drawn);
|
||||
for (length, cap) in [(self.window, MAX_WINDOW_PX), (self.blur, MAX_BLUR_PX)] {
|
||||
let px = if self.box_units { length * (art.width() * qx).max(art.height() * qy) } else { length * qx.max(qy) };
|
||||
if px > cap {
|
||||
let k = cap / px;
|
||||
(qx, qy) = (qx * k, qy * k);
|
||||
}
|
||||
}
|
||||
if !(qx.is_finite() && qx > 0.0 && qy.is_finite() && qy > 0.0 && ub.is_finite()) {
|
||||
return None;
|
||||
}
|
||||
let (cw, ch) = ((ub.width() * qx).ceil().max(1.0), (ub.height() * qy).ceil().max(1.0));
|
||||
// Rounding up adds at most a row and a column.
|
||||
if cw * ch > most + cw + ch + 1.0 {
|
||||
return None;
|
||||
}
|
||||
let outer = Affine::scale_non_uniform(qx, qy) * Affine::translate(Vec2::new(-ub.x0, -ub.y0));
|
||||
Some((cw as u32, ch as u32, outer, to_px * outer.inverse()))
|
||||
}
|
||||
}
|
||||
|
||||
/// The farthest a filter's region reaches beyond the object, in points.
|
||||
@@ -1450,6 +1618,22 @@ fn drawn_box(data: &[u8], w: usize, h: usize) -> Option<(usize, usize, usize, us
|
||||
(x1 > x0 && y1 > y0).then_some((x0, y0, x1, y1))
|
||||
}
|
||||
|
||||
/// The pixels of `data` (premultiplied RGBA8, `w` × `h`) drawn onto a `cw` × `ch` canvas through
|
||||
/// `to_canvas` (the raster's pixels → the canvas's), cut to the box of the canvas pixels that aren't
|
||||
/// transparent (the whole canvas when all are): a PNG of them, the box's corner on the canvas, and
|
||||
/// its size.
|
||||
fn on_canvas(data: &[u8], w: usize, h: usize, cw: u32, ch: u32, to_canvas: Affine) -> Option<(Vec<u8>, usize, usize, usize, usize)> {
|
||||
let size = tiny_skia::IntSize::from_wh(u32::try_from(w).ok()?, u32::try_from(h).ok()?)?;
|
||||
let raster = tiny_skia::Pixmap::from_vec(data.to_vec(), size)?;
|
||||
let mut canvas = tiny_skia::Pixmap::new(cw, ch)?;
|
||||
let paint = tiny_skia::PixmapPaint { quality: tiny_skia::FilterQuality::Bilinear, ..Default::default() };
|
||||
let [a, b, c, d, e, f] = to_canvas.as_coeffs().map(|v| v as f32);
|
||||
canvas.draw_pixmap(0, 0, raster.as_ref(), &paint, tiny_skia::Transform::from_row(a, b, c, d, e, f), None);
|
||||
let (cw, ch) = (cw as usize, ch as usize);
|
||||
let (x0, y0, x1, y1) = drawn_box(canvas.data(), cw, ch).unwrap_or((0, 0, cw, ch));
|
||||
Some((png_of(canvas.data(), cw, x0, y0, x1, y1)?, x0, y0, x1 - x0, y1 - y0))
|
||||
}
|
||||
|
||||
/// The pixels of `data` (premultiplied RGBA8, `w` wide) in columns x0..x1 and rows y0..y1, as a PNG.
|
||||
fn png_of(data: &[u8], w: usize, x0: usize, y0: usize, x1: usize, y1: usize) -> Option<Vec<u8>> {
|
||||
use image::ImageEncoder;
|
||||
|
||||
@@ -222,6 +222,154 @@ fn user_space_starts_at_the_origin() {
|
||||
assert!((filter(json!({ "xml": half, "origin": [-10.0, 0.0] })).outset(b) - 10.0).abs() < 1e-9);
|
||||
}
|
||||
|
||||
/// The opacity of `data` (`w` wide) after the filter `xml` with `params` runs on a blue square
|
||||
/// over 10..20 pt of a 40 pt raster one point a pixel, at each of `points`.
|
||||
fn turned_run(xml: &str, params: serde_json::Value, points: &[(usize, usize)]) -> Vec<u8> {
|
||||
let w = 40;
|
||||
let mut data = image(w, w, |x, y| if (10..20).contains(&x) && (10..20).contains(&y) { [0, 0, 255, 255] } else { [0; 4] });
|
||||
let mut p = params;
|
||||
p["xml"] = json!(xml);
|
||||
filter(p).apply(&mut data, w, w, &space(w, w, 1.0, 1.0));
|
||||
points.iter().map(|&(x, y)| at(&data, w, x, y)[3]).collect()
|
||||
}
|
||||
|
||||
const SHIFT_X: &str = r#"<filter id="Shift" x="-1" y="-1" width="3" height="3"><feOffset dx="4"/></filter>"#;
|
||||
|
||||
/// With `axes`, the filter runs in its turned or skewed user space: an offset along its x axis
|
||||
/// moves the art along that axis in the document (SVG 1.1 measures a primitive's lengths in the
|
||||
/// user space of the element the filter is on).
|
||||
#[test]
|
||||
fn a_turned_user_space_moves_the_art_along_its_own_axes() {
|
||||
// The square spans 10..20 pt; moved 4 pt along x it covers 14..24 across.
|
||||
let points = [(22, 15), (15, 22), (12, 11)];
|
||||
assert_eq!(turned_run(SHIFT_X, json!({}), &points), [255, 0, 0], "the document's axes: to the right");
|
||||
// Turned a quarter turn: the filter's x axis points down the page.
|
||||
let down = turned_run(SHIFT_X, json!({ "axes": [0.0, 1.0, -1.0, 0.0] }), &points);
|
||||
assert_eq!(down, [0, 255, 0], "moved down, not to the right");
|
||||
// Skewed: one unit along y is one across and one down, so dy 4 moves the art 4 pt each way.
|
||||
let shift_y = r#"<filter id="Shift" x="-1" y="-1" width="3" height="3"><feOffset dy="4"/></filter>"#;
|
||||
let skewed = turned_run(shift_y, json!({ "axes": [1.0, 0.0, 1.0, 1.0] }), &[(22, 22), (11, 22), (11, 11)]);
|
||||
assert!(skewed[0] > 200 && skewed[1] < 60 && skewed[2] < 60, "moved across and down: {skewed:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn axes_the_effect_cannot_measure_are_not_drawn() {
|
||||
for axes in [json!([0, 0, 0, 0]), json!([1, 2]), json!([1, 0, 0, "1"]), json!([2000, 0, 0, 1]), json!([0.01, 0, 0, 0.01]), json!("turned")] {
|
||||
let e = Effect { id: SVG_FILTER.into(), params: json!({ "xml": SHIFT_X, "axes": axes }), visible: true };
|
||||
assert!(raster_effects(&[e]).is_empty(), "{axes}: drawn without it");
|
||||
assert!(valid_axes(&axes).is_none(), "{axes}");
|
||||
}
|
||||
assert_eq!(valid_axes(&json!([0, 1, -1, 0])), Some(Affine::new([0.0, 1.0, -1.0, 0.0, 0.0, 0.0])));
|
||||
}
|
||||
|
||||
/// A region measured against the object's box is measured against its box in the turned user
|
||||
/// space: a diamond turned an eighth of a turn is a square there, and a flood over 0..100% of it
|
||||
/// covers the diamond alone.
|
||||
#[test]
|
||||
fn a_turned_region_is_measured_against_the_box_in_its_user_space() {
|
||||
let w = 40;
|
||||
let diamond = |x: usize, y: usize| (x as f64 - 19.5).abs() + (y as f64 - 19.5).abs() <= 10.0;
|
||||
let mut data = image(w, w, |x, y| if diamond(x, y) { [0, 0, 255, 255] } else { [0; 4] });
|
||||
let flood = r##"<filter id="F" filterUnits="userSpaceOnUse" x="0%" y="0%" width="100%" height="100%"><feFlood flood-color="#ff0000"/></filter>"##;
|
||||
let h = std::f64::consts::FRAC_1_SQRT_2;
|
||||
filter(json!({ "xml": flood, "axes": [h, h, -h, h] })).apply(&mut data, w, w, &space(w, w, 1.0, 1.0));
|
||||
assert_eq!(at(&data, w, 20, 20), [255, 0, 0, 255], "inside the diamond");
|
||||
assert!(at(&data, w, 12, 12)[3] < 40, "outside the diamond, inside its box on the page: {:?}", at(&data, w, 12, 12));
|
||||
}
|
||||
|
||||
/// In a turned user space, a region in the object's bounding box (the default `filterUnits`) and a
|
||||
/// primitive's lengths in it (`primitiveUnits="objectBoundingBox"`) are measured against the
|
||||
/// object's box there: on a diamond turned an eighth of a turn, a flood over 0..100% of the box
|
||||
/// covers the diamond alone.
|
||||
#[test]
|
||||
fn a_turned_filter_measures_box_units_against_the_box_in_its_user_space() {
|
||||
let w = 40;
|
||||
let h = std::f64::consts::FRAC_1_SQRT_2;
|
||||
let region = r##"<filter id="F" x="0" y="0" width="1" height="1"><feFlood flood-color="#ff0000"/></filter>"##;
|
||||
let primitive = r##"<filter id="F" filterUnits="userSpaceOnUse" x="-1000" y="-1000" width="2000" height="2000" primitiveUnits="objectBoundingBox"><feFlood flood-color="#ff0000" x="0" y="0" width="1" height="1"/></filter>"##;
|
||||
for xml in [region, primitive] {
|
||||
let diamond = |x: usize, y: usize| (x as f64 - 19.5).abs() + (y as f64 - 19.5).abs() <= 10.0;
|
||||
let mut data = image(w, w, |x, y| if diamond(x, y) { [0, 0, 255, 255] } else { [0; 4] });
|
||||
filter(json!({ "xml": xml, "axes": [h, h, -h, h] })).apply(&mut data, w, w, &space(w, w, 1.0, 1.0));
|
||||
assert_eq!(at(&data, w, 20, 20), [255, 0, 0, 255], "{xml}: inside the diamond");
|
||||
assert!(at(&data, w, 12, 12)[3] < 40, "{xml}: outside the diamond, inside its box on the page: {:?}", at(&data, w, 12, 12));
|
||||
}
|
||||
}
|
||||
|
||||
/// SVG import stores a filter's user space again only when `scale` and `axes` together stay within
|
||||
/// what it holds: each alone can be valid while their product is not.
|
||||
#[test]
|
||||
fn a_user_space_opens_again_only_within_what_import_stores() {
|
||||
let opens = |scale: f64, axes: serde_json::Value| filter(json!({ "xml": SHIFT_X, "scale": scale, "axes": axes })).opens_again();
|
||||
assert!(opens(1000.0, json!(null)));
|
||||
assert!(opens(2.0, json!([0.0, 1.0, -1.0, 0.0])));
|
||||
assert!(!opens(1000.0, json!([2.0, 0.0, 0.0, 2.0])), "scale 2000 across");
|
||||
assert!(!opens(0.001, json!([0.5, 0.0, 0.0, 0.5])), "scale 0.0005 across");
|
||||
let space = user_space(Affine::new([0.0, 2.0, -2.0, 0.0, 5.0, 6.0])).unwrap();
|
||||
assert_eq!((space.scale, space.origin, space.axes), (2.0, [5.0, 6.0], Some([0.0, 1.0, -1.0, 0.0])));
|
||||
}
|
||||
|
||||
/// The region of a turned filter reaches as far as its turned box does.
|
||||
#[test]
|
||||
fn a_turned_region_reaches_along_the_turned_axes() {
|
||||
let b = Rect::new(0.0, 0.0, 50.0, 50.0);
|
||||
let user = r#"<filter id="u" filterUnits="userSpaceOnUse" x="-30" y="-5" width="100" height="100"><feOffset/></filter>"#;
|
||||
assert!((filter(json!({ "xml": user })).outset(b) - 45.0).abs() < 1e-9, "45 pt below the box");
|
||||
// A quarter turn: user y runs to the left of the page, so -5..95 of it lies 95 pt left of the box.
|
||||
assert!((filter(json!({ "xml": user, "axes": [0.0, 1.0, -1.0, 0.0] })).outset(b) - 95.0).abs() < 1e-9);
|
||||
}
|
||||
|
||||
/// A filter skewed as far as `axes` allows runs on a canvas no larger than four times the raster's
|
||||
/// pixels, however far the skew spreads the raster's box in its user space.
|
||||
#[test]
|
||||
fn a_skewed_filter_runs_within_its_pixel_budget() {
|
||||
let (w, h) = (64, 48);
|
||||
let f = filter(json!({ "xml": SHIFT_X, "axes": [1.0, 0.0, 999.0, 1.0] }));
|
||||
let all = Rect::new(0.0, 0.0, w as f64, h as f64);
|
||||
let (cw, ch, ..) = f.turned_canvas(w, h, 1.0, all, &space(w, h, 1.0, 1.0)).unwrap();
|
||||
let (cw, ch) = (f64::from(cw), f64::from(ch));
|
||||
assert!(cw * ch <= TURNED_ROOM * (w * h) as f64 + cw + ch + 1.0, "{cw} × {ch}");
|
||||
// It still draws.
|
||||
let mut data = image(w, h, |x, y| if (20..40).contains(&x) && (10..30).contains(&y) { [0, 0, 255, 255] } else { [0; 4] });
|
||||
f.apply(&mut data, w, h, &space(w, h, 1.0, 1.0));
|
||||
// A plain quarter turn keeps the raster's own pixel size.
|
||||
let turned = filter(json!({ "xml": SHIFT_X, "axes": [0.0, 1.0, -1.0, 0.0] }));
|
||||
let (cw, ch, outer, _) = turned.turned_canvas(w, h, 1.0, all, &space(w, h, 1.0, 1.0)).unwrap();
|
||||
assert_eq!((cw, ch), (48, 64));
|
||||
assert!((outer.determinant() - 1.0).abs() < 1e-9);
|
||||
// Stretched 100 times across and squeezed 100 times down: each canvas axis keeps the raster's
|
||||
// detail along it, not one column of it.
|
||||
let stretched = filter(json!({ "xml": SHIFT_X, "axes": [100.0, 0.0, 0.0, 0.01] }));
|
||||
let (cw, ch, ..) = stretched.turned_canvas(100, 100, 1.0, Rect::new(0.0, 0.0, 100.0, 100.0), &space(100, 100, 1.0, 1.0)).unwrap();
|
||||
assert_eq!((cw, ch), (100, 100));
|
||||
}
|
||||
|
||||
/// On a far skewed canvas, a radius or a standard deviation in the object's box spans no more
|
||||
/// canvas pixels than the caps allow: it is measured against the art's box on the canvas, which the
|
||||
/// skew spreads far wider than the art's box in the raster.
|
||||
#[test]
|
||||
fn a_skewed_filter_keeps_box_lengths_within_the_caps_on_its_canvas() {
|
||||
let (w, h) = (64, 48);
|
||||
let sp = space(w, h, 1.0, 1.0);
|
||||
let drawn = Rect::new(20.0, 10.0, 40.0, 30.0);
|
||||
for (xml, length, cap) in [
|
||||
("<filter id=\"m\" primitiveUnits=\"objectBoundingBox\"><feMorphology radius=\"1.5\"/></filter>", 1.5, MAX_WINDOW_PX),
|
||||
("<filter id=\"b\" primitiveUnits=\"objectBoundingBox\"><feGaussianBlur stdDeviation=\"20\"/></filter>", 20.0, MAX_BLUR_PX),
|
||||
] {
|
||||
let f = filter(json!({ "xml": xml, "axes": [1.0, 0.0, 999.0, 1.0] }));
|
||||
let (_, _, outer, _) = f.turned_canvas(w, h, 1.0, drawn, &sp).unwrap();
|
||||
// The art's box on the canvas: the drawn pixels taken into user space, then onto the canvas.
|
||||
let art = (outer * f.to_doc().inverse() * sp.to_doc).transform_rect_bbox(drawn);
|
||||
let px = length * art.width().max(art.height());
|
||||
assert!(px <= cap + 1e-6, "{xml}: {px} canvas pixels");
|
||||
}
|
||||
// A user-space radius spans no more than 32 canvas pixels along either axis.
|
||||
let f = filter(json!({ "xml": "<filter id=\"u\"><feMorphology radius=\"100\"/></filter>", "scale": 1000.0, "axes": [1.0, 0.0, 999.0, 1.0] }));
|
||||
let (_, _, outer, _) = f.turned_canvas(w, h, 1.0, drawn, &sp).unwrap();
|
||||
let [qx, _, _, qy, _, _] = outer.as_coeffs();
|
||||
assert!(100.0 * qx.max(qy) <= MAX_WINDOW_PX + 1e-6, "{qx} {qy}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn runs_no_finer_than_the_raster_effects_resolution() {
|
||||
let w = 16;
|
||||
@@ -448,7 +596,8 @@ fn a_region_measured_against_the_box_is_written_out() {
|
||||
let far = r#"<filter id="r" filterUnits="userSpaceOnUse" x="-50%" y="0" width="200%" height="10"><feOffset/></filter>"#;
|
||||
let f = filter(json!({ "xml": far, "origin": [10.0, 0.0] }));
|
||||
assert_eq!(
|
||||
f.written_xml(Rect::new(10.0, 0.0, 30.0, 10.0)).as_deref(),
|
||||
// The object over 10..30 pt of the page: 0..20 of the user space that starts at the origin.
|
||||
f.written_xml(Rect::new(0.0, 0.0, 20.0, 10.0)).as_deref(),
|
||||
Some(r#"<filter id="r" filterUnits="userSpaceOnUse" x="-10" y="0" width="40" height="10"><feOffset/></filter>"#)
|
||||
);
|
||||
let plain = filter(json!({ "xml": RED_FLOOD }));
|
||||
|
||||
@@ -9,8 +9,9 @@
|
||||
//! text. Each action is an `/action-N` block with a hexadecimal `/name`; each step is an `/event-N`
|
||||
//! block inside one, with its `/internalName` in parentheses, the `/localizedName` it is shown with
|
||||
//! as hexadecimal text, and `/isOn` 0 when it is left out of playback; each value a step was
|
||||
//! recorded with is a `/parameter-N` block inside it, which is counted, and whose hexadecimal
|
||||
//! `/value` is checked against its byte count. The set's `/actionCount`, an action's `/eventCount`
|
||||
//! recorded with is a `/parameter-N` block inside it, which is counted, whose `/key` (a number),
|
||||
//! `/type` (text in parentheses) and `/value` (a number, text in parentheses or hexadecimal text) are
|
||||
//! kept, and whose hexadecimal `/value` is checked against its byte count. The set's `/actionCount`, an action's `/eventCount`
|
||||
//! and a step's `/parameterCount` give how many actions, steps and recorded values follow.
|
||||
//! The layout follows the README of Inventsable's Redesigning-Illustrator-Actions-in-Scripting
|
||||
//! (https://github.com/Inventsable/Redesigning-Illustrator-Actions-in-Scripting), the forum post
|
||||
@@ -40,6 +41,8 @@ const MAX_STEPS: usize = 10_000;
|
||||
/// The most steps read in the set: a small text can hold hundreds of thousands of empty steps, and
|
||||
/// the answer holds an object for each.
|
||||
const MAX_SET_STEPS: usize = 100_000;
|
||||
/// The most recorded values kept in the set; the others are counted but not kept.
|
||||
const MAX_VALUES: usize = 100_000;
|
||||
/// The longest name kept (bytes).
|
||||
const MAX_NAME: usize = 1024;
|
||||
/// The most tokens listed as unread.
|
||||
@@ -56,7 +59,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Read Action Set File",
|
||||
[],
|
||||
None,
|
||||
"{path? | data?: the file's text | dataBase64?, name?: the file's name (default: the path's)} read an action set another app saved as text (.aia, starting \"/version\") without changing anything → {set: the set's /name (else the file's name without its extension, else empty), version, actions: [{name, steps: [{name: the step's /internalName, label: its /localizedName, or null when it has none or it is blank, on: false when /isOn is 0, params: how many /parameter blocks it has, line}]}], unread: [{line, text}] (tokens that aren't read, at most 1000), truncated: true when a cap stopped the reading (8 MiB, 16 open blocks, 1,000 actions, 10,000 steps in an action, 100,000 steps in the set; names past 1,024 bytes are cut), when the text ends inside a block or a value or after a field's name, when /actionCount, /eventCount or a step's /parameterCount differs from the actions, steps or recorded values read (a negative count, one too large for a number and one that isn't a number always differ), or when a hexadecimal name, label or recorded /value isn't as many bytes as its count says}. Give exactly one of path, data and dataBase64. Text that doesn't start with /version and a number is an error",
|
||||
"{path? | data?: the file's text | dataBase64?, name?: the file's name (default: the path's)} read an action set another app saved as text (.aia, starting \"/version\") without changing anything → {set: the set's /name (else the file's name without its extension, else empty), version, actions: [{name, steps: [{name: the step's /internalName, label: its /localizedName, or null when it has none or it is blank, on: false when /isOn is 0, params: how many /parameter blocks it has, values: [{key: the block's /key, or null, type: its /type, or null, value: its /value when it is a number, or text that is UTF-8 (else null), bytes?: the text's length in bytes}] (the first 100,000 recorded values in the set), line}]}], unread: [{line, text}] (tokens that aren't read, at most 1000), truncated: true when a cap stopped the reading (8 MiB, 16 open blocks, 1,000 actions, 10,000 steps in an action, 100,000 steps in the set; names past 1,024 bytes are cut), when the text ends inside a block or a value or after a field's name, when /actionCount, /eventCount or a step's /parameterCount differs from the actions, steps or recorded values read (a negative count, one too large for a number and one that isn't a number always differ), or when a hexadecimal name, label or recorded /value isn't as many bytes as its count says}. Give exactly one of path, data and dataBase64. Text that doesn't start with /version and a number is an error",
|
||||
always,
|
||||
read
|
||||
)]
|
||||
@@ -73,12 +76,33 @@ pub struct AiaStep {
|
||||
pub on: Option<i64>,
|
||||
/// How many `/parameter-N` blocks it has.
|
||||
pub params: usize,
|
||||
/// Its `/parameter-N` blocks, in order, while the set keeps at most [`MAX_VALUES`].
|
||||
pub values: Vec<AiaValue>,
|
||||
/// Its `/parameterCount`, if it has one.
|
||||
pub declared: Option<i64>,
|
||||
/// The line its block opens on (from 1).
|
||||
pub line: usize,
|
||||
}
|
||||
|
||||
/// A value a step was recorded with: a `/parameter-N` block.
|
||||
#[derive(Clone, Debug, Default, PartialEq, Eq)]
|
||||
pub struct AiaValue {
|
||||
/// Its `/key`, if it has one that fits an `i64`.
|
||||
pub key: Option<i64>,
|
||||
/// Its `/type`, read as UTF-8 with replacement characters, if it has one.
|
||||
pub kind: Option<String>,
|
||||
/// Its `/value`, if it is a number that fits an `i64` or text.
|
||||
pub value: Option<AiaData>,
|
||||
}
|
||||
|
||||
/// A recorded `/value` that is kept.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub enum AiaData {
|
||||
Int(i64),
|
||||
/// The bytes of text in parentheses or of hexadecimal text.
|
||||
Text(Vec<u8>),
|
||||
}
|
||||
|
||||
/// An action: an `/action-N` block.
|
||||
#[derive(Clone, Debug, Default, PartialEq, Eq)]
|
||||
pub struct AiaAction {
|
||||
@@ -106,6 +130,8 @@ pub struct AiaSet {
|
||||
pub truncated: bool,
|
||||
/// How many steps were read in all the actions.
|
||||
steps: usize,
|
||||
/// How many recorded values were kept in all the steps.
|
||||
values: usize,
|
||||
}
|
||||
|
||||
/// A token of the text.
|
||||
@@ -252,7 +278,8 @@ fn hex_bytes(digits: &[u8]) -> Option<Vec<u8>> {
|
||||
enum Kind {
|
||||
Action,
|
||||
Step,
|
||||
Param,
|
||||
/// A recorded value, and whether it is kept.
|
||||
Param(bool),
|
||||
/// A block that isn't read, or one past a cap.
|
||||
Other,
|
||||
}
|
||||
@@ -315,12 +342,18 @@ fn open_block(set: &mut AiaSet, stack: &[Kind], name: &[u8], line: usize) -> Kin
|
||||
}
|
||||
},
|
||||
Some(Kind::Step) if numbered(name, b"parameter-") => {
|
||||
let mut kept = false;
|
||||
if let Some(s) = set.actions.last_mut().and_then(|a| a.steps.last_mut()) {
|
||||
s.params += 1;
|
||||
if set.values < MAX_VALUES {
|
||||
s.values.push(AiaValue::default());
|
||||
set.values += 1;
|
||||
kept = true;
|
||||
}
|
||||
}
|
||||
Kind::Param
|
||||
Kind::Param(kept)
|
||||
}
|
||||
Some(Kind::Param | Kind::Other) => Kind::Other,
|
||||
Some(Kind::Param(_) | Kind::Other) => Kind::Other,
|
||||
_ => {
|
||||
unread(set, line, format!("/{} {{", String::from_utf8_lossy(name)));
|
||||
Kind::Other
|
||||
@@ -355,12 +388,23 @@ fn set_hex(set: &mut AiaSet, kind: Option<&Kind>, name: Option<&[u8]>, bytes: Op
|
||||
}
|
||||
}
|
||||
|
||||
/// Mark `set` truncated when the hexadecimal `/value` on `line` isn't as many bytes as its count
|
||||
/// says.
|
||||
fn check_value(set: &mut AiaSet, bytes: Option<Vec<u8>>, line: usize) {
|
||||
if bytes.is_none() {
|
||||
/// Set the field `name` of the recorded value open on `line` to `token`: its `/key`, `/type` or
|
||||
/// `/value`, when the value is `kept`. A hexadecimal `/value` that isn't as many bytes as its count
|
||||
/// says marks `set` truncated, kept or not.
|
||||
fn set_param(set: &mut AiaSet, kept: bool, name: Option<&[u8]>, token: Token, line: usize) {
|
||||
if name == Some(b"value".as_slice()) && matches!(token, Token::Hex(None)) {
|
||||
set.truncated = true;
|
||||
unread(set, line, BAD_HEX);
|
||||
return;
|
||||
}
|
||||
let value = set.actions.last_mut().and_then(|a| a.steps.last_mut()).and_then(|s| s.values.last_mut());
|
||||
let Some(v) = value.filter(|_| kept) else { return };
|
||||
match (name, token) {
|
||||
(Some(b"key"), Token::Int(key)) => v.key = key,
|
||||
(Some(b"type"), Token::Text(t)) => v.kind = Some(String::from_utf8_lossy(&t).into_owned()),
|
||||
(Some(b"value"), Token::Int(Some(n))) => v.value = Some(AiaData::Int(n)),
|
||||
(Some(b"value"), Token::Text(t) | Token::Hex(Some(t))) => v.value = Some(AiaData::Text(t)),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -448,13 +492,13 @@ pub fn read_aia(bytes: &[u8]) -> std::result::Result<AiaSet, String> {
|
||||
unread(&mut set, line, "}");
|
||||
}
|
||||
}
|
||||
Token::Hex(bytes) if matches!(stack.last(), Some(Kind::Param)) => {
|
||||
if field(&mut pending).as_deref() == Some(b"value".as_slice()) {
|
||||
check_value(&mut set, bytes, line);
|
||||
}
|
||||
_ if matches!(stack.last(), Some(Kind::Param(_))) => {
|
||||
let kept = matches!(stack.last(), Some(Kind::Param(true)));
|
||||
let name = field(&mut pending);
|
||||
set_param(&mut set, kept, name.as_deref(), token, line);
|
||||
}
|
||||
// The other values inside a recorded value, or a block that isn't read.
|
||||
_ if matches!(stack.last(), Some(Kind::Param | Kind::Other)) => {
|
||||
// The values inside a block that isn't read.
|
||||
_ if matches!(stack.last(), Some(Kind::Other)) => {
|
||||
pending = None;
|
||||
}
|
||||
Token::Hex(bytes) => {
|
||||
@@ -521,6 +565,21 @@ pub fn read_aia(bytes: &[u8]) -> std::result::Result<AiaSet, String> {
|
||||
Ok(set)
|
||||
}
|
||||
|
||||
/// A recorded value in `actionSet.read`'s answer: `{key, type, value, bytes?}`, the value a number,
|
||||
/// text that is UTF-8 (else null) with its length in bytes, or null.
|
||||
fn value_json(v: &AiaValue) -> Value {
|
||||
let mut out = json!({ "key": v.key, "type": v.kind, "value": null });
|
||||
match &v.value {
|
||||
Some(AiaData::Int(n)) => out["value"] = json!(n),
|
||||
Some(AiaData::Text(t)) => {
|
||||
out["value"] = json!(std::str::from_utf8(t).ok());
|
||||
out["bytes"] = json!(t.len());
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn read(_: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "actionSet.read";
|
||||
let (path, data, b64) = (text_param(p, "path", C)?, text_param(p, "data", C)?, text_param(p, "dataBase64", C)?);
|
||||
@@ -544,7 +603,8 @@ fn read(_: &mut Session, p: &Value) -> Result<Value> {
|
||||
.iter()
|
||||
.map(|s| {
|
||||
let label = s.label.clone().filter(|l| !l.trim().is_empty());
|
||||
json!({ "name": s.name, "label": label, "on": s.on != Some(0), "params": s.params, "line": s.line })
|
||||
let values: Vec<Value> = s.values.iter().map(value_json).collect();
|
||||
json!({ "name": s.name, "label": label, "on": s.on != Some(0), "params": s.params, "values": values, "line": s.line })
|
||||
})
|
||||
.collect();
|
||||
json!({ "name": a.name, "steps": steps })
|
||||
|
||||
@@ -1225,7 +1225,7 @@ fn expand_dashes_keeps_the_fill_below_and_follows_aligned_corners() {
|
||||
let mut centred = 0;
|
||||
for id in ids(&r) {
|
||||
let sp = path(&s, id).subpaths[0].clone();
|
||||
if let [a, b, c] = sp.anchors.as_slice()
|
||||
if let [a, b, c] = &*sp.anchors.to_vec()
|
||||
&& corners.iter().any(|k| b.p.distance(*k) < 1e-6)
|
||||
{
|
||||
assert!((a.p.distance(b.p) - 5.0).abs() < 1e-6 && (c.p.distance(b.p) - 5.0).abs() < 1e-6, "{sp:?}");
|
||||
|
||||
@@ -14,8 +14,9 @@ use vectorcraft_doc::{LockedArtboards, Node, NodeId, NodeKind};
|
||||
use vectorcraft_geom::Point;
|
||||
|
||||
use super::super::links::{Status, statuses};
|
||||
use super::super::panelcmds::listed_artboards;
|
||||
use super::super::select::{is_selectable, on_artboard, selectable};
|
||||
use super::super::{CommandSpec, bad, checked_ids_param, cmd, has_doc, point_indices, switch_or, text_param};
|
||||
use super::super::{CommandSpec, bad, checked_ids_param, cmd, has_doc, switch_or, text_param};
|
||||
use crate::{DocState, Result, Session};
|
||||
|
||||
/// How Select by Artboards relates an object to the chosen artboards (`relation`).
|
||||
@@ -33,7 +34,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Select by Artboards",
|
||||
["Object", "Plug-ins", "Selection Tools"],
|
||||
None,
|
||||
"{artboards: [index…] (0-based, at least one), relation?: \"overlap\" (default: on at least one of them, as select.allOnArtboard takes it: the bounds overlap the artboard or the centre is on it) | \"inside\" (the bounds lie wholly within one of them, edges included) | \"outside\" (on none of them)} select those objects among the ones Select All takes (in isolation mode, the isolated container's); hidden and locked objects, objects on hidden, locked or template layers and art held by a locked artboard are left out. Bounds are geometric, a symbol instance's measured by its art → {count}",
|
||||
"{artboards: [index…] (0-based whole numbers, at least one), relation?: \"overlap\" (default: on at least one of them, as select.allOnArtboard takes it: the bounds overlap the artboard or the centre is on it) | \"inside\" (the bounds lie wholly within one of them, edges included) | \"outside\" (on none of them)} select those objects among the ones Select All takes (in isolation mode, the isolated container's); hidden and locked objects, objects on hidden, locked or template layers and art held by a locked artboard are left out. Bounds are geometric, a symbol instance's measured by its art → {count}",
|
||||
has_doc,
|
||||
by_artboards
|
||||
),
|
||||
@@ -58,13 +59,12 @@ fn by_artboards(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
return Err(bad(C, "`relation` must be overlap, inside or outside"));
|
||||
}
|
||||
let listed = p.get("artboards").ok_or_else(|| bad(C, "missing `artboards`"))?;
|
||||
let indices = point_indices(listed).ok_or_else(|| bad(C, "`artboards` must be a list of artboard indices"))?;
|
||||
if indices.is_empty() {
|
||||
if listed.as_array().is_some_and(Vec::is_empty) {
|
||||
return Err(bad(C, "choose at least one artboard"));
|
||||
}
|
||||
let st = s.doc()?;
|
||||
let rects =
|
||||
indices.iter().map(|i| st.doc.artboards.get(*i).map(|a| a.rect)).collect::<Option<Vec<_>>>().ok_or_else(|| bad(C, "no such artboard"))?;
|
||||
let rects: Vec<_> =
|
||||
listed_artboards(&st.doc, listed, "artboards", C)?.into_iter().filter_map(|i| st.doc.artboards.get(i)).map(|a| a.rect).collect();
|
||||
let symbols = st.doc.symbol_boxes();
|
||||
let ids: Vec<NodeId> = selectable(&st.doc, st.isolation)
|
||||
.into_iter()
|
||||
|
||||
@@ -108,6 +108,35 @@ fn bad_params_are_errors_and_leave_the_selection() {
|
||||
}
|
||||
}
|
||||
|
||||
/// A malformed `artboards` entry is refused as one, naming the parameter, before any entry is
|
||||
/// looked up; a value that is not a list, an empty list, a left-out list and a whole number past
|
||||
/// the last artboard each have their own error.
|
||||
#[test]
|
||||
fn artboard_errors_say_what_is_wrong() {
|
||||
let mut s = three_boards();
|
||||
let a = rect(&mut s, 10.0, 10.0, 20.0, 20.0);
|
||||
let entries = "invalid parameters for `addon.select.byArtboards`: `artboards` must contain whole numbers";
|
||||
let not_a_list = "invalid parameters for `addon.select.byArtboards`: `artboards` must be a list of artboard indices";
|
||||
for (p, want) in [
|
||||
(json!({"artboards": ["1"]}), entries),
|
||||
(json!({"artboards": [-1]}), entries),
|
||||
(json!({"artboards": [1.5]}), entries),
|
||||
(json!({"artboards": [true]}), entries),
|
||||
(json!({"artboards": [9, "1"]}), entries),
|
||||
(json!({"artboards": "0"}), not_a_list),
|
||||
(json!({"artboards": null}), not_a_list),
|
||||
(json!({"artboards": []}), "invalid parameters for `addon.select.byArtboards`: choose at least one artboard"),
|
||||
(json!({}), "invalid parameters for `addon.select.byArtboards`: missing `artboards`"),
|
||||
(json!({"artboards": [9]}), "no such artboard"),
|
||||
(json!({"artboards": [0, 9]}), "no such artboard"),
|
||||
] {
|
||||
s.execute("select.set", &json!({"ids": [a.0]})).unwrap();
|
||||
assert_eq!(s.execute(C, &p).unwrap_err().to_string(), want, "{p}");
|
||||
assert_eq!(s.doc().unwrap().selection.objects, vec![a], "{p}");
|
||||
}
|
||||
assert_eq!(pick(&mut s, json!({"artboards": [0, 0]})), vec![a]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_symbol_instance_is_measured_by_its_art() {
|
||||
// The symbol's art, (100, 60) to (140, 80), drawn 50 pt up and left: (50, 10) to (90, 30), on
|
||||
|
||||
@@ -12,6 +12,7 @@ use super::{
|
||||
thread_local! {
|
||||
static BOX_TESTS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
static CANDIDATE_VISITS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
static TRACES_ON_THIS_THREAD: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
}
|
||||
|
||||
// ---------- Image Trace ----------
|
||||
@@ -548,15 +549,20 @@ fn color_groups(cmd: &str, d: &mut Document, items: Vec<Arc<Node>>) -> Result<Ve
|
||||
Ok(seams.into_iter().chain(groups).collect())
|
||||
}
|
||||
|
||||
/// What a trace depends on: the document it is made in, the object traced (an image, or an Image
|
||||
/// Trace object traced again), its image, the image's encoded bytes, and the settings it is traced
|
||||
/// with. The tracer makes the same paths of the same inputs, so a trace made away from the command
|
||||
/// ([`TraceRun`]) stands in for the command's own in the same document.
|
||||
/// What a trace depends on: the document it is made in and the content it was reverted to, the
|
||||
/// object traced (an image, or an Image Trace object traced again), its image, the image's encoded
|
||||
/// bytes, and the settings it is traced with. The tracer makes the same paths of the same inputs,
|
||||
/// so a trace made away from the command ([`TraceRun`]) stands in for the command's own in the same
|
||||
/// document until File › Revert replaces its content.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
struct TraceInputs {
|
||||
/// The [`DocState::uid`](crate::DocState::uid) of the document traced in. A trace made in one
|
||||
/// document never stands in for one in another, however alike their images and settings.
|
||||
doc: u64,
|
||||
/// The document's [`DocState::reverts`](crate::DocState::reverts) when the trace was prepared.
|
||||
/// A trace prepared before File › Revert never stands in for one after it, even when the
|
||||
/// restored image, pixels, object and settings are the same.
|
||||
reverts: u64,
|
||||
target: NodeId,
|
||||
image: Box<ImageObject>,
|
||||
/// The settings traced with, as JSON.
|
||||
@@ -625,7 +631,8 @@ fn prepare(s: &Session, c: &str, p: &Value) -> Result<Prepared> {
|
||||
let bytes = Arc::clone(&blob.bytes);
|
||||
let library = trace_library(c, s, &mut params)?;
|
||||
let traced_with = serde_json::to_value(¶ms).map_err(|e| EngineError::Other(e.to_string()))?;
|
||||
let inputs = TraceInputs { doc: s.doc()?.uid, target, image, params: traced_with, swatches: params.swatches.clone(), bytes };
|
||||
let st = s.doc()?;
|
||||
let inputs = TraceInputs { doc: st.uid, reverts: st.reverts, target, image, params: traced_with, swatches: params.swatches.clone(), bytes };
|
||||
Ok(Prepared { inputs, trace: params, view, params_json, preset_label, library })
|
||||
}
|
||||
|
||||
@@ -641,7 +648,8 @@ pub struct Traced {
|
||||
impl Traced {
|
||||
/// Hand it to the next run of its command with the same inputs ([`TraceRun::params`]) in the
|
||||
/// document it was made in, which applies it as one undo step instead of tracing again. Any
|
||||
/// other trace drops it, a trace in another document included.
|
||||
/// other trace drops it and traces again, a trace in another document included, and so does
|
||||
/// the command after File › Revert replaced the document's content.
|
||||
pub fn hand_in(self, s: &mut Session) {
|
||||
s.trace_hand_off = Some(self);
|
||||
}
|
||||
@@ -650,6 +658,8 @@ impl Traced {
|
||||
/// Decode the image bytes of `inputs` and trace them with `params`, telling `steps` how far it has
|
||||
/// got ([`tr::trace_watched`]); [`EngineError::Cancelled`] once `steps` answers `false`.
|
||||
fn trace_now(inputs: &TraceInputs, params: &tr::TraceParams, steps: &(dyn Fn(u64, u64) -> bool + Sync)) -> Result<Traced> {
|
||||
#[cfg(test)]
|
||||
TRACES_ON_THIS_THREAD.with(|n| n.set(n.get() + 1));
|
||||
// An image over the tracer's size is traced scaled down (the paths are scaled back).
|
||||
let raster = tr::Raster::decode_to_fit(&inputs.bytes).map_err(|e| EngineError::Other(e.to_string()))?;
|
||||
if !steps(0, 0) {
|
||||
@@ -725,17 +735,30 @@ impl TraceRun {
|
||||
}
|
||||
|
||||
/// Does it still apply: would the command trace the same object, image, pixels and settings
|
||||
/// now, in the document it was prepared in?
|
||||
/// now, in the document it was prepared in, with no File › Revert since?
|
||||
pub fn current(&self, s: &Session) -> bool {
|
||||
prepare(s, self.command, &self.params).is_ok_and(|now| now.inputs == self.prepared.inputs)
|
||||
}
|
||||
|
||||
/// Has File › Revert replaced the content of the document it was prepared in since then? False
|
||||
/// when that document is no longer open.
|
||||
pub fn reverted(&self, s: &Session) -> bool {
|
||||
let TraceInputs { doc, reverts, .. } = self.prepared.inputs;
|
||||
s.documents().iter().any(|st| st.uid == doc && st.reverts != reverts)
|
||||
}
|
||||
|
||||
/// Decode and trace the image, telling `steps` how far it has got → what it traced, or why it
|
||||
/// failed or stopped ([`EngineError::Cancelled`] once `steps` answers `false`). It touches no
|
||||
/// document, so it can run on any thread.
|
||||
pub fn run(&self, steps: &(dyn Fn(u64, u64) -> bool + Sync)) -> Result<Traced> {
|
||||
trace_now(&self.prepared.inputs, &self.prepared.trace, steps)
|
||||
}
|
||||
|
||||
/// How many images this thread has decoded and traced so far.
|
||||
#[cfg(test)]
|
||||
pub(crate) fn traces_on_this_thread() -> usize {
|
||||
TRACES_ON_THIS_THREAD.with(std::cell::Cell::get)
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result<Value> {
|
||||
|
||||
@@ -356,7 +356,8 @@ fn mirror_open(sp: &SubPath, axis: &Axis, m: Affine) -> Vec<SubPath> {
|
||||
if !end_on {
|
||||
run.reverse();
|
||||
}
|
||||
let Some((last, body)) = run.anchors.split_last() else { return vec![] };
|
||||
let run = run.anchors.into_vec();
|
||||
let Some((last, body)) = run.split_last() else { return vec![] };
|
||||
let q = axis.project(last.p);
|
||||
let mut anchors = body.to_vec();
|
||||
anchors.push(Anchor::with_handles(q, last.h_in, m * last.h_in));
|
||||
|
||||
@@ -10,6 +10,7 @@ use vectorcraft_doc::{CharStyle, Guide, Node, NodeId, NodeKind, SavedSelection,
|
||||
use vectorcraft_geom::Vec2;
|
||||
|
||||
use super::edit::selected_roots;
|
||||
use super::panelcmds::artboard_at;
|
||||
use super::pathops::Beside;
|
||||
use super::select::{first_selectable, is_selectable, selectable_ids, walk_selectable};
|
||||
use super::{
|
||||
@@ -201,7 +202,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Add Guide",
|
||||
[],
|
||||
None,
|
||||
"{vertical: bool, pos: pt (x for vertical, y for horizontal), artboard?: index (an artboard guide: it runs across that artboard only and moves, is copied and is deleted with it; default a canvas guide, across the whole canvas), layer?: id (the layer it is on, shown, hidden, locked and deleted with it; default the current layer)} → {index}",
|
||||
"{vertical: bool, pos: pt (x for vertical, y for horizontal), artboard?: index (0-based whole number; an artboard guide: it runs across that artboard only and moves, is copied and is deleted with it; default, or null, a canvas guide, across the whole canvas), layer?: id (the layer it is on, shown, hidden, locked and deleted with it; default the current layer)} → {index}",
|
||||
has_doc,
|
||||
guide_add
|
||||
),
|
||||
@@ -767,15 +768,8 @@ fn clear_guides(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
fn guide_add(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let pos = f64_req(p, "pos", "guide.add")?;
|
||||
let vertical = switch_or(p, "vertical", false, "guide.add")?;
|
||||
let artboard = match p.get("artboard").filter(|v| !v.is_null()) {
|
||||
Some(v) => {
|
||||
let boards = &s.doc()?.doc.artboards;
|
||||
let ab = v.as_u64().and_then(|i| boards.get(usize::try_from(i).ok()?)).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
|
||||
Some(ab.id)
|
||||
}
|
||||
None => None,
|
||||
};
|
||||
let st = s.doc()?;
|
||||
let artboard = artboard_at(&st.doc, p, "artboard", "guide.add")?.and_then(|i| st.doc.artboards.get(i)).map(|a| a.id);
|
||||
let layer = match id_param(p, "layer") {
|
||||
Some(l) if st.doc.node(l).is_some_and(Node::is_layer) => Some(l),
|
||||
Some(_) => return Err(bad("guide.add", "layer must name a layer or sublayer")),
|
||||
|
||||
@@ -46,7 +46,7 @@ fn fit_freehand(pts: &[Point], tol: f64, closed: bool) -> SubPath {
|
||||
let sp = vectorcraft_tools::draw2::catmull_rom(&marked, false);
|
||||
if sp.anchors.len() < 3 {
|
||||
// Two anchors closed would run back over the line itself.
|
||||
return SubPath::new(sp.anchors, closed && n > 2);
|
||||
return SubPath::of(sp.anchors, closed && n > 2);
|
||||
}
|
||||
let fitted = po::simplify_with(
|
||||
&PathData::single(sp.clone()),
|
||||
@@ -62,7 +62,7 @@ fn fit_freehand(pts: &[Point], tol: f64, closed: bool) -> SubPath {
|
||||
f.h_in = f.p;
|
||||
}
|
||||
}
|
||||
SubPath::new(anchors, closed)
|
||||
SubPath::of(anchors, closed)
|
||||
}
|
||||
|
||||
/// The path of a freehand stroke: fitted at `tol` ([`fit_freehand`]), or with no `tol` the points
|
||||
@@ -133,13 +133,13 @@ fn redraw_section(pd: &PathData, pts: &[Point], tol: Option<f64>, within: f64) -
|
||||
*s0 = s1.p;
|
||||
let (Some(e0), Some(e1)) = (stroke.last_mut(), sp.anchors.get(end)) else { return None };
|
||||
*e0 = e1.p;
|
||||
let fit = stroke_subpath(&stroke, tol, false).anchors;
|
||||
let fit = stroke_subpath(&stroke, tol, false).anchors.into_vec();
|
||||
let (Some(f0), Some(f1)) = (fit.first().copied(), fit.last().copied()) else { return None };
|
||||
let inner = fit.get(1..fit.len().saturating_sub(1)).unwrap_or_default();
|
||||
let (before, after): (Vec<Anchor>, Vec<Anchor>) = if sp.closed {
|
||||
((0..=(start + n - end) % n).filter_map(|k| sp.anchors.get((end + k) % n).copied()).collect(), vec![])
|
||||
} else {
|
||||
(sp.anchors.get(..=start)?.to_vec(), sp.anchors.get(end..)?.to_vec())
|
||||
(sp.anchors.get_range(..=start)?, sp.anchors.get_range(end..)?)
|
||||
};
|
||||
let mut anchors = before;
|
||||
if let Some(a) = anchors.last_mut() {
|
||||
@@ -316,12 +316,12 @@ pub(crate) fn freehand_brushed(s: &mut Session, p: &Value, brush_name: Option<&s
|
||||
// outgoing handle.
|
||||
let mut other_len = 0.0;
|
||||
if let Some((_, _, y, _)) = &connect
|
||||
&& let Some((y0, rest)) = y.anchors.split_first()
|
||||
&& let Some(y0) = y.anchors.first()
|
||||
{
|
||||
if let Some(last) = sp.anchors.last_mut() {
|
||||
*last = Anchor::with_handles(y0.p, last.h_in + (y0.p - last.p), y0.h_out);
|
||||
}
|
||||
sp.anchors.extend_from_slice(rest);
|
||||
sp.anchors.extend(y.anchors.iter().skip(1));
|
||||
other_len = subpath_len(y);
|
||||
}
|
||||
// What the pen recorded along the path (in the direction it is continued in), followed by
|
||||
|
||||
@@ -274,7 +274,7 @@ fn refit_run(anchors: &[Anchor], tol: f64, sigma: f64, free: [bool; 2]) -> Vec<A
|
||||
for a in &mut out {
|
||||
*a = Anchor::with_handles(a.p, a.h_in, a.h_out);
|
||||
}
|
||||
out
|
||||
out.into_vec()
|
||||
}
|
||||
|
||||
/// Distance (points) from an anchor within which a smoothed closed path starts at that anchor
|
||||
@@ -549,7 +549,7 @@ fn smooth_subpath(sp: &SubPath, pts: &[Point], radius: f64, share: usize, tol: f
|
||||
if sp.closed {
|
||||
let start = sp.anchors[0].p;
|
||||
let Some(k) = marked.iter().position(|m| !m) else {
|
||||
let corners = smooth_corners(&sp.anchors, true, radius);
|
||||
let corners = smooth_corners(&sp.anchors.contiguous(), true, radius);
|
||||
let Some(c) = corners.iter().position(|c| *c) else {
|
||||
// Everything is in range and nothing is a corner: smooth the whole closed path,
|
||||
// across its start too.
|
||||
@@ -557,7 +557,7 @@ fn smooth_subpath(sp: &SubPath, pts: &[Point], radius: f64, share: usize, tol: f
|
||||
return f.subpaths.into_iter().next().map(|r| start_nearest(r, start, sp));
|
||||
};
|
||||
// Cut the path open at a corner, which then ends the last part as well as starting the first.
|
||||
let mut open = sp.anchors.clone();
|
||||
let mut open = sp.anchors.to_vec();
|
||||
open.rotate_left(c);
|
||||
let mut cut = corners;
|
||||
cut.rotate_left(c);
|
||||
@@ -576,15 +576,14 @@ fn smooth_subpath(sp: &SubPath, pts: &[Point], radius: f64, share: usize, tol: f
|
||||
return Some(start_nearest(SubPath::new(res, true), start, sp));
|
||||
};
|
||||
// Rotate so an untouched anchor comes first, duplicate it at the end and treat as open.
|
||||
let mut open = sp.clone();
|
||||
open.anchors.rotate_left(k);
|
||||
let mut open = sp.anchors.to_vec();
|
||||
open.rotate_left(k);
|
||||
let mut m = marked.clone();
|
||||
m.rotate_left(k);
|
||||
open.anchors.push(open.anchors[0]);
|
||||
open.push(open[0]);
|
||||
m.push(false);
|
||||
open.closed = false;
|
||||
let mut res = smooth_open(&open.anchors, &m, near, tol, sigma, radius, false);
|
||||
if same_anchors(&res, &open.anchors) {
|
||||
let mut res = smooth_open(&open, &m, near, tol, sigma, radius, false);
|
||||
if same_anchors(&res, &open) {
|
||||
return None;
|
||||
}
|
||||
let l = res.pop()?;
|
||||
@@ -595,8 +594,9 @@ fn smooth_subpath(sp: &SubPath, pts: &[Point], radius: f64, share: usize, tol: f
|
||||
let res = SubPath::new(res, true);
|
||||
return Some(if k == 0 { res } else { start_nearest(res, start, sp) });
|
||||
}
|
||||
let res = smooth_open(&sp.anchors, &marked, near, tol, sigma, radius, true);
|
||||
(!same_anchors(&res, &sp.anchors)).then(|| SubPath::new(res, false))
|
||||
let anchors = sp.anchors.contiguous();
|
||||
let res = smooth_open(&anchors, &marked, near, tol, sigma, radius, true);
|
||||
(!same_anchors(&res, &anchors)).then(|| SubPath::new(res, false))
|
||||
}
|
||||
|
||||
/// The segment `c`, which ends in the drag's reach (`near`) and starts outside it, split where it
|
||||
|
||||
@@ -54,6 +54,7 @@ pub mod ppi;
|
||||
pub mod progress;
|
||||
mod psdlayers;
|
||||
pub mod psdread;
|
||||
mod psdslices;
|
||||
mod pxrread;
|
||||
mod save;
|
||||
mod screens;
|
||||
@@ -93,6 +94,9 @@ pub(crate) use native::preview_png;
|
||||
pub use native::with_compression_pref;
|
||||
pub(crate) use pdfimport::opened_page_document;
|
||||
pub use pdfimport::{LoadOptions, page_document};
|
||||
pub(crate) use psdlayers::import_active as psd_layers;
|
||||
pub use psdlayers::{PsdInfo, info as psd_info};
|
||||
pub(crate) use psdslices::over as psd_slices;
|
||||
pub(crate) use save::job_for;
|
||||
pub(crate) use save::save as save_document;
|
||||
pub use save::{
|
||||
@@ -240,6 +244,8 @@ mod tests_psd;
|
||||
mod tests_psdlayers;
|
||||
#[cfg(test)]
|
||||
mod tests_psdread;
|
||||
#[cfg(test)]
|
||||
mod tests_psdslices;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests_heifread;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -528,17 +528,26 @@ pub fn load_with(name: &str, bytes: &[u8], opts: &LoadOptions) -> Result<Loaded>
|
||||
}
|
||||
// A PSD or PSB file's layers become layers (`layers`, default on); without layers, or with
|
||||
// `layers: false`, its merged image opens. Layers that can't be read leave the merged image.
|
||||
"psd" | "psb" if opts.layers => {
|
||||
let cms = vectorcraft_color::cms::active();
|
||||
match super::psdlayers::import(bytes, opts.hidden_layers, MAX_RASTER_ALLOC, |c| cms.cmyk_to_srgb(c, false)) {
|
||||
Ok(Some((doc, warnings))) => (doc, warnings, false),
|
||||
Ok(None) => (raster_doc(&title, bytes)?, vec![], false),
|
||||
Err(e) => (raster_doc(&title, bytes)?, vec![format!("the layers can't be read ({e}): the file opened as its merged image")], false),
|
||||
}
|
||||
}
|
||||
"psd" | "psb" if opts.layers => match super::psdlayers::import_active(bytes, opts.hidden_layers) {
|
||||
Ok(Some((doc, warnings))) => (doc, warnings, false),
|
||||
Ok(None) => (raster_doc(&title, bytes)?, vec![], false),
|
||||
Err(e) => (raster_doc(&title, bytes)?, vec![format!("the layers can't be read ({e}): the file opened as its merged image")], false),
|
||||
},
|
||||
_ if format.raster => (raster_doc(&title, bytes)?, vec![], false),
|
||||
_ => return Err(err(format!("{} files can't be opened yet", format.label))),
|
||||
};
|
||||
// A PSD or PSB file's slices become user slices over its canvas (`importSlices`, default on),
|
||||
// whether its layers or its merged image came in.
|
||||
if matches!(format.id, "psd" | "psb")
|
||||
&& opts.import_slices
|
||||
&& let Some(canvas) = doc.artboards.first().map(|a| a.rect)
|
||||
{
|
||||
let (slices, notes) = super::psd_slices(bytes, canvas);
|
||||
for (rect, options) in slices {
|
||||
crate::cmd::slices::add_slice(&mut doc, rect, options);
|
||||
}
|
||||
warnings.extend(notes);
|
||||
}
|
||||
// A PDF, `.ai` or `.ait` read from its pages or its editing copy, not restored from the document
|
||||
// it carries, opens with the File Info it gives (a PostScript `.ai` gives none).
|
||||
if matches!(format.id, "pdf" | "ai" | "ait")
|
||||
|
||||
@@ -36,6 +36,8 @@ pub struct LoadOptions {
|
||||
pub layers: bool,
|
||||
/// A PSD or PSB file's hidden layers come in, hidden (`hiddenLayers`; else they are left out).
|
||||
pub hidden_layers: bool,
|
||||
/// A PSD or PSB file's slices become user slices (`importSlices`; else they are left out).
|
||||
pub import_slices: bool,
|
||||
/// How a DXF drawing comes in (the `dxf` param, see [`super::dxfimport`]).
|
||||
pub dxf: vectorcraft_cad::ImportOptions,
|
||||
/// An Illustrator EPS or `.ai` that carries the editing copy of its art opens from it (its
|
||||
@@ -67,6 +69,7 @@ impl Default for LoadOptions {
|
||||
text_as: TextAs::default(),
|
||||
layers: true,
|
||||
hidden_layers: false,
|
||||
import_slices: true,
|
||||
dxf: Default::default(),
|
||||
editing_data: true,
|
||||
trust_editing_data: false,
|
||||
@@ -81,7 +84,7 @@ impl LoadOptions {
|
||||
/// From command params: `pages` (`"2-3, 5"`, a page number or `"all"`), `page` (one page, when
|
||||
/// `pages` isn't given), `cropTo` (or `crop`), `password`, `colorMode` (`rgb` | `cmyk`) with `grays`,
|
||||
/// `textAs` (`text` | `outlines`), `layers` (true | false), `hiddenLayers` (true | false),
|
||||
/// `editingData` (true | false | `always`),
|
||||
/// `importSlices` (true | false), `editingData` (true | false | `always`),
|
||||
/// `legacyNameEncoding` (one of [`vectorcraft_eps::NameEncoding::LABELS`]), `linkPages` (true |
|
||||
/// false) and `dxf` (the DXF import options).
|
||||
pub fn from_params(cmd: &str, p: &Value) -> Result<Self> {
|
||||
@@ -111,6 +114,10 @@ impl LoadOptions {
|
||||
None => false,
|
||||
Some(v) => v.as_bool().ok_or_else(|| bad(cmd, "hiddenLayers must be true or false"))?,
|
||||
};
|
||||
let import_slices = match p.get("importSlices").filter(|v| !v.is_null()) {
|
||||
None => true,
|
||||
Some(v) => v.as_bool().ok_or_else(|| bad(cmd, "importSlices must be true or false"))?,
|
||||
};
|
||||
let (editing_data, trust_editing_data) = match p.get("editingData").filter(|v| !v.is_null()) {
|
||||
None => (true, false),
|
||||
Some(Value::String(s)) if s.eq_ignore_ascii_case("always") => (true, true),
|
||||
@@ -137,6 +144,7 @@ impl LoadOptions {
|
||||
text_as,
|
||||
layers,
|
||||
hidden_layers,
|
||||
import_slices,
|
||||
dxf,
|
||||
editing_data,
|
||||
trust_editing_data,
|
||||
|
||||
@@ -43,6 +43,7 @@ use std::cell::Cell;
|
||||
use std::sync::Arc;
|
||||
|
||||
use image::RgbaImage;
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_color::BlendMode;
|
||||
use vectorcraft_color::blend::{blend_rgb, composite};
|
||||
use vectorcraft_color::cms::{Lab, lab::lab_to_srgb};
|
||||
@@ -51,6 +52,7 @@ use vectorcraft_geom::Affine;
|
||||
|
||||
use super::load::{RasterImage, as_png};
|
||||
use super::psdread::{Header, Reader, byte, header, layer_channel, layer_info, long_key, row_bytes, sample, to_rgb};
|
||||
use crate::cmd::Session;
|
||||
use crate::cmd::place::text::mac_roman;
|
||||
|
||||
/// Most layer groups inside one another.
|
||||
@@ -1527,3 +1529,65 @@ pub(super) fn import(
|
||||
doc.limit_depth_noting(&mut warnings);
|
||||
Ok(Some((doc, warnings)))
|
||||
}
|
||||
|
||||
/// [`import`] within the memory allowed for one image, CMYK converted with the active color
|
||||
/// settings: what `document.open` and `file.place` read a PSD or PSB file's layers with.
|
||||
pub(crate) fn import_active(bytes: &[u8], hidden: bool) -> Result<Option<(Document, Vec<String>)>, String> {
|
||||
let cms = vectorcraft_color::cms::active();
|
||||
import(bytes, hidden, super::MAX_RASTER_ALLOC, |c| cms.cmyk_to_srgb(c, false))
|
||||
}
|
||||
|
||||
/// What a PSD or PSB file holds (`document.psdInfo`, the PSD Import Options dialog).
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub struct PsdInfo {
|
||||
/// The large document format.
|
||||
pub psb: bool,
|
||||
/// The canvas, in pixels.
|
||||
pub width: u32,
|
||||
pub height: u32,
|
||||
/// The layers, group markers left out.
|
||||
pub layers: usize,
|
||||
/// The layers among them that are hidden.
|
||||
pub hidden: usize,
|
||||
/// The layer groups.
|
||||
pub groups: usize,
|
||||
/// The slices that come in with `importSlices` (those generated automatically, and those
|
||||
/// outside the canvas, left out).
|
||||
pub slices: usize,
|
||||
}
|
||||
|
||||
/// What PSD or PSB file `bytes` holds, read from its header, its slices and its layer records
|
||||
/// without decoding any pixels. A file without layer records, or whose layer records can't be read, has no layers: it
|
||||
/// opens and places as its merged image.
|
||||
pub fn info(bytes: &[u8]) -> Result<PsdInfo, String> {
|
||||
let mut r = Reader::new(bytes);
|
||||
let h = header(&mut r)?;
|
||||
let records = layer_info(h.layers, h.psb).filter(|info| info.len() > 2).and_then(|info| records(info, h.psb).ok()).unwrap_or_default();
|
||||
let layers = records.iter().filter(|r| r.divider == 0);
|
||||
Ok(PsdInfo {
|
||||
psb: h.psb,
|
||||
width: h.width,
|
||||
height: h.height,
|
||||
layers: layers.clone().count(),
|
||||
hidden: layers.filter(|r| r.hidden).count(),
|
||||
groups: records.iter().filter(|r| matches!(r.divider, 1 | 2)).count(),
|
||||
slices: super::psdslices::count(bytes),
|
||||
})
|
||||
}
|
||||
|
||||
const INFO: &str = "document.psdInfo";
|
||||
|
||||
/// `document.psdInfo`.
|
||||
pub(super) fn psd_info(_: &mut Session, p: &Value) -> crate::cmd::Result<Value> {
|
||||
let bytes = super::source(p, INFO)?.bytes;
|
||||
let i = info(&bytes).map_err(super::load::err)?;
|
||||
Ok(json!({
|
||||
"format": if i.psb { "psb" } else { "psd" },
|
||||
"width": i.width,
|
||||
"height": i.height,
|
||||
"layers": i.layers,
|
||||
"hiddenLayers": i.hidden,
|
||||
"groups": i.groups,
|
||||
"slices": i.slices,
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ pub(super) struct Header<'a> {
|
||||
/// Colour mode data: an indexed image's palette (256 reds, then greens, then blues).
|
||||
palette: &'a [u8],
|
||||
/// The image resources.
|
||||
resources: &'a [u8],
|
||||
pub(super) resources: &'a [u8],
|
||||
/// The layer and mask information.
|
||||
pub(super) layers: &'a [u8],
|
||||
}
|
||||
@@ -172,7 +172,7 @@ pub fn resolution(bytes: &[u8]) -> Option<(f64, f64)> {
|
||||
/// The image resource blocks of `resources`, in file order: each one's id, name (the bytes of its
|
||||
/// Pascal string) and data. Stops at the first block that is cut short. With `signed`, only the
|
||||
/// blocks whose signature is `8BIM` are given.
|
||||
fn resources(resources: &[u8], signed: bool) -> impl Iterator<Item = (u16, &[u8], &[u8])> {
|
||||
pub(super) fn resources(resources: &[u8], signed: bool) -> impl Iterator<Item = (u16, &[u8], &[u8])> {
|
||||
let mut r = Reader::new(resources);
|
||||
std::iter::from_fn(move || {
|
||||
if r.rest().is_empty() {
|
||||
|
||||
@@ -0,0 +1,408 @@
|
||||
//! The slices a Photoshop document (PSD or PSB) stores, for `document.open` and `file.place`
|
||||
//! with `importSlices`: image resource 1050, read from the "Slices resource format" of Adobe's
|
||||
//! public Photoshop File Formats Specification
|
||||
//! (<https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/>). Version 6 stores the slices
|
||||
//! as records; versions 7 and 8 store them in a descriptor. The descriptor's keys, and the meaning
|
||||
//! of the origin, type and background values, are read as the MIT-licensed ag-psd reads them
|
||||
//! (<https://github.com/Agamnentzar/ag-psd>, `src/imageResources.ts` and `src/descriptor.ts`),
|
||||
//! which agrees with psd.rb (<https://github.com/layervault/psd.rb>,
|
||||
//! `lib/psd/resources/slices.rb`) on the keys both read.
|
||||
//!
|
||||
//! A slice the file marks as generated automatically is left out: the document lays out its own
|
||||
//! auto slices around the others. A slice that follows a layer comes in as a user slice over the
|
||||
//! rectangle the file stores for it. Each slice keeps its name, its type (Image or No Image), its
|
||||
//! link, target, message, alternative text, cell text and background color; text alignment isn't
|
||||
//! read. The file is untrusted: every read is checked, and the slice count, the strings and the
|
||||
//! descriptor's nesting and item count are capped.
|
||||
|
||||
use vectorcraft_doc::{SliceKind, SliceOptions};
|
||||
use vectorcraft_geom::Rect;
|
||||
|
||||
use super::psdread::{Reader, TRUNCATED, header, resources};
|
||||
|
||||
/// The image resource that holds the slices.
|
||||
const SLICES: u16 = 1050;
|
||||
|
||||
/// The most slices one file brings in.
|
||||
const MAX_SLICES: usize = 10_000;
|
||||
|
||||
/// The deepest descriptor objects and lists nest.
|
||||
const MAX_DEPTH: usize = 16;
|
||||
|
||||
/// The most values the descriptors of one slices resource hold together, nested ones included.
|
||||
const MAX_VALUES: usize = 200_000;
|
||||
|
||||
/// The error of descriptors that hold more than [`MAX_VALUES`].
|
||||
const TOO_MANY_VALUES: &str = "the slices' descriptor holds too many values";
|
||||
|
||||
/// One slice as the file stores it.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
struct PsdSlice {
|
||||
/// Left, top, right and bottom, in the canvas's pixels.
|
||||
rect: [i64; 4],
|
||||
options: SliceOptions,
|
||||
}
|
||||
|
||||
/// The slices a file stores, those generated automatically left out, and its canvas.
|
||||
struct Stored {
|
||||
slices: Vec<PsdSlice>,
|
||||
/// The canvas's width and height, in pixels.
|
||||
size: (u32, u32),
|
||||
}
|
||||
|
||||
/// The slices PSD or PSB file `bytes` stores. `None` when it stores none (no `8BIM` resource 1050
|
||||
/// before the image resources end or are cut short). An error when the file isn't a PSD or PSB
|
||||
/// file, or its slices can't be read.
|
||||
fn read(bytes: &[u8]) -> Result<Option<Stored>, String> {
|
||||
let mut r = Reader::new(bytes);
|
||||
let h = header(&mut r)?;
|
||||
let Some((_, _, data)) = resources(h.resources, true).find(|(id, _, _)| *id == SLICES) else { return Ok(None) };
|
||||
Ok(Some(Stored { slices: decode(data)?, size: (h.width, h.height) }))
|
||||
}
|
||||
|
||||
/// The slices of resource 1050's `data`.
|
||||
fn decode(data: &[u8]) -> Result<Vec<PsdSlice>, String> {
|
||||
let mut r = Reader::new(data);
|
||||
// The values every descriptor of the resource may hold together.
|
||||
let mut budget = MAX_VALUES;
|
||||
match r.u32()? {
|
||||
6 => version_6(&mut r, &mut budget),
|
||||
7 | 8 => {
|
||||
if r.u32()? != 16 {
|
||||
return Err("the slices' descriptor has a version other than 16".into());
|
||||
}
|
||||
let d = descriptor(&mut r, 0, &mut budget)?;
|
||||
from_descriptor(&d)
|
||||
}
|
||||
v => Err(format!("the slices are stored in version {v}, which isn't read")),
|
||||
}
|
||||
}
|
||||
|
||||
/// Version 6: the bounds of all the slices, the group's name, the count, then each slice's record.
|
||||
/// The descriptors that follow the records spend one `budget` of values between them.
|
||||
fn version_6(r: &mut Reader<'_>, budget: &mut usize) -> Result<Vec<PsdSlice>, String> {
|
||||
r.take(16)?;
|
||||
unicode(r)?;
|
||||
let count = r.u32()? as usize;
|
||||
if count > MAX_SLICES {
|
||||
return Err(format!("the file has {count} slices, more than the {MAX_SLICES} read"));
|
||||
}
|
||||
let mut out = vec![];
|
||||
for _ in 0..count {
|
||||
// The ID and group ID.
|
||||
r.take(8)?;
|
||||
let origin = r.u32()?;
|
||||
// A slice that follows a layer gives the layer's ID.
|
||||
if origin == 1 {
|
||||
r.take(4)?;
|
||||
}
|
||||
let name = unicode(r)?;
|
||||
let kind = if r.u32()? == 0 { SliceKind::NoImage } else { SliceKind::Image };
|
||||
let mut rect = [0i64; 4];
|
||||
for v in &mut rect {
|
||||
*v = i64::from(r.u32()? as i32);
|
||||
}
|
||||
let (url, target, message, alt) = (unicode(r)?, unicode(r)?, unicode(r)?, unicode(r)?);
|
||||
let html = r.u8()? != 0;
|
||||
let cell = unicode(r)?;
|
||||
// The horizontal and vertical alignment.
|
||||
r.take(8)?;
|
||||
let [a, red, green, blue] = r.array::<4>()?;
|
||||
let background = if a == 0 && red == 0 && green == 0 && blue == 0 {
|
||||
String::new()
|
||||
} else if a == 0 {
|
||||
"matte".into()
|
||||
} else {
|
||||
format!("#{red:02x}{green:02x}{blue:02x}")
|
||||
};
|
||||
// Photoshop 7 and later may follow a record with a descriptor (version 16); a record that
|
||||
// doesn't start one is the next slice. A descriptor read that uses up the budget is an
|
||||
// error.
|
||||
if r.rest().starts_with(&16u32.to_be_bytes()) {
|
||||
let mut ahead = Reader::new(r.rest());
|
||||
ahead.u32()?;
|
||||
match descriptor(&mut ahead, 0, budget) {
|
||||
Ok(_) => {
|
||||
let used = r.rest().len() - ahead.rest().len();
|
||||
r.take(used)?;
|
||||
}
|
||||
Err(e) if e == TOO_MANY_VALUES => return Err(e),
|
||||
Err(_) => {}
|
||||
}
|
||||
}
|
||||
// Origin 0 is a slice generated automatically.
|
||||
if origin != 0 {
|
||||
let options = SliceOptions { kind, name, url, target, message, alt, text: cell_text(cell, html), background, ..Default::default() };
|
||||
out.push(PsdSlice { rect, options: for_kind(options) });
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// Versions 7 and 8: the descriptor's `slices` list, each slice an object.
|
||||
fn from_descriptor(d: &[(String, Value)]) -> Result<Vec<PsdSlice>, String> {
|
||||
let Some(Value::List(list)) = field(d, "slices") else { return Err("the slices' descriptor has no list of slices".into()) };
|
||||
if list.len() > MAX_SLICES {
|
||||
return Err(format!("the file has {} slices, more than the {MAX_SLICES} read", list.len()));
|
||||
}
|
||||
let mut out = vec![];
|
||||
for s in list {
|
||||
let Value::Object(s) = s else { return Err("the slices' descriptor lists something other than a slice".into()) };
|
||||
if matches!(field(s, "origin"), Some(Value::Enum(_, v)) if v == "autoGenerated") {
|
||||
continue;
|
||||
}
|
||||
let Some(Value::Object(b)) = field(s, "bounds") else { return Err("a slice in the slices' descriptor has no bounds".into()) };
|
||||
let edge = |k: &str| number(field(b, k)).ok_or_else(|| "a slice's bounds in the slices' descriptor aren't numbers".to_string());
|
||||
let rect = [edge("Left")?, edge("Top ")?, edge("Rght")?, edge("Btom")?];
|
||||
let text = |k: &str| match field(s, k) {
|
||||
Some(Value::Text(t)) => t.clone(),
|
||||
_ => String::new(),
|
||||
};
|
||||
let kind = if matches!(field(s, "Type"), Some(Value::Enum(_, v)) if v == "noImage") { SliceKind::NoImage } else { SliceKind::Image };
|
||||
let html = matches!(field(s, "cellTextIsHTML"), Some(Value::Bool(true)));
|
||||
let background = match field(s, "bgColorType") {
|
||||
Some(Value::Enum(_, v)) if v == "matte" => "matte".into(),
|
||||
Some(Value::Enum(_, v)) if v == "Clr " => match field(s, "bgColor") {
|
||||
Some(Value::Object(c)) => {
|
||||
let channel = |k: &str| number(field(c, k)).map(|v| v.clamp(0, 255));
|
||||
match (channel("Rd "), channel("Grn "), channel("Bl ")) {
|
||||
(Some(r), Some(g), Some(b)) => format!("#{r:02x}{g:02x}{b:02x}"),
|
||||
_ => String::new(),
|
||||
}
|
||||
}
|
||||
_ => String::new(),
|
||||
},
|
||||
_ => String::new(),
|
||||
};
|
||||
let options = SliceOptions {
|
||||
kind,
|
||||
name: text("Nm "),
|
||||
url: text("url"),
|
||||
target: text("null"),
|
||||
message: text("Msge"),
|
||||
alt: text("altTag"),
|
||||
text: cell_text(text("cellText"), html),
|
||||
background,
|
||||
..Default::default()
|
||||
};
|
||||
out.push(PsdSlice { rect, options: for_kind(options) });
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// `o` with only the options of its slice type: an Image slice's cell text isn't shown, and a No
|
||||
/// Image slice has no link, target, message or alternative text.
|
||||
fn for_kind(mut o: SliceOptions) -> SliceOptions {
|
||||
if o.kind == SliceKind::Image {
|
||||
o.text.clear();
|
||||
} else {
|
||||
for s in [&mut o.url, &mut o.target, &mut o.message, &mut o.alt] {
|
||||
s.clear();
|
||||
}
|
||||
}
|
||||
o
|
||||
}
|
||||
|
||||
/// A cell's text as the HTML a No Image slice shows: plain text has `&`, `<` and `>` escaped.
|
||||
fn cell_text(text: String, html: bool) -> String {
|
||||
if html { text } else { text.replace('&', "&").replace('<', "<").replace('>', ">") }
|
||||
}
|
||||
|
||||
/// The longest text one string, key or class ID holds (UTF-16 units or bytes).
|
||||
const MAX_TEXT: usize = 65_536;
|
||||
|
||||
/// An error unless `n`, the length a string or ID declares, is at most [`MAX_TEXT`].
|
||||
fn text_len(n: usize) -> Result<usize, String> {
|
||||
if n > MAX_TEXT {
|
||||
return Err(format!("a text in the slices has more than the {MAX_TEXT} characters read"));
|
||||
}
|
||||
Ok(n)
|
||||
}
|
||||
|
||||
/// A Unicode string: a count of UTF-16 units, then the units; trailing NULs dropped.
|
||||
fn unicode(r: &mut Reader<'_>) -> Result<String, String> {
|
||||
let n = text_len(r.u32()? as usize)?;
|
||||
let bytes = r.take(n.checked_mul(2).ok_or(TRUNCATED)?)?;
|
||||
let units: Vec<u16> = bytes.as_chunks::<2>().0.iter().map(|u| u16::from_be_bytes(*u)).collect();
|
||||
Ok(String::from_utf16_lossy(&units).trim_end_matches('\0').to_string())
|
||||
}
|
||||
|
||||
/// A descriptor's value, as far as the slices need it.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
enum Value {
|
||||
Long(i32),
|
||||
Double(f64),
|
||||
Bool(bool),
|
||||
Text(String),
|
||||
/// An enumeration's type and value.
|
||||
Enum(String, String),
|
||||
Object(Vec<(String, Value)>),
|
||||
List(Vec<Value>),
|
||||
/// A value of another type, read past.
|
||||
Other,
|
||||
}
|
||||
|
||||
/// The value with key `key`.
|
||||
fn field<'a>(d: &'a [(String, Value)], key: &str) -> Option<&'a Value> {
|
||||
d.iter().find(|(k, _)| k == key).map(|(_, v)| v)
|
||||
}
|
||||
|
||||
/// A whole number: a long, or a finite double rounded.
|
||||
fn number(v: Option<&Value>) -> Option<i64> {
|
||||
match v? {
|
||||
Value::Long(n) => Some(i64::from(*n)),
|
||||
Value::Double(d) if d.is_finite() && d.abs() < 1e12 => Some(d.round() as i64),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// A key or class ID: a length, then that many characters, or four when the length is 0.
|
||||
fn id(r: &mut Reader<'_>) -> Result<String, String> {
|
||||
let n = text_len(r.u32()? as usize)?;
|
||||
let b = r.take(if n == 0 { 4 } else { n })?;
|
||||
Ok(String::from_utf8_lossy(b).into_owned())
|
||||
}
|
||||
|
||||
/// A class: its Unicode name, then its ID.
|
||||
fn class(r: &mut Reader<'_>) -> Result<(), String> {
|
||||
unicode(r)?;
|
||||
id(r)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// A descriptor: its class, the count of its items, then each item's key, type and value.
|
||||
fn descriptor(r: &mut Reader<'_>, depth: usize, budget: &mut usize) -> Result<Vec<(String, Value)>, String> {
|
||||
if depth > MAX_DEPTH {
|
||||
return Err("the slices' descriptor nests too deep".into());
|
||||
}
|
||||
class(r)?;
|
||||
let count = r.u32()? as usize;
|
||||
let mut out = vec![];
|
||||
for _ in 0..count {
|
||||
let key = id(r)?;
|
||||
let kind = r.array::<4>()?;
|
||||
out.push((key, value(r, &kind, depth, budget)?));
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// A value of type `kind`.
|
||||
fn value(r: &mut Reader<'_>, kind: &[u8; 4], depth: usize, budget: &mut usize) -> Result<Value, String> {
|
||||
*budget = budget.checked_sub(1).ok_or(TOO_MANY_VALUES)?;
|
||||
Ok(match kind {
|
||||
b"long" => Value::Long(r.u32()? as i32),
|
||||
b"doub" => Value::Double(f64::from_be_bytes(r.array()?)),
|
||||
b"UntF" => {
|
||||
r.take(4)?;
|
||||
Value::Double(f64::from_be_bytes(r.array()?))
|
||||
}
|
||||
b"UnFl" => {
|
||||
r.take(4)?;
|
||||
Value::Double(f64::from(f32::from_be_bytes(r.array()?)))
|
||||
}
|
||||
b"bool" => Value::Bool(r.u8()? != 0),
|
||||
b"TEXT" => Value::Text(unicode(r)?),
|
||||
b"enum" => Value::Enum(id(r)?, id(r)?),
|
||||
b"Objc" | b"GlbO" => Value::Object(descriptor(r, depth + 1, budget)?),
|
||||
b"VlLs" => {
|
||||
if depth >= MAX_DEPTH {
|
||||
return Err("the slices' descriptor nests too deep".into());
|
||||
}
|
||||
let count = r.u32()? as usize;
|
||||
let mut items = vec![];
|
||||
for _ in 0..count {
|
||||
let kind = r.array::<4>()?;
|
||||
items.push(value(r, &kind, depth + 1, budget)?);
|
||||
}
|
||||
Value::List(items)
|
||||
}
|
||||
b"comp" => {
|
||||
r.take(8)?;
|
||||
Value::Other
|
||||
}
|
||||
b"type" | b"GlbC" => {
|
||||
class(r)?;
|
||||
Value::Other
|
||||
}
|
||||
b"tdta" | b"alis" => {
|
||||
let n = r.u32()? as usize;
|
||||
r.take(n)?;
|
||||
Value::Other
|
||||
}
|
||||
b"obj " => {
|
||||
let count = r.u32()? as usize;
|
||||
for _ in 0..count {
|
||||
*budget = budget.checked_sub(1).ok_or(TOO_MANY_VALUES)?;
|
||||
match &r.array::<4>()? {
|
||||
b"prop" => {
|
||||
class(r)?;
|
||||
id(r)?;
|
||||
}
|
||||
b"Clss" => class(r)?,
|
||||
b"Enmr" => {
|
||||
class(r)?;
|
||||
id(r)?;
|
||||
id(r)?;
|
||||
}
|
||||
b"rele" => {
|
||||
class(r)?;
|
||||
r.take(4)?;
|
||||
}
|
||||
b"Idnt" | b"indx" => {
|
||||
r.take(4)?;
|
||||
}
|
||||
b"name" => {
|
||||
class(r)?;
|
||||
unicode(r)?;
|
||||
}
|
||||
k => return Err(format!("the slices' descriptor has a reference of an unknown kind ({})", String::from_utf8_lossy(k))),
|
||||
}
|
||||
}
|
||||
Value::Other
|
||||
}
|
||||
k => return Err(format!("the slices' descriptor has a value of an unknown type ({})", String::from_utf8_lossy(k))),
|
||||
})
|
||||
}
|
||||
|
||||
/// The slices of PSD or PSB file `bytes` laid over `canvas`, the box its canvas takes (points),
|
||||
/// each clipped to the canvas, with warnings: for slices that lie wholly outside it or have no
|
||||
/// size, and for slices that can't be read (the file comes in without them). Empty, without a
|
||||
/// warning, when the file stores no slices.
|
||||
pub(crate) fn over(bytes: &[u8], canvas: Rect) -> (Vec<(Rect, SliceOptions)>, Vec<String>) {
|
||||
match read(bytes) {
|
||||
Ok(None) => (vec![], vec![]),
|
||||
Ok(Some(s)) => laid_over(&s.slices, s.size, canvas),
|
||||
Err(e) => (vec![], vec![format!("the slices can't be read ({e}) and were left out")]),
|
||||
}
|
||||
}
|
||||
|
||||
/// `slices` of a canvas of `size` pixels laid over `canvas` (points).
|
||||
fn laid_over(slices: &[PsdSlice], (w, h): (u32, u32), canvas: Rect) -> (Vec<(Rect, SliceOptions)>, Vec<String>) {
|
||||
let (sx, sy) = (canvas.width() / f64::from(w.max(1)), canvas.height() / f64::from(h.max(1)));
|
||||
let mut out = vec![];
|
||||
for s in slices {
|
||||
let [l, t, r, b] = s.rect;
|
||||
let (l, r) = (l.clamp(0, i64::from(w)), r.clamp(0, i64::from(w)));
|
||||
let (t, b) = (t.clamp(0, i64::from(h)), b.clamp(0, i64::from(h)));
|
||||
if l < r && t < b {
|
||||
let x = |v: i64| canvas.x0 + v as f64 * sx;
|
||||
let y = |v: i64| canvas.y0 + v as f64 * sy;
|
||||
out.push((Rect::new(x(l), y(t), x(r), y(b)), s.options.clone()));
|
||||
}
|
||||
}
|
||||
let warnings = match slices.len() - out.len() {
|
||||
0 => vec![],
|
||||
1 => vec!["1 slice lies outside the canvas or has no size and was left out".to_string()],
|
||||
n => vec![format!("{n} slices lie outside the canvas or have no size and were left out")],
|
||||
};
|
||||
(out, warnings)
|
||||
}
|
||||
|
||||
/// How many slices of PSD or PSB file `bytes` come in (`document.psdInfo`): 0 when it stores none
|
||||
/// or they can't be read.
|
||||
pub(crate) fn count(bytes: &[u8]) -> usize {
|
||||
match read(bytes) {
|
||||
Ok(Some(Stored { slices, size: (w, h) })) => laid_over(&slices, (w, h), Rect::new(0.0, 0.0, f64::from(w), f64::from(h))).0.len(),
|
||||
_ => 0,
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,8 @@
|
||||
//! Opening PSD and PSB files with their layers as layers (`document.open`'s `layers` and
|
||||
//! `hiddenLayers`): names, visibility, opacity, blend modes, groups, layer masks, clipped layers
|
||||
//! and blend modes VectorCraft lacks merged, 16-bit and PSB files, VectorCraft's own PSD export
|
||||
//! read back, and damaged files read without a panic.
|
||||
//! read back, and damaged files read without a panic. Placing them with their layers as objects
|
||||
//! (`file.place`'s `layers` and `hiddenLayers`), and `document.psdInfo`.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_color::BlendMode;
|
||||
@@ -967,10 +968,12 @@ fn damaged_layers_never_panic() {
|
||||
let mut f = good.clone();
|
||||
f[i] = v;
|
||||
let _ = psdlayers::import(&f, true, 1 << 30, cms);
|
||||
let _ = psdlayers::info(&f);
|
||||
}
|
||||
}
|
||||
for n in 0..good.len() {
|
||||
let _ = psdlayers::import(&good[..n], true, 1 << 30, cms);
|
||||
let _ = psdlayers::info(&good[..n]);
|
||||
}
|
||||
// A layer past the memory allowed is refused, not read.
|
||||
assert!(psdlayers::import(&good, true, 64, cms).unwrap_err().contains("too large"));
|
||||
@@ -1015,3 +1018,186 @@ fn merges_keep_pass_through_groups_blending_with_what_is_below() {
|
||||
assert!(px.iter().zip([75, 150, 38, 255]).all(|(&a, b)| a.abs_diff(b) <= 1), "{px:?}");
|
||||
}
|
||||
}
|
||||
|
||||
/// `file.place` of `f` with `p` into a new 100 × 100 pt document, centred on (50, 50).
|
||||
fn place(f: &[u8], p: Value) -> (Session, crate::cmd::Result<Value>) {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap();
|
||||
let r = s.execute("file.place", &merge(json!({"name": "layers.psd", "dataBase64": vectorcraft_format::base64_encode(f), "at": [50, 50]}), p));
|
||||
(s, r)
|
||||
}
|
||||
|
||||
/// The one object `file.place` placed.
|
||||
fn placed(s: &Session, r: &Value) -> Node {
|
||||
let id = vectorcraft_doc::NodeId(r["ids"][0].as_u64().unwrap());
|
||||
s.doc().unwrap().doc.node(id).unwrap().clone()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn placing_with_layers_embeds_the_layers_as_one_group() {
|
||||
let f = file(8, 8, &stack(), 8, false, false);
|
||||
let (mut s, r) = place(&f, json!({"layers": true}));
|
||||
let r = r.unwrap();
|
||||
assert_eq!((&r["format"], &r["linked"], &r["warnings"]), (&json!("psd"), &json!(false), &json!([HIDDEN_1])), "{r}");
|
||||
let g = placed(&s, &r);
|
||||
assert!(matches!(g.kind, NodeKind::Group { clip: false, .. }), "one group, unclipped: its layers lie on the canvas");
|
||||
assert_eq!(name(&g), "layers.psd");
|
||||
let kids = g.children().unwrap();
|
||||
assert_eq!(kids.iter().map(|c| name(c)).collect::<Vec<_>>(), ["Bottom", "Folder", "Screens", "Faded"], "bottom first");
|
||||
// A layer is its image, where the merged image would put it: the 8 pt canvas centred on (50, 50).
|
||||
let ((x, y), px) = pixels_of(&s, &kids[0]);
|
||||
assert_eq!(((x, y), px.dimensions(), px.get_pixel(3, 3).0), ((46.0, 46.0), (8, 8), [255, 0, 0, 255]));
|
||||
// A group is a group of its layers; a pass-through group isn't isolated, another mode's is.
|
||||
let folder = &kids[1];
|
||||
assert!(matches!(folder.kind, NodeKind::Group { .. }) && !folder.isolate && folder.blend == BlendMode::Normal);
|
||||
let inner = folder.children().unwrap();
|
||||
assert_eq!(inner.iter().map(|c| name(c)).collect::<Vec<_>>(), ["Inner A"], "the hidden layer is left out");
|
||||
assert!(matches!(inner[0].kind, NodeKind::Image(_)) && inner[0].blend == BlendMode::Multiply && (inner[0].opacity - 128.0 / 255.0).abs() < 1e-6);
|
||||
let screens = &kids[2];
|
||||
assert!(screens.isolate && screens.blend == BlendMode::Screen);
|
||||
let ((x, y), px) = pixels_of(&s, &screens.children().unwrap()[0]);
|
||||
assert_eq!(((x, y), px.get_pixel(0, 0).0), ((48.0, 48.0), [10, 20, 30, 128]));
|
||||
assert!((kids[3].opacity - 102.0 / 255.0).abs() < 1e-6, "fill opacity: {}", kids[3].opacity);
|
||||
// One undo step.
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.children().is_none_or(Vec::is_empty)));
|
||||
// Hidden layers come in hidden when asked for.
|
||||
let (s, r) = place(&f, json!({"layers": true, "hiddenLayers": true}));
|
||||
let r = r.unwrap();
|
||||
assert_eq!(r["warnings"], json!([]), "{r}");
|
||||
let g = placed(&s, &r);
|
||||
let inner: Vec<(&str, bool)> = g.children().unwrap()[1].children().unwrap().iter().map(|c| (name(c), c.visible)).collect();
|
||||
assert_eq!(inner, [("Inner A", true), ("Inner B", false)]);
|
||||
// Without `layers`, the merged image, in the same box.
|
||||
let (s, r) = place(&f, json!({}));
|
||||
let r = r.unwrap();
|
||||
let flat = placed(&s, &r);
|
||||
let ((x, y), px) = pixels_of(&s, &flat);
|
||||
assert_eq!(((x, y), px.dimensions(), px.get_pixel(0, 0).0), ((46.0, 46.0), (8, 8), [128, 128, 128, 255]), "{r}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn placed_layers_keep_their_masks_and_are_clipped_to_the_canvas() {
|
||||
let mut masked = layer("Masked", [0, 0, 8, 8], [255, 255, 255, 255]);
|
||||
masked.mask = Some(([2, 2, 4, 4], 0, 0, vec![255, 128, 0, 255]));
|
||||
let (s, r) = place(&file(8, 8, &[masked], 8, false, false), json!({"layers": true}));
|
||||
let g = placed(&s, &r.unwrap());
|
||||
let kids = g.children().unwrap();
|
||||
assert!(matches!(kids[0].kind, NodeKind::Image(_)), "the layer is its image");
|
||||
let m = kids[0].extras().mask.as_deref().expect("the layer mask as the image's opacity mask");
|
||||
let ((x, y), px) = pixels_of(&s, &m.art);
|
||||
assert_eq!(((x, y), px.dimensions(), m.clip), ((48.0, 48.0), (2, 2), true), "the mask moves with its layer");
|
||||
// A layer that reaches past the canvas: the group is clipped to the canvas, as the merged
|
||||
// image shows only the canvas.
|
||||
let over = layer("Over", [-2, -2, 6, 6], [0, 255, 0, 255]);
|
||||
let (s, r) = place(&file(8, 8, &[layer("Bottom", [0, 0, 8, 8], [255, 0, 0, 255]), over], 8, false, false), json!({"layers": true}));
|
||||
let r = r.unwrap();
|
||||
let g = placed(&s, &r);
|
||||
assert!(matches!(g.kind, NodeKind::Group { clip: true, .. }), "{r}");
|
||||
let kids = g.children().unwrap();
|
||||
let b = kids[0].geometric_bounds_with(&s.doc().unwrap().doc.symbol_boxes()).unwrap();
|
||||
assert!(matches!(kids[0].kind, NodeKind::Path { clipping: true, .. }));
|
||||
assert_eq!((b.x0, b.y0, b.x1, b.y1), (46.0, 46.0, 54.0, 54.0), "the clipping path is the canvas");
|
||||
assert_eq!(kids[1..].iter().map(|c| name(c)).collect::<Vec<_>>(), ["Bottom", "Over"]);
|
||||
assert_eq!(pixels_of(&s, &kids[2]).0, (44.0, 44.0));
|
||||
// A hidden layer that reaches past the canvas clips the group too, so showing it later draws
|
||||
// only the canvas. Left out, it doesn't.
|
||||
let mut hidden = layer("Hidden", [-2, -2, 6, 6], [0, 255, 0, 255]);
|
||||
hidden.hidden = true;
|
||||
let f = file(8, 8, &[layer("Bottom", [0, 0, 8, 8], [255, 0, 0, 255]), hidden], 8, false, false);
|
||||
let (s, r) = place(&f, json!({"layers": true, "hiddenLayers": true}));
|
||||
let r = r.unwrap();
|
||||
let g = placed(&s, &r);
|
||||
assert!(matches!(g.kind, NodeKind::Group { clip: true, .. }), "{r}");
|
||||
assert_eq!(g.children().unwrap()[1..].iter().map(|c| (name(c), c.visible)).collect::<Vec<_>>(), [("Bottom", true), ("Hidden", false)]);
|
||||
let (s, r) = place(&f, json!({"layers": true}));
|
||||
assert!(matches!(placed(&s, &r.unwrap()).kind, NodeKind::Group { clip: false, .. }));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn placing_with_layers_never_links_and_refuses_values_it_cant_use() {
|
||||
let f = file(8, 8, &stack(), 8, false, false);
|
||||
let dir = std::env::temp_dir().join(format!("vc-psd-place-layers-{}", std::process::id()));
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
let path = dir.join("layers.psd");
|
||||
std::fs::write(&path, &f).unwrap();
|
||||
let from_path = |p: Value| {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap();
|
||||
let r = s.execute("file.place", &merge(json!({"path": path.to_str().unwrap()}), p));
|
||||
(s, r)
|
||||
};
|
||||
// From a path, `layers` embeds: `link` is then false unless given, and `link: true` is refused.
|
||||
let (s, r) = from_path(json!({"layers": true}));
|
||||
let r = r.unwrap();
|
||||
assert_eq!(r["linked"], json!(false), "{r}");
|
||||
assert!(matches!(placed(&s, &r).kind, NodeKind::Group { .. }));
|
||||
let (s, r) = from_path(json!({"layers": true, "link": true}));
|
||||
assert!(r.unwrap_err().to_string().contains("a linked PSD file is placed as its flat image"));
|
||||
assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.children().is_none_or(Vec::is_empty)), "nothing is placed");
|
||||
// Without `layers` the file is linked as before.
|
||||
let (s, r) = from_path(json!({}));
|
||||
let r = r.unwrap();
|
||||
assert_eq!(r["linked"], json!(true), "{r}");
|
||||
assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_)));
|
||||
// A file without layers is embedded as its merged image, without a warning.
|
||||
let flat = {
|
||||
let mut f = file(2, 2, &[layer("x", [0, 0, 2, 2], [9, 9, 9, 255])], 8, false, false);
|
||||
let at = 26 + 8;
|
||||
let len = u32::from_be_bytes(f[at..at + 4].try_into().unwrap()) as usize;
|
||||
f.splice(at..at + 4 + len, 0u32.to_be_bytes());
|
||||
f
|
||||
};
|
||||
std::fs::write(&path, &flat).unwrap();
|
||||
let (s, r) = from_path(json!({"layers": true}));
|
||||
let r = r.unwrap();
|
||||
assert_eq!((&r["linked"], &r["warnings"]), (&json!(false), &json!([])), "{r}");
|
||||
assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_)));
|
||||
// Layers that are all left out: the merged image, with the importer's warnings.
|
||||
let mut gone = layer("Gone", [0, 0, 2, 2], [9, 9, 9, 255]);
|
||||
gone.hidden = true;
|
||||
let (s, r) = place(&file(2, 2, &[gone], 8, false, false), json!({"layers": true}));
|
||||
let r = r.unwrap();
|
||||
assert_eq!((&r["linked"], r["warnings"].as_array().map(Vec::len)), (&json!(false), Some(1)), "{r}");
|
||||
assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_)));
|
||||
// Layers that can't be read: the merged image, with a warning.
|
||||
let mut cut = file(4, 4, &[layer("x", [0, 0, 4, 4], [9, 9, 9, 255])], 8, false, false);
|
||||
let at = cut.windows(4).position(|w| w == [0, 0, 0, 18]).unwrap();
|
||||
cut[at..at + 4].copy_from_slice(&1000u32.to_be_bytes());
|
||||
let (s, r) = place(&cut, json!({"layers": true}));
|
||||
let r = r.unwrap();
|
||||
assert!(r["warnings"][0].as_str().unwrap().starts_with("the layers can't be read"), "{r}");
|
||||
assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_)));
|
||||
// Values the command can't use are errors, and nothing is placed.
|
||||
for (p, why) in [
|
||||
(json!({"hiddenLayers": true}), "hiddenLayers applies to a PSD file placed with layers: true"),
|
||||
(json!({"layers": true, "link": true}), "a linked PSD file is placed as its flat image"),
|
||||
(json!({"layers": "yes"}), "layers must be true or false"),
|
||||
(json!({"layers": true, "hiddenLayers": 1}), "hiddenLayers must be true or false"),
|
||||
] {
|
||||
let (s, r) = place(&f, p.clone());
|
||||
assert!(r.unwrap_err().to_string().contains(why), "{p}");
|
||||
assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.children().is_none_or(Vec::is_empty)), "{p}");
|
||||
}
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({})).unwrap();
|
||||
let q = s.execute("file.place.queue", &json!({"paths": [path.to_str().unwrap()], "layers": "yes"}));
|
||||
assert!(q.unwrap_err().to_string().contains("`layers` must be true or false"));
|
||||
std::fs::remove_dir_all(&dir).ok();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn psd_info_counts_the_layers_without_opening_the_file() {
|
||||
let mut s = Session::new();
|
||||
let info = |s: &mut Session, f: &[u8]| s.execute("document.psdInfo", &json!({"dataBase64": vectorcraft_format::base64_encode(f)}));
|
||||
let r = info(&mut s, &file(8, 8, &stack(), 8, false, false)).unwrap();
|
||||
assert_eq!(r, json!({"format": "psd", "width": 8, "height": 8, "layers": 5, "hiddenLayers": 1, "groups": 2, "slices": 0}));
|
||||
let r = info(&mut s, &file(4, 2, &[layer("x", [0, 0, 2, 2], [9, 9, 9, 255])], 16, true, true)).unwrap();
|
||||
assert_eq!((&r["format"], &r["width"], &r["height"], &r["layers"]), (&json!("psb"), &json!(4), &json!(2), &json!(1)), "{r}");
|
||||
// Layer records that can't be read count as no layers: the file opens as its merged image.
|
||||
let mut cut = file(4, 4, &[layer("x", [0, 0, 4, 4], [9, 9, 9, 255])], 8, false, false);
|
||||
let at = cut.windows(4).position(|w| w == [0, 0, 0, 18]).unwrap();
|
||||
cut[at..at + 4].copy_from_slice(&1000u32.to_be_bytes());
|
||||
assert_eq!(info(&mut s, &cut).unwrap()["layers"], json!(0));
|
||||
assert!(info(&mut s, b"not a psd").unwrap_err().to_string().contains("not a PSD file"));
|
||||
}
|
||||
|
||||
@@ -0,0 +1,459 @@
|
||||
//! A PSD or PSB file's slices (image resource 1050) opened and placed as user slices
|
||||
//! (`document.open`'s and `file.place`'s `importSlices`): version 6 records and version 7 and 8
|
||||
//! descriptors, built from the Photoshop File Formats Specification's "Slices resource format";
|
||||
//! their options, slices outside the canvas, damaged or unknown slice data, placing scaled and
|
||||
//! moved in one undo step, linked files, and `document.psdInfo`'s count.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_doc::{SliceKind, SliceOptions};
|
||||
use vectorcraft_geom::Rect;
|
||||
|
||||
use crate::Session;
|
||||
|
||||
/// A Unicode string: a count of UTF-16 units, then the units.
|
||||
fn ustr(s: &str) -> Vec<u8> {
|
||||
let units: Vec<u16> = s.encode_utf16().collect();
|
||||
let mut b = (units.len() as u32).to_be_bytes().to_vec();
|
||||
b.extend(units.iter().flat_map(|u| u.to_be_bytes()));
|
||||
b
|
||||
}
|
||||
|
||||
/// One version 6 slice record.
|
||||
#[derive(Clone)]
|
||||
struct S {
|
||||
/// 0: generated automatically, 1: follows a layer, 2: made by the user.
|
||||
origin: u32,
|
||||
name: &'static str,
|
||||
/// 0: No Image, 1: Image.
|
||||
kind: u32,
|
||||
/// Left, top, right, bottom (px).
|
||||
rect: [i32; 4],
|
||||
url: &'static str,
|
||||
target: &'static str,
|
||||
message: &'static str,
|
||||
alt: &'static str,
|
||||
html: bool,
|
||||
cell: &'static str,
|
||||
/// Alpha, red, green, blue.
|
||||
argb: [u8; 4],
|
||||
}
|
||||
|
||||
fn user(name: &'static str, rect: [i32; 4]) -> S {
|
||||
S { origin: 2, name, kind: 1, rect, url: "", target: "", message: "", alt: "", html: false, cell: "", argb: [0; 4] }
|
||||
}
|
||||
|
||||
/// Resource 1050 in version 6, each record followed by `trailing` (a Photoshop 7 descriptor, or
|
||||
/// nothing).
|
||||
fn v6(slices: &[S], trailing: &[u8]) -> Vec<u8> {
|
||||
let mut b = 6u32.to_be_bytes().to_vec();
|
||||
b.extend([0u8; 16]);
|
||||
b.extend(ustr("group"));
|
||||
b.extend((slices.len() as u32).to_be_bytes());
|
||||
for (i, s) in slices.iter().enumerate() {
|
||||
b.extend((i as u32 + 1).to_be_bytes());
|
||||
b.extend(0u32.to_be_bytes());
|
||||
b.extend(s.origin.to_be_bytes());
|
||||
if s.origin == 1 {
|
||||
b.extend(7u32.to_be_bytes());
|
||||
}
|
||||
b.extend(ustr(s.name));
|
||||
b.extend(s.kind.to_be_bytes());
|
||||
for v in s.rect {
|
||||
b.extend(v.to_be_bytes());
|
||||
}
|
||||
for t in [s.url, s.target, s.message, s.alt] {
|
||||
b.extend(ustr(t));
|
||||
}
|
||||
b.push(u8::from(s.html));
|
||||
b.extend(ustr(s.cell));
|
||||
b.extend([0u8; 8]);
|
||||
b.extend(s.argb);
|
||||
b.extend(trailing);
|
||||
}
|
||||
b
|
||||
}
|
||||
|
||||
/// A descriptor value.
|
||||
enum D {
|
||||
Long(i32),
|
||||
Doub(f64),
|
||||
Bool(bool),
|
||||
Text(&'static str),
|
||||
Enum(&'static str, &'static str),
|
||||
Obj(Vec<(&'static str, D)>),
|
||||
List(Vec<D>),
|
||||
}
|
||||
|
||||
/// A key or class ID: a four-character one with length 0, else its length and characters.
|
||||
fn key(k: &str) -> Vec<u8> {
|
||||
let mut b = if k.len() == 4 { 0u32 } else { k.len() as u32 }.to_be_bytes().to_vec();
|
||||
b.extend(k.as_bytes());
|
||||
b
|
||||
}
|
||||
|
||||
/// A descriptor: an empty class name, the class ID, the count, then each item.
|
||||
fn descriptor(items: &[(&str, D)]) -> Vec<u8> {
|
||||
let mut b = ustr("");
|
||||
b.extend(key("null"));
|
||||
b.extend((items.len() as u32).to_be_bytes());
|
||||
for (k, v) in items {
|
||||
b.extend(key(k));
|
||||
b.extend(value(v));
|
||||
}
|
||||
b
|
||||
}
|
||||
|
||||
/// A value's type, then the value.
|
||||
fn value(v: &D) -> Vec<u8> {
|
||||
let mut b = vec![];
|
||||
match v {
|
||||
D::Long(n) => {
|
||||
b.extend(b"long");
|
||||
b.extend(n.to_be_bytes());
|
||||
}
|
||||
D::Doub(d) => {
|
||||
b.extend(b"doub");
|
||||
b.extend(d.to_be_bytes());
|
||||
}
|
||||
D::Bool(on) => {
|
||||
b.extend(b"bool");
|
||||
b.push(u8::from(*on));
|
||||
}
|
||||
D::Text(t) => {
|
||||
b.extend(b"TEXT");
|
||||
b.extend(ustr(t));
|
||||
}
|
||||
D::Enum(t, e) => {
|
||||
b.extend(b"enum");
|
||||
b.extend(key(t));
|
||||
b.extend(key(e));
|
||||
}
|
||||
D::Obj(items) => {
|
||||
b.extend(b"Objc");
|
||||
b.extend(descriptor(items));
|
||||
}
|
||||
D::List(items) => {
|
||||
b.extend(b"VlLs");
|
||||
b.extend((items.len() as u32).to_be_bytes());
|
||||
for i in items {
|
||||
b.extend(value(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
b
|
||||
}
|
||||
|
||||
/// A bounds object: top, left, bottom and right.
|
||||
fn bounds(l: i32, t: i32, r: i32, b: i32) -> D {
|
||||
D::Obj(vec![("Top ", D::Long(t)), ("Left", D::Long(l)), ("Btom", D::Long(b)), ("Rght", D::Long(r))])
|
||||
}
|
||||
|
||||
/// Resource 1050 in `version` 7 or 8 holding `slices`.
|
||||
fn v7(version: u32, slices: Vec<D>) -> Vec<u8> {
|
||||
let mut b = version.to_be_bytes().to_vec();
|
||||
b.extend(16u32.to_be_bytes());
|
||||
b.extend(descriptor(&[("bounds", bounds(0, 0, 20, 20)), ("baseName", D::Text("poster")), ("slices", D::List(slices))]));
|
||||
b
|
||||
}
|
||||
|
||||
/// A 20 × 20 px PSD file written by `document.export`, with its layers (two) or flat.
|
||||
fn psd(layers: bool) -> Vec<u8> {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 20, "height": 20})).unwrap();
|
||||
s.execute("paint.setFill", &json!({ "color": "#ff0000" })).unwrap();
|
||||
s.execute("shape.rectangle", &json!({"x": 2, "y": 2, "width": 10, "height": 10})).unwrap();
|
||||
s.execute("layer.new", &json!({ "name": "Top" })).unwrap();
|
||||
s.execute("shape.rectangle", &json!({"x": 8, "y": 8, "width": 10, "height": 10})).unwrap();
|
||||
let r = s.execute("document.export", &json!({"format": "psd", "layers": layers})).unwrap();
|
||||
vectorcraft_format::base64_decode(r["dataBase64"].as_str().unwrap()).unwrap()
|
||||
}
|
||||
|
||||
/// `psd` with image resource `id` holding `data` added to its image resources.
|
||||
fn with_resource(psd: &[u8], id: u16, data: &[u8]) -> Vec<u8> {
|
||||
let u32_at = |at: usize| u32::from_be_bytes(psd[at..at + 4].try_into().unwrap()) as usize;
|
||||
let colors = 26 + 4 + u32_at(26);
|
||||
let len = u32_at(colors);
|
||||
let mut block = b"8BIM".to_vec();
|
||||
block.extend(id.to_be_bytes());
|
||||
block.extend([0, 0]);
|
||||
block.extend((data.len() as u32).to_be_bytes());
|
||||
block.extend(data);
|
||||
block.resize(block.len().next_multiple_of(2), 0);
|
||||
let mut out = psd[..colors].to_vec();
|
||||
out.extend(((len + block.len()) as u32).to_be_bytes());
|
||||
out.extend(&psd[colors + 4..colors + 4 + len]);
|
||||
out.extend(block);
|
||||
out.extend(&psd[colors + 4 + len..]);
|
||||
out
|
||||
}
|
||||
|
||||
fn b64(f: &[u8]) -> String {
|
||||
vectorcraft_format::base64_encode(f)
|
||||
}
|
||||
|
||||
fn open(f: &[u8], extra: Value) -> (Session, Value) {
|
||||
let mut s = Session::new();
|
||||
let mut p = json!({"name": "poster.psd", "dataBase64": b64(f)});
|
||||
for (k, v) in extra.as_object().unwrap() {
|
||||
p[k] = v.clone();
|
||||
}
|
||||
let r = s.execute("document.open", &p).unwrap();
|
||||
(s, r)
|
||||
}
|
||||
|
||||
/// The document's user slices: rectangle and options.
|
||||
fn slices(s: &Session) -> Vec<(Rect, SliceOptions)> {
|
||||
s.doc().unwrap().doc.slices.iter().map(|x| (x.rect, x.options.clone())).collect()
|
||||
}
|
||||
|
||||
fn warnings(r: &Value) -> Vec<String> {
|
||||
r["warnings"].as_array().map(|a| a.iter().filter_map(|w| w.as_str().map(str::to_string)).collect()).unwrap_or_default()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn version_6_slices_open_as_user_slices_with_their_options() {
|
||||
let linked = S { origin: 1, url: "https://example.com/", target: "_blank", message: "Go", alt: "Logo", ..user("logo", [2, 4, 10, 8]) };
|
||||
let plain = S { kind: 0, cell: "a < b & c", argb: [0, 0, 0, 0], ..user("note", [10, 10, 20, 20]) };
|
||||
let html = S { kind: 0, html: true, cell: "<b>Hi</b>", argb: [255, 0x12, 0x34, 0x56], ..user("", [0, 12, 6, 18]) };
|
||||
let matte = S { argb: [0, 1, 2, 3], cell: "ignored", ..user("matte", [12, 0, 18, 6]) };
|
||||
let auto = S { origin: 0, ..user("auto", [0, 0, 20, 2]) };
|
||||
let data = v6(&[linked, plain, html, matte, auto], &[]);
|
||||
for layers in [true, false] {
|
||||
let f = with_resource(&psd(layers), 1050, &data);
|
||||
// Either conversion brings the slices in; the automatic one stays out.
|
||||
for p in [json!({}), json!({"layers": false})] {
|
||||
let (s, r) = open(&f, p);
|
||||
assert!(warnings(&r).is_empty(), "{r}");
|
||||
let got = slices(&s);
|
||||
assert_eq!(got.len(), 4, "{got:?}");
|
||||
assert_eq!(got[0].0, Rect::new(2.0, 4.0, 10.0, 8.0));
|
||||
assert_eq!(
|
||||
got[0].1,
|
||||
SliceOptions {
|
||||
kind: SliceKind::Image,
|
||||
name: "logo".into(),
|
||||
url: "https://example.com/".into(),
|
||||
target: "_blank".into(),
|
||||
message: "Go".into(),
|
||||
alt: "Logo".into(),
|
||||
..Default::default()
|
||||
}
|
||||
);
|
||||
// Plain cell text is escaped as the HTML a No Image cell shows; HTML stays as it is.
|
||||
assert_eq!((got[1].1.kind, got[1].1.text.as_str(), got[1].1.background.as_str()), (SliceKind::NoImage, "a < b & c", ""));
|
||||
assert_eq!((got[2].1.text.as_str(), got[2].1.background.as_str(), got[2].1.name.as_str()), ("<b>Hi</b>", "#123456", ""));
|
||||
// An Image slice's cell text isn't kept; a background with no alpha is the matte.
|
||||
assert_eq!((got[3].1.text.as_str(), got[3].1.background.as_str()), ("", "matte"));
|
||||
// Web output lays them out with auto slices around them.
|
||||
let layout = s.doc().unwrap().doc.slice_layout();
|
||||
assert_eq!(layout.iter().filter(|a| a.source == vectorcraft_doc::SliceSource::User).count(), 4);
|
||||
assert!(layout.iter().any(|a| a.source == vectorcraft_doc::SliceSource::Auto));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn photoshop_7_descriptors_after_version_6_records_are_read_past() {
|
||||
let trailing = [16u32.to_be_bytes().to_vec(), descriptor(&[("topOutset", D::Long(0))])].concat();
|
||||
let f = with_resource(&psd(false), 1050, &v6(&[user("a", [0, 0, 5, 5]), user("b", [5, 5, 10, 10])], &trailing));
|
||||
let (s, r) = open(&f, json!({}));
|
||||
assert!(warnings(&r).is_empty(), "{r}");
|
||||
let names: Vec<String> = slices(&s).into_iter().map(|(_, o)| o.name).collect();
|
||||
assert_eq!(names, ["a", "b"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn version_6_descriptors_share_one_budget_of_values() {
|
||||
// Each record's descriptor holds 2,501 values, well under the 200,000 one descriptor may hold;
|
||||
// 100 of them hold 250,100 together.
|
||||
let list = D::List((0..2_500).map(D::Long).collect());
|
||||
let trailing = [16u32.to_be_bytes().to_vec(), descriptor(&[("many", list)])].concat();
|
||||
let records: Vec<S> = (0..100).map(|_| user("a", [0, 0, 5, 5])).collect();
|
||||
// Alone, one such descriptor is read past.
|
||||
let (s, r) = open(&with_resource(&psd(false), 1050, &v6(&records[..1], &trailing)), json!({}));
|
||||
assert!(warnings(&r).is_empty(), "{r}");
|
||||
assert_eq!(slices(&s).len(), 1);
|
||||
// Together they are refused, and the file opens without slices.
|
||||
let (s, r) = open(&with_resource(&psd(false), 1050, &v6(&records, &trailing)), json!({}));
|
||||
let w = warnings(&r);
|
||||
assert!(w.iter().any(|w| w.starts_with("the slices can't be read (") && w.contains("too many values")), "{w:?}");
|
||||
assert!(slices(&s).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn version_7_and_8_descriptors_open_as_user_slices() {
|
||||
let slice = |origin: &'static str, kind: &'static str, l: i32, t: i32, r: i32, b: i32| {
|
||||
D::Obj(vec![
|
||||
("sliceID", D::Long(1)),
|
||||
("groupID", D::Long(0)),
|
||||
("origin", D::Enum("ESliceOrigin", origin)),
|
||||
("Type", D::Enum("ESliceType", kind)),
|
||||
("bounds", bounds(l, t, r, b)),
|
||||
("Nm ", D::Text("cell")),
|
||||
("url", D::Text("https://example.com/")),
|
||||
("null", D::Text("_top")),
|
||||
("Msge", D::Text("msg")),
|
||||
("altTag", D::Text("alt")),
|
||||
("cellTextIsHTML", D::Bool(false)),
|
||||
("cellText", D::Text("x>y")),
|
||||
("bgColorType", D::Enum("ESliceBGColorType", "Clr ")),
|
||||
("bgColor", D::Obj(vec![("Rd ", D::Doub(255.0)), ("Grn ", D::Doub(128.0)), ("Bl ", D::Long(0))])),
|
||||
])
|
||||
};
|
||||
for version in [7, 8] {
|
||||
let data = v7(
|
||||
version,
|
||||
vec![slice("userGenerated", "Img ", 1, 2, 9, 10), slice("autoGenerated", "Img ", 0, 0, 20, 1), slice("layer", "noImage", 10, 10, 15, 15)],
|
||||
);
|
||||
let (s, r) = open(&with_resource(&psd(true), 1050, &data), json!({}));
|
||||
assert!(warnings(&r).is_empty(), "{r}");
|
||||
let got = slices(&s);
|
||||
assert_eq!(got.len(), 2, "{got:?}");
|
||||
assert_eq!(got[0].0, Rect::new(1.0, 2.0, 9.0, 10.0));
|
||||
assert_eq!(
|
||||
got[0].1,
|
||||
SliceOptions {
|
||||
name: "cell".into(),
|
||||
url: "https://example.com/".into(),
|
||||
target: "_top".into(),
|
||||
message: "msg".into(),
|
||||
alt: "alt".into(),
|
||||
background: "#ff8000".into(),
|
||||
..Default::default()
|
||||
}
|
||||
);
|
||||
assert_eq!((got[1].1.kind, got[1].1.text.as_str(), got[1].1.url.as_str()), (SliceKind::NoImage, "x>y", ""));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_slices_false_leaves_them_out_and_must_be_a_switch() {
|
||||
let f = with_resource(&psd(true), 1050, &v6(&[user("a", [0, 0, 5, 5])], &[]));
|
||||
let (s, _) = open(&f, json!({"importSlices": false}));
|
||||
assert!(slices(&s).is_empty());
|
||||
let mut s = Session::new();
|
||||
let e = s.execute("document.open", &json!({"name": "poster.psd", "dataBase64": b64(&f), "importSlices": "yes"})).unwrap_err();
|
||||
assert!(e.to_string().contains("importSlices must be true or false"), "{e}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn slices_that_cant_be_read_warn_and_the_file_still_opens() {
|
||||
let good = v6(&[user("a", [0, 0, 5, 5])], &[]);
|
||||
let mut bad_descriptor = v7(7, vec![]);
|
||||
bad_descriptor[4..8].copy_from_slice(&15u32.to_be_bytes());
|
||||
let cases: Vec<(Vec<u8>, &str)> = vec![
|
||||
(good[..good.len() - 3].to_vec(), "cut short"),
|
||||
([9u32.to_be_bytes().to_vec(), good[4..].to_vec()].concat(), "version 9"),
|
||||
(bad_descriptor, "version other than 16"),
|
||||
// The count follows the version, the bounds and the group's name.
|
||||
([&good[..34], &u32::MAX.to_be_bytes()[..], &good[38..]].concat(), "more than the 10000 read"),
|
||||
(v7(8, vec![D::Long(3)]), "other than a slice"),
|
||||
// A whole record whose name is longer than a slice's text may be.
|
||||
(v6(&[user("a".repeat(65_537).leak(), [0, 0, 5, 5])], &[]), "more than the 65536 characters read"),
|
||||
];
|
||||
for (data, why) in cases {
|
||||
for layers in [true, false] {
|
||||
let (s, r) = open(&with_resource(&psd(layers), 1050, &data), json!({}));
|
||||
let w = warnings(&r);
|
||||
assert!(w.iter().any(|w| w.starts_with("the slices can't be read (") && w.contains(why)), "{why}: {w:?}");
|
||||
assert!(slices(&s).is_empty());
|
||||
// The art still came in.
|
||||
assert!(s.doc().unwrap().doc.art_bounds().is_some(), "{why}");
|
||||
}
|
||||
}
|
||||
// A name of the longest length read comes in.
|
||||
let longest = v6(&[user("a".repeat(65_536).leak(), [0, 0, 5, 5])], &[]);
|
||||
let (s, r) = open(&with_resource(&psd(false), 1050, &longest), json!({}));
|
||||
assert!(warnings(&r).is_empty(), "{r}");
|
||||
assert_eq!(slices(&s).first().map(|(_, o)| o.name.len()), Some(65_536));
|
||||
// A file without slices opens without a word about them.
|
||||
let (s, r) = open(&psd(true), json!({}));
|
||||
assert!(warnings(&r).is_empty() && slices(&s).is_empty(), "{r}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn slices_are_clipped_to_the_canvas_and_those_outside_it_are_left_out() {
|
||||
let data = v6(&[user("over", [-5, -5, 5, 30]), user("out", [25, 0, 30, 5]), user("empty", [4, 4, 4, 9]), user("in", [1, 1, 2, 2])], &[]);
|
||||
let (s, r) = open(&with_resource(&psd(false), 1050, &data), json!({}));
|
||||
assert_eq!(warnings(&r), ["2 slices lie outside the canvas or have no size and were left out"]);
|
||||
let got: Vec<(Rect, String)> = slices(&s).into_iter().map(|(r, o)| (r, o.name)).collect();
|
||||
assert_eq!(got, [(Rect::new(0.0, 0.0, 5.0, 20.0), "over".to_string()), (Rect::new(1.0, 1.0, 2.0, 2.0), "in".to_string())]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn placed_embedded_files_bring_their_slices_with_the_art_in_one_undo_step() {
|
||||
let data = v6(&[user("a", [0, 0, 10, 10]), user("b", [10, 10, 20, 20])], &[]);
|
||||
for layers in [false, true] {
|
||||
let f = with_resource(&psd(layers), 1050, &data);
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 200, "height": 200})).unwrap();
|
||||
// Fitted into a 40 pt square at (100, 60): twice the size.
|
||||
let r = s.execute("file.place", &json!({"name": "poster.psd", "dataBase64": b64(&f), "rect": [100, 60, 40, 40], "layers": layers})).unwrap();
|
||||
assert_eq!(r["slices"].as_array().map(Vec::len), Some(2), "{r}");
|
||||
let got: Vec<Rect> = slices(&s).into_iter().map(|(r, _)| r).collect();
|
||||
assert_eq!(got, [Rect::new(100.0, 60.0, 120.0, 80.0), Rect::new(120.0, 80.0, 140.0, 100.0)]);
|
||||
// The placed art stays selected, and one undo takes the art and the slices away.
|
||||
assert_eq!(s.doc().unwrap().selection.objects.len(), 1);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!(slices(&s).is_empty());
|
||||
assert!(s.doc().unwrap().doc.art_bounds().is_none());
|
||||
// Centered on `at` at 100%.
|
||||
s.execute("file.place", &json!({"name": "poster.psd", "dataBase64": b64(&f), "at": [100, 100], "layers": layers})).unwrap();
|
||||
assert_eq!(slices(&s)[0].0, Rect::new(90.0, 90.0, 100.0, 100.0));
|
||||
// `importSlices: false` places the art alone.
|
||||
let r = s.execute("file.place", &json!({"name": "poster.psd", "dataBase64": b64(&f), "importSlices": false, "layers": layers})).unwrap();
|
||||
assert!(r.get("slices").is_none());
|
||||
assert_eq!(slices(&s).len(), 2);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn linked_files_are_placed_without_their_slices() {
|
||||
let dir = std::env::temp_dir().join(format!("vc-psd-slices-{}", std::process::id()));
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
let path = dir.join("poster.psd");
|
||||
std::fs::write(&path, with_resource(&psd(false), 1050, &v6(&[user("a", [0, 0, 5, 5])], &[]))).unwrap();
|
||||
let path = path.to_string_lossy().into_owned();
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap();
|
||||
let r = s.execute("file.place", &json!({ "path": path })).unwrap();
|
||||
assert_eq!((&r["linked"], r.get("slices")), (&json!(true), None));
|
||||
assert!(slices(&s).is_empty());
|
||||
let e = s.execute("file.place", &json!({ "path": path, "importSlices": true })).unwrap_err();
|
||||
assert!(e.to_string().contains("importSlices: a linked PSD file is placed as its flat image"), "{e}");
|
||||
// Embedded from its path, they come in.
|
||||
let r = s.execute("file.place", &json!({ "path": path, "link": false })).unwrap();
|
||||
assert_eq!((&r["linked"], r["slices"].as_array().map(Vec::len)), (&json!(false), Some(1)));
|
||||
// file.place.info counts what a place would bring in.
|
||||
let info = s.execute("file.place.info", &json!({ "path": path, "link": false })).unwrap();
|
||||
assert_eq!(info["slices"], json!(1));
|
||||
let info = s.execute("file.place.info", &json!({ "path": path })).unwrap();
|
||||
assert_eq!(info["slices"], json!(0));
|
||||
std::fs::remove_dir_all(&dir).ok();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn psd_info_counts_the_slices_that_come_in() {
|
||||
let mut s = Session::new();
|
||||
let info = |s: &mut Session, f: &[u8]| s.execute("document.psdInfo", &json!({"dataBase64": b64(f)})).unwrap();
|
||||
let data = v6(&[user("a", [0, 0, 5, 5]), S { origin: 0, ..user("auto", [5, 5, 20, 20]) }, user("out", [30, 30, 40, 40])], &[]);
|
||||
assert_eq!(info(&mut s, &with_resource(&psd(false), 1050, &data))["slices"], json!(1));
|
||||
assert_eq!(info(&mut s, &with_resource(&psd(true), 1050, &data[..data.len() - 4]))["slices"], json!(0));
|
||||
assert_eq!(info(&mut s, &psd(true))["slices"], json!(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn damaged_slices_never_panic() {
|
||||
let data = v7(8, vec![D::Obj(vec![("origin", D::Enum("ESliceOrigin", "userGenerated")), ("bounds", bounds(0, 0, 5, 5))])]);
|
||||
let base = with_resource(&psd(false), 1050, &data);
|
||||
let start = base.windows(data.len()).position(|w| w == data).unwrap();
|
||||
for at in (start - 12..start + data.len()).step_by(3) {
|
||||
for v in [0u8, 0x7f, 0xff] {
|
||||
let mut f = base.clone();
|
||||
f[at] = v;
|
||||
let mut s = Session::new();
|
||||
let _ = s.execute("document.open", &json!({"name": "poster.psd", "dataBase64": b64(&f)}));
|
||||
let _ = s.execute("document.psdInfo", &json!({"dataBase64": b64(&f)}));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,9 +10,10 @@ use vectorcraft_color::Paint;
|
||||
use vectorcraft_doc::{AppearanceItem, Document, Node, NodeId, NodeKind, TextKind, TextObject, TextRun};
|
||||
use vectorcraft_geom::Rect;
|
||||
|
||||
use super::panelcmds::listed_artboards;
|
||||
use super::select::on_artboard;
|
||||
use super::typecmd::refresh_bounds;
|
||||
use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, has_doc, index, str_param};
|
||||
use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, has_doc, str_param};
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
vec![
|
||||
@@ -39,7 +40,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Select Text by Font",
|
||||
[],
|
||||
None,
|
||||
"{family, style?, scope?: \"document\" (default) | {artboards: [index, …] (0-based)} | {layers: [id, …] (layers or sublayers)}} select the text objects using the font, the instances of the symbols whose art uses it, the text whose inline graphics draw such a symbol, the objects painted with a pattern whose art uses it (by a visible fill or stroke whose opacity is above 0, a stroke wider than 0) and the objects whose opacity mask uses it (in type that is not hidden or locked in that art), that are not hidden or locked, in a hidden or locked group or layer, or on a locked artboard; a pattern swatch that nothing paints, or a layer's mask, selects nothing; with scope, only those on one of the artboards (as All on Active Artboard takes them: their bounds overlap it or their center is on it) or in one of the layers → {count}",
|
||||
"{family, style?, scope?: \"document\" (default) | {artboards: [index, …] (0-based whole numbers)} | {layers: [id, …] (layers or sublayers)}} select the text objects using the font, the instances of the symbols whose art uses it, the text whose inline graphics draw such a symbol, the objects painted with a pattern whose art uses it (by a visible fill or stroke whose opacity is above 0, a stroke wider than 0) and the objects whose opacity mask uses it (in type that is not hidden or locked in that art), that are not hidden or locked, in a hidden or locked group or layer, or on a locked artboard; a pattern swatch that nothing paints, or a layer's mask, selects nothing; with scope, only those on one of the artboards (as All on Active Artboard takes them: their bounds overlap it or their center is on it) or in one of the layers → {count}",
|
||||
has_doc,
|
||||
select_font
|
||||
),
|
||||
@@ -1080,9 +1081,9 @@ impl FontScope {
|
||||
Some(_) => Err(bad(C, format!("`scope.{key}` must be a non-empty array"))),
|
||||
}
|
||||
};
|
||||
if let Some(a) = list("artboards")? {
|
||||
let rect = |v: &Value| v.as_u64().and_then(|i| d.artboards.get(index(i))).map(|b| b.rect);
|
||||
return a.iter().map(|v| rect(v).ok_or_else(|| bad(C, format!("no such artboard {v}")))).collect::<Result<_>>().map(Self::Artboards);
|
||||
if let (Some(v), Some(_)) = (scope.get("artboards"), list("artboards")?) {
|
||||
let indices = listed_artboards(d, v, "scope.artboards", C)?;
|
||||
return Ok(Self::Artboards(indices.into_iter().filter_map(|i| d.artboards.get(i)).map(|b| b.rect).collect()));
|
||||
}
|
||||
if let Some(a) = list("layers")? {
|
||||
let layer = |v: &Value| v.as_u64().map(NodeId).filter(|id| d.node(*id).is_some_and(Node::is_layer));
|
||||
@@ -1292,6 +1293,40 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
/// Select Text by Font refuses a `scope.artboards` entry that is not a whole number, naming the
|
||||
/// parameter, before it looks at the artboards, and leaves the selection as it was; a whole
|
||||
/// number past the last artboard is `no such artboard`.
|
||||
#[test]
|
||||
fn select_font_refuses_artboards_that_are_not_whole_numbers() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 200, "height": 200})).unwrap();
|
||||
s.execute("artboard.new", &json!({"x": 300, "y": 0, "width": 200, "height": 200})).unwrap();
|
||||
let text = |s: &mut Session, x: i32| {
|
||||
NodeId(s.execute("text.create", &json!({"x": x, "y": 50, "text": "Serif", "font": "Source Serif 4"})).unwrap()["id"].as_u64().unwrap())
|
||||
};
|
||||
let first = text(&mut s, 10);
|
||||
let second = text(&mut s, 350);
|
||||
let run =
|
||||
|s: &mut Session, artboards: Value| s.execute("select.font", &json!({"family": "Source Serif 4", "scope": {"artboards": artboards}}));
|
||||
let malformed = "invalid parameters for `select.font`: `scope.artboards` must contain whole numbers";
|
||||
for (artboards, want) in [
|
||||
(json!(["1"]), malformed),
|
||||
(json!([-1]), malformed),
|
||||
(json!([1.5]), malformed),
|
||||
(json!([true]), malformed),
|
||||
(json!([null]), malformed),
|
||||
(json!([9, "1"]), malformed),
|
||||
(json!([9]), "no such artboard"),
|
||||
(json!([1, 9]), "no such artboard"),
|
||||
] {
|
||||
s.execute("select.set", &json!({"ids": [first.0]})).unwrap();
|
||||
assert_eq!(run(&mut s, artboards.clone()).unwrap_err().to_string(), want, "{artboards}");
|
||||
assert_eq!(s.doc().unwrap().selection.objects, [first], "{artboards}");
|
||||
}
|
||||
run(&mut s, json!([1, 1])).unwrap();
|
||||
assert_eq!(s.doc().unwrap().selection.objects, [second]);
|
||||
}
|
||||
|
||||
/// Select Text by Font with a layer scope takes the text in the layers, their sublayers
|
||||
/// included, and still leaves out hidden and locked text.
|
||||
#[test]
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -369,6 +369,12 @@ pub fn check_effect_params(id: &str, effect: &str, params: &Value) -> Result<()>
|
||||
{
|
||||
return Err(bad(id, "`origin` must be [x, y] in points"));
|
||||
}
|
||||
if effect == vectorcraft_render::effects::SVG_FILTER
|
||||
&& let Some(axes) = given.get("axes")
|
||||
&& vectorcraft_render::effects::svg_filter::valid_axes(axes).is_none()
|
||||
{
|
||||
return Err(bad(id, "`axes` must be [a, b, c, d], each from -1000 to 1000, with a·d - b·c at least 0.001 from 0"));
|
||||
}
|
||||
// Its name is the filter's id.
|
||||
if effect == vectorcraft_render::effects::SVG_FILTER && given.contains_key("name") && !given.contains_key("xml") {
|
||||
return Err(bad(id, "an SVG filter is named by its id: give `xml` with `name`"));
|
||||
|
||||
@@ -5,7 +5,7 @@ use std::sync::Arc;
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_doc::{Document, Node, NodeId, NodeKind, Scaling, Selection};
|
||||
use vectorcraft_geom::{Anchor, AnchorKind, PathData, Point, SubPath, Vec2};
|
||||
use vectorcraft_geom::{Anchor, AnchorKind, Anchors, PathData, Point, SubPath, Vec2};
|
||||
|
||||
use super::create::anchor_from_json;
|
||||
use super::draw2::usize_opt;
|
||||
@@ -544,10 +544,12 @@ fn merge_coincident(sp: &mut SubPath, picked: impl Fn(usize) -> bool, join_kind:
|
||||
&& before > 2
|
||||
&& picked(0)
|
||||
&& picked(before - 1)
|
||||
&& let [first, .., last] = sp.anchors.as_mut_slice()
|
||||
&& same(first, last)
|
||||
&& let (Some(&first), Some(&last)) = (sp.anchors.first(), sp.anchors.last())
|
||||
&& same(&first, &last)
|
||||
{
|
||||
first.h_in = last.h_in;
|
||||
if let Some(first) = sp.anchors.first_mut() {
|
||||
first.h_in = last.h_in;
|
||||
}
|
||||
sp.anchors.pop();
|
||||
if let Some(smooth) = join_kind {
|
||||
join_point(sp, 0, smooth);
|
||||
@@ -565,10 +567,12 @@ fn merge_coincident(sp: &mut SubPath, picked: impl Fn(usize) -> bool, join_kind:
|
||||
for i in (1..len).rev() {
|
||||
if picked(i - 1)
|
||||
&& picked(i)
|
||||
&& let Some([a, b]) = anchors.get_mut(i - 1..=i)
|
||||
&& same(a, b)
|
||||
&& let (Some(&a), Some(&b)) = (anchors.get(i - 1), anchors.get(i))
|
||||
&& same(&a, &b)
|
||||
{
|
||||
a.h_out = b.h_out;
|
||||
if let Some(a) = anchors.get_mut(i - 1) {
|
||||
a.h_out = b.h_out;
|
||||
}
|
||||
if let Some(slot) = gone.get_mut(i) {
|
||||
*slot = true;
|
||||
}
|
||||
@@ -603,7 +607,7 @@ fn merge_coincident(sp: &mut SubPath, picked: impl Fn(usize) -> bool, join_kind:
|
||||
}
|
||||
|
||||
/// [`join_point`] on anchor `ai` of `anchors` with its neighbors given by index.
|
||||
fn join_point_between(anchors: &mut [Anchor], ai: usize, prev: Option<usize>, next: Option<usize>, smooth: bool) {
|
||||
fn join_point_between(anchors: &mut Anchors, ai: usize, prev: Option<usize>, next: Option<usize>, smooth: bool) {
|
||||
let at = |j: Option<usize>| j.and_then(|j| anchors.get(j)).map(|a| a.p);
|
||||
let (prev, next) = (at(prev), at(next));
|
||||
if let Some(a) = anchors.get_mut(ai) {
|
||||
@@ -1565,7 +1569,7 @@ enum Stretch {
|
||||
/// anchor, so the two handles of a smooth anchor stay in line with it. That share is below 0 or
|
||||
/// above 1 for a handle long enough beside the span. A closed subpath with no anchor that stays
|
||||
/// moves whole when it has a focal point.
|
||||
fn stretch_weights(anchors: &[Anchor], closed: bool, roles: &[Stretch]) -> Vec<[f64; 3]> {
|
||||
fn stretch_weights(anchors: &Anchors, closed: bool, roles: &[Stretch]) -> Vec<[f64; 3]> {
|
||||
let n = anchors.len();
|
||||
let mut shares = vec![[0.0; 3]; n];
|
||||
let role = |i: usize| match roles.get(i) {
|
||||
@@ -1891,10 +1895,10 @@ mod tests {
|
||||
&& before > 2
|
||||
&& picked(0)
|
||||
&& picked(before - 1)
|
||||
&& let [first, .., last] = sp.anchors.as_mut_slice()
|
||||
&& same(first, last)
|
||||
&& let (Some(&first), Some(&last)) = (sp.anchors.first(), sp.anchors.last())
|
||||
&& same(&first, &last)
|
||||
{
|
||||
first.h_in = last.h_in;
|
||||
sp.anchors[0].h_in = last.h_in;
|
||||
sp.anchors.pop();
|
||||
if let Some(smooth) = join_kind {
|
||||
join_point(sp, 0, smooth);
|
||||
@@ -1903,10 +1907,10 @@ mod tests {
|
||||
for i in (1..sp.anchors.len()).rev() {
|
||||
if picked(i - 1)
|
||||
&& picked(i)
|
||||
&& let Some([a, b]) = sp.anchors.get_mut(i - 1..=i)
|
||||
&& same(a, b)
|
||||
&& let (Some(&a), Some(&b)) = (sp.anchors.get(i - 1), sp.anchors.get(i))
|
||||
&& same(&a, &b)
|
||||
{
|
||||
a.h_out = b.h_out;
|
||||
sp.anchors[i - 1].h_out = b.h_out;
|
||||
sp.anchors.remove(i);
|
||||
if let Some(smooth) = join_kind {
|
||||
join_point(sp, i - 1, smooth);
|
||||
|
||||
+150
-16
File diff suppressed because one or more lines are too long
@@ -486,7 +486,9 @@ fn imaged(n: &Node, which: Which) -> bool {
|
||||
let live = filters
|
||||
&& pixels == 1
|
||||
&& effects::svg_filter::writes_live(&n.appearance.effects)
|
||||
&& fx.iter().any(|f| matches!(f, RasterFx::Pixel(effects::PixelFx::Svg(s)) if s.in_points() && (!s.measured() || fx.len() == 1) && s.writes_as_svg11()));
|
||||
&& fx
|
||||
.iter()
|
||||
.any(|f| matches!(f, RasterFx::Pixel(effects::PixelFx::Svg(s)) if (!s.measured() || fx.len() == 1) && s.writes_as_svg11() && s.opens_again()));
|
||||
(pixels > 0 && !live)
|
||||
|| (fx.iter().any(|f| matches!(f, RasterFx::DropShadow { darkness: Some(_), .. })) && (cmyk || !simple_rgb_shadow_source(n, &fx)))
|
||||
}
|
||||
|
||||
@@ -8,9 +8,10 @@ use vectorcraft_doc::{Document, LockedArtboards, Node, NodeId, NodeKind};
|
||||
use vectorcraft_tools::builder::is_live_paint;
|
||||
|
||||
use super::object::can_align;
|
||||
use super::panelcmds::artboard_at;
|
||||
use super::wand::{fill_of, stroke_of};
|
||||
use super::{
|
||||
CommandSpec, Result, Session, bad, bool_or, checked_id, checked_ids_param, cmd, color_value, has_doc, has_selection, index, ok, str_param,
|
||||
CommandSpec, Result, Session, bad, bool_or, checked_id, checked_ids_param, cmd, color_value, has_doc, has_selection, index_opt, ok, str_param,
|
||||
switch_or, text_param,
|
||||
};
|
||||
use crate::DocState;
|
||||
@@ -31,7 +32,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"All on Active Artboard",
|
||||
["Select"],
|
||||
Some("Cmd+Alt+A"),
|
||||
"{artboard?: index (0-based; the app passes the active one; default: the first)}",
|
||||
"{artboard?: index (0-based whole number; the app passes the active one; default, or null: the first)}",
|
||||
has_doc,
|
||||
all_on_artboard
|
||||
),
|
||||
@@ -229,7 +230,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Appearance Attribute",
|
||||
["Select", "Same"],
|
||||
None,
|
||||
"{item?: appearance item index} the objects sharing an appearance attribute of the first selected object: its fill or stroke `item` (default: the Appearance panel's active item), else its first effect, else its topmost fill (compound paths as select.same.fillColor)",
|
||||
"{item?: appearance item index (0-based whole number; default, or null: the Appearance panel's active item)} the objects sharing an appearance attribute of the first selected object: its fill or stroke `item` (default: the Appearance panel's active item), else its first effect, else its topmost fill (compound paths as select.same.fillColor)",
|
||||
has_selection,
|
||||
same_attribute
|
||||
),
|
||||
@@ -428,7 +429,7 @@ fn all(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
|
||||
fn all_on_artboard(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let st = s.doc()?;
|
||||
let i = p.get("artboard").and_then(Value::as_u64).map_or(0, index);
|
||||
let i = artboard_at(&st.doc, p, "artboard", "select.allOnArtboard")?.unwrap_or(0);
|
||||
let r = st.doc.artboards.get(i).map(|a| a.rect).ok_or_else(|| bad("select.allOnArtboard", "no such artboard"))?;
|
||||
let symbols = st.doc.symbol_boxes();
|
||||
let ids: Vec<NodeId> =
|
||||
@@ -1217,10 +1218,10 @@ enum Attribute {
|
||||
|
||||
fn same_attribute(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let cmd = "select.same.appearanceAttribute";
|
||||
let item = index_opt(p, "item", cmd)?.or(s.appearance_item());
|
||||
let st = s.doc()?;
|
||||
let (refn, _) = same_reference(st, cmd)?;
|
||||
let ap = &refn.appearance;
|
||||
let item = p.get("item").and_then(Value::as_u64).map(index).or(s.appearance_item());
|
||||
let attr = match (item.and_then(|i| ap.items.get(i)), ap.effects.first()) {
|
||||
(Some(it), _) => Attribute::Item(it.clone()),
|
||||
(None, Some(e)) => Attribute::Effect(e.clone()),
|
||||
|
||||
@@ -93,7 +93,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Merge Swatches",
|
||||
["Window", "Swatches"],
|
||||
None,
|
||||
"{names: [two or more solid-colour swatches], name?: the merged swatch's name (one swatch kept)} keep the first (its name and colour) and delete the others; paints linked to them take its colour and link to it (or unlink when it isn't global), as one undo step → {name, merged: [deleted names], relinked}",
|
||||
"{names: [two or more solid-colour swatches], name?: the merged swatch's name (one swatch kept)} keep the first (its name and colour) and delete the others; paints linked to them take its colour and link to it (or unlink when it isn't global), and gradient stops linked to them drop their process plates, as one undo step → {name, merged: [deleted names], relinked}",
|
||||
has_doc,
|
||||
swatch_merge
|
||||
),
|
||||
@@ -688,6 +688,11 @@ impl Relink {
|
||||
/// batch, and a canceled batch preview, put back the paints the batch started with. A change is
|
||||
/// recorded with the step just made, so Undo and Redo put these paints back with the document.
|
||||
pub(super) fn map_default_paints(s: &mut Session, f: &mut LinkFn) -> Result<()> {
|
||||
map_default_paints_by(s, &mut |p| p.map_links(f))
|
||||
}
|
||||
|
||||
/// [`map_default_paints`] with `f` applied to each whole paint; `f` returns true when it changed it.
|
||||
fn map_default_paints_by(s: &mut Session, f: &mut dyn FnMut(&mut Paint) -> bool) -> Result<()> {
|
||||
if s.in_interaction() && s.batch_stash.is_none() {
|
||||
return Ok(());
|
||||
}
|
||||
@@ -699,7 +704,7 @@ pub(super) fn map_default_paints(s: &mut Session, f: &mut LinkFn) -> Result<()>
|
||||
});
|
||||
let mut changed = false;
|
||||
for p in [&mut pd.fill, &mut pd.stroke].into_iter().chain(template) {
|
||||
changed |= p.map_links(f);
|
||||
changed |= f(p);
|
||||
}
|
||||
if changed {
|
||||
super::colormgmt::record_new_art_colors(s, start)?;
|
||||
@@ -1124,17 +1129,37 @@ fn swatch_merge(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
*l = link.clone();
|
||||
true
|
||||
};
|
||||
// A stop linked to a merged swatch loses its process plates, which printed with that ink.
|
||||
let mut unplate = |p: &Paint| {
|
||||
let mut q = p.clone();
|
||||
drop_stop_plates(&mut q, &merged_names).then_some(q)
|
||||
};
|
||||
let colorized_ok = super::paint::check_colorized(d).is_ok();
|
||||
let relinked = s.edit("Merge Swatches", |d, _| {
|
||||
take_swatches(d, merged, |_| true);
|
||||
map_all_paints(d, &mut unplate);
|
||||
let relinked = map_swatch_links(d, &mut relink);
|
||||
super::paint::check_colorized_kept(colorized_ok, d).map_err(|e| bad(C, e))?;
|
||||
Ok(relinked)
|
||||
})?;
|
||||
map_default_paints(s, &mut relink)?;
|
||||
map_default_paints_by(s, &mut |p| {
|
||||
let unplated = drop_stop_plates(p, &merged_names);
|
||||
p.map_links(&mut relink) | unplated
|
||||
})?;
|
||||
Ok(json!({"name": keep, "merged": merged, "relinked": relinked}))
|
||||
}
|
||||
|
||||
/// Clear the process plates of `p`'s gradient stops linked to a swatch in `names`. True when any
|
||||
/// stop had plates.
|
||||
fn drop_stop_plates(p: &mut Paint, names: &HashSet<&str>) -> bool {
|
||||
let Paint::Gradient(g) = p else { return false };
|
||||
g.gradient
|
||||
.stops
|
||||
.iter_mut()
|
||||
.filter(|st| st.swatch.as_deref().is_some_and(|l| names.contains(l)))
|
||||
.fold(false, |ch, st| st.plates.take().is_some() | ch)
|
||||
}
|
||||
|
||||
fn swatch_ungroup(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "swatch.ungroup";
|
||||
let name = str_param(p, "name").ok_or_else(|| bad(C, "missing `name`"))?.to_string();
|
||||
|
||||
@@ -384,7 +384,7 @@ fn weather_icons() -> SymbolLibrary {
|
||||
Anchor { p: Point::new(5.0, 16.0), h_in: Point::new(-6.0, 16.0), h_out: Point::new(0.0, 8.0), kind: AnchorKind::Corner },
|
||||
Anchor { p: Point::new(-4.0, -1.0), h_in: Point::new(-4.0, 6.0), h_out: Point::new(-4.0, -8.0), kind: AnchorKind::Smooth },
|
||||
];
|
||||
let moon = PathData::single(SubPath { anchors: moon_anchors, closed: true });
|
||||
let moon = PathData::single(SubPath::new(moon_anchors, true));
|
||||
|
||||
// Helper for cloud contour
|
||||
let cloud_subpath = |offset_y: f64, scale: f64| -> SubPath {
|
||||
|
||||
@@ -1652,6 +1652,30 @@ fn paragraph_style_options_edit_applies_to_users_and_is_one_saved_undo_step() {
|
||||
}
|
||||
}
|
||||
|
||||
/// A paragraph style can hold a Standard composer: it applies to its paragraphs, redefining and
|
||||
/// resetting treat it like any attribute, and the style and the paragraphs keep it through a save.
|
||||
#[test]
|
||||
fn paragraph_styles_keep_a_standard_composer_through_a_save() {
|
||||
use vectorcraft_doc::Composer;
|
||||
let (mut s, id) = session_with_text("One\nTwo");
|
||||
s.execute("paraStyle.new", &json!({"name": "Legacy", "attrs": {"composer": "standardSingleLine"}})).unwrap();
|
||||
s.execute("paraStyle.apply", &json!({"name": "Legacy", "id": id, "start": 0, "end": 0})).unwrap();
|
||||
assert_eq!(paras(&s, id).iter().map(|p| p.composer).collect::<Vec<_>>(), [Composer::StandardSingleLine, Composer::EveryLine]);
|
||||
let doc = s.doc().unwrap().doc.clone();
|
||||
let saved = vectorcraft_format::load(&vectorcraft_format::save(&doc, false)).unwrap();
|
||||
let style = saved.para_styles.iter().find(|d| d.name == "Legacy").unwrap();
|
||||
assert_eq!(style.attrs["composer"], json!("standardSingleLine"));
|
||||
let mut composers = vec![];
|
||||
saved.walk(|n| {
|
||||
if let vectorcraft_doc::NodeKind::Text(t) = &n.kind {
|
||||
composers.extend(t.paragraph_styles().iter().map(|p| p.composer));
|
||||
}
|
||||
});
|
||||
assert_eq!(composers, [Composer::StandardSingleLine, Composer::EveryLine]);
|
||||
s.execute("paraStyle.setAttrs", &json!({"name": "Legacy", "attrs": {"composer": "standardEveryLine"}})).unwrap();
|
||||
assert_eq!(paras(&s, id)[0].composer, Composer::StandardEveryLine, "an edited style reaches its paragraphs");
|
||||
}
|
||||
|
||||
/// A changed paragraph attribute outside the range `text.setFormat` keeps it to is an error for
|
||||
/// `paraStyle.edit`, `paraStyle.setAttrs` and `paraStyle.new`, with no change to the document; the
|
||||
/// ends of each range are accepted, and an out-of-range value the style already has can be kept.
|
||||
|
||||
@@ -59,8 +59,23 @@ fn rect_in_range(r: vectorcraft_geom::Rect) -> bool {
|
||||
/// margin passes without being measured: its curves stay inside their control points. Any other
|
||||
/// object, and a path with a point outside that margin, is measured.
|
||||
pub(crate) fn objects_in_range(d: &Document, ids: &[NodeId]) -> bool {
|
||||
let paths = d.index_paths(ids.iter().copied());
|
||||
ids.iter().all(|id| paths.get(id).and_then(|p| d.node_at(p)).is_none_or(|n| points_in_range(n) || n.geometric_bounds().is_none_or(rect_in_range)))
|
||||
if ids.is_empty() {
|
||||
return true;
|
||||
}
|
||||
let node_ok = |n: &vectorcraft_doc::Node| points_in_range(n) || n.geometric_bounds().is_none_or(rect_in_range);
|
||||
// A cached document or a few ids: look each one up. Otherwise one walk of the tree, with no
|
||||
// path vectors allocated.
|
||||
if d.has_lookup_cache() || ids.len() <= 16 {
|
||||
return ids.iter().all(|id| d.node(*id).is_none_or(node_ok));
|
||||
}
|
||||
let want: std::collections::HashSet<NodeId> = ids.iter().copied().collect();
|
||||
let mut ok = true;
|
||||
d.walk(|n| {
|
||||
if ok && want.contains(&n.id) && !node_ok(n) {
|
||||
ok = false;
|
||||
}
|
||||
});
|
||||
ok
|
||||
}
|
||||
|
||||
/// Coordinates at most this far from 0 keep a curve's measured bounds within [`MAX_COORD`]
|
||||
|
||||
@@ -2133,7 +2133,7 @@ mod pen_interactions {
|
||||
gesture(&mut s, &[(400.0, 500.0)], Mods::default(), v);
|
||||
let extended = path(&s, id);
|
||||
assert_eq!(extended.anchor_count(), 3);
|
||||
assert_eq!(extended.subpaths[0].anchors[..2], reversed.subpaths[0].anchors);
|
||||
assert_eq!(extended.subpaths[0].anchors.to_vec()[..2], reversed.subpaths[0].anchors);
|
||||
assert!(!s.in_interaction() && !s.tool_busy());
|
||||
assert_eq!(s.doc().unwrap().doc.layers[0].children().unwrap().len(), 1);
|
||||
}
|
||||
@@ -2168,7 +2168,7 @@ mod pen_interactions {
|
||||
gesture(&mut s, &[(300.0, 400.0)], Mods::default(), v);
|
||||
let extended = path(&s, id);
|
||||
assert_eq!(extended.anchor_count(), 3);
|
||||
assert_eq!(extended.subpaths[0].anchors[..2], converted.subpaths[0].anchors);
|
||||
assert_eq!(extended.subpaths[0].anchors.to_vec()[..2], converted.subpaths[0].anchors);
|
||||
assert_eq!(s.doc().unwrap().doc.layers[0].children().unwrap().len(), 1);
|
||||
}
|
||||
|
||||
@@ -2227,7 +2227,7 @@ mod pen_interactions {
|
||||
}
|
||||
let extended = path(&s, id);
|
||||
assert_eq!(extended.anchor_count(), 3);
|
||||
assert_eq!(extended.subpaths[0].anchors[..2], before.subpaths[0].anchors);
|
||||
assert_eq!(extended.subpaths[0].anchors.to_vec()[..2], before.subpaths[0].anchors);
|
||||
let a = extended.subpaths[0].anchors[2];
|
||||
assert_eq!(a.p, Point::new(320.0, 450.0));
|
||||
assert_eq!(a.h_in, Point::new(290.0, 430.0), "Alt freezes the incoming handle and Space translates it");
|
||||
@@ -3381,7 +3381,7 @@ fn reshape_open_path(s: &mut Session, anchors: Value) -> NodeId {
|
||||
|
||||
/// The anchors of the path's first subpath.
|
||||
fn reshape_anchors(s: &Session, id: NodeId) -> Vec<vectorcraft_geom::Anchor> {
|
||||
s.doc().unwrap().doc.node(id).unwrap().path_data().unwrap().subpaths[0].anchors.clone()
|
||||
s.doc().unwrap().doc.node(id).unwrap().path_data().unwrap().subpaths[0].anchors.to_vec()
|
||||
}
|
||||
|
||||
/// The share of the drag an anchor takes at `u` of the way from an end to the grabbed point.
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
use serde_json::json;
|
||||
|
||||
use crate::cmd::actionset::{AiaStep, read_aia};
|
||||
use crate::cmd::actionset::{AiaData, AiaStep, AiaValue, read_aia};
|
||||
use crate::*;
|
||||
|
||||
/// `text` as a bracketed hexadecimal value.
|
||||
@@ -37,7 +37,12 @@ fn a_set_reads_its_actions_and_steps() {
|
||||
let names: Vec<&str> = set.actions.iter().map(|a| a.name.as_str()).collect();
|
||||
assert_eq!(names, ["First", "二番目"]);
|
||||
let step = |a: usize, s: usize| set.actions[a].steps[s].clone();
|
||||
let join = AiaStep { name: "sample_join".into(), label: Some("Join".into()), on: Some(1), params: 3, declared: Some(3), line: 9 };
|
||||
let values = vec![
|
||||
AiaValue { key: Some(1), kind: Some("unit real".into()), value: None },
|
||||
AiaValue { key: None, kind: Some("ustring".into()), value: Some(AiaData::Text(b"a } brace".to_vec())) },
|
||||
AiaValue { key: None, kind: Some("raw".into()), value: None },
|
||||
];
|
||||
let join = AiaStep { name: "sample_join".into(), label: Some("Join".into()), on: Some(1), params: 3, values, declared: Some(3), line: 9 };
|
||||
assert_eq!(step(0, 0), join);
|
||||
assert_eq!((step(1, 0).name.as_str(), step(1, 0).label.clone(), step(1, 0).on), ("sample)one", None, Some(0)));
|
||||
assert_eq!((step(1, 1).label.as_deref(), step(1, 1).on, step(1, 1).line), (Some("Second Step"), None, 39));
|
||||
@@ -60,6 +65,55 @@ fn recorded_values_are_counted_and_checked() {
|
||||
assert!(set(&[value("one"), "/value [ 1 zz ]".to_string()]).truncated, "a second value that isn't hexadecimal");
|
||||
}
|
||||
|
||||
/// `actionSet.read` answers with each recorded value's key, type and value: a number, text in
|
||||
/// parentheses or hexadecimal text that is UTF-8 with its length in bytes, and null for text that
|
||||
/// isn't UTF-8 and for other values. Fields may come in any order, and a value with the wrong byte
|
||||
/// count still marks the set truncated.
|
||||
#[test]
|
||||
fn recorded_values_come_back_with_their_keys_and_types() {
|
||||
let mut s = Session::new();
|
||||
let text = format!(
|
||||
"/version 3 /action-1 {{ /event-1 {{ /internalName (sample_values) /parameterCount 6 \
|
||||
/parameter-1 {{ /key 1952807028 /type (ustring) /value {note} }} \
|
||||
/parameter-2 {{ /value 1 /type (boolean) /key 2003792484 }} \
|
||||
/parameter-3 {{ /type (ustring) /value [ 2 c328 ] /key 7 }} \
|
||||
/parameter-4 {{ /key 99999999999999999999 /type (real) /value 4.5 }} \
|
||||
/parameter-5 {{ /key 3 /type (text) /value (plain) }} \
|
||||
/parameter-6 {{ }} }} }}",
|
||||
note = hex("Größe ✓")
|
||||
);
|
||||
let r = s.execute("actionSet.read", &json!({ "data": text })).unwrap();
|
||||
assert_eq!(r["truncated"], false);
|
||||
assert_eq!(
|
||||
r["actions"][0]["steps"][0]["values"],
|
||||
json!([
|
||||
{"key": 1952807028, "type": "ustring", "value": "Größe ✓", "bytes": 11},
|
||||
{"key": 2003792484, "type": "boolean", "value": 1},
|
||||
{"key": 7, "type": "ustring", "value": null, "bytes": 2},
|
||||
{"key": null, "type": "real", "value": null},
|
||||
{"key": 3, "type": "text", "value": "plain", "bytes": 5},
|
||||
{"key": null, "type": null, "value": null},
|
||||
])
|
||||
);
|
||||
let bad = "/version 3 /action-1 { /event-1 { /parameter-1 { /key 1 /type (ustring) /value [ 3 4142 ] } } }";
|
||||
assert_eq!(s.execute("actionSet.read", &json!({ "data": bad })).unwrap()["truncated"], true);
|
||||
}
|
||||
|
||||
/// At most 100,000 recorded values are kept in a set: the others are still counted, so a step's
|
||||
/// `values` can be shorter than its `params`.
|
||||
#[test]
|
||||
fn recorded_values_past_the_cap_are_counted_but_not_kept() {
|
||||
let step = format!("/event-1 {{ {} }} ", "/parameter-1 { /key 1 /value 0 } ".repeat(1000));
|
||||
let action = format!("/action-1 {{ {} }} ", step.repeat(50));
|
||||
let set = read_aia(format!("/version 3 {}", action.repeat(3)).as_bytes()).unwrap();
|
||||
assert!(!set.truncated);
|
||||
let steps = || set.actions.iter().flat_map(|a| &a.steps);
|
||||
assert_eq!(steps().map(|s| s.params).sum::<usize>(), 150_000);
|
||||
assert_eq!(steps().map(|s| s.values.len()).sum::<usize>(), 100_000);
|
||||
assert_eq!(set.actions[2].steps[0].values.len(), 0);
|
||||
assert_eq!(set.actions[1].steps[49].values[999], AiaValue { key: Some(1), kind: None, value: Some(AiaData::Int(0)) });
|
||||
}
|
||||
|
||||
/// `actionSet.read` takes exactly one of `path`, `data` and `dataBase64`, and text for the text
|
||||
/// params; any other value is an error.
|
||||
#[test]
|
||||
@@ -97,7 +151,7 @@ fn read_command_answers_with_the_set() {
|
||||
let text = sample().replacen(&format!("/name {}", hex("Prep Sätze")), "", 1);
|
||||
let r = s.execute("actionSet.read", &json!({ "data": text, "name": "/sets/Mine.aia" })).unwrap();
|
||||
assert_eq!(r["set"], "Mine");
|
||||
assert_eq!(r["actions"][1]["steps"][0], json!({"name": "sample)one", "label": null, "on": false, "params": 0, "line": 34}));
|
||||
assert_eq!(r["actions"][1]["steps"][0], json!({"name": "sample)one", "label": null, "on": false, "params": 0, "values": [], "line": 34}));
|
||||
assert_eq!(r["actions"][0]["steps"][0]["on"], true);
|
||||
assert_eq!(r["actions"][0]["steps"][0]["label"], "Join");
|
||||
let blank = format!("/version 3 /action-1 {{ /event-1 {{ /internalName (x) /localizedName {} }} }}", hex(" "));
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
//! An edit of one anchor of a long selected path does not measure the path's segments
|
||||
//! ([`vectorcraft_geom::path::measured_segments`]) to check that it stays within the canvas, and
|
||||
//! an edit that leaves the anchor as it was records no undo step.
|
||||
//! ([`vectorcraft_geom::path::measured_segments`]) to check that it stays within the canvas, its
|
||||
//! undo step keeps the chunk of anchors it changed rather than a copy of every anchor, and an edit
|
||||
//! that leaves the anchor as it was records no undo step.
|
||||
|
||||
use std::collections::BTreeSet;
|
||||
use std::sync::Arc;
|
||||
@@ -74,6 +75,46 @@ fn one_anchor_edit_of_a_long_path_measures_few_segments() {
|
||||
}
|
||||
}
|
||||
|
||||
/// Most bytes the undo step of one anchor edit may keep, however many anchors the path has: about
|
||||
/// one chunk of anchors and the node, with room for the chunk tables of 200,000 anchors.
|
||||
const MOST_STEP_BYTES: usize = 48 * 1024;
|
||||
|
||||
#[test]
|
||||
fn one_anchor_edit_of_a_long_path_keeps_one_chunk_in_its_undo_step() {
|
||||
for n in [10_000, 200_000] {
|
||||
let (mut s, id) = long_path(n);
|
||||
let original = s.doc().unwrap().doc.clone();
|
||||
let edits = [
|
||||
("path.moveAnchor", json!({"id": id.0, "anchor": 5, "x": 3, "y": 50})),
|
||||
("path.setHandle", json!({"id": id.0, "anchor": 5, "which": "out", "x": 4, "y": 40})),
|
||||
("path.moveAnchors", json!({"dx": 1, "dy": 0})),
|
||||
("object.nudge", json!({"dx": 1, "dy": 0})),
|
||||
];
|
||||
let mut docs = vec![];
|
||||
for (cmd, p) in &edits {
|
||||
s.execute(cmd, p).unwrap();
|
||||
let step = s.doc().unwrap().history.undo.last().unwrap().bytes;
|
||||
assert!(step <= MOST_STEP_BYTES, "{cmd} on {n} anchors kept {step} bytes in its undo step");
|
||||
docs.push(s.doc().unwrap().doc.clone());
|
||||
}
|
||||
assert_eq!(anchor(&s, id, 5).p, Point::new(5.0, 50.0));
|
||||
assert_eq!(anchor(&s, id, 5).h_out, Point::new(6.0, 40.0));
|
||||
assert_eq!(anchor(&s, id, n - 1), original.node(id).unwrap().path_data().unwrap().subpaths[0].anchors[n - 1]);
|
||||
// Undo gives back each version exactly, and redo the edits, each step as small.
|
||||
for k in (0..edits.len()).rev() {
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
let expected = if k == 0 { &original } else { &docs[k - 1] };
|
||||
assert!(s.doc().unwrap().doc == *expected, "undo of {} on {n} anchors", edits[k].0);
|
||||
let redo = s.doc().unwrap().history.redo.last().unwrap().bytes;
|
||||
assert!(redo <= MOST_STEP_BYTES, "redo of {} on {n} anchors keeps {redo} bytes", edits[k].0);
|
||||
}
|
||||
for (k, doc) in docs.iter().enumerate() {
|
||||
s.execute("edit.redo", &json!({})).unwrap();
|
||||
assert!(s.doc().unwrap().doc == *doc, "redo of {} on {n} anchors", edits[k].0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A handle past the canvas is measured: the edit stands while the curve stays within the canvas,
|
||||
/// and is refused once the curve leaves it.
|
||||
#[test]
|
||||
|
||||
@@ -5688,6 +5688,57 @@ fn a_trace_run_applies_only_in_its_own_document() {
|
||||
}
|
||||
}
|
||||
|
||||
/// A trace prepared before File › Revert doesn't apply after it, even when the document keeps its
|
||||
/// uid and the restored image, object and settings are the same: both trace commands drop the
|
||||
/// trace handed in and trace the restored image again, as one undo step. Reverting another
|
||||
/// document, or a revert that fails, leaves the run current, and a trace prepared after the revert
|
||||
/// applies as usual.
|
||||
#[test]
|
||||
fn a_trace_run_prepared_before_a_revert_does_not_apply_after_it() {
|
||||
let p = json!({"params": {"ignoreWhite": true}});
|
||||
for command in ["imageTrace.make", "imageTrace.makeAndExpand"] {
|
||||
let mut direct = session();
|
||||
image_doc(&mut direct);
|
||||
let want = direct.execute(command, &p).unwrap();
|
||||
let mut s = session();
|
||||
let img = image_doc(&mut s);
|
||||
let a = s.active_index().unwrap();
|
||||
let copy = (*s.doc().unwrap().doc).clone();
|
||||
let run = cmd::TraceRun::prepare(&s, command, &p).unwrap();
|
||||
let traced = run.run(&|_, _| true).unwrap();
|
||||
let b = s.add_document(copy.clone(), None);
|
||||
assert!(s.replace_document(b, copy.clone()));
|
||||
assert!(s.set_active(a));
|
||||
assert!(run.current(&s) && !run.reverted(&s), "{command}: another document reverted");
|
||||
assert!(!s.replace_document(s.documents().len(), copy.clone()));
|
||||
assert!(run.current(&s) && !run.reverted(&s), "{command}: a revert that failed");
|
||||
let (uid, reverts) = (s.doc().unwrap().uid, s.doc().unwrap().reverts);
|
||||
assert!(s.replace_document(a, copy));
|
||||
assert_eq!(s.doc().unwrap().uid, uid, "{command}: the tab keeps its uid");
|
||||
assert_eq!(s.doc().unwrap().reverts, reverts + 1, "{command}");
|
||||
assert!(!run.current(&s), "{command}: reverted");
|
||||
assert!(run.reverted(&s), "{command}");
|
||||
traced.hand_in(&mut s);
|
||||
let traces = cmd::TraceRun::traces_on_this_thread();
|
||||
let got = s.execute(run.command(), run.params()).unwrap();
|
||||
assert_eq!(cmd::TraceRun::traces_on_this_thread(), traces + 1, "{command}: traced again");
|
||||
assert!(s.trace_hand_off.is_none(), "{command}: dropped");
|
||||
assert_eq!(got, want, "{command}");
|
||||
let g = NodeId(got["id"].as_u64().unwrap());
|
||||
assert_eq!(node(&s, g), node(&direct, g), "{command}");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!(matches!(node(&s, img).kind, NodeKind::Image(_)), "{command}: one undo step");
|
||||
// A trace prepared after the revert is handed in and applied without tracing again.
|
||||
let after = cmd::TraceRun::prepare(&s, command, run.params()).unwrap();
|
||||
let traced = after.run(&|_, _| true).unwrap();
|
||||
assert!(after.current(&s) && !after.reverted(&s), "{command}: prepared after the revert");
|
||||
traced.hand_in(&mut s);
|
||||
let traces = cmd::TraceRun::traces_on_this_thread();
|
||||
s.execute(after.command(), after.params()).unwrap();
|
||||
assert_eq!(cmd::TraceRun::traces_on_this_thread(), traces, "{command}: the trace handed in applied");
|
||||
}
|
||||
}
|
||||
|
||||
/// A plug-in run that calls Image Trace and then fails leaves a trace handed in for the command in
|
||||
/// place, as it leaves the document.
|
||||
#[test]
|
||||
|
||||
@@ -40,7 +40,7 @@ fn close(a: f64, b: f64) -> bool {
|
||||
fn segment_angles(p: &PathData) -> Vec<f64> {
|
||||
p.subpaths
|
||||
.iter()
|
||||
.flat_map(|sp| sp.anchors.windows(2).map(|w| w[1].p - w[0].p))
|
||||
.flat_map(|sp| sp.anchors.iter().zip(sp.anchors.iter().skip(1)).map(|(a, b)| b.p - a.p))
|
||||
.filter(|v| v.hypot() > 1e-9)
|
||||
.map(|v| (-v.y).atan2(v.x).to_degrees().rem_euclid(90.0))
|
||||
.collect()
|
||||
|
||||
@@ -890,7 +890,7 @@ fn curvature_rubber_band_is_the_path_the_click_makes() {
|
||||
s.pointer(&PointerEvent::new(PointerKind::Up, 450.0, 400.0), v).unwrap();
|
||||
let made = path(&s, id).subpaths[0].clone();
|
||||
assert_eq!(made.anchors.len(), 4);
|
||||
let tail = vectorcraft_geom::SubPath::new(made.anchors[1..].to_vec(), false);
|
||||
let tail = vectorcraft_geom::SubPath::new(made.anchors.to_vec()[1..].to_vec(), false);
|
||||
assert_eq!(preview, bez(&tail));
|
||||
}
|
||||
|
||||
@@ -1218,7 +1218,7 @@ fn scissors_cut_ellipse_end_drags_alone() {
|
||||
s.pointer(&PointerEvent::new(PointerKind::Up, cut.x + 8.0, cut.y + 8.0).with_mods(m), v).unwrap();
|
||||
assert_eq!(undo_steps(&s), undo + 1);
|
||||
let after = path(&s, id);
|
||||
let (old, new) = (&sp.anchors, &after.subpaths[0].anchors);
|
||||
let (old, new) = (&sp.anchors.to_vec(), &after.subpaths[0].anchors.to_vec());
|
||||
assert_eq!(new.len(), old.len());
|
||||
assert_eq!(new[1..], old[1..], "only the dragged end moves (at anchor: {at_anchor}, {m:?})");
|
||||
let d = Point::new(cut.x + 8.0, cut.y + 8.0) - cut;
|
||||
@@ -1572,7 +1572,7 @@ fn a_short_smooth_drag_leaves_the_rest_of_long_segments_alone() {
|
||||
drag(&mut s, "smooth", &[(195.0, 194.0), (205.0, 194.0)], Mods::default());
|
||||
let p = path(&s, id);
|
||||
assert_ne!(p, before, "the bump is smoothed");
|
||||
let a = &p.subpaths[0].anchors;
|
||||
let a = &p.subpaths[0].anchors.to_vec();
|
||||
let (first, second, last) = (a[0], a[1], a[a.len() - 1]);
|
||||
assert!(first.p == Point::new(50.0, 200.0) && !first.has_out() && !second.has_in(), "the left side is a line still: {first:?} {second:?}");
|
||||
assert!(last.p == Point::new(350.0, 200.0) && !last.has_in() && !a[a.len() - 2].has_out(), "and the right one: {last:?}");
|
||||
@@ -1783,7 +1783,7 @@ fn smoothing_over_a_closed_paths_first_anchor_keeps_its_start() {
|
||||
assert_ne!(after, before, "the bump is smoothed");
|
||||
assert_starts_nearest(&after, old, 12.0);
|
||||
let kept = &after.subpaths[0].anchors;
|
||||
for a in &before.subpaths[0].anchors[2..=10] {
|
||||
for a in &before.subpaths[0].anchors.to_vec()[2..=10] {
|
||||
assert!(kept.iter().any(|k| k.p == a.p), "{:?} is out of reach and stays: {kept:?}", a.p);
|
||||
}
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
@@ -3885,7 +3885,7 @@ fn pen_cmd_selected_anchors_are_what_copy_and_cut_take() {
|
||||
assert!(left.is_empty());
|
||||
assert!(s.doc().unwrap().selection.objects.is_empty());
|
||||
assert_eq!(s.clipboard.nodes.len(), 1);
|
||||
assert_eq!(s.clipboard.nodes[0].path_data().unwrap().subpaths[0].anchors, original.subpaths[0].anchors[1..3]);
|
||||
assert_eq!(s.clipboard.nodes[0].path_data().unwrap().subpaths[0].anchors, original.subpaths[0].anchors.to_vec()[1..3]);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(paths(&s), vec![(id, original.clone())]);
|
||||
assert_eq!(s.doc().unwrap().selection, picked);
|
||||
|
||||
@@ -231,6 +231,75 @@ fn deleting_a_spot_swatch_takes_the_process_plates_of_the_stops_it_unlinks() {
|
||||
assert_eq!(gradient(&s, id).gradient.stops[1], linked, "undo brings back the link and the plates");
|
||||
}
|
||||
|
||||
/// The stops of the gradients the merge test puts in place: the art's fill, gradient swatch "Glow",
|
||||
/// graphic style "Style", the art of brush "Brush" and the fill new art takes.
|
||||
fn merge_test_stops(s: &Session, id: NodeId) -> Vec<(&'static str, Vec<GradientStop>)> {
|
||||
let d = doc(s);
|
||||
let stops = |p: Paint| match p {
|
||||
Paint::Gradient(g) => g.gradient.stops,
|
||||
p => panic!("not a gradient: {p:?}"),
|
||||
};
|
||||
let style = d.graphic_style("Style").unwrap().appearance.items.iter().find_map(|it| match it {
|
||||
vectorcraft_doc::AppearanceItem::Fill(f) => Some(f.paint.clone()),
|
||||
vectorcraft_doc::AppearanceItem::Stroke(_) => None,
|
||||
});
|
||||
let mut brush = None;
|
||||
for n in vectorcraft_brush::find(d, "Brush").unwrap().art() {
|
||||
n.walk(&mut |m| {
|
||||
if brush.is_none() && matches!(m.appearance.fill_paint(), Paint::Gradient(_)) {
|
||||
brush = Some(m.appearance.fill_paint());
|
||||
}
|
||||
});
|
||||
}
|
||||
vec![
|
||||
("art", stops(d.node(id).unwrap().appearance.fill_paint())),
|
||||
("gradient swatch", stops(d.swatch("Glow").unwrap().paint.clone())),
|
||||
("graphic style", stops(style.unwrap())),
|
||||
("brush art", stops(brush.unwrap())),
|
||||
("new art", stops(s.paint.fill.clone())),
|
||||
]
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn merging_swatches_takes_the_process_plates_of_the_stops_it_relinks() {
|
||||
// Kept swatch "Keep": spot, global process, and process that isn't global.
|
||||
for (spot, global) in [(true, true), (false, true), (false, false)] {
|
||||
let (mut s, id) = setup();
|
||||
run(&mut s, "swatch.new", json!({"name": "Keep", "color": "#00ff00", "spot": spot, "global": global}));
|
||||
run(&mut s, "swatch.new", json!({"name": "Other", "color": {"c": 1, "m": 0, "y": 0, "k": 0}, "spot": true}));
|
||||
// Ink at 50 % over a 30 % cyan plate, and Other over its own 20 % magenta plate, which the
|
||||
// merge leaves alone.
|
||||
let plated = json!({"stops": [
|
||||
{"offset": 0, "swatch": "Ink", "tint": 50, "plates": [0.3, 0, 0, 0]},
|
||||
{"offset": 1, "swatch": "Other", "plates": [0, 0.2, 0, 0]},
|
||||
]});
|
||||
run(&mut s, "paint.editGradient", plated.clone());
|
||||
run(&mut s, "swatch.new", json!({"name": "Glow", "gradient": plated}));
|
||||
run(&mut s, "graphicStyle.new", json!({"name": "Style"}));
|
||||
run(&mut s, "brush.new", json!({"type": "art", "name": "Brush"}));
|
||||
s.paint.fill = doc(&s).node(id).unwrap().appearance.fill_paint();
|
||||
let before = merge_test_stops(&s, id);
|
||||
let kept = doc(&s).linked_color(doc(&s).swatch("Keep").unwrap().paint.color().unwrap(), spot);
|
||||
assert!(before.iter().all(|(_, st)| st[0].plates == Some([0.3, 0.0, 0.0, 0.0])), "{before:?}");
|
||||
|
||||
run(&mut s, "swatch.merge", json!({"names": ["Keep", "Ink"]}));
|
||||
let after = merge_test_stops(&s, id);
|
||||
// The stop shows its tint of the kept color, unlinked when the kept swatch isn't global.
|
||||
let (link, tint, color) = if global { (Some("Keep"), 0.5, kept.tinted(0.5)) } else { (None, 1.0, kept.tinted(0.5)) };
|
||||
for (place, st) in &after {
|
||||
let what = format!("spot {spot}, global {global}, {place}: {st:?}");
|
||||
assert_eq!((st[0].swatch.as_deref(), st[0].tint, st[0].plates), (link, tint, None), "{what}");
|
||||
assert_eq!(st[0].color, color, "{what}");
|
||||
assert_eq!((st[1].swatch.as_deref(), st[1].plates), (Some("Other"), Some([0.0, 0.2, 0.0, 0.0])), "{what}");
|
||||
}
|
||||
|
||||
run(&mut s, "edit.undo", json!({}));
|
||||
assert_eq!(merge_test_stops(&s, id), before, "undo brings back the links and the plates");
|
||||
run(&mut s, "edit.redo", json!({}));
|
||||
assert_eq!(merge_test_stops(&s, id), after, "redo merges again");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn radial_spot_gradients_mixed_with_other_inks_export_as_device_n_shadings() {
|
||||
let (mut s, _) = setup();
|
||||
|
||||
@@ -3299,6 +3299,32 @@ fn select_all_on_artboard_refuses_an_artboard_past_u32() {
|
||||
assert!(selected(&s).is_empty());
|
||||
}
|
||||
|
||||
/// All on Active Artboard refuses an `artboard` that is not a whole number, naming the parameter,
|
||||
/// and leaves the selection as it was; a whole number past the last artboard is `no such
|
||||
/// artboard`. Left out or null, it takes the first artboard.
|
||||
#[test]
|
||||
fn select_all_on_artboard_refuses_an_artboard_that_is_not_a_whole_number() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 100, "height": 100, "artboards": 2, "artboardLayout": {"layout": "row", "spacing": 0}})).unwrap();
|
||||
let (first, second) = (rect(&mut s, 10.0, 10.0, 20.0, 20.0), rect(&mut s, 110.0, 10.0, 20.0, 20.0));
|
||||
for bad in [json!("1"), json!(-1), json!(1.5), json!(true), json!([1]), json!({})] {
|
||||
s.execute("select.none", &json!({})).unwrap();
|
||||
let err = s.execute("select.allOnArtboard", &json!({"artboard": bad})).unwrap_err().to_string();
|
||||
assert_eq!(err, "invalid parameters for `select.allOnArtboard`: `artboard` must be a whole number", "{bad}");
|
||||
assert!(selected(&s).is_empty(), "{bad}");
|
||||
}
|
||||
s.execute("select.none", &json!({})).unwrap();
|
||||
assert_eq!(s.execute("select.allOnArtboard", &json!({"artboard": 9})).unwrap_err().to_string(), "no such artboard");
|
||||
assert!(selected(&s).is_empty());
|
||||
for p in [json!({}), json!({"artboard": null}), json!({"artboard": 0})] {
|
||||
s.execute("select.none", &json!({})).unwrap();
|
||||
s.execute("select.allOnArtboard", &p).unwrap();
|
||||
assert_eq!(selected(&s), vec![first], "{p}");
|
||||
}
|
||||
s.execute("select.allOnArtboard", &json!({"artboard": 1})).unwrap();
|
||||
assert_eq!(selected(&s), vec![second]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn save_and_recall_selection() {
|
||||
let mut s = session();
|
||||
@@ -4605,6 +4631,27 @@ fn artboard_guides_go_with_their_artboard() {
|
||||
assert_eq!((guides(&s).len(), selected_guides(&s)), (3, vec![0, 1]));
|
||||
}
|
||||
|
||||
/// `guide.add` refuses an `artboard` that is not a whole number, naming the parameter, and adds no
|
||||
/// guide; a whole number past the last artboard is `no such artboard`. Null makes a canvas guide,
|
||||
/// and a whole number an artboard guide.
|
||||
#[test]
|
||||
fn guide_add_refuses_an_artboard_that_is_not_a_whole_number() {
|
||||
let mut s = session();
|
||||
s.execute("artboard.new", &json!({"x": 900, "y": 0, "width": 400, "height": 300})).unwrap();
|
||||
let add = |s: &mut Session, artboard: Value| s.execute("guide.add", &json!({"vertical": true, "pos": 10, "artboard": artboard}));
|
||||
for bad in [json!("1"), json!(-1), json!(1.5), json!(true), json!([1]), json!({})] {
|
||||
let err = add(&mut s, bad.clone()).unwrap_err().to_string();
|
||||
assert_eq!(err, "invalid parameters for `guide.add`: `artboard` must be a whole number", "{bad}");
|
||||
}
|
||||
assert_eq!(add(&mut s, json!(9)).unwrap_err().to_string(), "no such artboard");
|
||||
assert!(s.doc().unwrap().doc.ruler_guides().is_empty());
|
||||
add(&mut s, Value::Null).unwrap();
|
||||
add(&mut s, json!(1)).unwrap();
|
||||
let d = &s.doc().unwrap().doc;
|
||||
let boards: Vec<_> = d.ruler_guides().iter().map(|g| g.artboard).collect();
|
||||
assert_eq!(boards, [None, Some(d.artboards[1].id)]);
|
||||
}
|
||||
|
||||
/// #451: a guide dragged out of a ruler snaps (to the art's corners, side midpoints and anchors,
|
||||
/// the artboards' edges and centres) and is made in one undo step where it is released over the
|
||||
/// canvas; with the Artboard tool it is an artboard guide of the active artboard.
|
||||
|
||||
@@ -1722,6 +1722,35 @@ fn text_set_format() {
|
||||
assert_eq!(t.para.composer, vectorcraft_doc::Composer::EveryLine);
|
||||
}
|
||||
|
||||
/// `text.setFormat {composer}` takes the two Middle Eastern & South Asian and the two Standard
|
||||
/// composers, each per paragraph and one undo step; any other value is refused and names them all.
|
||||
#[test]
|
||||
fn text_set_format_takes_the_four_composers() {
|
||||
use vectorcraft_doc::Composer;
|
||||
let mut s = session();
|
||||
let r = s.execute("text.create", &json!({"x": 10, "y": 100, "text": "One\nTwo"})).unwrap();
|
||||
let id = NodeId(r["id"].as_u64().unwrap());
|
||||
let composers = |s: &Session| {
|
||||
let NodeKind::Text(t) = node(s, id).kind else { panic!() };
|
||||
[t.para_at(0).composer, t.para_at(1).composer]
|
||||
};
|
||||
assert_eq!(composers(&s), [Composer::EveryLine; 2], "new type is ME&SA Every-line");
|
||||
for (value, want) in [
|
||||
("singleLine", Composer::SingleLine),
|
||||
("standardSingleLine", Composer::StandardSingleLine),
|
||||
("standardEveryLine", Composer::StandardEveryLine),
|
||||
("everyLine", Composer::EveryLine),
|
||||
] {
|
||||
s.execute("text.setFormat", &json!({"ids": [id.0], "composer": value, "start": 4, "end": 4})).unwrap();
|
||||
assert_eq!(composers(&s), [Composer::EveryLine, want], "{value}: only the second paragraph");
|
||||
}
|
||||
s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "standardEveryLine"})).unwrap();
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(composers(&s), [Composer::EveryLine; 2], "one undo step");
|
||||
let e = s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "standard"})).unwrap_err().to_string();
|
||||
assert!(e.contains("standardSingleLine") && e.contains("standardEveryLine"), "{e}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stroke_advanced_scale_swap_flip() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -704,10 +704,11 @@ fn effect_params_are_the_effects_own() {
|
||||
fn an_effect_parameter_without_a_default_is_held_to_its_type() {
|
||||
use crate::cmd::params::undefaulted_type;
|
||||
use vectorcraft_render::effects::effect_catalog;
|
||||
// Read by checks of their own: a stored texture or a texture to load, an SVG filter, a Warp's
|
||||
// Read by checks of their own: a stored texture or a texture to load, an SVG filter and its axes, a Warp's
|
||||
// map and the style of Crop Marks.
|
||||
let own_check = |effect: &str, key: &str| match key {
|
||||
"textureImage" | "name" | "xml" => true,
|
||||
"axes" => effect == "svg.filter",
|
||||
"version" => effect.starts_with("warp."),
|
||||
"style" => effect == "cropMarks",
|
||||
_ => false,
|
||||
|
||||
@@ -73,8 +73,8 @@ fn simplify_refits_only_the_run_between_direct_selected_anchors() {
|
||||
assert_eq!(out["after"].as_u64(), Some(len as u64));
|
||||
assert!(len < 101 - 30, "{len}");
|
||||
let end = len - 41;
|
||||
assert_eq!(sp.anchors[..20], original.anchors[..20], "the anchors before the run");
|
||||
assert_eq!(sp.anchors[end + 1..], original.anchors[61..], "the anchors after the run");
|
||||
assert_eq!(sp.anchors.to_vec()[..20], original.anchors.to_vec()[..20], "the anchors before the run");
|
||||
assert_eq!(sp.anchors.to_vec()[end + 1..], original.anchors.to_vec()[61..], "the anchors after the run");
|
||||
assert_eq!((sp.anchors[20].p, sp.anchors[20].h_in), (original.anchors[20].p, original.anchors[20].h_in));
|
||||
assert_eq!((sp.anchors[end].p, sp.anchors[end].h_out), (original.anchors[60].p, original.anchors[60].h_out));
|
||||
for i in 0..20 {
|
||||
@@ -100,7 +100,7 @@ fn separate_runs_on_one_path_simplify_independently_in_one_step() {
|
||||
let id = wave(&mut s);
|
||||
select_anchors(&mut s, id, ranges);
|
||||
s.execute("object.path.simplify", &json!({"tolerance": 1})).unwrap();
|
||||
path_of(&s, id).subpaths[0].anchors.clone()
|
||||
path_of(&s, id).subpaths[0].anchors.to_vec()
|
||||
};
|
||||
let (first, second) = (alone(&[(10, 30)]), alone(&[(60, 80)]));
|
||||
let mut s = session();
|
||||
@@ -110,13 +110,13 @@ fn separate_runs_on_one_path_simplify_independently_in_one_step() {
|
||||
let undo = undo_len(&s);
|
||||
s.execute("object.path.simplify", &json!({"tolerance": 1})).unwrap();
|
||||
assert_eq!(undo_len(&s), undo + 1, "one undo step");
|
||||
let both = path_of(&s, id).subpaths[0].anchors.clone();
|
||||
let both = path_of(&s, id).subpaths[0].anchors.to_vec();
|
||||
// Where old anchor 30 is in the first result, and old anchor 80 in the second.
|
||||
let (a30, a80) = (first.len() - 71, second.len() - 21);
|
||||
assert!(a30 < 30 && a80 < 80, "both runs lose anchors");
|
||||
let mid = a30 + 30;
|
||||
assert_eq!(both[..=a30], first[..=a30]);
|
||||
assert_eq!(both[a30 + 1..mid], original.anchors[31..60], "the anchors between the runs");
|
||||
assert_eq!(both[a30 + 1..mid], original.anchors.to_vec()[31..60], "the anchors between the runs");
|
||||
assert_eq!(both[mid..], second[60..]);
|
||||
let sel: BTreeSet<_> = (10..=a30).chain(mid..=mid + a80 - 60).map(|i| (0, i)).collect();
|
||||
assert_eq!(s.doc().unwrap().selection.anchors.get(&id), Some(&sel));
|
||||
@@ -138,7 +138,7 @@ fn a_run_across_the_start_of_a_closed_path_simplifies_as_one() {
|
||||
assert!(sp.closed);
|
||||
assert!(sp.anchors.len() < 80 - 10, "{}", sp.anchors.len());
|
||||
assert!(!sp.anchors.iter().any(|a| a.p == original.anchors[0].p), "anchor 0 was inside the run");
|
||||
assert_eq!(sp.anchors[1..60], original.anchors[11..70]);
|
||||
assert_eq!(sp.anchors.to_vec()[1..60], original.anchors.to_vec()[11..70]);
|
||||
assert_eq!((sp.anchors[0].p, sp.anchors[0].h_out), (original.anchors[10].p, original.anchors[10].h_out));
|
||||
assert_eq!((sp.anchors[60].p, sp.anchors[60].h_in), (original.anchors[70].p, original.anchors[70].h_in));
|
||||
for i in 0..60 {
|
||||
@@ -162,8 +162,8 @@ fn picked_segments_simplify_and_stay_picked() {
|
||||
s.execute("object.path.simplify", &json!({"tolerance": 1})).unwrap();
|
||||
let sp = path_of(&s, id).subpaths[0].clone();
|
||||
let end = sp.anchors.len() - 41;
|
||||
assert_eq!(sp.anchors[..20], original.anchors[..20]);
|
||||
assert_eq!(sp.anchors[end + 1..], original.anchors[61..]);
|
||||
assert_eq!(sp.anchors.to_vec()[..20], original.anchors.to_vec()[..20]);
|
||||
assert_eq!(sp.anchors.to_vec()[end + 1..], original.anchors.to_vec()[61..]);
|
||||
let sel = &s.doc().unwrap().selection;
|
||||
assert_eq!(sel.segments.get(&id), Some(&(20..end).map(|i| (0, i)).collect()));
|
||||
assert_eq!(sel.anchors.get(&id), Some(&(20..=end).map(|i| (0, i)).collect()));
|
||||
@@ -200,8 +200,8 @@ fn slider_preview_and_auto_simplify_only_the_run() {
|
||||
let previewed = path_of(&s, id);
|
||||
let sp = &previewed.subpaths[0];
|
||||
assert!(sp.anchors.len() < 101, "{p}");
|
||||
assert_eq!(sp.anchors[..20], original.anchors[..20], "{p}");
|
||||
assert_eq!(sp.anchors[sp.anchors.len() - 40..], original.anchors[61..], "{p}");
|
||||
assert_eq!(sp.anchors.to_vec()[..20], original.anchors.to_vec()[..20], "{p}");
|
||||
assert_eq!(sp.anchors.to_vec()[sp.anchors.len() - 40..], original.anchors.to_vec()[61..], "{p}");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
s.execute("object.path.simplify", &p).unwrap();
|
||||
assert_eq!(path_of(&s, id), previewed, "{p}");
|
||||
|
||||
@@ -93,7 +93,7 @@ fn more_smoothing_removes_the_jags_and_keeps_the_shape() {
|
||||
// Within the tolerance (2.5 % of 300 pt at most) plus the jag the refit smooths away.
|
||||
assert!(farthest(&before, &after) <= 7.5 + 1.5, "level {level}: {}", farthest(&before, &after));
|
||||
// The end points of an open path stay put.
|
||||
let (a, b) = (&before.subpaths[0].anchors, &after.subpaths[0].anchors);
|
||||
let (a, b) = (&before.subpaths[0].anchors.to_vec(), &after.subpaths[0].anchors.to_vec());
|
||||
assert_eq!((a[0].p, a[a.len() - 1].p), (b[0].p, b[b.len() - 1].p));
|
||||
assert!(!after.subpaths[0].closed);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
@@ -206,7 +206,7 @@ fn direct_selected_anchors_smooth_only_their_section() {
|
||||
s.execute("select.anchors", &json!({"id": id.0, "anchors": anchors})).unwrap();
|
||||
s.execute("object.path.smooth", &json!({"level": 100})).unwrap();
|
||||
let after = path_of(&s, id);
|
||||
let (a, b) = (&before.subpaths[0].anchors, &after.subpaths[0].anchors);
|
||||
let (a, b) = (&before.subpaths[0].anchors.to_vec(), &after.subpaths[0].anchors.to_vec());
|
||||
assert!(b.len() < a.len(), "{} → {}", a.len(), b.len());
|
||||
// Anchors 0..=10 and 30..=40 are untouched, the section between them refitted.
|
||||
assert_eq!(a[..=10].iter().map(|x| x.p).collect::<Vec<_>>(), b[..=10].iter().map(|x| x.p).collect::<Vec<_>>());
|
||||
|
||||
@@ -325,6 +325,26 @@ fn select_same_appearance_attribute() {
|
||||
run(&mut s, "select.set", json!({"ids": [a.0]}));
|
||||
run(&mut s, "select.same.appearanceAttribute", json!({"item": (1u64 << 32) + 1}));
|
||||
assert_eq!(s.doc().unwrap().selection.objects, vec![a, b]);
|
||||
// Null is the default: the shared effect.
|
||||
run(&mut s, "select.set", json!({"ids": [a.0]}));
|
||||
run(&mut s, "select.same.appearanceAttribute", json!({"item": null}));
|
||||
assert_eq!(s.doc().unwrap().selection.objects, vec![a, b]);
|
||||
}
|
||||
|
||||
/// Select > Same > Appearance Attribute refuses an `item` that is not a whole number and leaves
|
||||
/// the selection as it was.
|
||||
#[test]
|
||||
fn select_same_appearance_attribute_refuses_an_item_that_is_not_a_whole_number() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 10.0);
|
||||
run(&mut s, "effect.apply", json!({"effect": "distort.roughen"}));
|
||||
rect(&mut s, 100.0);
|
||||
run(&mut s, "select.set", json!({"ids": [a.0]}));
|
||||
for item in [json!("1"), json!(-1), json!(1.5), json!(true), json!([1])] {
|
||||
let e = s.execute("select.same.appearanceAttribute", &json!({"item": item})).unwrap_err().to_string();
|
||||
assert_eq!(e, "invalid parameters for `select.same.appearanceAttribute`: `item` must be a whole number", "{item}");
|
||||
assert_eq!(s.doc().unwrap().selection.objects, vec![a], "{item}");
|
||||
}
|
||||
}
|
||||
|
||||
/// With a member path of a compound path selected first, Select > Same > Graphic Style and
|
||||
|
||||
@@ -551,6 +551,26 @@ fn svg_export_keeps_a_measured_region_only_on_the_object_alone() {
|
||||
assert!(after.contains("<image") && !after.contains("<feOffset dx=\"3\""), "{after}");
|
||||
}
|
||||
|
||||
/// SVG export keeps a filter live only in a user space SVG import stores again: `scale` 1000 with
|
||||
/// `axes` that double it scales the user space 2000 times, past what import holds, so the object is
|
||||
/// written as an image instead of a filter that would be left out when the file is opened.
|
||||
#[test]
|
||||
fn svg_export_writes_an_image_for_a_user_space_import_cannot_store() {
|
||||
let hue = r#"<filter id="Hue"><feColorMatrix type="hueRotate" values="90"/></filter>"#;
|
||||
for (scale, axes, live) in [(2.0, json!([2, 0, 0, 2]), true), (1000.0, json!([2, 0, 0, 2]), false)] {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 10.0);
|
||||
run(&mut s, "effect.apply", json!({"effect": "svg.filter", "ids": [a.0], "params": {"xml": hue, "scale": scale, "axes": axes}}));
|
||||
let out = svg(&mut s);
|
||||
assert_eq!((out.contains("<feColorMatrix"), out.contains("<image")), (live, !live), "scale {scale}: {out}");
|
||||
let (back, warnings) = vectorcraft_svg::import_with_report(&out).unwrap();
|
||||
assert!(warnings.is_empty(), "scale {scale}: {warnings:?}");
|
||||
let mut kept = 0;
|
||||
back.walk(|n| kept += n.appearance.effects.iter().filter(|e| e.id == "svg.filter").count());
|
||||
assert_eq!(kept, usize::from(live), "scale {scale}: {out}");
|
||||
}
|
||||
}
|
||||
|
||||
/// SVG export writes a filter rebuilt from its filter elements and filter attributes, not the XML
|
||||
/// the effect holds.
|
||||
#[test]
|
||||
@@ -575,6 +595,23 @@ fn moving_the_object_moves_the_filters_origin() {
|
||||
assert_eq!(p["origin"], json!([8.0, 2.0]));
|
||||
}
|
||||
|
||||
/// `axes` turns or skews the filter's user space; a move moves only its origin. Axes the effect
|
||||
/// can't measure are refused.
|
||||
#[test]
|
||||
fn axes_turn_the_filters_user_space_and_bad_axes_are_refused() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 10.0);
|
||||
run(&mut s, "effect.apply", json!({"effect": "svg.filter", "ids": [a.0], "params": {"xml": SHIFT, "axes": [0, 1, -1, 0]}}));
|
||||
run(&mut s, "object.move", json!({"ids": [a.0], "dx": 5, "dy": -2}));
|
||||
let p = &s.doc().unwrap().doc.node(a).unwrap().appearance.effects[0].params;
|
||||
assert_eq!((&p["axes"], &p["origin"]), (&json!([0, 1, -1, 0]), &json!([5.0, -2.0])));
|
||||
for axes in [json!([0, 0, 0, 0]), json!([1, 0, 0]), json!([1, 0, 0, "1"]), json!([1001, 0, 0, 1]), json!(null), json!("x")] {
|
||||
let e = err(&mut s, "effect.apply", json!({"effect": "svg.filter", "ids": [a.0], "params": {"xml": SHIFT, "axes": axes}}));
|
||||
assert!(e.contains("`axes` must be [a, b, c, d]"), "{axes}: {e}");
|
||||
}
|
||||
assert!(err(&mut s, "effect.setParams", json!({"ids": [a.0], "index": 0, "params": {"axes": [0.01, 0, 0, 0.01]}})).contains("`axes` must be"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn filters_survive_a_native_round_trip() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -286,7 +286,7 @@ fn legacy_spiral_decay_preferences_report_the_ratio_drawn_after_reopening() {
|
||||
assert_eq!(d.selection.objects.len(), 1);
|
||||
let id = d.selection.objects[0];
|
||||
let path = d.doc.node(id).unwrap().path_data().unwrap().clone();
|
||||
let anchors = &path.subpaths[0].anchors;
|
||||
let anchors = &path.subpaths[0].anchors.to_vec();
|
||||
assert_eq!(anchors.len(), 5);
|
||||
assert!(!path.is_closed());
|
||||
let center = Point::new(200.0, 200.0);
|
||||
|
||||
@@ -1672,6 +1672,9 @@ fn action_set(bytes: &[u8]) -> Result<(), TestCaseError> {
|
||||
prop_assert!(actions.iter().all(|a| a["steps"].as_array().map_or(0, Vec::len) <= 10_000));
|
||||
prop_assert!(actions.iter().map(|a| a["steps"].as_array().map_or(0, Vec::len)).sum::<usize>() <= 100_000);
|
||||
prop_assert!(r["unread"].as_array().map_or(0, Vec::len) <= 1000);
|
||||
let steps = || actions.iter().flat_map(|a| a["steps"].as_array().cloned().unwrap_or_default());
|
||||
prop_assert!(steps().all(|s| s["values"].as_array().map_or(0, Vec::len) as u64 <= s["params"].as_u64().unwrap_or(0)));
|
||||
prop_assert!(steps().map(|s| s["values"].as_array().map_or(0, Vec::len)).sum::<usize>() <= 100_000);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -1690,6 +1693,8 @@ fn arb_aia_token() -> impl Strategy<Value = Vec<u8>> {
|
||||
"/localizedName",
|
||||
"/isOn",
|
||||
"/value",
|
||||
"/key",
|
||||
"/type",
|
||||
"/x",
|
||||
"/version",
|
||||
])
|
||||
@@ -1699,6 +1704,7 @@ fn arb_aia_token() -> impl Strategy<Value = Vec<u8>> {
|
||||
"[a-z ()\\\\]{0,12}".prop_map(|t| format!("({t})").into_bytes()),
|
||||
prop::sample::select(vec!["(", ")", "\\", "[ 2 4142 ]", "[ 3 41 4", "[ 1 zz ]", "[", "]", "< 2 0a0b >", "<", ">", "2.5"])
|
||||
.prop_map(|t| t.as_bytes().to_vec()),
|
||||
prop::sample::select(vec!["[ 2 c328 ]", "(ustring)", "(boolean)"]).prop_map(|t| t.as_bytes().to_vec()),
|
||||
prop::sample::select(vec!["{", "}", "\r\n", "\r", "\n"]).prop_map(|t| t.as_bytes().to_vec()),
|
||||
prop::sample::select(vec![vec![0u8], vec![0xFF, 0xFE], vec![0xC3]]),
|
||||
]
|
||||
@@ -1835,6 +1841,7 @@ proptest! {
|
||||
/// Mutated copies of the PSD and PSB samples never crash opening them with their layers, hidden
|
||||
/// ones too: the PSD's layer records, channel lengths and data, and the PSB's layer count.
|
||||
/// (Masks, clipping and groups are covered by `tests_psdlayers::damaged_layers_never_panic`.)
|
||||
/// Neither does `document.psdInfo`, nor placing them with their layers as objects.
|
||||
#[test]
|
||||
fn mutated_layered_psds_open_without_panics(which in 6usize..8, cut in 0usize..1_000_000, edits in prop::collection::vec((0usize..1_000_000, any::<u8>()), 0..12)) {
|
||||
let (name, mut bytes) = raster_samples().swap_remove(which);
|
||||
@@ -1849,6 +1856,10 @@ proptest! {
|
||||
let mut s = vectorcraft_engine::Session::new();
|
||||
let p = json!({"name": name, "dataBase64": vectorcraft_format::base64_encode(&bytes), "hiddenLayers": true});
|
||||
let _ = no_panic(s.execute("document.open", &p));
|
||||
let _ = no_panic(s.execute("document.psdInfo", &p));
|
||||
let _ = no_panic(s.execute("file.new", &json!({})));
|
||||
let p = json!({"name": name, "dataBase64": vectorcraft_format::base64_encode(&bytes), "layers": true, "hiddenLayers": true});
|
||||
let _ = no_panic(s.execute("file.place", &p));
|
||||
});
|
||||
prop_assert!(r.is_ok(), "{name}: panicked: {:?}", r.err());
|
||||
}
|
||||
|
||||
@@ -1038,7 +1038,8 @@ fn nested_symbol_instances_stop_at_the_symbol_art_limit() {
|
||||
/// The documents [`the_writer_counts_objects_as_the_reader_reads_them`] writes: groups, compound
|
||||
/// paths, guides, sublayers, clipping groups and layers, painted clipping paths, opacity masks,
|
||||
/// gradients, pattern definitions and tiles, images, type, symbol definitions and instances,
|
||||
/// objects with art styles, objects bound to variables and live envelopes.
|
||||
/// objects with art styles, objects bound to variables, live envelopes, and the rectangles of the
|
||||
/// bounds of wrapped objects written as their art.
|
||||
fn counted() -> Vec<(&'static str, Document)> {
|
||||
vec![
|
||||
("sample", sample()),
|
||||
@@ -1054,9 +1055,28 @@ fn counted() -> Vec<(&'static str, Document)> {
|
||||
("blend", blend_doc()),
|
||||
("brushes", brushes_document()),
|
||||
("envelopes", envelopes_document()),
|
||||
("wrap bounds", wrap_bounds_doc()),
|
||||
]
|
||||
}
|
||||
|
||||
/// Area type below a wrapped symbol instance written as its art and wrapped type written as its
|
||||
/// outlines, each with the rectangle of its bounds.
|
||||
fn wrap_bounds_doc() -> Document {
|
||||
let mut doc = over_area_type(|doc| {
|
||||
two_leaves(doc);
|
||||
let mut n = instance(doc, "Leaf", Affine::new([3.0, 0.0, 0.0, 3.0, 150.0, 100.0]));
|
||||
n.isolate = true;
|
||||
wrapped(n, 4.5, false)
|
||||
});
|
||||
let mut label = vectorcraft_doc::TextObject::point(vectorcraft_geom::Point::ZERO, "Ill", style(60.0, Color::BLACK));
|
||||
// Mirrored, so written as its outlines.
|
||||
label.xf = Affine::new([-1.0, 0.0, 0.0, 1.0, 150.0, 120.0]);
|
||||
let label = wrapped(text_node(&mut doc, label), -2.0, true);
|
||||
let layer = doc.layers[0].id;
|
||||
doc.insert(Some(layer), usize::MAX, label).unwrap();
|
||||
doc
|
||||
}
|
||||
|
||||
/// A blend of two squares 20 pt apart with a step every 10 pt, written as its steps.
|
||||
fn blend_doc() -> Document {
|
||||
let mut doc = Document::new(200.0, 100.0);
|
||||
@@ -11374,6 +11394,42 @@ fn text_wrap_options_of_type_and_envelopes_are_read_back() {
|
||||
same_wraps(&wraps(top), &[(Some("Bent".into()), 2.5, true)]);
|
||||
}
|
||||
|
||||
/// The wrap shapes that `doc`'s first area type on its first layer takes from the objects above it,
|
||||
/// in the type's own space: the bounds of each one's subpaths, and its options.
|
||||
fn area_wrap_region(doc: &Document) -> Vec<(Vec<[f64; 4]>, f64, bool)> {
|
||||
use vectorcraft_doc::TextKind;
|
||||
let mut doc = doc.clone();
|
||||
vectorcraft_doc::text::resolve_wrap(None, &mut doc);
|
||||
let top = doc.layers[0].children().unwrap();
|
||||
let Some(NodeKind::Text(t)) = top.iter().map(|n| &n.kind).find(|k| matches!(k, NodeKind::Text(t) if matches!(t.kind, TextKind::Area { .. })))
|
||||
else {
|
||||
panic!("no area type");
|
||||
};
|
||||
t.wrap
|
||||
.iter()
|
||||
.map(|s| {
|
||||
let parts = s
|
||||
.path
|
||||
.subpaths
|
||||
.iter()
|
||||
.map(|sp| {
|
||||
let b = PathData::new(vec![sp.clone()]).bounds().unwrap_or_default();
|
||||
[b.x0, b.y0, b.x1, b.y1]
|
||||
})
|
||||
.collect();
|
||||
(parts, s.wrap.offset, s.wrap.invert)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// `before` and `after` hold as many wrap shapes, each with as many subpaths, with bounds within
|
||||
/// `1e-3`, and the same options.
|
||||
fn same_region(before: &[(Vec<[f64; 4]>, f64, bool)], after: &[(Vec<[f64; 4]>, f64, bool)]) -> bool {
|
||||
let close =
|
||||
|b: &[[f64; 4]], a: &[[f64; 4]]| b.len() == a.len() && b.iter().zip(a).all(|(b, a)| b.iter().zip(a).all(|(x, y)| (x - y).abs() < 1e-3));
|
||||
before.len() == after.len() && before.iter().zip(after).all(|(b, a)| close(&b.0, &a.0) && (b.1 - a.1).abs() < 1e-6 && b.2 == a.2)
|
||||
}
|
||||
|
||||
/// Type written as its outlines wraps area type below it by its bounds, as it did before saving,
|
||||
/// not by its glyphs: its text wrap options go on an unpainted rectangle of its bounds, the last
|
||||
/// member of the outlines' group, which keeps the type's name and has no options of its own.
|
||||
@@ -11464,6 +11520,276 @@ fn type_written_as_outlines_keeps_wrapping_by_its_bounds() {
|
||||
assert_eq!(top[1].name.as_deref(), Some("Label"), "{text_out}");
|
||||
}
|
||||
|
||||
/// A 300 × 200 document of area type "Body" filling the page, with `top` above it.
|
||||
fn over_area_type(make: impl FnOnce(&mut Document) -> Node) -> Document {
|
||||
use vectorcraft_doc::{TextKind, TextObject, TextRun};
|
||||
let mut doc = Document::new(300.0, 200.0);
|
||||
let layer = doc.layers[0].id;
|
||||
let mut body = TextObject::point(vectorcraft_geom::Point::ZERO, "", style(10.0, Color::BLACK));
|
||||
body.runs = vec![TextRun::new("one two three four five six seven eight nine ten eleven twelve", style(10.0, Color::BLACK))];
|
||||
body.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(10.0, 10.0, 290.0, 190.0)) };
|
||||
body.xf = Affine::IDENTITY;
|
||||
let body = named(text_node(&mut doc, body), "Body");
|
||||
let top = make(&mut doc);
|
||||
for n in [body, top] {
|
||||
doc.insert(Some(layer), usize::MAX, n).unwrap();
|
||||
}
|
||||
doc
|
||||
}
|
||||
|
||||
/// Symbol "Leaf": two squares in opposite corners of the 20 × 20 square around the origin, apart.
|
||||
fn two_leaves(doc: &mut Document) {
|
||||
let a = square(doc, Rect::new(-10.0, -10.0, -6.0, -6.0), LEAF);
|
||||
let b = square(doc, Rect::new(6.0, 6.0, 10.0, 10.0), LEAF);
|
||||
let art = group(doc, vec![a, b], false);
|
||||
doc.symbols.push(Symbol { dynamic: false, name: "Leaf".into(), art: Arc::new(art) });
|
||||
}
|
||||
|
||||
/// A symbol instance written as its art (its isolation is a group's), a blend and an intertwine,
|
||||
/// each written as a group of its art, wrap area type below them by their bounds after reopening,
|
||||
/// as they did before saving, not by the members of that art: the text wrap options go on an
|
||||
/// unpainted rectangle of the bounds, the group's first member, and the group, which keeps the
|
||||
/// object's name, isolation, lock and visibility, has none. A positive offset, a negative offset
|
||||
/// with Invert Wrap, and hidden and locked.
|
||||
#[test]
|
||||
fn live_art_written_as_a_group_keeps_wrapping_by_its_bounds() {
|
||||
let instance_of = |offset: f64, invert: bool, visible: bool, locked: bool| {
|
||||
move |doc: &mut Document| {
|
||||
two_leaves(doc);
|
||||
let mut n = instance(doc, "Leaf", Affine::new([3.0, 0.0, 0.0, 3.0, 150.0, 100.0]));
|
||||
n.isolate = true;
|
||||
(n.visible, n.locked) = (visible, locked);
|
||||
wrapped(named(n, "Thing"), offset, invert)
|
||||
}
|
||||
};
|
||||
let blend = |doc: &mut Document| {
|
||||
let keys = vec![
|
||||
Arc::new(square(doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))),
|
||||
Arc::new(square(doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))),
|
||||
];
|
||||
let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() };
|
||||
wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), 4.5, false)
|
||||
};
|
||||
let intertwine = |doc: &mut Document| {
|
||||
let a = Arc::new(square(doc, Rect::new(60.0, 60.0, 80.0, 80.0), Color::gray(0.5)));
|
||||
let b = Arc::new(square(doc, Rect::new(200.0, 120.0, 220.0, 140.0), Color::gray(0.5)));
|
||||
wrapped(named(Node::new(doc.alloc_id(), NodeKind::Intertwine { children: vec![a, b] }), "Thing"), 2.0, true)
|
||||
};
|
||||
let repeat = |doc: &mut Document| {
|
||||
let a = Arc::new(square(doc, Rect::new(100.0, 80.0, 110.0, 90.0), Color::gray(0.5)));
|
||||
let spec = vectorcraft_doc::RepeatSpec::grid(vec![a], 8.0, 12.0);
|
||||
wrapped(named(Node::new(doc.alloc_id(), NodeKind::Repeat(spec)), "Thing"), 1.5, false)
|
||||
};
|
||||
// A Fidelity that isn't a whole number: written as its distorted art.
|
||||
let envelope = |doc: &mut Document| {
|
||||
use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
|
||||
let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] };
|
||||
wrapped(named(envelope_node(doc, kind, 50.5, false, EnvelopeOptions::NEW), "Thing"), -3.0, true)
|
||||
};
|
||||
let docs = [
|
||||
("instance", over_area_type(instance_of(4.5, false, true, false)), 4.5, false, true, false),
|
||||
("instance, inverted", over_area_type(instance_of(-2.0, true, true, false)), -2.0, true, true, false),
|
||||
("instance, hidden and locked", over_area_type(instance_of(3.0, false, false, true)), 3.0, false, false, true),
|
||||
("blend", over_area_type(blend), 4.5, false, true, false),
|
||||
("intertwine", over_area_type(intertwine), 2.0, true, true, false),
|
||||
("repeat", over_area_type(repeat), 1.5, false, true, false),
|
||||
("envelope", over_area_type(envelope), -3.0, true, true, false),
|
||||
];
|
||||
for (name, doc, offset, invert, visible, locked) in docs {
|
||||
let thing = &doc.layers[0].children().unwrap()[1];
|
||||
let want = thing.geometric_bounds().unwrap();
|
||||
let text_out = program(&doc);
|
||||
let back = read_back(&doc);
|
||||
let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back));
|
||||
assert_eq!(before.len(), usize::from(visible), "{name}");
|
||||
assert!(same_region(&before, &after), "{name}\n{before:?}\n{after:?}\n{text_out}");
|
||||
assert_eq!(text_out.matches("(AI11TextWrapOffset)").count(), 1, "{name}: {text_out}");
|
||||
let top = back.layers[0].children().unwrap();
|
||||
same_wraps(&wraps(top), &[(None, offset, invert)]);
|
||||
let g = &top[1];
|
||||
assert!(matches!(g.kind, NodeKind::Group { clip: false, .. }), "{name}: {text_out}");
|
||||
assert_eq!(
|
||||
(g.name.as_deref(), g.extras().wrap, g.visible, g.locked, g.isolate),
|
||||
(Some("Thing"), None, visible, locked, thing.isolate),
|
||||
"{name}"
|
||||
);
|
||||
let first = &g.children().unwrap()[0];
|
||||
assert!(matches!(first.kind, NodeKind::Path { guide: false, .. }) && first.appearance.items.is_empty(), "{name}: {text_out}");
|
||||
assert_eq!((first.visible, first.locked), (visible, locked), "{name}");
|
||||
let b = first.geometric_bounds().unwrap();
|
||||
assert!([b.x0 - want.x0, b.y0 - want.y0, b.x1 - want.x1, b.y1 - want.y1].iter().all(|d| d.abs() < 1e-3), "{name}: {b:?} {want:?}");
|
||||
}
|
||||
|
||||
// An envelope written live opens live and wraps by its bounds, its options its own.
|
||||
let live = |doc: &mut Document| {
|
||||
use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
|
||||
let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] };
|
||||
wrapped(named(envelope_node(doc, kind, 50.0, false, EnvelopeOptions::NEW), "Thing"), -3.0, true)
|
||||
};
|
||||
let doc = over_area_type(live);
|
||||
let text_out = program(&doc);
|
||||
let back = read_back(&doc);
|
||||
let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back));
|
||||
assert_eq!(before.len(), 1);
|
||||
assert!(same_region(&before, &after), "{before:?}\n{after:?}\n{text_out}");
|
||||
let top = back.layers[0].children().unwrap();
|
||||
assert!(matches!(top[1].kind, NodeKind::Envelope { .. }), "{text_out}");
|
||||
same_wraps(&wraps(top), &[(Some("Thing".into()), -3.0, true)]);
|
||||
}
|
||||
|
||||
/// The rectangle that keeps a blend written as its art wrapping by its bounds counts toward the
|
||||
/// object limit, ahead of the art: one object short, the last step is left out with the limit's
|
||||
/// warning; without room for the rectangle, the options are left out with the warning, and the
|
||||
/// group does not take them. In an instance whose art holds area type, shown, hidden, in a hidden
|
||||
/// group or written as its outlines, the rectangle is the group's first member, below that type:
|
||||
/// area type below the instance wraps by its bounds after reopening, and the type in its art is not
|
||||
/// wrapped by them.
|
||||
#[test]
|
||||
fn wrap_bounds_of_live_art_fit_the_object_limit_and_leave_area_type_in_the_art_unwrapped() {
|
||||
use vectorcraft_doc::{TextKind, TextObject, TextRun};
|
||||
// A blend alone, without a symbol definition, so the objects are the group, the rectangle and
|
||||
// the steps.
|
||||
let mut doc = Document::new(300.0, 200.0);
|
||||
let keys = vec![
|
||||
Arc::new(square(&mut doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))),
|
||||
Arc::new(square(&mut doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))),
|
||||
];
|
||||
let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() };
|
||||
let thing = wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), 4.5, false);
|
||||
let layer = doc.layers[0].id;
|
||||
doc.insert(Some(layer), usize::MAX, thing).unwrap();
|
||||
let steps = export_ai_editing(&doc, &opts()).unwrap();
|
||||
let steps = crate::ai_alone(&steps.program).unwrap().0.layers[0].children().unwrap()[0].children().unwrap().len() - 1;
|
||||
let read = crate::import::objects_read(&export_ai_editing(&doc, &opts()).unwrap().program).unwrap();
|
||||
let all = export_within(&doc, &opts(), read).unwrap();
|
||||
assert!(!all.warnings.iter().any(|w| w == writer::OBJECT_LIMIT), "{:?}", all.warnings);
|
||||
let out = export_within(&doc, &opts(), read - 1).unwrap();
|
||||
assert!(out.warnings.iter().any(|w| w == writer::OBJECT_LIMIT), "{:?}", out.warnings);
|
||||
let text_out = String::from_utf8_lossy(&out.program).replace("\r\n", "\n");
|
||||
assert_eq!(text_out.matches("(AI11TextWrapOffset)").count(), 1, "{text_out}");
|
||||
let (back, _) = crate::ai_alone(&out.program).unwrap();
|
||||
let top = back.layers[0].children().unwrap();
|
||||
same_wraps(&wraps(top), &[(None, 4.5, false)]);
|
||||
assert_eq!((top[0].name.as_deref(), top[0].extras().wrap), (Some("Thing"), None), "{text_out}");
|
||||
let members = top[0].children().unwrap();
|
||||
assert_eq!(members.len(), steps, "the rectangle and all but the last step: {text_out}");
|
||||
assert!(matches!(members[0].kind, NodeKind::Path { guide: false, .. }) && members[0].appearance.items.is_empty(), "{text_out}");
|
||||
let out = export_within(&doc, &opts(), read - steps - 1).unwrap();
|
||||
assert!(out.warnings.iter().any(|w| w == writer::OBJECT_LIMIT), "{:?}", out.warnings);
|
||||
let text_out = String::from_utf8_lossy(&out.program).replace("\r\n", "\n");
|
||||
assert!(!text_out.contains("(AI11TextWrapOffset)"), "{text_out}");
|
||||
let (back, _) = crate::ai_alone(&out.program).unwrap();
|
||||
assert!(wraps(back.layers[0].children().unwrap()).is_empty(), "{text_out}");
|
||||
|
||||
// Area type in the symbol's art, shown or hidden, of `words`, in a hidden group with `in_hidden`.
|
||||
let make = |shown: bool, words: &'static str, in_hidden: bool| {
|
||||
move |doc: &mut Document| {
|
||||
let mut t = TextObject::point(vectorcraft_geom::Point::ZERO, "", style(2.0, Color::BLACK));
|
||||
t.runs = vec![TextRun::new(words, style(2.0, Color::BLACK))];
|
||||
t.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(-10.0, -10.0, -6.0, -6.0)) };
|
||||
t.xf = Affine::IDENTITY;
|
||||
let mut t = text_node(doc, t);
|
||||
t.visible = shown;
|
||||
if in_hidden {
|
||||
t = group(doc, vec![t], false);
|
||||
t.visible = false;
|
||||
}
|
||||
let s = square(doc, Rect::new(6.0, 6.0, 10.0, 10.0), LEAF);
|
||||
let art = group(doc, vec![t, s], false);
|
||||
doc.symbols.push(Symbol { dynamic: false, name: "Leaf".into(), art: Arc::new(art) });
|
||||
let mut n = instance(doc, "Leaf", Affine::new([3.0, 0.0, 0.0, 3.0, 150.0, 100.0]));
|
||||
n.isolate = true;
|
||||
wrapped(named(n, "Thing"), 4.5, false)
|
||||
}
|
||||
};
|
||||
// Type of spaces alone is written as its outlines, which are not type.
|
||||
for (what, shown, words, in_hidden) in
|
||||
[("shown", true, "leaf", false), ("hidden", false, "leaf", false), ("in a hidden group", true, "leaf", true), ("spaces", true, " ", false)]
|
||||
{
|
||||
let doc = over_area_type(make(shown, words, in_hidden));
|
||||
let text_out = program(&doc);
|
||||
assert_eq!(text_out.matches("(AI11TextWrapOffset)").count(), 1, "{what}: {text_out}");
|
||||
let back = read_back(&doc);
|
||||
let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back));
|
||||
assert_eq!(before.len(), 1, "{what}");
|
||||
assert!(same_region(&before, &after), "{what}\n{before:?}\n{after:?}\n{text_out}");
|
||||
let g = &back.layers[0].children().unwrap()[1];
|
||||
assert!(matches!(g.kind, NodeKind::Group { clip: false, .. }), "{what}: {text_out}");
|
||||
assert_eq!(g.extras().wrap, None, "{what}: {text_out}");
|
||||
let first = &g.children().unwrap()[0];
|
||||
assert!(matches!(first.kind, NodeKind::Path { guide: false, .. }) && first.appearance.items.is_empty(), "{what}: {text_out}");
|
||||
let mut resolved = back.clone();
|
||||
vectorcraft_doc::text::resolve_wrap(None, &mut resolved);
|
||||
let mut inner = vec![];
|
||||
resolved.layers[0].children().unwrap()[1].walk(&mut |m| {
|
||||
if let NodeKind::Text(t) = &m.kind {
|
||||
inner.push((matches!(t.kind, TextKind::Area { .. }), m.visible, t.wrap.len()));
|
||||
}
|
||||
});
|
||||
let want: &[(bool, bool, usize)] = match what {
|
||||
"shown" | "in a hidden group" => &[(true, true, 0)],
|
||||
"hidden" => &[(true, false, 0)],
|
||||
_ => &[],
|
||||
};
|
||||
assert_eq!(inner, want, "{what}: {text_out}");
|
||||
}
|
||||
}
|
||||
|
||||
/// A blend with no keys, written as an empty group, has no bounds for a rectangle: its group keeps
|
||||
/// the text wrap options, and they read back.
|
||||
#[test]
|
||||
fn live_art_without_bounds_keeps_its_text_wrap_on_the_group() {
|
||||
let mut doc = Document::new(300.0, 200.0);
|
||||
let spec = vectorcraft_doc::BlendSpec::default();
|
||||
let thing = wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: vec![], spec: Box::new(spec) }), "Thing"), 4.5, true);
|
||||
assert_eq!(thing.geometric_bounds(), None);
|
||||
let layer = doc.layers[0].id;
|
||||
doc.insert(Some(layer), usize::MAX, thing).unwrap();
|
||||
let text_out = program(&doc);
|
||||
assert_eq!(text_out.matches("(AI11TextWrapOffset)").count(), 1, "{text_out}");
|
||||
let back = read_back(&doc);
|
||||
same_wraps(&wraps(back.layers[0].children().unwrap()), &[(Some("Thing".into()), 4.5, true)]);
|
||||
}
|
||||
|
||||
/// A symbol instance written as its art, whose art holds an envelope of area type beside a square,
|
||||
/// wraps area type below it by its bounds after reopening. The envelope there is written as its art,
|
||||
/// after the type written for it as a live envelope is taken back: the group has no text wrap
|
||||
/// options, and its first member is the rectangle of the bounds.
|
||||
#[test]
|
||||
fn an_envelope_of_area_type_in_written_art_leaves_the_wrap_on_the_bounds() {
|
||||
use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
|
||||
use vectorcraft_doc::{TextKind, TextObject, TextRun};
|
||||
let doc = over_area_type(|doc| {
|
||||
let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] };
|
||||
let mut envelope = envelope_node(doc, kind, 50.0, false, EnvelopeOptions::NEW);
|
||||
let mut t = TextObject::point(vectorcraft_geom::Point::ZERO, "", style(10.0, Color::BLACK));
|
||||
t.runs = vec![TextRun::new("bent", style(10.0, Color::BLACK))];
|
||||
t.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(60.0, 30.0, 140.0, 70.0)) };
|
||||
t.xf = Affine::IDENTITY;
|
||||
let t = text_node(doc, t);
|
||||
let NodeKind::Envelope { content, .. } = &mut envelope.kind else { unreachable_envelope() };
|
||||
content.push(Arc::new(t));
|
||||
let s = square(doc, Rect::new(250.0, 150.0, 260.0, 160.0), LEAF);
|
||||
let art = group(doc, vec![envelope, s], false);
|
||||
doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) });
|
||||
let mut n = instance(doc, "Bent", Affine::IDENTITY);
|
||||
n.isolate = true;
|
||||
wrapped(named(n, "Thing"), 4.5, false)
|
||||
});
|
||||
let text_out = program(&doc);
|
||||
let back = read_back(&doc);
|
||||
let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back));
|
||||
assert_eq!(before.len(), 1);
|
||||
assert!(same_region(&before, &after), "{before:?}\n{after:?}\n{text_out}");
|
||||
let g = &back.layers[0].children().unwrap()[1];
|
||||
assert_eq!(g.extras().wrap, None, "{text_out}");
|
||||
let mut live = 0;
|
||||
g.walk(&mut |m| live += usize::from(matches!(m.kind, NodeKind::Envelope { .. })));
|
||||
assert_eq!(live, 0, "{text_out}");
|
||||
let first = &g.children().unwrap()[0];
|
||||
assert!(matches!(first.kind, NodeKind::Path { guide: false, .. }) && first.appearance.items.is_empty(), "{text_out}");
|
||||
}
|
||||
|
||||
/// A clipping path inside art cut to a clipping object is written as its fills and its strokes,
|
||||
/// two objects: its text wrap options are written once, whether it has both or only strokes, and
|
||||
/// with its strokes when the region outside leaves nothing of its fills.
|
||||
|
||||
@@ -289,7 +289,8 @@ pub(super) struct Writer<'a> {
|
||||
/// brushed stroke's pieces) the art being written is in. Text wrap options are written only
|
||||
/// outside them, since only the document's own objects wrap type.
|
||||
drawn: u32,
|
||||
/// The type just written as outlines has its text wrap options on the rectangle of its bounds
|
||||
/// The type just written as outlines, or the symbol instance or live object just written as a
|
||||
/// group of its art, has its text wrap options on the rectangle of its bounds
|
||||
/// ([`Self::wrap_bounds`]), not in the group's dictionary.
|
||||
wrap_moved: bool,
|
||||
/// The brushes written ([`brushes`]).
|
||||
@@ -773,6 +774,8 @@ impl<'a> Writer<'a> {
|
||||
if !self.open_group("u") {
|
||||
return;
|
||||
}
|
||||
let state = self.state;
|
||||
let moved = self.wrap_on_bounds(n, state);
|
||||
// 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;
|
||||
@@ -817,12 +820,13 @@ impl<'a> Writer<'a> {
|
||||
self.warn(SYMBOL_LIMIT);
|
||||
}
|
||||
}
|
||||
self.wrap_moved = moved;
|
||||
self.end_group("U", xy);
|
||||
}
|
||||
NodeKind::Envelope { .. } if self.envelope(n, xy) => {}
|
||||
NodeKind::Envelope { .. } => self.drawn_art(n, xy, Some(envelopes::ENVELOPES)),
|
||||
NodeKind::Envelope { .. } => self.drawn_art(n, xy, Some(envelopes::ENVELOPES), true),
|
||||
NodeKind::Blend { .. } | NodeKind::Mesh(_) | NodeKind::Repeat(_) | NodeKind::PlacedDocument(_) | NodeKind::Intertwine { .. } => {
|
||||
self.drawn_art(n, xy, Some(LIVE));
|
||||
self.drawn_art(n, xy, Some(LIVE), true);
|
||||
}
|
||||
// Ruler guides are kept in the document's native copy only.
|
||||
NodeKind::RulerGuide { .. } => {}
|
||||
@@ -889,13 +893,17 @@ impl<'a> Writer<'a> {
|
||||
}
|
||||
|
||||
/// Live object `n`, of transparency `xy`, as a group of its art, with `warning` when it is given.
|
||||
fn drawn_art(&mut self, n: &Node, xy: Xy, warning: Option<&str>) {
|
||||
/// With `bounds`, `n`'s text wrap options go on the rectangle of its bounds, the group's first
|
||||
/// member ([`Self::wrap_on_bounds`]); without it, in the group's dictionary.
|
||||
fn drawn_art(&mut self, n: &Node, xy: Xy, warning: Option<&str>, bounds: bool) {
|
||||
if !self.open_group("u") {
|
||||
return;
|
||||
}
|
||||
let state = self.state;
|
||||
if let Some(w) = warning {
|
||||
self.warn(w);
|
||||
}
|
||||
let moved = bounds && self.wrap_on_bounds(n, state);
|
||||
if self.nest < MAX_NEST {
|
||||
let g = vectorcraft_effects::expand_live_deep(Some(self.doc), n);
|
||||
self.nest += 1;
|
||||
@@ -906,9 +914,29 @@ impl<'a> Writer<'a> {
|
||||
self.drawn -= 1;
|
||||
self.nest -= 1;
|
||||
}
|
||||
self.wrap_moved = moved;
|
||||
self.end_group("U", xy);
|
||||
}
|
||||
|
||||
/// In the group that object `n` is written as, when the group's dictionary would hold `n`'s text
|
||||
/// wrap options: the rectangle of `n`'s bounds with them ([`Self::wrap_bounds`]), then lock and
|
||||
/// hidden state `state` again. True when the group's dictionary is to leave the options out
|
||||
/// ([`Self::wrap_moved`]), so the group wraps type by `n`'s bounds, as `n` does
|
||||
/// ([`vectorcraft_doc::text::resolve_wrap`]), not by its members. Written before the group's
|
||||
/// members, the rectangle is below any area type among them and does not wrap it. False,
|
||||
/// writing nothing, when `n` has no finite bounds, and the group's dictionary keeps the options.
|
||||
fn wrap_on_bounds(&mut self, n: &Node, state: Option<(bool, bool)>) -> bool {
|
||||
let Some(w) = n.extras().wrap.filter(|_| self.drawn == 0 && !self.in_look) else { return false };
|
||||
if finite_bounds(n).is_none() {
|
||||
return false;
|
||||
}
|
||||
self.wrap_bounds(n, w);
|
||||
if let Some((locked, hidden)) = state {
|
||||
self.state(locked, hidden);
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
/// `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`), has text wrap options ([`Self::text_wrap`]), has an opacity mask
|
||||
@@ -1555,23 +1583,20 @@ impl<'a> Writer<'a> {
|
||||
for c in over {
|
||||
self.node(c);
|
||||
}
|
||||
// Type wraps by its bounds: its text wrap options go on a rectangle of its bounds, the
|
||||
// group's last member, and the group's dictionary leaves them out.
|
||||
if let Some(w) = n.extras().wrap.filter(|_| self.drawn == 0 && !self.in_look) {
|
||||
self.wrap_bounds(n, w);
|
||||
self.wrap_moved = true;
|
||||
}
|
||||
// Type wraps by its bounds.
|
||||
self.wrap_moved = self.wrap_on_bounds(n, state);
|
||||
if let Some((locked, hidden)) = state {
|
||||
self.state(locked, hidden);
|
||||
}
|
||||
self.end_group("U", xy);
|
||||
}
|
||||
|
||||
/// An unpainted closed rectangle at the geometric bounds of type `n`, the region its text wraps
|
||||
/// around, with `n`'s lock and hidden state and text wrap options `w` in its dictionary. Nothing
|
||||
/// An unpainted closed rectangle at the geometric bounds of type, a symbol instance or a live
|
||||
/// object `n`, the region its text wraps around ([`vectorcraft_doc::text::resolve_wrap`]), with
|
||||
/// `n`'s lock and hidden state and text wrap options `w` in its dictionary. Nothing
|
||||
/// when `n` has no finite bounds, or without room for it ([`Self::take_objects`]).
|
||||
fn wrap_bounds(&mut self, n: &Node, w: TextWrap) {
|
||||
let Some(b) = n.geometric_bounds().filter(|b| [b.x0, b.y0, b.x1, b.y1].iter().all(|v| v.is_finite())) else { return };
|
||||
let Some(b) = finite_bounds(n) else { return };
|
||||
self.state(n.locked, !n.visible);
|
||||
let objects = self.objects;
|
||||
self.plain_object(&shapes::rectangle(b), FillRule::NonZero, None, None, Xy::PLAIN);
|
||||
@@ -1760,6 +1785,11 @@ impl<'a> Writer<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
/// `n`'s geometric bounds, when they are finite.
|
||||
fn finite_bounds(n: &Node) -> Option<vectorcraft_geom::Rect> {
|
||||
n.geometric_bounds().filter(|b| [b.x0, b.y0, b.x1, b.y1].iter().all(|v| v.is_finite()))
|
||||
}
|
||||
|
||||
/// The gradient of paint `p`, when it has one.
|
||||
fn gradient(p: Option<&Paint>) -> Option<&vectorcraft_color::GradientPaint> {
|
||||
match p {
|
||||
|
||||
@@ -411,9 +411,10 @@ impl Writer<'_> {
|
||||
self.hidden -= 1;
|
||||
self.nest -= 1;
|
||||
// The distorted art, which takes the envelope's lock, visibility, transparency, name and
|
||||
// opacity mask.
|
||||
// opacity mask. The reader opens the envelope live, wrapping type by its bounds, so its text
|
||||
// wrap options stay in the art's dictionary.
|
||||
self.state(n.locked, !n.visible);
|
||||
self.drawn_art(n, xy, None);
|
||||
self.drawn_art(n, xy, None, false);
|
||||
if !opened || outlines || self.left_out_since(charges) {
|
||||
let lines = self.body.split_off(start);
|
||||
self.give_back(charges, &lines);
|
||||
|
||||
@@ -36,10 +36,8 @@ pub(crate) fn subpath(s: &mut String, xf: Affine, sp: &SubPath) {
|
||||
s.push_str(if smooth { "c\n" } else { "C\n" });
|
||||
}
|
||||
};
|
||||
for pair in sp.anchors.windows(2) {
|
||||
if let [a, b] = pair {
|
||||
segment(s, a, b);
|
||||
}
|
||||
for (a, b) in sp.anchors.iter().zip(sp.anchors.iter().skip(1)) {
|
||||
segment(s, a, b);
|
||||
}
|
||||
if sp.closed
|
||||
&& sp.anchors.len() > 1
|
||||
|
||||
@@ -212,6 +212,44 @@ fn text_composer_round_trips() {
|
||||
assert!(!String::from_utf8_lossy(&save(&d2, false)).contains("composer"));
|
||||
}
|
||||
|
||||
/// Every composer reads back as it was saved (the two Standard ones as their own values), and the
|
||||
/// ME&SA names are the ones files have always used: `everyLine` stays the unwritten default and
|
||||
/// `singleLine` keeps its spelling, so a document that never picks a Standard composer is unchanged.
|
||||
#[test]
|
||||
fn all_four_composers_round_trip() {
|
||||
use vectorcraft_doc::{TextKind, TextObject};
|
||||
let one = |c: Composer| {
|
||||
let mut d = Document::new(200.0, 200.0);
|
||||
let mut t = TextObject::point(vectorcraft_geom::Point::ZERO, "ક\u{ACD}ક", Default::default());
|
||||
t.para.composer = c;
|
||||
t.kind = TextKind::Point;
|
||||
let id = d.alloc_id();
|
||||
d.insert(None, usize::MAX, Node::new(id, NodeKind::Text(Box::new(t)))).unwrap();
|
||||
d
|
||||
};
|
||||
for (c, written) in [
|
||||
(Composer::SingleLine, Some("singleLine")),
|
||||
(Composer::EveryLine, None),
|
||||
(Composer::StandardSingleLine, Some("standardSingleLine")),
|
||||
(Composer::StandardEveryLine, Some("standardEveryLine")),
|
||||
] {
|
||||
let bytes = save(&one(c), false);
|
||||
let text = String::from_utf8_lossy(&bytes);
|
||||
match written {
|
||||
Some(w) => assert!(text.contains(&format!("\"composer\":\"{w}\"")), "{c:?}"),
|
||||
None => assert!(!text.contains("\"composer\""), "{c:?}"),
|
||||
}
|
||||
let back = load(&bytes).unwrap();
|
||||
let mut got = None;
|
||||
back.walk(|n| {
|
||||
if let NodeKind::Text(t) = &n.kind {
|
||||
got = Some(t.para.composer);
|
||||
}
|
||||
});
|
||||
assert_eq!(got, Some(c));
|
||||
}
|
||||
}
|
||||
|
||||
/// A document as the first version wrote it (format name `drawcraft`, anchors as maps).
|
||||
const V1_FILE: &str = r#"{"format":"drawcraft","version":1,"generator":"DrawCraft 0.1.0","document":{"version":1,"title":"Old","artboards":[{"id":1,"name":"Artboard 1","rect":{"x0":0.0,"y0":0.0,"x1":100.0,"y1":80.0}}],
|
||||
"layers":[{"id":1,"name":"Layer 1","visible":true,"locked":false,"opacity":1.0,"kind":{"type":"layer","children":[
|
||||
|
||||
@@ -0,0 +1,790 @@
|
||||
//! The anchors of a subpath, held in shared chunks.
|
||||
//!
|
||||
//! [`Anchors`] keeps its anchors in chunks of at most [`CHUNK`] anchors, each behind an `Arc`.
|
||||
//! Copying the list copies the table of chunks and shares the chunks themselves; changing an
|
||||
//! anchor copies only the chunk that holds it when another copy still shares that chunk. An undo
|
||||
//! step that keeps the version of a path before a one-anchor edit then keeps one chunk of its
|
||||
//! own, however many anchors the path has. Inserting or removing an anchor copies the chunk it is
|
||||
//! in and rebuilds the table, which has one entry per chunk.
|
||||
//!
|
||||
//! The list reads and writes as one flat sequence of anchors, as a `Vec<Anchor>` does.
|
||||
|
||||
use std::borrow::Cow;
|
||||
use std::fmt;
|
||||
use std::ops::{Index, IndexMut, RangeBounds};
|
||||
use std::sync::Arc;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::path::Anchor;
|
||||
|
||||
/// An [`Anchors`] list of the anchors given, as `vec!` makes a `Vec`.
|
||||
#[macro_export]
|
||||
macro_rules! anchors {
|
||||
($($t:tt)*) => {
|
||||
$crate::Anchors::from(vec![$($t)*])
|
||||
};
|
||||
}
|
||||
|
||||
/// Most anchors one chunk holds.
|
||||
pub const CHUNK: usize = 256;
|
||||
|
||||
/// The anchors of a subpath: a sequence with the reads of a slice and the edits of a `Vec`, whose
|
||||
/// copies share the chunks they have not changed.
|
||||
#[derive(Clone, Default)]
|
||||
pub struct Anchors {
|
||||
/// The chunks in order, none of them empty.
|
||||
chunks: Vec<Arc<Vec<Anchor>>>,
|
||||
/// Empty while every chunk but the last holds [`CHUNK`] anchors (anchor `i` is then in chunk
|
||||
/// `i / CHUNK`). Otherwise `ends[c]` is the number of anchors in chunks `0..=c`.
|
||||
ends: Vec<usize>,
|
||||
/// The number of anchors.
|
||||
len: usize,
|
||||
}
|
||||
|
||||
impl Anchors {
|
||||
/// An empty list.
|
||||
pub const fn new() -> Self {
|
||||
Self { chunks: Vec::new(), ends: Vec::new(), len: 0 }
|
||||
}
|
||||
|
||||
/// The number of anchors.
|
||||
pub fn len(&self) -> usize {
|
||||
self.len
|
||||
}
|
||||
|
||||
/// Whether the list has no anchors.
|
||||
pub fn is_empty(&self) -> bool {
|
||||
self.len == 0
|
||||
}
|
||||
|
||||
/// The chunk that holds anchor `i` and its place in that chunk. For `i` at or past the end the
|
||||
/// chunk or the place is out of range.
|
||||
fn locate(&self, i: usize) -> (usize, usize) {
|
||||
if self.ends.is_empty() {
|
||||
(i / CHUNK, i % CHUNK)
|
||||
} else {
|
||||
let c = self.ends.partition_point(|&e| e <= i);
|
||||
let start = c.checked_sub(1).and_then(|p| self.ends.get(p)).copied().unwrap_or(0);
|
||||
(c, i.saturating_sub(start))
|
||||
}
|
||||
}
|
||||
|
||||
/// Anchor `i`, or `None` past the end.
|
||||
pub fn get(&self, i: usize) -> Option<&Anchor> {
|
||||
if i >= self.len {
|
||||
return None;
|
||||
}
|
||||
let (c, o) = self.locate(i);
|
||||
self.chunks.get(c)?.get(o)
|
||||
}
|
||||
|
||||
/// Anchor `i` to change, or `None` past the end. Copies the chunk that holds it when another
|
||||
/// list shares that chunk.
|
||||
pub fn get_mut(&mut self, i: usize) -> Option<&mut Anchor> {
|
||||
if i >= self.len {
|
||||
return None;
|
||||
}
|
||||
let (c, o) = self.locate(i);
|
||||
Arc::make_mut(self.chunks.get_mut(c)?).get_mut(o)
|
||||
}
|
||||
|
||||
/// The first anchor.
|
||||
pub fn first(&self) -> Option<&Anchor> {
|
||||
self.chunks.first()?.first()
|
||||
}
|
||||
|
||||
/// The last anchor.
|
||||
pub fn last(&self) -> Option<&Anchor> {
|
||||
self.chunks.last()?.last()
|
||||
}
|
||||
|
||||
/// The first anchor to change.
|
||||
pub fn first_mut(&mut self) -> Option<&mut Anchor> {
|
||||
Arc::make_mut(self.chunks.first_mut()?).first_mut()
|
||||
}
|
||||
|
||||
/// The last anchor to change.
|
||||
pub fn last_mut(&mut self) -> Option<&mut Anchor> {
|
||||
Arc::make_mut(self.chunks.last_mut()?).last_mut()
|
||||
}
|
||||
|
||||
/// The anchors in order.
|
||||
pub fn iter(&self) -> Iter<'_> {
|
||||
let (front, back): (&[Anchor], &[Anchor]) = (&[], &[]);
|
||||
Iter { chunks: self.chunks.iter(), front: front.iter(), back: back.iter(), left: self.len }
|
||||
}
|
||||
|
||||
/// The anchors in order, to change. Each chunk is copied, when another list shares it, as the
|
||||
/// iterator reaches it.
|
||||
pub fn iter_mut(&mut self) -> IterMut<'_> {
|
||||
let chunk: fn(&mut Arc<Vec<Anchor>>) -> std::slice::IterMut<'_, Anchor> = |c| Arc::make_mut(c).iter_mut();
|
||||
self.chunks.iter_mut().flat_map(chunk)
|
||||
}
|
||||
|
||||
/// The anchors as one slice: borrowed when they are in one chunk, copied otherwise.
|
||||
pub fn contiguous(&self) -> Cow<'_, [Anchor]> {
|
||||
match self.chunks.as_slice() {
|
||||
[] => Cow::Borrowed(&[]),
|
||||
[one] => Cow::Borrowed(one.as_slice()),
|
||||
_ => Cow::Owned(self.to_vec()),
|
||||
}
|
||||
}
|
||||
|
||||
/// The anchors in `range` copied into a `Vec`, or `None` when the range is out of bounds or
|
||||
/// starts after it ends (as `slice::get` with a range).
|
||||
pub fn get_range(&self, range: impl RangeBounds<usize>) -> Option<Vec<Anchor>> {
|
||||
use std::ops::Bound;
|
||||
let start = match range.start_bound() {
|
||||
Bound::Included(&s) => s,
|
||||
Bound::Excluded(&s) => s.checked_add(1)?,
|
||||
Bound::Unbounded => 0,
|
||||
};
|
||||
let end = match range.end_bound() {
|
||||
Bound::Included(&e) => e.checked_add(1)?,
|
||||
Bound::Excluded(&e) => e,
|
||||
Bound::Unbounded => self.len,
|
||||
};
|
||||
(start <= end && end <= self.len).then(|| self.iter().skip(start).take(end - start).copied().collect())
|
||||
}
|
||||
|
||||
/// The anchors copied into a `Vec`.
|
||||
pub fn to_vec(&self) -> Vec<Anchor> {
|
||||
let mut v = Vec::with_capacity(self.len);
|
||||
for c in &self.chunks {
|
||||
v.extend_from_slice(c);
|
||||
}
|
||||
v
|
||||
}
|
||||
|
||||
/// The anchors as a `Vec`, without a copy when they are in one chunk no other list shares.
|
||||
pub fn into_vec(mut self) -> Vec<Anchor> {
|
||||
if self.chunks.len() == 1
|
||||
&& let Some(one) = self.chunks.pop()
|
||||
{
|
||||
return Arc::try_unwrap(one).unwrap_or_else(|shared| (*shared).clone());
|
||||
}
|
||||
self.to_vec()
|
||||
}
|
||||
|
||||
/// Change the anchors as a `Vec` (for edits that move many of them, such as reversing).
|
||||
pub fn with_vec<R>(&mut self, f: impl FnOnce(&mut Vec<Anchor>) -> R) -> R {
|
||||
let mut v = std::mem::take(self).into_vec();
|
||||
let r = f(&mut v);
|
||||
*self = Self::from(v);
|
||||
r
|
||||
}
|
||||
|
||||
/// Rebuild `ends` and `len` after the chunks changed, dropping empty chunks.
|
||||
fn reindex(&mut self) {
|
||||
self.chunks.retain(|c| !c.is_empty());
|
||||
self.len = self.chunks.iter().map(|c| c.len()).sum();
|
||||
let n = self.chunks.len();
|
||||
let uniform = self.chunks.iter().enumerate().all(|(k, c)| if k + 1 == n { c.len() <= CHUNK } else { c.len() == CHUNK });
|
||||
self.ends.clear();
|
||||
if !uniform {
|
||||
let mut total = 0;
|
||||
self.ends.extend(self.chunks.iter().map(|c| {
|
||||
total += c.len();
|
||||
total
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
/// Add `a` at the end.
|
||||
pub fn push(&mut self, a: Anchor) {
|
||||
match self.chunks.last_mut() {
|
||||
Some(last) if last.len() < CHUNK => Arc::make_mut(last).push(a),
|
||||
_ => {
|
||||
self.chunks.push(Arc::new(vec![a]));
|
||||
if !self.ends.is_empty() {
|
||||
self.ends.push(self.len);
|
||||
}
|
||||
}
|
||||
}
|
||||
self.len += 1;
|
||||
if let Some(end) = self.ends.last_mut() {
|
||||
*end = self.len;
|
||||
}
|
||||
}
|
||||
|
||||
/// Remove the last anchor.
|
||||
pub fn pop(&mut self) -> Option<Anchor> {
|
||||
let last = self.chunks.last_mut()?;
|
||||
let a = Arc::make_mut(last).pop();
|
||||
if last.is_empty() {
|
||||
self.chunks.pop();
|
||||
self.ends.pop();
|
||||
}
|
||||
self.len = self.len.saturating_sub(1);
|
||||
if let Some(end) = self.ends.last_mut() {
|
||||
*end = self.len;
|
||||
}
|
||||
a
|
||||
}
|
||||
|
||||
/// Insert `a` before anchor `i`, or at the end when `i` is the length or more.
|
||||
pub fn insert(&mut self, i: usize, a: Anchor) {
|
||||
if i >= self.len {
|
||||
self.push(a);
|
||||
return;
|
||||
}
|
||||
let (c, o) = self.locate(i);
|
||||
let Some(chunk) = self.chunks.get_mut(c) else { return };
|
||||
let chunk = Arc::make_mut(chunk);
|
||||
chunk.insert(o.min(chunk.len()), a);
|
||||
if chunk.len() > CHUNK {
|
||||
let tail = chunk.split_off(chunk.len() / 2);
|
||||
self.chunks.insert(c + 1, Arc::new(tail));
|
||||
}
|
||||
self.reindex();
|
||||
}
|
||||
|
||||
/// Remove anchor `i`, or `None` past the end.
|
||||
pub fn try_remove(&mut self, i: usize) -> Option<Anchor> {
|
||||
if i >= self.len {
|
||||
return None;
|
||||
}
|
||||
let (c, o) = self.locate(i);
|
||||
let chunk = Arc::make_mut(self.chunks.get_mut(c)?);
|
||||
let a = (o < chunk.len()).then(|| chunk.remove(o));
|
||||
// A chunk left small joins the next one when the two fit in one chunk.
|
||||
if chunk.len() < CHUNK / 4
|
||||
&& let Some(next) = self.chunks.get(c + 1)
|
||||
&& self.chunks.get(c).map_or(0, |c| c.len()) + next.len() <= CHUNK
|
||||
{
|
||||
let next = self.chunks.remove(c + 1);
|
||||
if let Some(chunk) = self.chunks.get_mut(c) {
|
||||
Arc::make_mut(chunk).extend_from_slice(&next);
|
||||
}
|
||||
}
|
||||
self.reindex();
|
||||
a
|
||||
}
|
||||
|
||||
/// Remove anchor `i`. Panics past the end, as `Vec::remove` does.
|
||||
pub fn remove(&mut self, i: usize) -> Anchor {
|
||||
match self.try_remove(i) {
|
||||
Some(a) => a,
|
||||
None => {
|
||||
let none: &[Anchor] = &[];
|
||||
none[i]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Keep the first `n` anchors.
|
||||
pub fn truncate(&mut self, n: usize) {
|
||||
if n >= self.len {
|
||||
return;
|
||||
}
|
||||
let (c, o) = self.locate(n);
|
||||
self.chunks.truncate(c + 1);
|
||||
if let Some(last) = self.chunks.last_mut() {
|
||||
Arc::make_mut(last).truncate(o);
|
||||
}
|
||||
self.reindex();
|
||||
}
|
||||
|
||||
/// Remove every anchor.
|
||||
pub fn clear(&mut self) {
|
||||
*self = Self::new();
|
||||
}
|
||||
|
||||
/// Add the anchors of `s` at the end.
|
||||
pub fn extend_from_slice(&mut self, s: &[Anchor]) {
|
||||
self.extend(s.iter().copied());
|
||||
}
|
||||
|
||||
/// Keep the anchors for which `f` is true.
|
||||
pub fn retain(&mut self, f: impl FnMut(&Anchor) -> bool) {
|
||||
self.with_vec(|v| v.retain(f));
|
||||
}
|
||||
|
||||
/// Keep the anchors for which `f` is true, letting `f` change them.
|
||||
pub fn retain_mut(&mut self, f: impl FnMut(&mut Anchor) -> bool) {
|
||||
self.with_vec(|v| v.retain_mut(f));
|
||||
}
|
||||
|
||||
/// Reverse the order of the anchors.
|
||||
pub fn reverse(&mut self) {
|
||||
self.with_vec(|v| v.reverse());
|
||||
}
|
||||
|
||||
/// Rotate the anchors `k` places towards the start.
|
||||
pub fn rotate_left(&mut self, k: usize) {
|
||||
self.with_vec(|v| v.rotate_left(k));
|
||||
}
|
||||
|
||||
/// Rotate the anchors `k` places towards the end.
|
||||
pub fn rotate_right(&mut self, k: usize) {
|
||||
self.with_vec(|v| v.rotate_right(k));
|
||||
}
|
||||
|
||||
/// Remove the anchors in `range` and return them.
|
||||
pub fn drain(&mut self, range: impl RangeBounds<usize>) -> std::vec::IntoIter<Anchor> {
|
||||
self.with_vec(|v| v.drain(range).collect::<Vec<_>>()).into_iter()
|
||||
}
|
||||
|
||||
/// Replace the anchors in `range` with those of `with`, and return the anchors replaced.
|
||||
pub fn splice(&mut self, range: impl RangeBounds<usize>, with: impl IntoIterator<Item = Anchor>) -> std::vec::IntoIter<Anchor> {
|
||||
self.with_vec(|v| v.splice(range, with).collect::<Vec<_>>()).into_iter()
|
||||
}
|
||||
|
||||
/// The pairs of anchors in the same place in `self` and `other`, with that place, in order.
|
||||
/// When the two are chunked alike, the chunks they share in the same place are skipped (their
|
||||
/// anchors are the same); otherwise every pair is visited. Stops at the end of the shorter list.
|
||||
pub fn pairs_not_shared<'a>(&'a self, other: &'a Self) -> impl Iterator<Item = (usize, &'a Anchor, &'a Anchor)> + 'a {
|
||||
let alike = self.len == other.len && self.chunks.len() == other.chunks.len() && self.ends == other.ends;
|
||||
let chunked = alike.then(|| {
|
||||
let starts = self.chunks.iter().scan(0, |start, c| {
|
||||
let at = *start;
|
||||
*start += c.len();
|
||||
Some(at)
|
||||
});
|
||||
starts
|
||||
.zip(self.chunks.iter().zip(&other.chunks))
|
||||
.filter(|(_, (a, b))| !Arc::ptr_eq(a, b))
|
||||
.flat_map(|(at, (a, b))| a.iter().zip(b.iter()).enumerate().map(move |(o, (x, y))| (at + o, x, y)))
|
||||
});
|
||||
let flat = (!alike).then(|| self.iter().zip(other.iter()).enumerate().map(|(i, (a, b))| (i, a, b)));
|
||||
chunked.into_iter().flatten().chain(flat.into_iter().flatten())
|
||||
}
|
||||
|
||||
/// Each chunk's address and capacity (in anchors): two lists hold a chunk in common when they
|
||||
/// give the same address. For memory estimates.
|
||||
pub fn chunk_allocations(&self) -> impl Iterator<Item = (usize, usize)> + '_ {
|
||||
self.chunks.iter().map(|c| (Arc::as_ptr(c) as usize, c.capacity()))
|
||||
}
|
||||
|
||||
/// The bytes the list's own tables hold on the heap (the chunk table and the running totals),
|
||||
/// without the chunks.
|
||||
pub fn table_bytes(&self) -> usize {
|
||||
self.chunks.capacity() * size_of::<Arc<Vec<Anchor>>>() + self.ends.capacity() * size_of::<usize>()
|
||||
}
|
||||
}
|
||||
|
||||
/// [`Anchors::iter_mut`]'s iterator.
|
||||
pub type IterMut<'a> = std::iter::FlatMap<
|
||||
std::slice::IterMut<'a, Arc<Vec<Anchor>>>,
|
||||
std::slice::IterMut<'a, Anchor>,
|
||||
fn(&mut Arc<Vec<Anchor>>) -> std::slice::IterMut<'_, Anchor>,
|
||||
>;
|
||||
|
||||
/// [`Anchors::iter`]'s iterator.
|
||||
#[derive(Clone)]
|
||||
pub struct Iter<'a> {
|
||||
/// The chunks neither end has reached.
|
||||
chunks: std::slice::Iter<'a, Arc<Vec<Anchor>>>,
|
||||
/// What is left of the chunk the front is in.
|
||||
front: std::slice::Iter<'a, Anchor>,
|
||||
/// What is left of the chunk the back is in.
|
||||
back: std::slice::Iter<'a, Anchor>,
|
||||
/// The anchors left.
|
||||
left: usize,
|
||||
}
|
||||
|
||||
impl<'a> Iterator for Iter<'a> {
|
||||
type Item = &'a Anchor;
|
||||
|
||||
fn next(&mut self) -> Option<&'a Anchor> {
|
||||
loop {
|
||||
if let Some(a) = self.front.next() {
|
||||
self.left -= 1;
|
||||
return Some(a);
|
||||
}
|
||||
match self.chunks.next() {
|
||||
Some(c) => self.front = c.iter(),
|
||||
None => {
|
||||
let a = self.back.next()?;
|
||||
self.left -= 1;
|
||||
return Some(a);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn size_hint(&self) -> (usize, Option<usize>) {
|
||||
(self.left, Some(self.left))
|
||||
}
|
||||
|
||||
fn nth(&mut self, mut n: usize) -> Option<&'a Anchor> {
|
||||
// Whole chunks are skipped without visiting their anchors.
|
||||
loop {
|
||||
let f = self.front.len();
|
||||
if n < f {
|
||||
self.left -= n + 1;
|
||||
return self.front.nth(n);
|
||||
}
|
||||
n -= f;
|
||||
self.left -= f;
|
||||
self.front = Default::default();
|
||||
match self.chunks.as_slice().first() {
|
||||
Some(c) if c.len() <= n => {
|
||||
n -= c.len();
|
||||
self.left -= c.len();
|
||||
self.chunks.next();
|
||||
}
|
||||
Some(_) => {
|
||||
if let Some(c) = self.chunks.next() {
|
||||
self.front = c.iter();
|
||||
}
|
||||
}
|
||||
None => {
|
||||
let b = self.back.len();
|
||||
if n < b {
|
||||
self.left -= n + 1;
|
||||
return self.back.nth(n);
|
||||
}
|
||||
self.left -= b;
|
||||
self.back = Default::default();
|
||||
return None;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn count(self) -> usize {
|
||||
self.left
|
||||
}
|
||||
|
||||
fn last(mut self) -> Option<&'a Anchor> {
|
||||
self.next_back()
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> DoubleEndedIterator for Iter<'a> {
|
||||
fn next_back(&mut self) -> Option<&'a Anchor> {
|
||||
loop {
|
||||
if let Some(a) = self.back.next_back() {
|
||||
self.left -= 1;
|
||||
return Some(a);
|
||||
}
|
||||
match self.chunks.next_back() {
|
||||
Some(c) => self.back = c.iter(),
|
||||
None => {
|
||||
let a = self.front.next_back()?;
|
||||
self.left -= 1;
|
||||
return Some(a);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ExactSizeIterator for Iter<'_> {}
|
||||
|
||||
impl std::iter::FusedIterator for Iter<'_> {}
|
||||
|
||||
impl Index<usize> for Anchors {
|
||||
type Output = Anchor;
|
||||
|
||||
/// Anchor `i`. Panics past the end, as indexing a slice does.
|
||||
fn index(&self, i: usize) -> &Anchor {
|
||||
let (c, o) = self.locate(i);
|
||||
&self.chunks[c][o]
|
||||
}
|
||||
}
|
||||
|
||||
impl IndexMut<usize> for Anchors {
|
||||
/// Anchor `i` to change ([`Anchors::get_mut`]). Panics past the end, as indexing a slice does.
|
||||
fn index_mut(&mut self, i: usize) -> &mut Anchor {
|
||||
let (c, o) = self.locate(i);
|
||||
&mut Arc::make_mut(&mut self.chunks[c])[o]
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Vec<Anchor>> for Anchors {
|
||||
fn from(v: Vec<Anchor>) -> Self {
|
||||
if v.is_empty() {
|
||||
return Self::new();
|
||||
}
|
||||
let len = v.len();
|
||||
let chunks = if len <= CHUNK { vec![Arc::new(v)] } else { v.chunks(CHUNK).map(|c| Arc::new(c.to_vec())).collect() };
|
||||
Self { chunks, ends: Vec::new(), len }
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&[Anchor]> for Anchors {
|
||||
fn from(s: &[Anchor]) -> Self {
|
||||
Self::from(s.to_vec())
|
||||
}
|
||||
}
|
||||
|
||||
impl<const N: usize> From<[Anchor; N]> for Anchors {
|
||||
fn from(s: [Anchor; N]) -> Self {
|
||||
Self::from(Vec::from(s))
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Anchors> for Vec<Anchor> {
|
||||
fn from(a: Anchors) -> Self {
|
||||
a.into_vec()
|
||||
}
|
||||
}
|
||||
|
||||
impl FromIterator<Anchor> for Anchors {
|
||||
fn from_iter<I: IntoIterator<Item = Anchor>>(it: I) -> Self {
|
||||
Self::from(it.into_iter().collect::<Vec<_>>())
|
||||
}
|
||||
}
|
||||
|
||||
impl Extend<Anchor> for Anchors {
|
||||
fn extend<I: IntoIterator<Item = Anchor>>(&mut self, it: I) {
|
||||
for a in it {
|
||||
self.push(a);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Extend<&'a Anchor> for Anchors {
|
||||
fn extend<I: IntoIterator<Item = &'a Anchor>>(&mut self, it: I) {
|
||||
self.extend(it.into_iter().copied());
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a Anchors {
|
||||
type Item = &'a Anchor;
|
||||
type IntoIter = Iter<'a>;
|
||||
|
||||
fn into_iter(self) -> Iter<'a> {
|
||||
self.iter()
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a mut Anchors {
|
||||
type Item = &'a mut Anchor;
|
||||
type IntoIter = IterMut<'a>;
|
||||
|
||||
fn into_iter(self) -> IterMut<'a> {
|
||||
self.iter_mut()
|
||||
}
|
||||
}
|
||||
|
||||
impl IntoIterator for Anchors {
|
||||
type Item = Anchor;
|
||||
type IntoIter = std::vec::IntoIter<Anchor>;
|
||||
|
||||
fn into_iter(self) -> std::vec::IntoIter<Anchor> {
|
||||
self.into_vec().into_iter()
|
||||
}
|
||||
}
|
||||
|
||||
impl PartialEq for Anchors {
|
||||
fn eq(&self, other: &Self) -> bool {
|
||||
self.len == other.len && self.iter().eq(other.iter())
|
||||
}
|
||||
}
|
||||
|
||||
impl PartialEq<[Anchor]> for Anchors {
|
||||
fn eq(&self, other: &[Anchor]) -> bool {
|
||||
self.len == other.len() && self.iter().eq(other.iter())
|
||||
}
|
||||
}
|
||||
|
||||
impl PartialEq<&[Anchor]> for Anchors {
|
||||
fn eq(&self, other: &&[Anchor]) -> bool {
|
||||
*self == **other
|
||||
}
|
||||
}
|
||||
|
||||
impl PartialEq<Vec<Anchor>> for Anchors {
|
||||
fn eq(&self, other: &Vec<Anchor>) -> bool {
|
||||
*self == **other
|
||||
}
|
||||
}
|
||||
|
||||
impl<const N: usize> PartialEq<[Anchor; N]> for Anchors {
|
||||
fn eq(&self, other: &[Anchor; N]) -> bool {
|
||||
*self == other[..]
|
||||
}
|
||||
}
|
||||
|
||||
impl PartialEq<Anchors> for [Anchor] {
|
||||
fn eq(&self, other: &Anchors) -> bool {
|
||||
*other == *self
|
||||
}
|
||||
}
|
||||
|
||||
impl PartialEq<Anchors> for Vec<Anchor> {
|
||||
fn eq(&self, other: &Anchors) -> bool {
|
||||
*other == **self
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Debug for Anchors {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_list().entries(self.iter()).finish()
|
||||
}
|
||||
}
|
||||
|
||||
impl Serialize for Anchors {
|
||||
fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
|
||||
s.collect_seq(self.iter())
|
||||
}
|
||||
}
|
||||
|
||||
impl<'de> Deserialize<'de> for Anchors {
|
||||
fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
|
||||
Vec::<Anchor>::deserialize(d).map(Self::from)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use kurbo::Point;
|
||||
|
||||
use super::*;
|
||||
|
||||
fn line(n: usize) -> Vec<Anchor> {
|
||||
(0..n).map(|i| Anchor::corner(Point::new(i as f64, (i % 7) as f64))).collect()
|
||||
}
|
||||
|
||||
/// Chunks of `a` that `b` does not hold, with their capacity in anchors.
|
||||
fn own_chunks(a: &Anchors, b: &Anchors) -> Vec<usize> {
|
||||
let theirs: Vec<usize> = b.chunk_allocations().map(|(id, _)| id).collect();
|
||||
a.chunk_allocations().filter(|(id, _)| !theirs.contains(id)).map(|(_, cap)| cap).collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn editing_one_anchor_copies_one_chunk_whatever_the_length() {
|
||||
for n in [10_000, 200_000] {
|
||||
let before = Anchors::from(line(n));
|
||||
let mut after = before.clone();
|
||||
after[n / 2].p = Point::new(-1.0, -1.0);
|
||||
if let Some(a) = after.get_mut(n / 2 + 1) {
|
||||
a.h_out = Point::new(-2.0, -2.0);
|
||||
}
|
||||
let copied = own_chunks(&after, &before);
|
||||
assert_eq!(copied.len(), 1, "{n} anchors: one chunk copied");
|
||||
assert!(copied.iter().all(|&cap| cap <= CHUNK), "{n} anchors: {copied:?}");
|
||||
assert_eq!(own_chunks(&before, &after).len(), 1, "{n} anchors: the old version keeps one chunk of its own");
|
||||
// The old version is as it was; the new one differs only at the two anchors.
|
||||
assert_eq!(before, line(n));
|
||||
let mut expected = line(n);
|
||||
expected[n / 2].p = Point::new(-1.0, -1.0);
|
||||
expected[n / 2 + 1].h_out = Point::new(-2.0, -2.0);
|
||||
assert_eq!(after, expected);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn inserting_and_removing_copy_only_the_chunk_touched() {
|
||||
let n = 200_000;
|
||||
let before = Anchors::from(line(n));
|
||||
let mut after = before.clone();
|
||||
let extra = Anchor::corner(Point::new(0.5, 0.5));
|
||||
after.insert(n / 2, extra);
|
||||
assert!(own_chunks(&after, &before).len() <= 2, "the chunk split in two");
|
||||
assert_eq!(after.len(), n + 1);
|
||||
assert_eq!(after[n / 2], extra);
|
||||
assert_eq!(after[n / 2 + 1], line(n)[n / 2]);
|
||||
assert_eq!(after.remove(n / 2), extra);
|
||||
assert_eq!(after, line(n));
|
||||
assert!(own_chunks(&after, &before).len() <= 2);
|
||||
assert_eq!(before, line(n));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn acts_as_a_vec_through_edits() {
|
||||
// A run of edits applied to an `Anchors` and to a `Vec` leaves the two the same, across
|
||||
// chunk splits, joins and the uniform and non-uniform layouts.
|
||||
let mut v = line(700);
|
||||
let mut a = Anchors::from(v.clone());
|
||||
let mut seed = 7u64;
|
||||
let mut next = |m: usize| {
|
||||
seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1442695040888963407);
|
||||
(seed >> 33) as usize % m.max(1)
|
||||
};
|
||||
for step in 0..3000 {
|
||||
let x = Anchor::corner(Point::new(step as f64, 0.25));
|
||||
match next(8) {
|
||||
0 | 1 => {
|
||||
let i = next(v.len() + 1);
|
||||
v.insert(i, x);
|
||||
a.insert(i, x);
|
||||
}
|
||||
2 | 3 if !v.is_empty() => {
|
||||
let i = next(v.len());
|
||||
assert_eq!(v.remove(i), a.remove(i));
|
||||
}
|
||||
4 => {
|
||||
v.push(x);
|
||||
a.push(x);
|
||||
}
|
||||
5 => assert_eq!(v.pop(), a.pop()),
|
||||
6 if !v.is_empty() => {
|
||||
let i = next(v.len());
|
||||
v[i].h_in = x.p;
|
||||
a[i].h_in = x.p;
|
||||
}
|
||||
_ => {
|
||||
let keep = v.len().saturating_sub(next(3));
|
||||
v.truncate(keep);
|
||||
a.truncate(keep);
|
||||
}
|
||||
}
|
||||
assert_eq!(a.len(), v.len(), "step {step}");
|
||||
if step % 50 == 0 {
|
||||
assert_eq!(a, v, "step {step}");
|
||||
for i in 0..v.len() {
|
||||
assert_eq!(a.get(i), v.get(i), "step {step}, anchor {i}");
|
||||
}
|
||||
}
|
||||
}
|
||||
assert_eq!(a, v);
|
||||
assert_eq!(a.iter().rev().copied().collect::<Vec<_>>(), v.iter().rev().copied().collect::<Vec<_>>());
|
||||
assert_eq!(a.get(v.len()), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn iterators_skip_and_count_as_a_slice_does() {
|
||||
let v = line(1000);
|
||||
let a = Anchors::from(v.clone());
|
||||
for skip in [0, 1, 255, 256, 257, 999, 1000, 1001] {
|
||||
assert_eq!(a.iter().nth(skip), v.get(skip), "nth {skip}");
|
||||
assert_eq!(a.iter().skip(skip).count(), v.iter().skip(skip).count(), "skip {skip}");
|
||||
assert_eq!(a.iter().skip(skip).len(), v.iter().skip(skip).len(), "len after {skip}");
|
||||
}
|
||||
let mut both = a.iter();
|
||||
let mut vs = v.iter();
|
||||
for k in 0..1000 {
|
||||
let (x, y) = if k % 3 == 0 { (both.next_back(), vs.next_back()) } else { (both.next(), vs.next()) };
|
||||
assert_eq!(x, y, "step {k}");
|
||||
assert_eq!(both.len(), vs.len());
|
||||
}
|
||||
assert_eq!(both.next(), None);
|
||||
assert_eq!(a.iter().last(), v.last());
|
||||
let mut m = a.clone();
|
||||
m.iter_mut().for_each(|x| x.p.x += 1.0);
|
||||
assert!(m.iter().zip(&v).all(|(x, y)| x.p.x == y.p.x + 1.0));
|
||||
assert_eq!(a, v, "changing a copy left the original alone");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reads_and_writes_as_a_flat_list() {
|
||||
let v = line(600);
|
||||
let a = Anchors::from(v.clone());
|
||||
assert_eq!(serde_json::to_string(&a).ok(), serde_json::to_string(&v).ok());
|
||||
let back: Anchors = serde_json::from_str(&serde_json::to_string(&v).unwrap_or_default()).unwrap_or_default();
|
||||
assert_eq!(back, v);
|
||||
assert_eq!(format!("{a:?}"), format!("{v:?}"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn pairs_not_shared_skip_the_chunks_both_hold() {
|
||||
let before = Anchors::from(line(10_000));
|
||||
let mut after = before.clone();
|
||||
after[5000].p = Point::new(-3.0, 0.0);
|
||||
let pairs: Vec<_> = before.pairs_not_shared(&after).collect();
|
||||
assert!(pairs.len() <= CHUNK);
|
||||
let changed: Vec<usize> = pairs.iter().filter(|(_, a, b)| a != b).map(|(i, _, _)| *i).collect();
|
||||
assert_eq!(changed, [5000]);
|
||||
assert!(pairs.iter().all(|&(i, a, b)| *a == before[i] && *b == after[i]));
|
||||
// Chunked differently: every pair.
|
||||
let mut moved = before.clone();
|
||||
moved.insert(0, Anchor::corner(Point::ZERO));
|
||||
moved.remove(0);
|
||||
assert_eq!(before.pairs_not_shared(&moved).count(), 10_000);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
//! Coordinates are document points (1/72 in), y pointing down.
|
||||
#![forbid(unsafe_code)]
|
||||
|
||||
pub mod anchors;
|
||||
pub mod arc;
|
||||
pub mod bez;
|
||||
pub mod corners;
|
||||
@@ -17,6 +18,7 @@ pub mod recognize;
|
||||
pub mod shapes;
|
||||
pub mod snap;
|
||||
|
||||
pub use anchors::Anchors;
|
||||
pub use arc::ArcPath;
|
||||
pub use kurbo;
|
||||
pub use kurbo::{Affine, BezPath, CubicBez, Line, ParamCurve, PathEl, PathSeg, Point, Rect, Shape, Size, Vec2};
|
||||
|
||||
+14
-9
@@ -6,6 +6,7 @@ use kurbo::{Affine, BezPath, CubicBez, ParamCurve, ParamCurveExtrema, ParamCurve
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::EPS;
|
||||
use crate::anchors::Anchors;
|
||||
|
||||
/// Fill rule for paths and compound paths.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
@@ -224,15 +225,15 @@ pub fn with_anchor_budget<T>(max: usize, f: impl FnOnce() -> T) -> T {
|
||||
}
|
||||
|
||||
/// A subpath's anchors read within [`with_anchor_budget`].
|
||||
fn anchors_within<'de, D: serde::Deserializer<'de>>(d: D) -> Result<Vec<Anchor>, D::Error> {
|
||||
fn anchors_within<'de, D: serde::Deserializer<'de>>(d: D) -> Result<Anchors, D::Error> {
|
||||
struct V;
|
||||
impl<'de> serde::de::Visitor<'de> for V {
|
||||
type Value = Vec<Anchor>;
|
||||
type Value = Anchors;
|
||||
fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
f.write_str("a list of anchors")
|
||||
}
|
||||
fn visit_seq<A: serde::de::SeqAccess<'de>>(self, mut a: A) -> Result<Vec<Anchor>, A::Error> {
|
||||
let mut out = Vec::new();
|
||||
fn visit_seq<A: serde::de::SeqAccess<'de>>(self, mut a: A) -> Result<Anchors, A::Error> {
|
||||
let mut out = Anchors::new();
|
||||
while let Some(anchor) = a.next_element::<Anchor>()? {
|
||||
if let Some(left) = ANCHORS_LEFT.get() {
|
||||
let left = left
|
||||
@@ -262,13 +263,17 @@ pub fn measured_segments() -> u64 {
|
||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SubPath {
|
||||
#[serde(deserialize_with = "anchors_within")]
|
||||
pub anchors: Vec<Anchor>,
|
||||
pub anchors: Anchors,
|
||||
#[serde(default)]
|
||||
pub closed: bool,
|
||||
}
|
||||
|
||||
impl SubPath {
|
||||
pub fn new(anchors: Vec<Anchor>, closed: bool) -> Self {
|
||||
Self { anchors: anchors.into(), closed }
|
||||
}
|
||||
/// A subpath of `anchors`, sharing their chunks.
|
||||
pub fn of(anchors: Anchors, closed: bool) -> Self {
|
||||
Self { anchors, closed }
|
||||
}
|
||||
/// Polyline from points.
|
||||
@@ -442,7 +447,7 @@ impl SubPath {
|
||||
let (run, cuts): (Vec<Anchor>, BTreeSet<usize>) = if self.closed {
|
||||
(self.anchors.iter().cycle().skip(first).take(n + 1).copied().collect(), cuts.map(|c| (c + n - first) % n).chain([n]).collect())
|
||||
} else {
|
||||
(self.anchors.clone(), cuts.collect())
|
||||
(self.anchors.to_vec(), cuts.collect())
|
||||
};
|
||||
let mut pieces = vec![];
|
||||
let mut cur: Vec<Anchor> = vec![];
|
||||
@@ -511,11 +516,11 @@ impl PathData {
|
||||
{
|
||||
subpaths.push(sp);
|
||||
}
|
||||
cur = Some(SubPath { anchors: vec![Anchor::corner(p)], closed: false });
|
||||
cur = Some(SubPath::new(vec![Anchor::corner(p)], false));
|
||||
last = p;
|
||||
}
|
||||
PathEl::LineTo(p) => {
|
||||
let sp = cur.get_or_insert_with(|| SubPath { anchors: vec![Anchor::corner(last)], closed: false });
|
||||
let sp = cur.get_or_insert_with(|| SubPath::new(vec![Anchor::corner(last)], false));
|
||||
sp.anchors.push(Anchor::corner(p));
|
||||
last = p;
|
||||
}
|
||||
@@ -752,7 +757,7 @@ pub fn segment_bounds(seg: PathSeg) -> Rect {
|
||||
}
|
||||
|
||||
fn push_curve(cur: &mut Option<SubPath>, last: Point, c1: Point, c2: Point, p: Point) {
|
||||
let sp = cur.get_or_insert_with(|| SubPath { anchors: vec![Anchor::corner(last)], closed: false });
|
||||
let sp = cur.get_or_insert_with(|| SubPath::new(vec![Anchor::corner(last)], false));
|
||||
if let Some(a) = sp.anchors.last_mut() {
|
||||
a.h_out = c1;
|
||||
}
|
||||
|
||||
@@ -814,7 +814,7 @@ mod tests {
|
||||
for decay in [20.0, 30.0, 50.0, 80.0, 95.0] {
|
||||
for clockwise in [true, false] {
|
||||
let p = spiral(center, 100.0, decay, 8, clockwise);
|
||||
let anchors = &p.subpaths[0].anchors;
|
||||
let anchors = &p.subpaths[0].anchors.to_vec();
|
||||
let k = (decay / 100.0_f64).ln() / TAU;
|
||||
let mut worst = 0.0_f64;
|
||||
for pair in anchors.windows(2) {
|
||||
|
||||
@@ -392,7 +392,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
|
||||
"type.lineComposer",
|
||||
"Toggle Line Composer",
|
||||
"Cmd+Alt+Shift+C",
|
||||
"{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer (text.setFormat {composer}) → \"singleLine\" | \"everyLine\"",
|
||||
"{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer; paragraphs that all use a Standard composer keep it, any other mix takes the Middle Eastern & South Asian one (text.setFormat {composer}) → \"singleLine\" | \"everyLine\" | \"standardSingleLine\" | \"standardEveryLine\"",
|
||||
),
|
||||
(
|
||||
"type.hyphenate",
|
||||
@@ -432,6 +432,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
|
||||
),
|
||||
("view.nextArtboard", "Next Artboard", "", "{} the navigator's Next Artboard button: view.goToArtboard {index: \"next\"} → {index}"),
|
||||
("view.lastArtboard", "Last Artboard", "", "{} the navigator's Last Artboard button: view.goToArtboard {index: \"last\"} → {index}"),
|
||||
(
|
||||
"view.statusBarShow",
|
||||
"Status Bar Show",
|
||||
"",
|
||||
"{show: \"artboardName\" | \"currentTool\" | \"dateTime\" | \"undos\" | \"colorProfile\"} the status bar's Show menu (a click on its info field): the field shows the name of the artboard the navigator shows, the tool in use (the default), the date and time (local on the desktop, UTC on the web), the active document's undo and redo step counts, or the profile its colors use (the one assigned for its color mode, else, or when that one is not available, that mode's working space); kept with the UI state; any other value is an error → show",
|
||||
),
|
||||
("view.edges", "Hide Edges", "Cmd+H", "{}"),
|
||||
("view.artboards", "Hide Artboards", "Cmd+Shift+H", "{}"),
|
||||
(
|
||||
@@ -1615,7 +1621,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
|
||||
"ui.actionSet.load",
|
||||
"Load Actions…",
|
||||
"",
|
||||
"{path? | data?: the file's text} read an action set file (.vcactions) at path, else a picked one, and add its set after the Actions panel's sets; a set named like one in the panel gets the next free number (Print 2), and the other sets stay. Files of another version, over 8 MiB, with more than 1,000 actions or with an action of more than 10,000 steps are refused, and so is any set, .aia ones too, that Save Actions… would write larger than 8 MiB (a file with less white space, or a name that gets a number); the panel menu's Load Actions… (disabled where there is no open dialog, the web) → {set: index, name, actions: n}. An action set another app saved as text (.aia, starting /version; read with actionSet.read) comes in with its actions. A step with a label and no recorded values comes in when exactly one menu command has that label (in English or the interface language, any case, no final …), and that command is directly in a top menu, can be recorded in actions, is what its menu bar item runs with no values and opens no dialog (never a submenu's item, a file or document command, Paste, Undo, Redo or an add-on's command), with no params and excluded from playback when it is off in the file; the other steps, every step with no label and every step recorded with values (a recorded menu item too) among them, are left out → {set, name, actions, skipped: [{action, step: its label, else its name}] (the first 1,000), leftOut: n}, and the status bar says how many were left out; a set with no name takes the file's name, else Actions; a file actionSet.read marks truncated is refused, and text that starts /version and isn't an action set gives \"not an action set file\"",
|
||||
"{path? | data?: the file's text} read an action set file (.vcactions) at path, else a picked one, and add its set after the Actions panel's sets; a set named like one in the panel gets the next free number (Print 2), and the other sets stay. Files of another version, over 8 MiB, with more than 1,000 actions or with an action of more than 10,000 steps are refused, and so is any set, .aia ones too, that Save Actions… would write larger than 8 MiB (a file with less white space, or a name that gets a number); the panel menu's Load Actions… (disabled where there is no open dialog, the web) → {set: index, name, actions: n}. An action set another app saved as text (.aia, starting /version; read with actionSet.read) comes in with its actions. A step with a label and no recorded values comes in when exactly one menu command has that label (in English or the interface language, any case, no final …), and that command is directly in a top menu, can be recorded in actions, is what its menu bar item runs with no values and opens no dialog (never a submenu's item, a file or document command, Paste, Undo, Redo or an add-on's command), with no params and excluded from playback when it is off in the file. A Set Selection step (found by its internal name, whatever its label) comes in as select.byNote {note, caseSensitive, wholeWord} when it has exactly three recorded values: text (ustring, UTF-8; 1 to 1,024 bytes once trimmed), word and case (boolean, 0 or 1); with any other values it is left out. The other steps, every other step with no label and every other step recorded with values (a recorded menu item too) among them, are left out → {set, name, actions, skipped: [{action, step: its label, else its name}] (the first 1,000), leftOut: n}, and the status bar says how many were left out; a set with no name takes the file's name, else Actions; a file actionSet.read marks truncated is refused, and text that starts /version and isn't an action set gives \"not an action set file\"",
|
||||
),
|
||||
(
|
||||
"ui.actionSet.delete",
|
||||
|
||||
@@ -104,7 +104,7 @@ pub fn merge_duplicate_anchors(sp: &mut SubPath, distance: f64) -> usize {
|
||||
{
|
||||
*f = Anchor::with_handles(f.p, moved(f.p, last.p, last.h_in), f.h_out);
|
||||
}
|
||||
sp.anchors = out;
|
||||
sp.anchors = out.into();
|
||||
before - sp.anchors.len()
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ const ACCURACY: f64 = 1e-6;
|
||||
fn merged(prev: &Anchor, cur: &Anchor, next: &Anchor) -> CubicBez {
|
||||
let mut run = SubPath::new(vec![*prev, *cur, *next], false);
|
||||
remove_anchor(&mut run, 1);
|
||||
match run.anchors.as_slice() {
|
||||
match &*run.anchors.contiguous() {
|
||||
[a, b] => CubicBez::new(prev.p, a.h_out, b.h_in, next.p),
|
||||
_ => CubicBez::new(prev.p, prev.h_out, next.h_in, next.p),
|
||||
}
|
||||
|
||||
@@ -377,7 +377,7 @@ fn splice(sp: &SubPath, st: Stretch, chain: &[CubicBez]) -> Option<SubPath> {
|
||||
let own = backward(chain);
|
||||
let chain = if st.reversed { own.as_slice() } else { chain };
|
||||
let (first, last) = (chain.first()?, chain.last()?);
|
||||
let mut out = sp.anchors.clone();
|
||||
let mut out = sp.anchors.to_vec();
|
||||
let start = st.start.min(out.len());
|
||||
out.rotate_left(start);
|
||||
let settle = |a: &mut Anchor| {
|
||||
|
||||
@@ -5,7 +5,7 @@ use std::collections::{BTreeMap, BTreeSet};
|
||||
|
||||
use kurbo::{CubicBez, Line, ParamCurve, ParamCurveNearest, PathSeg, Point, Rect, Vec2};
|
||||
use vectorcraft_geom::path::measured_arclen;
|
||||
use vectorcraft_geom::{Anchor, AnchorKind, PathData, SubPath};
|
||||
use vectorcraft_geom::{Anchor, AnchorKind, Anchors, PathData, SubPath};
|
||||
|
||||
use crate::boolean::{Seg, segs_to_subpath};
|
||||
use crate::fit::{end_tangent, fit_cubics, fit_single, fit_single_from, is_straight, largest_second_difference, sample, start_tangent, unit};
|
||||
@@ -1091,7 +1091,7 @@ pub fn remove_anchor(sp: &mut SubPath, index: usize) -> bool {
|
||||
/// Refit the facing handles of anchors `pi` and `ni` so one cubic follows the two segments that
|
||||
/// meet at anchor `index` between them ([`remove_anchor`]). Two straight segments are left as
|
||||
/// they are, and so are the handles when the fit is not finite.
|
||||
fn refit_across(anchors: &mut [Anchor], pi: usize, index: usize, ni: usize) {
|
||||
fn refit_across(anchors: &mut Anchors, pi: usize, index: usize, ni: usize) {
|
||||
let (Some(&a), Some(&b), Some(&c)) = (anchors.get(pi), anchors.get(index), anchors.get(ni)) else { return };
|
||||
let line = |a: &Anchor, b: &Anchor| !a.has_out() && !b.has_in();
|
||||
if line(&a, &b) && line(&b, &c) {
|
||||
@@ -1233,7 +1233,7 @@ pub fn add_anchor_points(path: &PathData) -> PathData {
|
||||
v[2 * seg + 1] = Anchor { p: l.p3, h_in: l.p2, h_out: r.p1, kind: AnchorKind::Smooth };
|
||||
}
|
||||
}
|
||||
sp.anchors = v;
|
||||
sp.anchors = v.into();
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
@@ -769,7 +769,7 @@ fn add_anchor_points_doubles() {
|
||||
/// The one-pass build gives what inserting a midpoint into each segment (last first) gives, open or closed.
|
||||
#[test]
|
||||
fn add_anchor_points_matches_inserting() {
|
||||
let open = PathData::single(SubPath::new(circle(0.0, 0.0, 10.0).subpaths[0].anchors.clone(), false));
|
||||
let open = PathData::single(SubPath::new(circle(0.0, 0.0, 10.0).subpaths[0].anchors.to_vec(), false));
|
||||
for src in [circle(0.0, 0.0, 10.0), rect(0.0, 0.0, 10.0, 10.0), open] {
|
||||
let mut want = src.clone();
|
||||
for sp in &mut want.subpaths {
|
||||
|
||||
@@ -859,7 +859,9 @@ impl Exporter<'_> {
|
||||
/// Opens the blend mode and the transparency group `n` is drawn with (`container` when it is a
|
||||
/// group or layer whose children `knockout` each other). Returns how many were opened, and
|
||||
/// whether the children are to be drawn in an isolated group of their own: the knockout group of
|
||||
/// an unclipped group's elements is its isolated group too.
|
||||
/// an unclipped group's elements is its isolated group too. An opaque knockout group in Normal
|
||||
/// mode that does not isolate opens no group: its elements are drawn on the art below it, in a
|
||||
/// knockout group without `/I` when there are several.
|
||||
fn transparency(s: &mut Surface, n: &Node, page: Rect, container: bool, knockout: bool) -> (usize, bool) {
|
||||
let mut pushes = 0;
|
||||
if n.blend != BlendMode::Normal {
|
||||
@@ -876,6 +878,8 @@ fn transparency(s: &mut Surface, n: &Node, page: Rect, container: bool, knockout
|
||||
} else if n.opacity < 1.0 {
|
||||
s.push_opacity(norm(n.opacity));
|
||||
pushes += 1;
|
||||
} else if knockout && !n.isolate && n.blend == BlendMode::Normal {
|
||||
// A knockout group that does not isolate: its elements start from the art below it.
|
||||
} else if knockout && matches!(n.kind, NodeKind::Layer { clip: false, .. } | NodeKind::Group { clip: false, .. }) {
|
||||
isolated_children = true;
|
||||
} else {
|
||||
|
||||
@@ -151,6 +151,77 @@ fn a_knockout_group_is_written_as_one_pdf_knockout_group() {
|
||||
}
|
||||
}
|
||||
|
||||
/// A knockout group with nothing blending inside is drawn in an isolated group (`/I true`) only
|
||||
/// when the group isolates, clipped or not, with opaque or translucent elements, and reads back
|
||||
/// knocking out.
|
||||
#[test]
|
||||
fn a_knockout_group_without_blending_inside_is_isolated_only_when_it_isolates() {
|
||||
for clip in [false, true] {
|
||||
for opacity in [0.5, 1.0] {
|
||||
for isolate in [false, true] {
|
||||
let mut d = knockout_squares(3, false, isolate);
|
||||
let g = d.layers[0].children().unwrap()[1].id;
|
||||
let mut squares: Vec<_> = d.node(g).unwrap().children().unwrap().to_vec();
|
||||
for s in &mut squares {
|
||||
std::sync::Arc::make_mut(s).opacity = opacity;
|
||||
}
|
||||
if clip {
|
||||
let c = Node::path(
|
||||
d.alloc_id(),
|
||||
shapes::rectangle(Rect::new(10.0, 10.0, 190.0, 190.0)),
|
||||
Appearance::basic(Paint::None, Paint::None, 0.0),
|
||||
);
|
||||
squares.insert(0, std::sync::Arc::new(c));
|
||||
}
|
||||
d.node_mut(g).unwrap().kind = vectorcraft_doc::NodeKind::Group { children: squares, clip };
|
||||
let case = format!("clip {clip}, opacity {opacity}, isolate {isolate}");
|
||||
let t = text(&d);
|
||||
assert_eq!(t.matches("/Ktrue").count(), 1, "{case}");
|
||||
// Each translucent element is an isolated form with its opacity.
|
||||
let elements = if opacity < 1.0 { 3 } else { 0 };
|
||||
assert_eq!(t.matches("/Itrue").count(), elements + usize::from(isolate), "{case}");
|
||||
let back = import(&export(&d, &PdfOptions::default()).unwrap()).unwrap_or_else(|e| panic!("{case}: {e}"));
|
||||
let mut found = vec![];
|
||||
back.walk(|n| {
|
||||
if n.knockout == vectorcraft_doc::Knockout::On {
|
||||
found.push(n.isolate);
|
||||
}
|
||||
});
|
||||
assert_eq!(found, [false], "{case}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// An overprinting element of a knockout group that does not isolate is drawn in a `/K` group
|
||||
/// without `/I true`, so it overprints the art below the group, and its graphics state still
|
||||
/// overprints (`/OP`, `/op`, `/OPM 1`). An isolated group keeps `/I true`.
|
||||
#[test]
|
||||
fn an_overprinting_element_of_a_knockout_group_that_does_not_isolate_overprints_the_art_below() {
|
||||
for isolate in [false, true] {
|
||||
let mut d = knockout_squares(3, false, isolate);
|
||||
let g = d.layers[0].children().unwrap()[1].id;
|
||||
let squares: Vec<_> = d.node(g).unwrap().children().unwrap().iter().map(|s| s.id).collect();
|
||||
for s in &squares {
|
||||
d.node_mut(*s).unwrap().opacity = 1.0;
|
||||
}
|
||||
d.node_mut(squares[2]).unwrap().appearance.fill_mut().unwrap().overprint = true;
|
||||
let t = text(&d);
|
||||
assert_eq!(t.matches("/Ktrue").count(), 1, "isolate {isolate}");
|
||||
assert_eq!(t.matches("/Itrue").count(), usize::from(isolate), "isolate {isolate}");
|
||||
assert!(t.contains("/OPtrue/optrue/OPM1"), "isolate {isolate}");
|
||||
let back = import(&export(&d, &PdfOptions::default()).unwrap()).unwrap_or_else(|e| panic!("isolate {isolate}: {e}"));
|
||||
let mut overprints = vec![];
|
||||
back.walk(|n| {
|
||||
if let Some(f) = n.appearance.fill() {
|
||||
overprints.push(f.overprint);
|
||||
}
|
||||
});
|
||||
assert_eq!(overprints, [false, false, false, true], "isolate {isolate}");
|
||||
assert_eq!(knockout_groups(&back), [3], "isolate {isolate}");
|
||||
}
|
||||
}
|
||||
|
||||
/// The knockout group of an isolated group is isolated too (`/I true` beside `/K true`), and the
|
||||
/// group reads back as isolated and knocking out. (Each translucent element is a group of its own.)
|
||||
#[test]
|
||||
|
||||
@@ -290,7 +290,7 @@ impl Sub {
|
||||
/// them.
|
||||
fn moved(&mut self, was: &SubPath, now: &SubPath, els: &mut [PathEl], st: Option<&StrokeLayer>) {
|
||||
let (mut first, mut segs) = (false, vec![]);
|
||||
for (k, (a, b)) in was.anchors.iter().zip(&now.anchors).enumerate() {
|
||||
for (k, a, b) in was.anchors.pairs_not_shared(&now.anchors) {
|
||||
if same(a, b) {
|
||||
continue;
|
||||
}
|
||||
@@ -489,7 +489,7 @@ fn differs(was: &PathData, now: &PathData) -> bool {
|
||||
!std::ptr::eq(was, now)
|
||||
&& (was.subpaths.len() != now.subpaths.len()
|
||||
|| was.subpaths.iter().zip(&now.subpaths).any(|(w, p)| {
|
||||
w.closed != p.closed || w.anchors.len() != p.anchors.len() || w.anchors.iter().zip(&p.anchors).any(|(a, b)| !same(a, b))
|
||||
w.closed != p.closed || w.anchors.len() != p.anchors.len() || w.anchors.pairs_not_shared(&p.anchors).any(|(_, a, b)| !same(a, b))
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@ fn a_long_path_draws_and_culls_after_each_edit_as_when_its_path_is_made_again()
|
||||
}),
|
||||
("that anchor moved off it", |p| moved(&mut p.subpaths[0].anchors[1535], Vec2::new(5.0, 5.0))),
|
||||
("a doubled anchor moved off its twin", |p| moved(&mut p.subpaths[0].anchors[1536], Vec2::new(0.0, -12.0))),
|
||||
("1,200 anchors moved", |p| p.subpaths[0].anchors[..1200].iter_mut().for_each(|a| moved(a, Vec2::new(2.0, 1.0)))),
|
||||
("1,200 anchors moved", |p| p.subpaths[0].anchors.iter_mut().take(1200).for_each(|a| moved(a, Vec2::new(2.0, 1.0)))),
|
||||
("an anchor added", |p| _ = p.subpaths[0].insert_anchor(1520, 0.5)),
|
||||
("an anchor deleted", |p| _ = p.subpaths[0].anchors.remove(1521)),
|
||||
("the subpath closed", |p| p.subpaths[0].closed = true),
|
||||
@@ -454,7 +454,7 @@ fn random_edit(g: &mut Seeded, p: &mut PathData) -> String {
|
||||
match g.below(3) {
|
||||
0 => moved(&mut sp.anchors[at], Vec2::new(g.offset(30), g.offset(30))),
|
||||
1 => sp.anchors[at].h_out = sp.anchors[at].p + Vec2::new(g.offset(10), g.offset(10)),
|
||||
_ => sp.anchors[at..].iter_mut().take(n / 10).for_each(|a| moved(a, Vec2::new(1.0, -1.0))),
|
||||
_ => sp.anchors.iter_mut().skip(at).take(n / 10).for_each(|a| moved(a, Vec2::new(1.0, -1.0))),
|
||||
}
|
||||
format!("anchors moved at {at} of subpath {s} of {n}")
|
||||
}
|
||||
@@ -486,7 +486,7 @@ fn same_as_made_again(k: &mut crate::kept_paths::KeptPath, n: &Arc<Node>, st: &S
|
||||
fn random_edits_of_a_long_path_keep_what_making_its_path_again_makes() {
|
||||
let st = stroke(6.0, LineJoin::Miter, LineCap::Butt);
|
||||
let mut g = Seeded(5744);
|
||||
let closed = |sp: SubPath| SubPath::new(sp.anchors, true);
|
||||
let closed = |sp: SubPath| SubPath::of(sp.anchors, true);
|
||||
let path = PathData::new(vec![
|
||||
zigzag(2, 11_990.0),
|
||||
closed(zigzag(3, 12_000.0)),
|
||||
@@ -517,7 +517,7 @@ fn random_edits_of_a_long_compound_path_keep_what_making_its_path_again_makes()
|
||||
Arc::new(Node::path(NodeId(ids.get()), p, Appearance::default()))
|
||||
};
|
||||
let children = vec![
|
||||
member(PathData::new(vec![SubPath::new(zigzag(3, 11_990.0).anchors, true), zigzag(5, 12_010.0)])),
|
||||
member(PathData::new(vec![SubPath::of(zigzag(3, 11_990.0).anchors, true), zigzag(5, 12_010.0)])),
|
||||
member(PathData::single(zigzag(3000, 0.0))),
|
||||
member(PathData::single(ring(40, Point::new(12_000.0, 15.0), 30.0))),
|
||||
member(PathData::single(zigzag(2, 12_020.0))),
|
||||
|
||||
@@ -500,8 +500,8 @@ impl Writer<'_> {
|
||||
/// `<circle>` when its radii are written the same, else `<ellipse>`.
|
||||
fn ellipse_shape(&self, sp: &SubPath, m: Affine) -> Option<(&'static str, String)> {
|
||||
let tol = 10f64.powi(-i32::from(self.opts.decimals));
|
||||
let (anchors, closed) = (sp.anchors.as_slice(), sp.closed);
|
||||
let [a0, a1, a2, a3] = anchors else { return None };
|
||||
let (anchors, closed) = (sp.anchors.contiguous(), sp.closed);
|
||||
let [a0, a1, a2, a3] = &*anchors else { return None };
|
||||
let [p0, p1, p2, p3] = [a0.p, a1.p, a2.p, a3.p].map(|p| m * p);
|
||||
let c = p0.midpoint(p2);
|
||||
let near = |a: f64, b: f64| (a - b).abs() <= tol;
|
||||
|
||||
@@ -604,25 +604,41 @@ impl Writer<'_> {
|
||||
let mut inner = n.clone();
|
||||
inner.appearance.effects.retain(|e| !vectorcraft_effects::is_raster(&e.id));
|
||||
// An SVG filter's user-space coordinates are the document's from the effect's origin: the
|
||||
// object is written in them, in a group that moves it where the rest of the art goes.
|
||||
// object is written in them, in a group that moves it where the rest of the art goes. A
|
||||
// user space that is scaled or turned ([`turned_filter_space`]) is the group's own: the
|
||||
// object is written as it is in a group inside the filter that maps it back
|
||||
// ([`Self::open_filters`]), so its strokes keep their widths.
|
||||
let xf = self.xf;
|
||||
let origin = live_svg_filter(&n.appearance.effects).map(|f| Affine::translate(f.origin()));
|
||||
let live = live_svg_filter(&n.appearance.effects);
|
||||
let turned = self.turned_filter_space(live.as_ref());
|
||||
let origin = live.filter(|_| turned.is_none()).map(|f| Affine::translate(f.origin()));
|
||||
let moved = origin.is_some_and(|o| xf * o != Affine::IDENTITY);
|
||||
if let Some(o) = origin.filter(|_| moved) {
|
||||
self.line(&format!("<g transform=\"{}\">", self.matrix(xf * o)));
|
||||
self.depth += 1;
|
||||
self.xf = o.inverse();
|
||||
}
|
||||
if let Some(space) = turned {
|
||||
self.line(&format!("<g transform=\"{}\">", exact_matrix(space)));
|
||||
self.depth += 1;
|
||||
}
|
||||
let opened = self.open_filters(n, &n.appearance.effects);
|
||||
self.node_body(&inner);
|
||||
self.close_filters(opened);
|
||||
if moved {
|
||||
if moved || turned.is_some() {
|
||||
self.xf = xf;
|
||||
self.depth -= 1;
|
||||
self.line("</g>");
|
||||
}
|
||||
}
|
||||
|
||||
/// The group transform that holds a live SVG filter `live` ([`live_svg_filter`]) whose user
|
||||
/// space is scaled or turned (not only moved, [`vectorcraft_effects::svg_filter::SvgFilterFx::moves_only`]): the filter's user
|
||||
/// space in the output's. `None` for other filters and in SVG Tiny, which writes no filters.
|
||||
fn turned_filter_space(&self, live: Option<&vectorcraft_effects::svg_filter::SvgFilterFx>) -> Option<Affine> {
|
||||
live.filter(|f| !f.moves_only() && !self.tiny()).map(|f| self.xf * f.to_doc())
|
||||
}
|
||||
|
||||
/// Open one `<g filter>` per visible raster effect of `effects` (an object's, or one fill or
|
||||
/// stroke's) on `n`, outermost last effect; returns how many to close.
|
||||
pub(super) fn open_filters(&mut self, n: &Node, effects: &[vectorcraft_doc::Effect]) -> usize {
|
||||
@@ -644,6 +660,7 @@ impl Writer<'_> {
|
||||
let mut opened = 0;
|
||||
// An SVG filter that is the object's last effect is written as it is ([`Self::filtered`]).
|
||||
let live = if std::ptr::eq(effects, n.appearance.effects.as_slice()) { live_svg_filter(effects) } else { None };
|
||||
let turned = self.turned_filter_space(live.as_ref());
|
||||
for (k, f) in fx.iter().enumerate().rev() {
|
||||
if let RasterFx::Pixel(vectorcraft_effects::PixelFx::Svg(sf)) = f
|
||||
&& live.is_some()
|
||||
@@ -654,12 +671,40 @@ impl Writer<'_> {
|
||||
// against the object alone, which is all it runs on ([`live_svg_filter`]).
|
||||
let mut input = n.clone();
|
||||
input.appearance.effects.clear();
|
||||
let input_bounds = input.visual_bounds_with(&self.doc.symbol_boxes()).unwrap_or_default();
|
||||
if let Some(def) = sf.written_xml(input_bounds).and_then(|xml| vectorcraft_effects::svg_filter::with_id(&xml, &fid)) {
|
||||
self.def(1, &def);
|
||||
// Its box in the filter's user space: in a turned or skewed one, the box of the
|
||||
// object's geometry turned into it, grown by what its strokes and other paint add
|
||||
// around it in the document: a square that far to each side, as it measures in
|
||||
// user space along each axis (a miter corner reaches that far along both).
|
||||
let symbols = self.doc.symbol_boxes();
|
||||
let visual = input.visual_bounds_with(&symbols).unwrap_or_default();
|
||||
let user_box = if sf.moves_only() {
|
||||
visual - sf.origin()
|
||||
} else {
|
||||
let geometric = input.geometric_bounds_with(&symbols).unwrap_or(visual);
|
||||
let margin = [geometric.x0 - visual.x0, geometric.y0 - visual.y0, visual.x1 - geometric.x1, visual.y1 - geometric.y1]
|
||||
.into_iter()
|
||||
.fold(0.0, f64::max);
|
||||
let to_user = sf.to_doc().inverse();
|
||||
input.transform(to_user, false);
|
||||
let [a, b, c, d, _, _] = to_user.as_coeffs();
|
||||
let turned = input.geometric_bounds_with(&symbols).unwrap_or_default();
|
||||
turned.inflate(margin * (a.abs() + c.abs()), margin * (b.abs() + d.abs()))
|
||||
};
|
||||
let def = sf.written_xml(user_box).and_then(|xml| vectorcraft_effects::svg_filter::with_id(&xml, &fid));
|
||||
if let Some(def) = &def {
|
||||
self.def(1, def);
|
||||
self.line(&format!("<g filter=\"url(#{fid})\">"));
|
||||
self.depth += 1;
|
||||
opened += 1;
|
||||
}
|
||||
// Inside the group of a turned user space ([`Self::filtered`]), the object and its
|
||||
// other effects are written as they are, in a group that maps them back to it.
|
||||
if let Some(space) = turned {
|
||||
self.line(&format!("<g transform=\"{}\">", exact_matrix(space.inverse())));
|
||||
self.depth += 1;
|
||||
opened += 1;
|
||||
}
|
||||
if def.is_some() {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -786,8 +831,18 @@ pub(super) fn pixel_gradient(p: &Paint, fill: bool) -> Option<&GradientPaint> {
|
||||
}
|
||||
}
|
||||
|
||||
/// `a` as an SVG `matrix(…)` with every digit its numbers need to read back the same, whatever
|
||||
/// the export's decimals: the transforms around a turned SVG filter ([`Writer::turned_filter_space`])
|
||||
/// and their inverses still undo each other when one holds very small numbers.
|
||||
fn exact_matrix(a: Affine) -> String {
|
||||
// (Without negative zeros.)
|
||||
let [a, b, c, d, e, f] = a.as_coeffs().map(|v| v + 0.0);
|
||||
format!("matrix({a} {b} {c} {d} {e} {f})")
|
||||
}
|
||||
|
||||
/// The SVG filter (Effect › SVG Filters) of an object's `effects` that SVG keeps as a `<filter>`:
|
||||
/// its last visible effect, measured in points.
|
||||
/// its last visible effect, in any user space the effect gives it ([`Writer::turned_filter_space`])
|
||||
/// that SVG import can store again.
|
||||
fn live_svg_filter(effects: &[vectorcraft_doc::Effect]) -> Option<vectorcraft_effects::svg_filter::SvgFilterFx> {
|
||||
if !vectorcraft_effects::svg_filter::writes_live(effects) {
|
||||
return None;
|
||||
@@ -797,7 +852,7 @@ fn live_svg_filter(effects: &[vectorcraft_doc::Effect]) -> Option<vectorcraft_ef
|
||||
let alone = fx.len() == 1;
|
||||
match fx.pop() {
|
||||
Some(vectorcraft_effects::RasterFx::Pixel(vectorcraft_effects::PixelFx::Svg(f)))
|
||||
if f.in_points() && (alone || !f.measured()) && f.writes_as_svg11() =>
|
||||
if (alone || !f.measured()) && f.writes_as_svg11() && f.opens_again() =>
|
||||
{
|
||||
Some(f)
|
||||
}
|
||||
|
||||
@@ -142,19 +142,22 @@ fn source_of<'a>(filter: &Filter, sources: &'a HashMap<String, Source>) -> Optio
|
||||
/// XML from `sources` ([`sources`]), in user space mapped to the document by `ts`. `None` when one
|
||||
/// isn't there, looks different outside the document, or isn't a filter the effect draws
|
||||
/// ([`vectorcraft_effects::svg_filter::check`]), or
|
||||
/// when `ts` turns or skews the user space or scales it past what the effect measures (0.001 to
|
||||
/// 1000 points to a unit). Where `ts` moves the user space is the effect's `origin`.
|
||||
/// when `ts` scales the user space past what the effect measures (0.001 to 1000 points to a unit,
|
||||
/// as the square root of its area scale) or stretches its axes past what the effect's `axes` hold.
|
||||
/// Where `ts` moves the user space is the effect's `origin`; a user space that `ts` turns, skews
|
||||
/// or scales unevenly keeps those directions in the effect's `axes`, so the filter runs in the
|
||||
/// element's own user space as SVG 1.1 defines it (<https://www.w3.org/TR/SVG11/filters.html#FilterEffectsRegion>).
|
||||
pub(super) fn kept(filters: &[Arc<Filter>], ts: Affine, sources: &HashMap<String, Source>) -> Option<Vec<Effect>> {
|
||||
let [a, b, c, d, e, f] = ts.as_coeffs();
|
||||
if b != 0.0 || c != 0.0 || !(0.001..=1000.0).contains(&a) || (a - d).abs() > 1e-9 * a.abs().max(1.0) || !e.is_finite() || !f.is_finite() {
|
||||
return None;
|
||||
}
|
||||
let space = vectorcraft_effects::svg_filter::user_space(ts)?;
|
||||
filters
|
||||
.iter()
|
||||
.map(|filter| {
|
||||
// A filter styled by the document is left out rather than drawn differently.
|
||||
let source = source_of(filter, sources).filter(|s| !s.styled)?;
|
||||
let params = json!({ "name": source.name()?, "xml": source.xml, "scale": a, "origin": [e, f] });
|
||||
let mut params = json!({ "name": source.name()?, "xml": source.xml, "scale": space.scale, "origin": space.origin });
|
||||
if let Some(axes) = space.axes {
|
||||
params["axes"] = json!(axes);
|
||||
}
|
||||
Some(Effect { id: vectorcraft_effects::SVG_FILTER.into(), params, visible: true })
|
||||
})
|
||||
.collect()
|
||||
|
||||
@@ -763,14 +763,15 @@ fn percentages_in_a_symbol_are_of_its_view_box() {
|
||||
}
|
||||
|
||||
/// #1598: the warning for a filter that neither the live effects nor an SVG filter effect can hold
|
||||
/// (here, on turned objects) names the filter, its primitives and the object, and says it is drawn
|
||||
/// without it (not "a group": usvg wraps the element in one). Such a filter on an object that
|
||||
/// isn't turned comes in as an SVG filter effect holding the filter's XML.
|
||||
/// (here, on objects skewed past what the effect measures) names the filter, its primitives and the
|
||||
/// object, and says it is drawn without it (not "a group": usvg wraps the element in one). Such a
|
||||
/// filter on an object that isn't skewed that far comes in as an SVG filter effect holding the
|
||||
/// filter's XML.
|
||||
#[test]
|
||||
fn unsupported_filters_are_named_in_the_warning() {
|
||||
let body = r#"<filter id="f"><feColorMatrix type="saturate" values="0"/></filter><filter id="t"><feTurbulence baseFrequency="0.05"/></filter>
|
||||
<rect x="20" y="20" width="60" height="60" fill="red" transform="rotate(10 50 50)" filter="url(#f)"/>
|
||||
<rect id="r" x="100" y="20" width="60" height="60" fill="blue" transform="rotate(10 130 50)" filter="url(#t)"/>
|
||||
<rect x="0.02" y="0.02" width="0.06" height="0.06" fill="red" transform="skewX(89.95)" filter="url(#f)"/>
|
||||
<rect id="r" x="0.1" y="0.02" width="0.06" height="0.06" fill="blue" transform="skewX(89.95)" filter="url(#t)"/>
|
||||
<rect x="20" y="90" width="20" height="20" fill="red" filter="url(#f)"/>"#;
|
||||
let (d, w) = import_with_report(&svg(body)).unwrap();
|
||||
assert!(w.iter().any(|w| w == "filter 'f' (feColorMatrix) on an object isn't supported; drawn without it"), "{w:?}");
|
||||
|
||||
@@ -522,7 +522,8 @@ fn a_filter_used_twice_among_many_is_kept_twice() {
|
||||
assert_eq!(filters, vec![vec![json!("g")], vec![json!("g")]], "{:?}", art(&d));
|
||||
}
|
||||
|
||||
/// Other filters come in as SVG filters; one on a turned object is reported and left out.
|
||||
/// Other filters come in as SVG filters, on a turned or skewed object too, with the object's user
|
||||
/// space in `scale`, `origin` and `axes`; one past what the effect measures is reported and left out.
|
||||
#[test]
|
||||
fn other_filters_are_kept_or_reported() {
|
||||
let (d, w) =
|
||||
@@ -530,8 +531,32 @@ fn other_filters_are_kept_or_reported() {
|
||||
assert!(w.is_empty(), "{w:?}");
|
||||
let fx = effects(&d);
|
||||
assert_eq!((fx.len(), fx[0].id.as_str(), &fx[0].params["name"]), (1, "svg.filter", &json!("t")));
|
||||
assert!(fx[0].params.get("axes").is_none(), "the document's axes: {:?}", fx[0].params);
|
||||
let (d, w) = open(
|
||||
r##"<defs><filter id="t"><feTurbulence baseFrequency="0.05"/></filter></defs><rect width="60" height="40" transform="rotate(30)" filter="url(#t)"/>"##,
|
||||
r##"<defs><filter id="t"><feTurbulence baseFrequency="0.05"/></filter></defs><rect width="60" height="40" transform="translate(10 20) scale(2) rotate(30)" filter="url(#t)"/>"##,
|
||||
);
|
||||
assert!(w.is_empty(), "{w:?}");
|
||||
let fx = effects(&d);
|
||||
assert_eq!(fx.len(), 1);
|
||||
let p = &fx[0].params;
|
||||
let (c, s) = (30f64.to_radians().cos(), 30f64.to_radians().sin());
|
||||
let num = |v: &serde_json::Value| v.as_f64().unwrap();
|
||||
assert!((num(&p["scale"]) - 2.0).abs() < 1e-6 && p["origin"] == json!([10.0, 20.0]), "{p}");
|
||||
let axes: Vec<f64> = p["axes"].as_array().unwrap().iter().map(num).collect();
|
||||
assert!(axes.iter().zip([c, s, -s, c]).all(|(a, b)| (a - b).abs() < 1e-6), "{axes:?}");
|
||||
// Skewed, and scaled unevenly: the axes keep both.
|
||||
let (d, w) = open(
|
||||
r##"<defs><filter id="t"><feTurbulence baseFrequency="0.05"/></filter></defs><rect width="60" height="40" transform="skewX(45)" filter="url(#t)"/><rect width="60" height="40" transform="scale(1 4)" filter="url(#t)"/>"##,
|
||||
);
|
||||
assert!(w.is_empty(), "{w:?}");
|
||||
let all: Vec<Vec<f64>> =
|
||||
art(&d).iter().flat_map(|n| &n.appearance.effects).map(|e| e.params["axes"].as_array().unwrap().iter().map(num).collect()).collect();
|
||||
assert_eq!(all.len(), 2);
|
||||
assert!(all.iter().any(|a| a.iter().zip([1.0, 0.0, 1.0, 1.0]).all(|(a, b)| (a - b).abs() < 1e-6)), "{all:?}");
|
||||
assert!(all.iter().any(|a| a.iter().zip([0.5, 0.0, 0.0, 2.0]).all(|(a, b)| (a - b).abs() < 1e-6)), "{all:?}");
|
||||
// Skewed so far that an axis would stretch past 1000 times: reported and left out.
|
||||
let (d, w) = open(
|
||||
r##"<defs><filter id="t"><feTurbulence baseFrequency="0.05"/></filter></defs><rect width="0.01" height="0.01" transform="skewX(89.95)" filter="url(#t)"/>"##,
|
||||
);
|
||||
assert!(w.iter().any(|w| w.contains("filter")), "{w:?}");
|
||||
assert!(effects(&d).is_empty());
|
||||
@@ -543,6 +568,40 @@ fn other_filters_are_kept_or_reported() {
|
||||
assert!(effects(&d).is_empty());
|
||||
}
|
||||
|
||||
/// A filter on a turned object runs in the object's user space (SVG 1.1 measures its lengths
|
||||
/// there): opened, it draws as the same filter does on the same art drawn unturned with its offset
|
||||
/// turned by hand.
|
||||
#[test]
|
||||
fn a_filter_on_a_turned_object_draws_in_its_user_space() {
|
||||
let filter = |dx: f64, dy: f64| {
|
||||
format!(
|
||||
r#"<filter id="m" x="-1" y="-1" width="3" height="3"><feOffset dx="{dx}" dy="{dy}"/><feColorMatrix type="hueRotate" values="90"/></filter>"#
|
||||
)
|
||||
};
|
||||
let turned = format!(
|
||||
r##"<defs>{}</defs><rect x="60" y="30" width="40" height="40" fill="#08f" transform="rotate(30 80 50)" filter="url(#m)"/>"##,
|
||||
filter(24.0, 0.0)
|
||||
);
|
||||
let (d, w) = open(&turned);
|
||||
assert!(w.is_empty(), "{w:?}");
|
||||
assert_eq!(effects(&d).iter().map(|e| e.id.as_str()).collect::<Vec<_>>(), ["svg.filter"]);
|
||||
// The same square, its corners turned by hand, with the offset 24 along the turned x axis.
|
||||
let (c, s) = (30f64.to_radians().cos(), 30f64.to_radians().sin());
|
||||
let corner = |x: f64, y: f64| format!("{},{}", 80.0 + c * (x - 80.0) - s * (y - 50.0), 50.0 + s * (x - 80.0) + c * (y - 50.0));
|
||||
let reference = format!(
|
||||
r##"<defs>{}</defs><polygon points="{} {} {} {}" fill="#08f" filter="url(#m)"/>"##,
|
||||
filter(24.0 * c, 24.0 * s),
|
||||
corner(60.0, 30.0),
|
||||
corner(100.0, 30.0),
|
||||
corner(100.0, 70.0),
|
||||
corner(60.0, 70.0)
|
||||
);
|
||||
let canvas = render_artboard(&d);
|
||||
// The moved square lies beyond where it was: its center, turned and moved, is near (100.8, 62).
|
||||
assert!(canvas.over_white(101, 62) != [255, 255, 255], "drawn where the offset puts it");
|
||||
assert_similar(&canvas, &resvg_render(&svg(&reference), 200, 120), 40.0, 0.02);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_filter_and_a_clip_on_one_object_filter_first() {
|
||||
let body = r##"<defs><filter id="b"><feGaussianBlur stdDeviation="4"/></filter><clipPath id="c"><rect x="60" y="40" width="40" height="40"/></clipPath></defs>
|
||||
@@ -638,6 +697,69 @@ fn filtered_rect(xml: &str) -> Document {
|
||||
d
|
||||
}
|
||||
|
||||
/// An SVG filter in a scaled, turned or skewed user space is written live: the filter's user space
|
||||
/// is a group's transform, and the art is written in document coordinates in a group inside the
|
||||
/// filter that maps it back, so its stroke keeps its width. Opened again, it is the same effect
|
||||
/// and draws as the canvas drew it.
|
||||
#[test]
|
||||
fn an_exported_turned_filter_opens_as_the_same_effect() {
|
||||
let xml = r#"<filter id="m" x="-1" y="-1" width="3" height="3"><feOffset dx="10"/><feColorMatrix type="hueRotate" values="90"/></filter>"#;
|
||||
for (scale, axes) in [(2.0, json!([0.8, 0.6, -0.6, 0.8])), (1.0, json!([1.0, 0.0, 0.5, 1.0])), (0.5, serde_json::Value::Null)] {
|
||||
let mut d = Document::new(200.0, 120.0);
|
||||
let mut n = Node::path(
|
||||
d.alloc_id(),
|
||||
shapes::rectangle(Rect::new(40.0, 20.0, 100.0, 70.0)),
|
||||
Appearance::basic(Paint::solid(Color::rgb(0.9, 0.1, 0.1)), Paint::solid(Color::BLACK), 4.0),
|
||||
);
|
||||
let mut params = json!({ "xml": xml, "scale": scale, "origin": [30.0, 10.0] });
|
||||
if !axes.is_null() {
|
||||
params["axes"] = axes.clone();
|
||||
}
|
||||
n.appearance.effects = vec![Effect { id: "svg.filter".into(), params, visible: true }];
|
||||
let l = d.layers[0].id;
|
||||
d.insert(Some(l), 0, n).unwrap();
|
||||
let out = export(&d, &ExportOptions::default());
|
||||
assert!(out.contains("<g filter=\"url(#") && !out.contains("<image"), "{out}");
|
||||
assert!(out.contains("stroke-width=\"4\""), "the stroke keeps its width: {out}");
|
||||
let (back, w) = import_with_report(&out).unwrap();
|
||||
assert!(w.is_empty(), "{w:?}");
|
||||
let fx = effects(&back);
|
||||
assert_eq!(fx.len(), 1, "{out}");
|
||||
let num = |v: &serde_json::Value| v.as_f64().unwrap();
|
||||
assert!((num(&fx[0].params["scale"]) - scale).abs() < 1e-6, "{:?}", fx[0].params);
|
||||
let origin: Vec<f64> = fx[0].params["origin"].as_array().unwrap().iter().map(num).collect();
|
||||
assert!((origin[0] - 30.0).abs() < 1e-6 && (origin[1] - 10.0).abs() < 1e-6, "{origin:?}");
|
||||
match fx[0].params.get("axes") {
|
||||
Some(got) => {
|
||||
let got: Vec<f64> = got.as_array().unwrap().iter().map(num).collect();
|
||||
let want: Vec<f64> = axes.as_array().unwrap().iter().map(num).collect();
|
||||
assert!(got.iter().zip(&want).all(|(a, b)| (a - b).abs() < 1e-6), "{got:?}");
|
||||
}
|
||||
None => assert!(axes.is_null(), "{:?}", fx[0].params),
|
||||
}
|
||||
assert_similar(&render_artboard(&d), &render_artboard(&back), 40.0, 0.02);
|
||||
}
|
||||
// A user space stretched 10,000 times along x: the inverse transform holds 0.0001, which the
|
||||
// export's three decimals would round to 0, and the art still opens at its place.
|
||||
let mut d = Document::new(200.0, 120.0);
|
||||
let mut n = Node::path(
|
||||
d.alloc_id(),
|
||||
shapes::rectangle(Rect::new(40.0, 20.0, 100.0, 70.0)),
|
||||
Appearance::basic(Paint::solid(Color::rgb(0.9, 0.1, 0.1)), Paint::None, 0.0),
|
||||
);
|
||||
let xml = r#"<filter id="k"><feColorMatrix type="hueRotate" values="90"/></filter>"#;
|
||||
let params = json!({ "xml": xml, "scale": 10.0, "axes": [1000.0, 0.0, 0.0, 1.0] });
|
||||
n.appearance.effects = vec![Effect { id: "svg.filter".into(), params, visible: true }];
|
||||
let l = d.layers[0].id;
|
||||
d.insert(Some(l), 0, n).unwrap();
|
||||
let out = export(&d, &ExportOptions::default());
|
||||
let (back, w) = import_with_report(&out).unwrap();
|
||||
assert!(w.is_empty(), "{w:?}");
|
||||
let bounds = |d: &Document| art(d).iter().find_map(|n| n.path_data().and_then(|p| p.bounds())).unwrap();
|
||||
let (a, b) = (bounds(&d), bounds(&back));
|
||||
assert!((a.x0 - b.x0).abs() < 1e-3 && (a.x1 - b.x1).abs() < 1e-3 && (a.y1 - b.y1).abs() < 1e-3, "{a:?} {b:?}: {out}");
|
||||
}
|
||||
|
||||
/// SVG 1.1 export writes an SVG filter's image reference as `xlink:href`, and it imports back.
|
||||
#[test]
|
||||
fn an_exported_filter_image_has_an_xlink_reference() {
|
||||
|
||||
@@ -52,6 +52,10 @@ pub struct OtFeatures {
|
||||
pub extra_values: [u16; EXTRA_FEATURES.len()],
|
||||
/// The value `swsh=N` gives swashes ([`Self::swash`]), as [`Self::extra_values`] for `salt`.
|
||||
pub swash_value: u16,
|
||||
/// Set a complex script (Indic, Arabic, Hebrew) glyph by glyph as the font maps its
|
||||
/// characters, with none of its layout tables: the Standard composers. Set per paragraph by
|
||||
/// layout from the paragraph's composer, not by a style.
|
||||
pub unshaped_complex: bool,
|
||||
}
|
||||
|
||||
/// The largest value a `tag=N` feature takes: a font's glyph ids are 16 bits, so is an alternate's
|
||||
@@ -94,6 +98,7 @@ impl Default for OtFeatures {
|
||||
extra: 0,
|
||||
extra_values: [0; EXTRA_FEATURES.len()],
|
||||
swash_value: 0,
|
||||
unshaped_complex: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -167,6 +172,7 @@ impl OtFeatures {
|
||||
extra: u32::MAX >> (32 - EXTRA_FEATURES.len()),
|
||||
extra_values: [0; EXTRA_FEATURES.len()],
|
||||
swash_value: 0,
|
||||
unshaped_complex: false,
|
||||
};
|
||||
change(&mut off);
|
||||
change(&mut on);
|
||||
|
||||
@@ -78,10 +78,11 @@ fn joining(c: char) -> Joining {
|
||||
}
|
||||
|
||||
/// Is the cluster of glyph `a` joined to the cluster of glyph `b` that follows it in `text`: both
|
||||
/// right to left in one face, `a`'s last character other than a mark joining the letter after it,
|
||||
/// and `b` starting with a letter that joins the one before it?
|
||||
/// right to left in one face and set as joining letters (not by a Standard composer), `a`'s last
|
||||
/// character other than a mark joining the letter after it, and `b` starting with a letter that
|
||||
/// joins the one before it?
|
||||
fn joined(text: &str, a: &SGlyph, b: &SGlyph) -> bool {
|
||||
if a.face.id() != b.face.id() || a.level != b.level || !a.level.is_rtl() || a.byte + a.len != b.byte {
|
||||
if a.face.id() != b.face.id() || a.level != b.level || !a.level.is_rtl() || a.byte + a.len != b.byte || !(a.cursive && b.cursive) {
|
||||
return false;
|
||||
}
|
||||
let last = text.get(a.byte..a.byte + a.len).and_then(|s| s.chars().rev().find(|&c| joining(c) != Joining::Transparent));
|
||||
|
||||
@@ -22,7 +22,7 @@ use crate::shape::{
|
||||
Punct, SGlyph, Tcy, cap_x_heights, hyphen_glyph, is_cjk, mark_word_ends, no_line_end, no_line_start, punct, run_face, shape_range, shape_runs,
|
||||
soft_line_start, style_metrics,
|
||||
};
|
||||
use crate::{Composer, FirstBaseline, InlineGlyph, LayoutOptions, LineInfo, ListMarker, OtFeatures, PositionedGlyph, TextLayout, VerticalAlign};
|
||||
use crate::{FirstBaseline, InlineGlyph, LayoutOptions, LineInfo, ListMarker, OtFeatures, PositionedGlyph, TextLayout, VerticalAlign};
|
||||
|
||||
mod bidi;
|
||||
mod breaking;
|
||||
@@ -229,11 +229,14 @@ impl Ctx<'_> {
|
||||
out
|
||||
}
|
||||
|
||||
/// Shape paragraph `r` (its bidi resolution `bidi`).
|
||||
fn shape_para(&self, r: Range<usize>, bidi: Option<&BidiInfo<'_>>) -> Vec<SGlyph> {
|
||||
/// Shape paragraph `r` (its bidi resolution `bidi`, its attributes `para`). A Standard composer
|
||||
/// sets a complex script glyph by glyph ([`OtFeatures::unshaped_complex`]).
|
||||
fn shape_para(&self, r: Range<usize>, bidi: Option<&BidiInfo<'_>>, para: &ParaStyle) -> Vec<SGlyph> {
|
||||
let mut v = Vec::with_capacity(r.len());
|
||||
let levels = bidi.map_or(&[][..], |b| &b.levels);
|
||||
shape_runs(self.db, self.text, r, &self.runs, &self.inlines, &self.faces, &self.opts.features, levels, &mut v);
|
||||
let standard = !self.opts.composer.unwrap_or(para.composer).shapes_complex_scripts();
|
||||
let feats = OtFeatures { unshaped_complex: standard, ..self.opts.features };
|
||||
shape_runs(self.db, self.text, r, &self.runs, &self.inlines, &self.faces, &feats, levels, &mut v);
|
||||
self.finish_shaping(&mut v, |g| self.style_at(g.byte));
|
||||
v
|
||||
}
|
||||
@@ -373,7 +376,8 @@ impl Ctx<'_> {
|
||||
// Only the glyph right after an upright glyph can continue its cluster.
|
||||
let cluster = self.upright_cluster.take();
|
||||
// Control characters (tabs) and soft hyphens draw nothing (fonts map them to .notdef).
|
||||
let blank = g.is_soft_hyphen() || g.ch.is_control() || g.ch == '\u{2028}';
|
||||
// Joiners and direction marks are format controls: no ink either, whatever glyph the font maps.
|
||||
let blank = g.is_soft_hyphen() || g.ch.is_control() || g.ch == '\u{2028}' || crate::justify::is_format_control(g.ch);
|
||||
// A colour glyph draws its art (COLR layers, an SVG document) or its image (a bitmap, or
|
||||
// COLR paints documents have no form for), not its outline; COLR, then SVG, then bitmaps.
|
||||
// Art in the text's colours takes the run's fill (black when it isn't a colour) and
|
||||
|
||||
@@ -395,8 +395,29 @@ pub(super) fn word_width(g: &[SGlyph], i: usize, line_end: &[f64], kinsoku: Kins
|
||||
if end >= g.len() { set(w, trailing, ink) } else { w }
|
||||
}
|
||||
|
||||
/// Whether the cluster `j..end` is drawn last, at the right end, of the left-to-right line of
|
||||
/// glyphs `i..end`: the line's glyphs are reordered by their levels (UAX #9 L2), with each tab and
|
||||
/// the spaces before it at the paragraph's level (L1).
|
||||
fn drawn_last(g: &[SGlyph], i: usize, j: usize, end: usize) -> bool {
|
||||
let line = g.get(i..end).unwrap_or_default();
|
||||
let mut levels: Vec<unicode_bidi::Level> = line.iter().map(|h| h.level).collect();
|
||||
let mut before_tab = false;
|
||||
for (level, h) in levels.iter_mut().zip(line).rev() {
|
||||
if h.ch == '\t' && h.len > 0 {
|
||||
before_tab = true;
|
||||
} else if !h.is_space() {
|
||||
before_tab = false;
|
||||
}
|
||||
if before_tab {
|
||||
*level = unicode_bidi::Level::ltr();
|
||||
}
|
||||
}
|
||||
unicode_bidi::BidiInfo::reorder_visual(&levels).last().is_some_and(|&k| i + k >= j)
|
||||
}
|
||||
|
||||
/// Greedy break: returns (end glyph index, hyphenated) for a line starting at `i` of `width`.
|
||||
/// With burasagari, a comma or full stop that doesn't fit ends the line, hanging outside it.
|
||||
/// With burasagari, a comma or full stop that doesn't fit ends the line, hanging outside it,
|
||||
/// unless No Break or Bunri-Kinshi keeps characters after it on its line.
|
||||
/// `hyphenate` holds the paragraph's Hyphenation options and the Hyphenation Zone in force when
|
||||
/// the line may hyphenate a word; a line whose text before the overflowing word already ends
|
||||
/// within the zone breaks before that word. A tab is as wide as it is set: up to its next stop
|
||||
@@ -416,7 +437,9 @@ pub(super) fn word_width(g: &[SGlyph], i: usize, line_end: &[f64], kinsoku: Kins
|
||||
/// line holds a glyph with a negative advance and has been wider than `width` in the order of its
|
||||
/// text, it reads at most [`MAX_DRAWN_CHECKS_STEPPING_BACK`] legal breaks further, and a forced
|
||||
/// line break right after the last of them, and ends at the latest of the breaks read that fits as
|
||||
/// drawn.
|
||||
/// drawn. Such a line with a tab hangs a burasagari mark only when the mark is drawn at its right
|
||||
/// end in the visual order of the line's levels ([`drawn_last`]) and the line before the mark fits
|
||||
/// as drawn.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub(super) fn break_line(
|
||||
text: &str,
|
||||
@@ -543,8 +566,24 @@ pub(super) fn break_line(
|
||||
let measured = if tabbed && fits.is_some() { (ink + cluster_ink).max(stops_reached) } else { x + cluster_width };
|
||||
overflowed |= tabbed && fits.is_some() && j > first && !gl.is_space() && x + cluster_width - end_credit > width + EPS;
|
||||
if j > first && !gl.is_space() && measured - end_credit > width + EPS {
|
||||
// It ends the line with the spaces after it.
|
||||
if burasagari != Burasagari::None && hangs(gl) && kinsoku_allows(g, cluster_end - 1, kinsoku) {
|
||||
// It ends the line with the spaces after it, when the mark is all the characters kept
|
||||
// together (the line's last character is the mark, which is what hangs). Once the line
|
||||
// holds a tab and is measured as drawn, the mark hangs only where it is drawn at the
|
||||
// line's right end (its cluster is last in the line's visual order, [`drawn_last`]) and
|
||||
// the line before it fits as drawn with no line-end trim on its last glyph; otherwise the
|
||||
// line ends at a legal break that fits as drawn.
|
||||
let alone = g[j..cluster_end].iter().all(|h| h.byte == gl.byte);
|
||||
let hangs_as_drawn = || match fits.filter(|_| tabbed) {
|
||||
None => true,
|
||||
Some(fits) => {
|
||||
let mut body = j;
|
||||
while body > i && g[body - 1].is_space() {
|
||||
body -= 1;
|
||||
}
|
||||
drawn_last(g, i, j, cluster_end) && line_end_credit(g, line_end, body) == 0.0 && fits(j, false)
|
||||
}
|
||||
};
|
||||
if burasagari != Burasagari::None && hangs(gl) && alone && kinsoku_allows(g, cluster_end - 1, kinsoku) && hangs_as_drawn() {
|
||||
let mut end = cluster_end;
|
||||
while g.get(end).is_some_and(SGlyph::is_space) {
|
||||
end += 1;
|
||||
|
||||
@@ -8,9 +8,9 @@ use super::vertical::{
|
||||
EM_CENTER, MojikumiRules, align_shift, compress_punctuation, dot_quarter, glyph_em, halve_punctuation, punct_half, space_japanese_and_latin,
|
||||
};
|
||||
use super::{
|
||||
Affine, BidiInfo, Burasagari, CharStyle, Composer, Ctx, EPS, Flex, Justify, Kinsoku, KinsokuShoriType, LeadingModel, LineFit, LineInfo,
|
||||
ListMarker, ParaStyle, Params, Point, Punct, Range, SGlyph, SingleWordJustify, TextObject, apply_desired, cap_x_heights, compose, fit_line,
|
||||
hyphen_glyph, is_cjk, is_word_space, kashida, mark_word_ends, no_line_end, no_line_start, style_metrics,
|
||||
Affine, BidiInfo, Burasagari, CharStyle, Ctx, EPS, Flex, Justify, Kinsoku, KinsokuShoriType, LeadingModel, LineFit, LineInfo, ListMarker,
|
||||
ParaStyle, Params, Point, Punct, Range, SGlyph, SingleWordJustify, TextObject, apply_desired, cap_x_heights, compose, fit_line, hyphen_glyph,
|
||||
is_cjk, is_word_space, kashida, mark_word_ends, no_line_end, no_line_start, style_metrics,
|
||||
};
|
||||
use crate::justify::is_format_control;
|
||||
use crate::shape::{keep_inseparable_pairs, keep_korean_words};
|
||||
@@ -62,7 +62,7 @@ fn compose_para(
|
||||
// The tab of a list marker is on the first line, with the marker, and has a fixed width.
|
||||
let has_tab = sg.iter().any(|g| g.ch == '\t' && g.len > 0);
|
||||
let has_soft_break = sg.iter().any(|g| g.ch == '\u{2028}');
|
||||
if composer != Composer::EveryLine
|
||||
if composer.is_single_line()
|
||||
|| pen.regions.is_none()
|
||||
|| sg.len() < 2
|
||||
|| sg.len() > MAX_COMPOSE_GLYPHS
|
||||
@@ -247,7 +247,7 @@ fn prepare_paragraph<'a, 'text>(
|
||||
let text = cx.text;
|
||||
let bidi = para_bidi_with(text.get(pr.clone()).unwrap_or_default(), para.direction, &cx.char_directions(&pr));
|
||||
let rtl = is_rtl(bidi.as_ref());
|
||||
let mut sg = cx.shape_para(pr.clone(), bidi.as_ref());
|
||||
let mut sg = cx.shape_para(pr.clone(), bidi.as_ref(), para);
|
||||
// Thai, Lao, Khmer and Myanmar break lines between words, not at spaces.
|
||||
mark_word_ends(text.get(pr.clone()).unwrap_or_default(), pr.start, &mut sg);
|
||||
// Korean breaks between words, unless Korean Line Break Anywhere lets it break between syllables.
|
||||
@@ -321,7 +321,7 @@ fn prepare_paragraph<'a, 'text>(
|
||||
let composed = compose_para(cx, &sg, &flex, &line_end, para, pen, rtl, continued);
|
||||
// Hyphenation options: the Hyphenation Zone applies with the Single-line Composer, and the
|
||||
// Hyphen Limit counts the lines in a row that end with a hyphen.
|
||||
let zone = if cx.opts.composer.unwrap_or(para.composer) == Composer::SingleLine { para.hyphenation.zone } else { 0.0 };
|
||||
let zone = if cx.opts.composer.unwrap_or(para.composer).is_single_line() { para.hyphenation.zone } else { 0.0 };
|
||||
let hyphen_limit = usize::try_from(para.hyphenation.hyphen_limit).unwrap_or(usize::MAX);
|
||||
let mirror = mirrors_indents(para, rtl, cx.vertical);
|
||||
ParagraphData {
|
||||
@@ -474,7 +474,9 @@ fn place_flow_line(cx: &mut Ctx<'_>, pen: &mut Pen<'_>, context: &mut PlacementC
|
||||
¶.tabs,
|
||||
ind_l,
|
||||
hyphenate,
|
||||
para.burasagari,
|
||||
// A right-to-left paragraph draws a burasagari mark inside its line
|
||||
// ([`prepare_line_geometry`]): the line ends where it fits with the mark.
|
||||
if *rtl { Burasagari::None } else { para.burasagari },
|
||||
para.kinsoku,
|
||||
ty,
|
||||
*hanging,
|
||||
|
||||
@@ -422,7 +422,7 @@ pub(super) fn on_path(cx: &mut Ctx<'_>, paras: &[Range<usize>], t: &TextObject,
|
||||
let text = cx.text;
|
||||
let bidi = para_bidi_with(text.get(pr.clone()).unwrap_or_default(), para.direction, &cx.char_directions(pr));
|
||||
rtl.get_or_insert(is_rtl(bidi.as_ref()) && !cx.vertical);
|
||||
let mut glyphs = cx.shape_para(pr.clone(), bidi.as_ref());
|
||||
let mut glyphs = cx.shape_para(pr.clone(), bidi.as_ref(), t.para_at(pi));
|
||||
// Bullets and numbers: a list paragraph's text starts after its marker here too, unless
|
||||
// the paragraph continues from the frame before in its thread.
|
||||
if pi > 0 || !t.first_para_continues {
|
||||
|
||||
@@ -477,6 +477,95 @@ fn a_tabbed_line_ends_at_the_latest_break_that_fits_as_drawn() {
|
||||
assert_eq!(ended, (8, false));
|
||||
}
|
||||
|
||||
/// A tabbed line measured as drawn hangs a burasagari full stop that overflows only when the stop
|
||||
/// is drawn at the line's right end (last in the visual order of the line's levels, whatever its
|
||||
/// own level) and the line before it fits as drawn with no line-end trim on its last glyph;
|
||||
/// otherwise it ends at the latest legal break that fits as drawn.
|
||||
#[test]
|
||||
fn a_tabbed_burasagari_mark_hangs_only_at_the_drawn_end_of_a_fitting_line() {
|
||||
let text = "a \t\u{05D0} 漢。";
|
||||
let specs: Vec<_> = text.char_indices().map(|(byte, ch)| (byte, ch.len_utf8(), 10.0, ch)).collect();
|
||||
let mut glyphs = synthetic_glyphs(&specs);
|
||||
glyphs[3].level = unicode_bidi::Level::rtl();
|
||||
// The text without its tab is 60 pt wide at 。 (glyph 6), past 55 pt; kinsoku keeps 。 off a line
|
||||
// start, so the latest legal break before it ends the line before 漢 (glyph 5).
|
||||
let end = |glyphs: &[SGlyph], line_end: &[f64], fits: Option<&dyn Fn(usize, bool) -> bool>| {
|
||||
break_line(
|
||||
text,
|
||||
glyphs,
|
||||
0,
|
||||
55.0,
|
||||
&[],
|
||||
0.0,
|
||||
None,
|
||||
Burasagari::Standard,
|
||||
Kinsoku::Hard,
|
||||
KinsokuShoriType::PushOutOnly,
|
||||
false,
|
||||
false,
|
||||
line_end,
|
||||
fits,
|
||||
)
|
||||
};
|
||||
let all_fit = |_end: usize, _hyphenated: bool| true;
|
||||
assert_eq!(end(&glyphs, &[], Some(&all_fit)), (7, false), "drawn at the right end of a line that fits: 。 hangs");
|
||||
let body_too_wide = |end: usize, _hyphenated: bool| end <= 5;
|
||||
assert_eq!(end(&glyphs, &[], Some(&body_too_wide)), (5, false), "the line before 。 is too wide as drawn");
|
||||
let mut trimmed = vec![0.0; glyphs.len()];
|
||||
trimmed[5] = 2.0;
|
||||
assert_eq!(end(&glyphs, &trimmed, Some(&all_fit)), (5, false), "the line before 。 fits only with 漢 trimmed");
|
||||
let level = |n: u8| unicode_bidi::Level::new(n).unwrap_or_else(|_| panic!("level {n}"));
|
||||
glyphs[6].level = level(2);
|
||||
assert_eq!(end(&glyphs, &[], Some(&all_fit)), (7, false), "。 set left to right in right-to-left text is drawn at the right end");
|
||||
glyphs[6].level = level(1);
|
||||
assert_eq!(end(&glyphs, &[], Some(&all_fit)), (7, false), "。 alone right to left after 漢 is drawn at the right end");
|
||||
glyphs[5].level = level(1);
|
||||
assert_eq!(end(&glyphs, &[], Some(&all_fit)), (5, false), "。 right to left after 漢 in the same run is drawn inside the line");
|
||||
glyphs[6].level = level(2);
|
||||
assert_eq!(end(&glyphs, &[], Some(&all_fit)), (5, false), "。 left to right inside the right-to-left run of 漢 is drawn inside the line");
|
||||
}
|
||||
|
||||
/// A burasagari full stop that No Break keeps with the character after it does not hang: the line
|
||||
/// would end with that character, which is drawn inside the line, so it ends at an earlier break.
|
||||
#[test]
|
||||
fn a_burasagari_mark_kept_with_the_next_character_does_not_hang() {
|
||||
let text = "漢漢。漢";
|
||||
let specs: Vec<_> = text.char_indices().map(|(byte, ch)| (byte, ch.len_utf8(), 10.0, ch)).collect();
|
||||
let mut glyphs = synthetic_glyphs(&specs);
|
||||
let end = |glyphs: &[SGlyph]| {
|
||||
break_line(text, glyphs, 0, 25.0, &[], 0.0, None, Burasagari::Standard, Kinsoku::Hard, KinsokuShoriType::PushOutOnly, false, false, &[], None)
|
||||
};
|
||||
assert_eq!(end(&glyphs), (3, false), "alone, 。 overflows by 5 pt and hangs");
|
||||
glyphs[2].no_break = true;
|
||||
glyphs[3].no_break = true;
|
||||
assert_eq!(end(&glyphs), (1, false), "kept with the 漢 after it, 。 does not end the line");
|
||||
}
|
||||
|
||||
/// A line with a tab and right-to-left text pushes a closing bracket out with every Kinsoku Shori
|
||||
/// Type, where the same widths without them push it in.
|
||||
#[test]
|
||||
fn push_in_leaves_a_tabbed_right_to_left_line_to_push_out() {
|
||||
use vectorcraft_doc::{TabAlign, TabStop};
|
||||
let tabbed = "\u{05D0}\t一二三四五」六";
|
||||
let mut glyphs = full_width(tabbed);
|
||||
glyphs[0].level = unicode_bidi::Level::rtl();
|
||||
glyphs[1].adv = 2.0;
|
||||
let tabs = [TabStop { position: 12.0, align: TabAlign::Left, leader: String::new(), align_on: '.' }];
|
||||
let all_fit = |_end: usize, _hyphenated: bool| true;
|
||||
let fits: Option<&dyn Fn(usize, bool) -> bool> = Some(&all_fit);
|
||||
// 」 (glyph 7) ends 72 pt along, 5 pt past the measure: five gaps close by 1 pt each.
|
||||
let end = |ty| break_line(tabbed, &glyphs, 0, 67.0, &tabs, 0.0, None, Burasagari::None, Kinsoku::Hard, ty, false, false, &[], fits);
|
||||
for ty in [KinsokuShoriType::PushInFirst, KinsokuShoriType::PushOutFirst, KinsokuShoriType::PushOutOnly] {
|
||||
assert_eq!(end(ty), (6, false), "{ty:?}: 五 is pushed out with 」");
|
||||
}
|
||||
let plain = "ax一二三四五」六";
|
||||
let mut glyphs = full_width(plain);
|
||||
glyphs[1].adv = 2.0;
|
||||
let pushed =
|
||||
break_line(plain, &glyphs, 0, 67.0, &[], 0.0, None, Burasagari::None, Kinsoku::Hard, KinsokuShoriType::PushInFirst, false, false, &[], None);
|
||||
assert_eq!(pushed, (8, false), "without the tab and right-to-left text, 」 is pushed in");
|
||||
}
|
||||
|
||||
/// Past the breaks a tabbed line measures one by one, it ends at the latest break without a hyphen
|
||||
/// that fits as drawn, whatever the breaks with a hyphen between them measure.
|
||||
#[test]
|
||||
|
||||
@@ -128,6 +128,27 @@ pub(crate) fn joins(script: Script) -> bool {
|
||||
)
|
||||
}
|
||||
|
||||
/// Is `script` one a Standard composer leaves unshaped: Indic (conjuncts, half forms, marks placed
|
||||
/// by the font's layout tables), the joining scripts ([`joins`]: Arabic, Syriac, N'Ko, Mongolian…)
|
||||
/// and Hebrew?
|
||||
fn is_complex_script(script: Script) -> bool {
|
||||
joins(script)
|
||||
|| matches!(
|
||||
script,
|
||||
Script::Hebrew
|
||||
| Script::Devanagari
|
||||
| Script::Bengali
|
||||
| Script::Gurmukhi
|
||||
| Script::Gujarati
|
||||
| Script::Oriya
|
||||
| Script::Tamil
|
||||
| Script::Telugu
|
||||
| Script::Kannada
|
||||
| Script::Malayalam
|
||||
| Script::Sinhala
|
||||
)
|
||||
}
|
||||
|
||||
/// How `vpal` and the vertical kerning with it move an upright glyph in vertical type and change
|
||||
/// its length down the column, in points: `advance` down the column, `dx` and `dy` in glyph space
|
||||
/// (y down; `dy` is down the column once the glyph stands upright). `proportional`: `vpal` itself
|
||||
@@ -1394,7 +1415,13 @@ fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFe
|
||||
let source_runs = &(source_runs.start + first..source_runs.start + last);
|
||||
let text_seg = &text[range.clone()];
|
||||
// The segment's script: that of its first character of a script of its own.
|
||||
let cursive = text_seg.chars().map(|c| c.script()).find(|s| !matches!(s, Script::Common | Script::Inherited)).is_some_and(joins);
|
||||
let first_script = text_seg.chars().map(|c| c.script()).find(|s| !matches!(s, Script::Common | Script::Inherited));
|
||||
// A Standard composer sets a complex script glyph by glyph (no layout tables, nominal glyphs).
|
||||
// shortcut: decided for the whole segment by its first strong script, as `cursive` is; segments
|
||||
// already split where the script changes.
|
||||
let unshaped = feats.unshaped_complex && first_script.is_some_and(is_complex_script);
|
||||
// Unshaped letters don't join, so they are not bent along a path as joined ones are.
|
||||
let cursive = first_script.is_some_and(joins) && !unshaped;
|
||||
let full = st.size.max(0.0);
|
||||
// Superscript/subscript and small capitals shrink the glyphs; line metrics keep the full size.
|
||||
let (_, pos_shift) = st.position.scale_shift(full);
|
||||
@@ -1475,7 +1502,7 @@ fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFe
|
||||
.and_then(|l| l.parse::<harfrust::Language>().ok());
|
||||
let mut shaped = Shaped::default();
|
||||
let Shaped { raw, proportional, vpal, chars, unkerned } = &mut shaped;
|
||||
let hb_shaped = face.hb().map(|hb| {
|
||||
let hb_shaped = face.hb().filter(|_| !unshaped).map(|hb| {
|
||||
let shaper = face.shaper.shaper(&hb).instance(face.instance.as_ref()).build();
|
||||
// The baseline and character-level pass use exactly the same resolved features.
|
||||
// Alternate positioning passes still resolve their own features, with `more` last.
|
||||
@@ -1591,7 +1618,8 @@ fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFe
|
||||
}
|
||||
});
|
||||
if hb_shaped.is_none() {
|
||||
// Fallback: nominal glyphs and hmtx advances, no shaping.
|
||||
// Fallback: nominal glyphs and hmtx advances, no shaping (also a complex script under a
|
||||
// Standard composer).
|
||||
if let Some(f) = face.skrifa() {
|
||||
let cmap = f.charmap();
|
||||
let gm = f.glyph_metrics(Size::unscaled(), face.location());
|
||||
@@ -1600,8 +1628,14 @@ fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFe
|
||||
let c = st.digits.map(c);
|
||||
let chars: Vec<char> = if upper { c.to_uppercase().collect() } else { vec![c] };
|
||||
for u in chars {
|
||||
let g = cmap.map(u).unwrap_or_default();
|
||||
let adv = gm.advance_width(g).unwrap_or(face.upem as f32 * 0.5);
|
||||
// Format characters (joiners, direction marks) have no glyph of their own in most
|
||||
// fonts, and the shaper hides them: draw the space's glyph with no advance.
|
||||
let (g, adv) = if crate::justify::is_format_control(u) {
|
||||
(cmap.map(' ').unwrap_or_default(), 0.0)
|
||||
} else {
|
||||
let g = cmap.map(u).unwrap_or_default();
|
||||
(g, gm.advance_width(g).unwrap_or(face.upem as f32 * 0.5))
|
||||
};
|
||||
raw.push((g.to_u32(), cl, adv.round() as i32, 0, 0));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -534,7 +534,8 @@ pub fn half_form_font(half: bool) -> Option<Vec<u8>> {
|
||||
pub const CONJUNCT_FAMILY: &str = "Conjuncttest Sans";
|
||||
|
||||
/// A test-only cmap over bundled Source Sans 3: Devanagari Ka uses K, the halant uses a period and
|
||||
/// the vowel sign I (drawn before its syllable) uses i. The `GSUB` table's `dev2` script has an
|
||||
/// the vowel sign I (drawn before its syllable) uses i; Gujarati Ka, virama and vowel sign I use the
|
||||
/// same glyphs. The `GSUB` table's `dev2` and `gjr2` scripts have an
|
||||
/// `aalt` single substitution of K by k and a `salt` one of K by i, which list k and the vowel
|
||||
/// sign's glyph as alternates of Ka, and a `half` ligature of K and the period into k (Ka's half
|
||||
/// form). Family [`CONJUNCT_FAMILY`]. `None` when it can't be built.
|
||||
@@ -549,7 +550,7 @@ pub fn conjunct_font() -> Option<Vec<u8>> {
|
||||
const BASE: &[u8] = include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf");
|
||||
let font = skrifa::FontRef::new(BASE).ok()?;
|
||||
let charmap = font.charmap();
|
||||
let mapping = [('क', 'K'), ('\u{094D}', '.'), ('\u{093F}', 'i')];
|
||||
let mapping = [('क', 'K'), ('\u{094D}', '.'), ('\u{093F}', 'i'), ('ક', 'K'), ('\u{0ACD}', '.'), ('\u{0ABF}', 'i')];
|
||||
let mappings = mapping.into_iter().map(|(c, source)| Some((c, write_fonts::types::GlyphId::new(charmap.map(source)?.to_u32()))));
|
||||
let cmap = Cmap::from_mappings(mappings.collect::<Option<Vec<_>>>()?).ok()?;
|
||||
let family = CONJUNCT_FAMILY;
|
||||
@@ -574,7 +575,8 @@ pub fn conjunct_font() -> Option<Vec<u8>> {
|
||||
SubstitutionLookup::Ligature(Lookup::new(Default::default(), vec![half])),
|
||||
SubstitutionLookup::Single(Lookup::new(Default::default(), vec![salt.into()])),
|
||||
]);
|
||||
let scripts = ScriptList::new(vec![ScriptRecord::new(Tag::new(b"dev2"), Script::new(Some(LangSys::new(vec![0, 1, 2])), vec![]))]);
|
||||
let langsys = || Script::new(Some(LangSys::new(vec![0, 1, 2])), vec![]);
|
||||
let scripts = ScriptList::new(vec![ScriptRecord::new(Tag::new(b"dev2"), langsys()), ScriptRecord::new(Tag::new(b"gjr2"), langsys())]);
|
||||
builder.add_table(&Gsub::new(scripts, features, lookups)).ok()?;
|
||||
for r in font.table_directory.table_records() {
|
||||
let tag = Tag::new(&r.tag().to_be_bytes());
|
||||
|
||||
@@ -10,6 +10,7 @@ mod bidi;
|
||||
mod bitmaps;
|
||||
mod colr;
|
||||
mod combos;
|
||||
mod composers;
|
||||
mod composite;
|
||||
mod devanagari;
|
||||
mod embed;
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
//! The four composers: the Middle Eastern & South Asian ones shape complex scripts with the font's
|
||||
//! layout tables, the Standard ones set them glyph by glyph as the font maps their characters.
|
||||
//! Uses a font built in code ([`conjunct_font`]): Ka K, halant a period and vowel sign I i, in
|
||||
//! Devanagari and Gujarati, with a `half` ligature of K and the period into k.
|
||||
use crate::test_fonts::{CONJUNCT_FAMILY, conjunct_font, source_sans_gid};
|
||||
use crate::*;
|
||||
use kurbo::Point;
|
||||
use vectorcraft_doc::{CharStyle, Composer, TextObject};
|
||||
|
||||
/// Ka, halant, Ka, vowel sign I in Devanagari, then in Gujarati.
|
||||
const DEVANAGARI: &str = "क\u{94D}क\u{93F}";
|
||||
const GUJARATI: &str = "ક\u{ACD}ક\u{ABF}";
|
||||
|
||||
fn db() -> FontDb {
|
||||
let db = FontDb::with_font_dirs(vec![]);
|
||||
db.add_font(conjunct_font().expect("the test font builds"));
|
||||
db
|
||||
}
|
||||
|
||||
fn object(text: &str, composer: Composer) -> TextObject {
|
||||
let st = CharStyle { font_family: CONJUNCT_FAMILY.into(), font_style: "Regular".into(), size: 20.0, ..CharStyle::default() };
|
||||
let mut t = TextObject::point(Point::ZERO, text, st);
|
||||
t.para.composer = composer;
|
||||
t
|
||||
}
|
||||
|
||||
/// The glyph ids drawn for `text` with `composer`, and each glyph's source cluster length.
|
||||
fn drawn(db: &FontDb, text: &str, composer: Composer) -> Vec<(u32, usize)> {
|
||||
layout(db, &object(text, composer)).glyphs.iter().map(|g| (g.gid, g.len)).collect()
|
||||
}
|
||||
|
||||
fn g(c: char) -> u32 {
|
||||
u32::from(source_sans_gid(c).expect("a Source Sans glyph"))
|
||||
}
|
||||
|
||||
/// Under the ME&SA composers the conjunct forms (the vowel sign I drawn before its syllable and Ka's
|
||||
/// half form, in Devanagari and in Gujarati); under the Standard ones each character
|
||||
/// has its own glyph, in text order, as the font maps it.
|
||||
#[test]
|
||||
fn standard_composers_set_indic_text_glyph_by_glyph() {
|
||||
let db = db();
|
||||
let ids = |v: Vec<(u32, usize)>| v.into_iter().map(|(gid, _)| gid).collect::<Vec<_>>();
|
||||
for composer in [Composer::SingleLine, Composer::EveryLine] {
|
||||
assert_eq!(ids(drawn(&db, DEVANAGARI, composer)), [g('i'), g('k'), g('K')], "{composer:?} Devanagari");
|
||||
assert_eq!(ids(drawn(&db, GUJARATI, composer)), [g('i'), g('k'), g('K')], "{composer:?} Gujarati");
|
||||
}
|
||||
for composer in [Composer::StandardSingleLine, Composer::StandardEveryLine] {
|
||||
let plain = [g('K'), g('.'), g('K'), g('i')];
|
||||
let devanagari = drawn(&db, DEVANAGARI, composer);
|
||||
assert_eq!(ids(devanagari.clone()), plain, "{composer:?} Devanagari");
|
||||
assert_eq!(ids(drawn(&db, GUJARATI, composer)), plain, "{composer:?} Gujarati");
|
||||
assert!(devanagari.iter().all(|&(_, len)| len == 3), "each glyph is one character's own cluster: {devanagari:?}");
|
||||
}
|
||||
}
|
||||
|
||||
/// The composer is per paragraph: of two paragraphs of the same text, each is shaped by its own.
|
||||
#[test]
|
||||
fn each_paragraph_follows_its_own_composer() {
|
||||
let db = db();
|
||||
let mut t = object(&format!("{DEVANAGARI}\n{DEVANAGARI}"), Composer::EveryLine);
|
||||
let standard = vectorcraft_doc::ParaStyle { composer: Composer::StandardEveryLine, ..t.para.clone() };
|
||||
t.set_paragraph_styles(vec![t.para.clone(), standard]);
|
||||
let l = layout(&db, &t);
|
||||
let second = DEVANAGARI.len() + 1;
|
||||
let of = |from: usize, to: usize| l.glyphs.iter().filter(|g| (from..to).contains(&g.byte) && g.len > 0).map(|g| g.gid).collect::<Vec<_>>();
|
||||
assert_eq!(of(0, second), [g('i'), g('k'), g('K')], "ME&SA paragraph");
|
||||
assert_eq!(of(second, second + DEVANAGARI.len()), [g('K'), g('.'), g('K'), g('i')], "Standard paragraph");
|
||||
}
|
||||
|
||||
/// Layout's composer override ([`LayoutOptions::composer`]) decides the shaping too.
|
||||
#[test]
|
||||
fn the_layout_composer_override_decides_the_shaping() {
|
||||
let db = db();
|
||||
let t = object(DEVANAGARI, Composer::EveryLine);
|
||||
let with = |c| layout_with(&db, &t, &LayoutOptions { composer: Some(c), ..Default::default() }).glyphs.len();
|
||||
assert_eq!((with(Composer::SingleLine), with(Composer::StandardSingleLine)), (3, 4));
|
||||
}
|
||||
|
||||
/// Standard composers break lines as the ME&SA ones do (`is_single_line`), and old files' composers
|
||||
/// keep their meaning.
|
||||
#[test]
|
||||
fn composers_split_into_breaking_and_shaping() {
|
||||
use Composer::*;
|
||||
for (c, single, shapes) in
|
||||
[(SingleLine, true, true), (EveryLine, false, true), (StandardSingleLine, true, false), (StandardEveryLine, false, false)]
|
||||
{
|
||||
assert_eq!((c.is_single_line(), c.shapes_complex_scripts()), (single, shapes), "{c:?}");
|
||||
assert_eq!(c.with_breaking(single), c, "{c:?}");
|
||||
assert_eq!(
|
||||
(c.with_breaking(!single).is_single_line(), c.with_breaking(!single).shapes_complex_scripts()),
|
||||
(!single, shapes),
|
||||
"{c:?} toggled"
|
||||
);
|
||||
}
|
||||
assert_eq!(Composer::default(), EveryLine, "new type and old documents are ME&SA Every-line");
|
||||
}
|
||||
|
||||
/// A joiner or non-joiner has no glyph in most fonts and the shaper hides it; a Standard composer
|
||||
/// draws it as no width at all, not as a missing-glyph box.
|
||||
#[test]
|
||||
fn standard_composers_give_format_characters_no_width() {
|
||||
let db = db();
|
||||
let text = "क\u{200C}क";
|
||||
for composer in [Composer::StandardSingleLine, Composer::StandardEveryLine] {
|
||||
let l = layout(&db, &object(text, composer));
|
||||
let widths: Vec<f64> = l.glyphs.iter().map(|g| g.advance).collect();
|
||||
assert_eq!(widths.len(), 3, "{composer:?}: {widths:?}");
|
||||
assert_eq!(widths[1], 0.0, "{composer:?}: the non-joiner takes no room: {widths:?}");
|
||||
assert!(widths[0] > 0.0 && widths[2] > 0.0, "{composer:?}: {widths:?}");
|
||||
// The test font maps no space: the control must still draw nothing (not glyph 0's outline).
|
||||
assert!(l.glyphs[1].outline.elements().is_empty(), "{composer:?}: the non-joiner has no ink");
|
||||
}
|
||||
}
|
||||
@@ -293,3 +293,38 @@ fn burasagari_counts_the_hung_start() {
|
||||
assert!((quote.origin.x + quote.advance).abs() < EPS, "the quote hangs: {:?}", quote.origin);
|
||||
assert!((comma.origin.x + comma.advance - 100.0).abs() < EPS, "、 inside, on the edge: {:?} {}", comma.origin, comma.advance);
|
||||
}
|
||||
|
||||
/// A right-to-left paragraph draws a burasagari full stop inside its line, so the line breaks where
|
||||
/// it fits with the stop: in a frame too narrow for the whole line by half the stop, the line ends
|
||||
/// after the first word and nothing is drawn past the frame.
|
||||
#[test]
|
||||
fn right_to_left_burasagari_keeps_the_line_inside_the_frame() {
|
||||
use vectorcraft_doc::{Burasagari, Kinsoku, ParaDirection};
|
||||
const EPS: f64 = 1e-6;
|
||||
let text = "\u{05D0}\u{05D1} \u{05D2}\u{05D3}\u{3002}";
|
||||
let lay = |width: f64| {
|
||||
let mut t = area(text, 20.0, Rect::new(0.0, 0.0, width, 400.0), Justify::Auto);
|
||||
t.para.direction = Some(ParaDirection::RightToLeft);
|
||||
t.para.burasagari = Burasagari::Standard;
|
||||
t.para.kinsoku = Kinsoku::Hard;
|
||||
let l = layout(db(), &t);
|
||||
(t, l)
|
||||
};
|
||||
let (_, wide) = lay(1000.0);
|
||||
assert_eq!(wide.lines.len(), 1);
|
||||
let full: f64 = wide.glyphs.iter().map(|g| g.advance).sum();
|
||||
let Some(stop) = wide.glyphs.iter().find(|g| g.byte == text.len() - '\u{3002}'.len_utf8()) else {
|
||||
panic!("。 is set as a glyph of its own");
|
||||
};
|
||||
let (t, l) = lay(full - stop.advance / 2.0);
|
||||
assert!(!l.overflow);
|
||||
assert_eq!(l.lines.len(), 2, "the line ends after the first word");
|
||||
for (li, gs) in inked(&t, &l) {
|
||||
// A right-to-left line's trailing space is set at its left, outside the aligned text.
|
||||
for g in gs.into_iter().filter(|g| !is_space(ch(&t, g))) {
|
||||
let c = ch(&t, g);
|
||||
assert!(g.origin.x >= li.avail.0 - EPS, "{c:?} starts at {} before {}", g.origin.x, li.avail.0);
|
||||
assert!(g.origin.x + g.advance <= li.avail.1 + EPS, "{c:?} ends at {} past {}", g.origin.x + g.advance, li.avail.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1457,7 +1457,7 @@ fn touching_contours_keep_their_parts_and_holes() {
|
||||
#[test]
|
||||
fn an_open_subpath_closes_straight_whether_or_not_contours_meet() {
|
||||
let open = vectorcraft_geom::SubPath {
|
||||
anchors: vec![
|
||||
anchors: vectorcraft_geom::anchors![
|
||||
vectorcraft_geom::Anchor {
|
||||
p: Point::new(0.0, 0.0),
|
||||
h_in: Point::new(0.0, -50.0),
|
||||
@@ -1505,7 +1505,7 @@ fn flat_far_and_too_large_merges() {
|
||||
assert!(close(area(&cap), 200.0, 1e-3), "joined, not lost");
|
||||
// Handles count too: a lobe whose handles reach 1.3e8 widens the boolean's snapping to 1.85e-6.
|
||||
let lobe = vectorcraft_geom::SubPath {
|
||||
anchors: vec![
|
||||
anchors: vectorcraft_geom::anchors![
|
||||
vectorcraft_geom::Anchor {
|
||||
p: Point::new(0.0, 1000.0),
|
||||
h_in: Point::new(0.0, 1000.0),
|
||||
@@ -1604,7 +1604,7 @@ fn meets_within_twice_the_boolean_tolerance() {
|
||||
// What the boolean is given decides the tolerance: an open subpath's end handles (closed
|
||||
// straight) and a one-anchor subpath (skipped) don't widen it.
|
||||
let ends = vectorcraft_geom::SubPath {
|
||||
anchors: vec![
|
||||
anchors: vectorcraft_geom::anchors![
|
||||
vectorcraft_geom::Anchor {
|
||||
p: Point::new(0.0, 0.0),
|
||||
h_in: Point::new(1e9, 0.0),
|
||||
@@ -1620,7 +1620,8 @@ fn meets_within_twice_the_boolean_tolerance() {
|
||||
],
|
||||
closed: false,
|
||||
};
|
||||
let speck = vectorcraft_geom::SubPath { anchors: vec![vectorcraft_geom::Anchor::corner(Point::new(1e9, 1e9))], closed: true };
|
||||
let speck =
|
||||
vectorcraft_geom::SubPath { anchors: vectorcraft_geom::anchors![vectorcraft_geom::Anchor::corner(Point::new(1e9, 1e9))], closed: true };
|
||||
let quiet = PathData::new(vec![ends, speck]);
|
||||
assert_eq!(rings::touch(&rings::closed_straight(&quiet)), 1e-6);
|
||||
// A closing-side handle at either end alone is enough to close the subpath straight.
|
||||
@@ -1653,7 +1654,7 @@ fn the_merged_rings_are_turned_as_a_whole() {
|
||||
#[test]
|
||||
fn a_one_anchor_subpath_builds_nothing() {
|
||||
let loop_ = vectorcraft_geom::SubPath {
|
||||
anchors: vec![vectorcraft_geom::Anchor {
|
||||
anchors: vectorcraft_geom::anchors![vectorcraft_geom::Anchor {
|
||||
p: Point::new(0.0, 0.0),
|
||||
h_in: Point::new(-20.0, 30.0),
|
||||
h_out: Point::new(20.0, 30.0),
|
||||
|
||||
@@ -178,10 +178,10 @@ impl Tool for ExtendPathTool {
|
||||
let (k, n) = (end.sp.anchors.len(), ext.anchors.len());
|
||||
// From the old end on; a stretched last curve (no anchor added) shows whole.
|
||||
let from = if n > k { k - 1 } else { n.saturating_sub(2) };
|
||||
let tail = if end.start { ext.anchors.get(..n - from) } else { ext.anchors.get(from..) };
|
||||
let tail = if end.start { ext.anchors.get_range(..n - from) } else { ext.anchors.get_range(from..) };
|
||||
if let Some(tail) = tail {
|
||||
let mut bp = vectorcraft_geom::BezPath::new();
|
||||
SubPath::new(tail.to_vec(), false).to_bezpath_into(&mut bp);
|
||||
SubPath::new(tail, false).to_bezpath_into(&mut bp);
|
||||
out.push(Overlay::Path { path: bp, color: GREY, width: 1.0, dashed: true });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -478,9 +478,9 @@ impl SmartPenTool {
|
||||
} else {
|
||||
straighten_segment(&mut sp, prev);
|
||||
}
|
||||
let tail = sp.anchors.get(prev..)?;
|
||||
let tail = sp.anchors.get_range(prev..)?;
|
||||
let mut bp = BezPath::new();
|
||||
SubPath::new(tail.to_vec(), false).to_bezpath_into(&mut bp);
|
||||
SubPath::new(tail, false).to_bezpath_into(&mut bp);
|
||||
Some(bp)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -547,7 +547,7 @@ fn simplify(sp: &mut SubPath, tol: f64, region: Rect) {
|
||||
None => out[0].h_in = h_in,
|
||||
}
|
||||
}
|
||||
sp.anchors = out;
|
||||
sp.anchors = out.into();
|
||||
}
|
||||
|
||||
/// Apply a liquify stroke (its dabs, at the brush's intensity) to `path`. `salt` decorrelates
|
||||
|
||||
@@ -607,7 +607,7 @@ fn a_drag_from_the_first_anchor_always_closes() {
|
||||
fn alt_mid_close_keeps_the_turned_outgoing_handle() {
|
||||
use vectorcraft_geom::{Anchor, SubPath};
|
||||
let anchors = vec![Anchor::smooth(Point::new(100.0, 300.0), Point::new(150.0, 300.0)), Anchor::corner(Point::new(200.0, 200.0))];
|
||||
let (mut d, id, s) = drawing(SubPath { anchors, closed: false });
|
||||
let (mut d, id, s) = drawing(SubPath::new(anchors, false));
|
||||
let p = paint();
|
||||
let mut t = PenTool { drawing: true, ..PenTool::default() };
|
||||
assert_eq!(t.pointer(&cx(&d, &s, &p), &PointerEvent::new(PointerKind::Down, 100.0, 300.0)), close_press(id, Point::new(100.0, 300.0)));
|
||||
@@ -634,7 +634,7 @@ fn alt_mid_close_keeps_the_turned_outgoing_handle() {
|
||||
fn space_moves_the_closing_anchor() {
|
||||
use vectorcraft_geom::{Anchor, SubPath};
|
||||
let anchors = vec![Anchor::smooth(Point::new(100.0, 300.0), Point::new(150.0, 300.0)), Anchor::corner(Point::new(200.0, 200.0))];
|
||||
let (mut d, id, s) = drawing(SubPath { anchors, closed: false });
|
||||
let (mut d, id, s) = drawing(SubPath::new(anchors, false));
|
||||
let p = paint();
|
||||
let mut t = PenTool { drawing: true, ..PenTool::default() };
|
||||
assert_eq!(t.pointer(&cx(&d, &s, &p), &PointerEvent::new(PointerKind::Down, 100.0, 300.0)), close_press(id, Point::new(100.0, 300.0)));
|
||||
|
||||
@@ -84,7 +84,7 @@ fn fills(paths: &[TracedPath]) -> Vec<TracedPath> {
|
||||
continue;
|
||||
}
|
||||
if sp.closed && marks.iter().all(|&m| m) {
|
||||
runs.push(SubPath::new(sp.anchors.clone(), true));
|
||||
runs.push(sp.clone());
|
||||
continue;
|
||||
}
|
||||
// Start after an unmarked segment, so that a run across the subpath's first anchor
|
||||
|
||||
@@ -54,6 +54,9 @@ log = { workspace = true }
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||
craft-ui = { workspace = true, features = ["native-windows"] }
|
||||
craft-update = { workspace = true }
|
||||
# The local date and time the status bar's Date and Time readout shows (`chrono::Local`). Already in
|
||||
# Cargo.lock with the time-zone crates `clock` uses.
|
||||
chrono = { workspace = true, features = ["clock"] }
|
||||
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
# `now_ms` (src/lib.rs) reads the page's `performance.now()` with this crate in the web build. It is
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user