mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 17:05:55 +01:00
Merge main into feat/live-paint-bucket-multi-click
This commit is contained in:
commit
67fd1cd127
223 files changed
+13876
-2734
No files matched your search
@@ -31,3 +31,8 @@ jobs:
|
||||
require-craft-fonts: true
|
||||
craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
|
||||
run-package-check: true
|
||||
# The test builds of this workspace's largest crates (engine, ui-egui) need more than the
|
||||
# VM's 12 GB when two compile at once: the build was killed (exit 137) every night with
|
||||
# four jobs and again with two. One rustc at a time; it still uses every core.
|
||||
cargo-build-extra-args: "-j 1"
|
||||
cargo-test-extra-args: "-j 1"
|
||||
Generated
+12
@@ -1043,6 +1043,17 @@ dependencies = [
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-metafile"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=6d620e971e820b517b11a99cad040ebac670e1e2#6d620e971e820b517b11a99cad040ebac670e1e2"
|
||||
dependencies = [
|
||||
"encoding_rs",
|
||||
"image",
|
||||
"kurbo 0.13.1",
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-pdf"
|
||||
version = "0.1.0"
|
||||
@@ -6681,6 +6692,7 @@ dependencies = [
|
||||
name = "vectorcraft-metafile"
|
||||
version = "0.24.1"
|
||||
dependencies = [
|
||||
"craft-metafile",
|
||||
"image",
|
||||
"kurbo 0.13.1",
|
||||
"vectorcraft-brush",
|
||||
|
||||
@@ -31,6 +31,8 @@ craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "6d620e971e
|
||||
craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "6d620e971e820b517b11a99cad040ebac670e1e2" }
|
||||
# DXF tags, reader and writer (craft-libs#778, #926, #927).
|
||||
craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "6d620e971e820b517b11a99cad040ebac670e1e2" }
|
||||
# WMF, EMF and EMF+ reader (craft-libs#778).
|
||||
craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "6d620e971e820b517b11a99cad040ebac670e1e2" }
|
||||
craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "e98299546f5c5c3c22388d16507f8b5e61a5f280", features = ["egui"] }
|
||||
# internal
|
||||
vectorcraft-geom = { path = "crates/geom" }
|
||||
|
||||
@@ -1008,6 +1008,33 @@ pub fn has_brush(n: &Node) -> bool {
|
||||
n.appearance.items.iter().any(|i| matches!(i, AppearanceItem::Stroke(s) if s.brush.is_some() && s.visible))
|
||||
}
|
||||
|
||||
/// How far brush art can paint past the visual box of `n`: `16 × w + 8`, where `w` is the widest
|
||||
/// stroke of `n` (at least 1), when `n` has a visible brushed stroke with a paint; 0 when it has
|
||||
/// none, as a brushed stroke without a paint draws no brush art. This is the room the renderer and
|
||||
/// the exports leave for brush art when they cull.
|
||||
pub fn reach(n: &Node) -> f64 {
|
||||
let paints = |i: &AppearanceItem| matches!(i, AppearanceItem::Stroke(s) if s.visible && s.brush.is_some() && !s.paint.is_none());
|
||||
if !n.appearance.items.iter().any(paints) {
|
||||
return 0.0;
|
||||
}
|
||||
let w = n.appearance.items.iter().filter_map(|i| if let AppearanceItem::Stroke(s) = i { Some(s.width) } else { None }).fold(1.0, f64::max);
|
||||
16.0 * w + 8.0
|
||||
}
|
||||
|
||||
/// The largest [`reach`] of `n` and of the objects in it: the members of its groups, layers and
|
||||
/// live objects. Of a group or layer with a clipping path only the clipping path counts, as the
|
||||
/// clip keeps its members' brush art inside it. A compound path counts its own strokes only, as
|
||||
/// it is painted with its own appearance and not its paths'. Symbol art is not looked into
|
||||
/// ([`vectorcraft_doc::SymbolBoxes::with_brush_art`] measures it).
|
||||
pub fn reach_within(n: &Node) -> f64 {
|
||||
let members = match &n.kind {
|
||||
NodeKind::Group { children, clip: true } | NodeKind::Layer { children, clip: true, .. } => children.get(..1).unwrap_or_default(),
|
||||
NodeKind::Compound { .. } => &[],
|
||||
_ => n.children().map_or(&[][..], |c| &c[..]),
|
||||
};
|
||||
members.iter().map(|c| reach_within(c)).fold(reach(n), f64::max)
|
||||
}
|
||||
|
||||
/// Expand a brushed path: a group of [the path with its fills and unbrushed strokes (if any
|
||||
/// paint remains), the brush art…]. Ids are 0 (the caller re-ids). `None` if not brushed.
|
||||
pub fn expand(doc: &Document, n: &Node) -> Option<Node> {
|
||||
|
||||
+440
-16
@@ -19,11 +19,11 @@
|
||||
use std::f64::consts::PI;
|
||||
use std::sync::Arc;
|
||||
|
||||
use vectorcraft_color::{Color, Gradient, GradientPaint, GradientStop, Paint};
|
||||
use vectorcraft_color::{Color, Gradient, GradientMethod, GradientPaint, GradientSpread, GradientStop, Paint};
|
||||
use vectorcraft_geom::kurbo::{ParamCurve, ParamCurveArclen, ParamCurveDeriv};
|
||||
use vectorcraft_geom::{Affine, Anchor, BezPath, FillRule, PathData, Point, Rect, SubPath, Vec2};
|
||||
|
||||
use crate::appearance::{AngleProfile, Appearance, AppearanceItem, Dash, PressureProfile, StrokeLayer, WidthProfile};
|
||||
use crate::appearance::{AngleProfile, Appearance, AppearanceItem, Dash, PressureProfile, StrokeGradientMode, StrokeLayer, WidthProfile};
|
||||
use crate::live::{BlendOrientation, BlendSpacing, BlendSpec};
|
||||
use crate::node::{Node, NodeId, NodeKind};
|
||||
use crate::text::TextObject;
|
||||
@@ -79,7 +79,11 @@ fn solid_gradient(c: Color, swatch: Option<&str>, tint: f32, like: &Gradient) ->
|
||||
/// of the two stops around `t` at the tint and plates between theirs (unlinked when they differ),
|
||||
/// as [`Gradient::sample_with`] walks.
|
||||
fn link_at(g: &Gradient, t: f32) -> (Option<String>, f32, Option<[f32; 4]>) {
|
||||
let stops = &g.stops;
|
||||
link_in(&g.stops, t)
|
||||
}
|
||||
|
||||
/// [`link_at`] of a gradient's `stops`.
|
||||
fn link_in(stops: &[GradientStop], t: f32) -> (Option<String>, f32, Option<[f32; 4]>) {
|
||||
let link = |s: &GradientStop| (s.swatch.clone(), s.tint, s.plates);
|
||||
let Some(first) = stops.first() else { return (None, 1.0, None) };
|
||||
if t <= first.offset {
|
||||
@@ -103,15 +107,32 @@ fn link_at(g: &Gradient, t: f32) -> (Option<String>, f32, Option<[f32; 4]>) {
|
||||
stops.last().map_or((None, 1.0, None), link)
|
||||
}
|
||||
|
||||
/// `g` with its stops at `offsets`, each painting what `g` paints there (midpoints centred).
|
||||
/// How close two places a gradient changes are for [`common_stops`] to give them one stop (two
|
||||
/// where either gradient steps there: two of its stops at the same offset).
|
||||
const STEP: f32 = 1e-4;
|
||||
|
||||
/// `g` with its stops at `offsets`, each painting what `g` paints there (midpoints centred). An
|
||||
/// offset given twice is a step: the second stop paints what `g` steps to there (the last of its
|
||||
/// stops at one offset within [`STEP`] of it), or what it paints there when it does not step.
|
||||
fn resample_stops(g: &Gradient, offsets: &[f32]) -> Gradient {
|
||||
let mut out = g.clone();
|
||||
out.stops = offsets
|
||||
.iter()
|
||||
.map(|&o| {
|
||||
let (color, opacity) = g.sample_keep_model(o);
|
||||
let (swatch, tint, plates) = link_at(g, o);
|
||||
GradientStop { opacity, swatch, tint, plates, ..GradientStop::new(o, color) }
|
||||
.enumerate()
|
||||
.map(|(i, &o)| {
|
||||
let after = i.checked_sub(1).and_then(|j| offsets.get(j)) == Some(&o);
|
||||
let stepped =
|
||||
if after { g.stops.windows(2).rfind(|w| w[0].offset == w[1].offset && (w[0].offset - o).abs() < STEP).map(|w| &w[1]) } else { None };
|
||||
match stepped {
|
||||
Some(s) => {
|
||||
GradientStop { opacity: s.opacity, swatch: s.swatch.clone(), tint: s.tint, plates: s.plates, ..GradientStop::new(o, s.color) }
|
||||
}
|
||||
None => {
|
||||
let (color, opacity) = g.sample_keep_model(o);
|
||||
let (swatch, tint, plates) = link_at(g, o);
|
||||
GradientStop { opacity, swatch, tint, plates, ..GradientStop::new(o, color) }
|
||||
}
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
out
|
||||
@@ -130,7 +151,7 @@ fn gradient_breaks(g: &Gradient, out: &mut Vec<f32>) {
|
||||
}
|
||||
|
||||
/// Two gradients of one kind with the same number of stops: as they are when the counts match,
|
||||
/// else both resampled at every place either changes.
|
||||
/// else both resampled at every place either changes, with two stops where either steps.
|
||||
fn common_stops(a: &Gradient, b: &Gradient) -> Option<(Gradient, Gradient)> {
|
||||
if a.kind != b.kind {
|
||||
return None;
|
||||
@@ -146,8 +167,22 @@ fn common_stops(a: &Gradient, b: &Gradient) -> Option<(Gradient, Gradient)> {
|
||||
gradient_breaks(b, &mut offs);
|
||||
offs.retain(|o| o.is_finite());
|
||||
offs.sort_by(f32::total_cmp);
|
||||
offs.dedup_by(|x, y| (*x - *y).abs() < 1e-4);
|
||||
Some((resample_stops(a, &offs), resample_stops(b, &offs)))
|
||||
offs.dedup_by(|x, y| (*x - *y).abs() < STEP);
|
||||
let mut steps: Vec<f32> =
|
||||
[a, b].into_iter().flat_map(|g| g.stops.windows(2).filter(|w| w[1].offset == w[0].offset).map(|w| w[0].offset)).collect();
|
||||
steps.sort_by(f32::total_cmp);
|
||||
let mut at = Vec::with_capacity(offs.len() + steps.len());
|
||||
let mut k = 0;
|
||||
for o in offs {
|
||||
at.push(o);
|
||||
while steps.get(k).is_some_and(|&s| s <= o - STEP) {
|
||||
k += 1;
|
||||
}
|
||||
if steps.get(k).is_some_and(|&s| (s - o).abs() < STEP) {
|
||||
at.push(o);
|
||||
}
|
||||
}
|
||||
Some((resample_stops(a, &at), resample_stops(b, &at)))
|
||||
}
|
||||
|
||||
fn lerp_gradient(a: &GradientPaint, b: &GradientPaint, t: f32) -> Option<GradientPaint> {
|
||||
@@ -627,12 +662,128 @@ fn reoriented<V: Copy>(points: &[(f64, V)], o: Orient, at: impl Fn(f64) -> V, wr
|
||||
out
|
||||
}
|
||||
|
||||
/// A stroke read along its subpath turned as `o` says: its width profile (whose sides swap when
|
||||
/// reversed), pen pressure, tilt, bearing and rotation. Its arrowheads stay as they are.
|
||||
fn reorient_stroke(s: &mut StrokeLayer, o: Orient) {
|
||||
/// Gradient `g` laid along a closed subpath that now starts at fraction `s` of its length: the
|
||||
/// part from `s` on runs first, then the part before it, stepping where the old start now falls.
|
||||
/// The stops follow its colors as [`Gradient::span`] reads them, mixed linearly, and run once.
|
||||
/// One of `g`'s own stops keeps its swatch link (each stop of a step its own), and a stop between
|
||||
/// two of them the link [`link_at`] reads there.
|
||||
fn gradient_from(g: &Gradient, s: f32) -> Gradient {
|
||||
// A hue gradient that reflects unrolls through its curve, whose stops have no links: the links
|
||||
// come from its own stops unrolled as a Classic gradient's, which keep them.
|
||||
let hue_reflect = g.is_spread() && g.spread == GradientSpread::Reflect && g.method.is_hue();
|
||||
let classic = hue_reflect.then(|| Gradient { method: GradientMethod::Classic, ..g.clone() });
|
||||
let g = g.unrolled();
|
||||
let mut own = classic.as_ref().map_or_else(|| g.stops.clone(), |c| c.unrolled().stops.clone());
|
||||
own.sort_by(|a, b| a.offset.total_cmp(&b.offset));
|
||||
let mut stops = Vec::new();
|
||||
// The part from `s` to the end runs first, then the part up to `s`.
|
||||
for (from, to, at) in [(s, 1.0, 0.0), (0.0, s, 1.0 - s)] {
|
||||
// The first of `own` not yet matched: the parts' stops run in order, so the links are
|
||||
// found in one pass.
|
||||
let mut j = 0;
|
||||
for (k, st) in g.span(from, to).stops.into_iter().enumerate() {
|
||||
let p = from + (to - from) * st.offset;
|
||||
while own.get(j).is_some_and(|o| o.offset <= p - STEP) {
|
||||
j += 1;
|
||||
}
|
||||
let same = |i: usize| own.get(i).is_some_and(|o| o.color == st.color && o.opacity == st.opacity);
|
||||
let near = (j..own.len()).take_while(|&i| own.get(i).is_some_and(|o| o.offset < p + STEP));
|
||||
let mut hit = near.clone().find(|&i| same(i));
|
||||
// A part starting on a step starts with the color after it, so its first stop takes
|
||||
// the link of the step's last stop of that color.
|
||||
if k == 0
|
||||
&& let Some(at) = hit.and_then(|i| own.get(i)).map(|o| o.offset)
|
||||
{
|
||||
hit = near.filter(|&i| own.get(i).is_some_and(|o| o.offset == at) && same(i)).last().or(hit);
|
||||
}
|
||||
let (swatch, tint, plates) = match hit.and_then(|i| own.get(i).map(|o| (i, o))) {
|
||||
Some((i, o)) => {
|
||||
j = i + 1;
|
||||
(o.swatch.clone(), o.tint, o.plates)
|
||||
}
|
||||
None => link_in(own.get(j.saturating_sub(1)..(j + 1).min(own.len())).unwrap_or_default(), p),
|
||||
};
|
||||
stops.push(GradientStop { offset: at + (to - from) * st.offset, swatch, tint, plates, ..st });
|
||||
}
|
||||
}
|
||||
Gradient { stops, method: GradientMethod::Classic, spread: GradientSpread::Pad, repeats: 1, ..g.into_owned() }
|
||||
}
|
||||
|
||||
/// Dash pattern `d` read along subpaths of lengths `lens` turned as `o` says. Reversed, the
|
||||
/// pattern runs backwards: from the start of a dash, that is the dash and then the other entries
|
||||
/// in reverse order. Exact dashes also start where the turned subpaths now start. The pattern
|
||||
/// restarts on every subpath at the one offset, so the offset moves only when every subpath needs
|
||||
/// the same one (as subpaths whose lengths differ by whole periods do); dashes fitted to corners
|
||||
/// ignore the offset, which stays as it is. A dash pattern starts once per subpath, so on a closed
|
||||
/// subpath started elsewhere the dashes match the key's as far as its own start, and past it run
|
||||
/// on without restarting there.
|
||||
fn reorient_dash(d: &mut Dash, o: Orient, lens: &[f64]) {
|
||||
if !d.is_dashed() || !d.offset.is_finite() {
|
||||
return;
|
||||
}
|
||||
let mut pat = d.pattern.clone();
|
||||
// An odd pattern repeats twice per period (dash, gap, dash / gap, dash, gap).
|
||||
if pat.len() % 2 == 1 {
|
||||
pat.extend_from_within(..);
|
||||
}
|
||||
let period: f64 = pat.iter().sum();
|
||||
// Where along the key's own subpath the turned one starts (a closed one wraps round). A
|
||||
// closed one reversed from its own start runs back from its end.
|
||||
let at = match (o.closed, o.seam()) {
|
||||
(true, s) if s == 0.0 && o.reversed => 1.0,
|
||||
(true, s) => s,
|
||||
(false, _) => o.start,
|
||||
};
|
||||
let first = pat.first().copied().unwrap_or(0.0);
|
||||
let offset = |len: f64| if o.reversed { first - at * len - d.offset } else { d.offset + at * len };
|
||||
let offsets: Vec<f64> = lens.iter().map(|&len| offset(len)).collect();
|
||||
let agree = offsets.first().is_some_and(|&a| {
|
||||
offsets.iter().all(|&b| {
|
||||
let r = (b - a).rem_euclid(period);
|
||||
r.is_finite() && r.min(period - r) <= 1e-6
|
||||
})
|
||||
});
|
||||
if o.reversed {
|
||||
if let Some(rest) = pat.get_mut(1..) {
|
||||
rest.reverse();
|
||||
}
|
||||
d.pattern = pat;
|
||||
}
|
||||
if let Some(&off) = offsets.first().filter(|_| agree && !d.align_corners) {
|
||||
d.offset = off;
|
||||
}
|
||||
}
|
||||
|
||||
/// A key's stroke read along its subpaths turned as `o` says (`lens`: their lengths): its width
|
||||
/// profile (whose sides swap when reversed), pen pressure, tilt, bearing and rotation, its dashes,
|
||||
/// a gradient along the path or across it (whose sides swap when reversed). Its arrowheads stay as
|
||||
/// they are.
|
||||
fn reorient_stroke(s: &mut StrokeLayer, o: Orient, lens: &[f64]) {
|
||||
if o.is_identity() {
|
||||
return;
|
||||
}
|
||||
if let Some(d) = &mut s.dash {
|
||||
reorient_dash(d, o, lens);
|
||||
}
|
||||
let along = s.gradient_mode == StrokeGradientMode::Along;
|
||||
if s.path_gradient().is_some()
|
||||
&& let Paint::Gradient(g) = &mut s.paint
|
||||
{
|
||||
let start = along && o.seam() > 0.0;
|
||||
if start {
|
||||
g.gradient = gradient_from(&g.gradient, o.seam() as f32);
|
||||
}
|
||||
// Stops that reflect an even number of times read the same either way.
|
||||
let (spread, runs) = g.gradient.painted_spread();
|
||||
let reverse = o.reversed && !(spread == GradientSpread::Reflect && runs % 2 == 0);
|
||||
if reverse {
|
||||
g.gradient.reverse();
|
||||
}
|
||||
if start || reverse {
|
||||
// The turned gradient is no longer the swatch's.
|
||||
g.swatch = None;
|
||||
}
|
||||
}
|
||||
let same = |v: f64| v;
|
||||
if let Some(p) = &mut s.profile {
|
||||
let mut pts: Vec<(f64, (f64, f64))> = p.points.iter().map(|&(t, l, r)| (t, (l, r))).collect();
|
||||
@@ -676,9 +827,11 @@ fn reorient_strokes(n: &mut Node, o: Orient) {
|
||||
if o.is_identity() {
|
||||
return;
|
||||
}
|
||||
let lens: Vec<f64> =
|
||||
node_path(n).map(|(p, ..)| p.subpaths.iter().map(|sp| PathData::new(vec![sp.clone()]).length()).collect()).unwrap_or_default();
|
||||
for it in n.appearance.items.iter_mut() {
|
||||
if let AppearanceItem::Stroke(s) = it {
|
||||
reorient_stroke(s, o);
|
||||
reorient_stroke(s, o, &lens);
|
||||
if o.reversed && !o.closed {
|
||||
std::mem::swap(&mut s.start_arrow, &mut s.end_arrow);
|
||||
s.arrow_scale = (s.arrow_scale.1, s.arrow_scale.0);
|
||||
@@ -709,9 +862,11 @@ pub fn reverse_stroke_records(n: &mut Node, reversed: &[bool]) {
|
||||
if o.is_identity() || !turns.all(|t| t.same_turn(&o)) {
|
||||
return;
|
||||
}
|
||||
let lens: Vec<f64> =
|
||||
node_path(n).map(|(p, ..)| p.subpaths.iter().map(|sp| PathData::new(vec![sp.clone()]).length()).collect()).unwrap_or_default();
|
||||
for it in n.appearance.items.iter_mut() {
|
||||
if let AppearanceItem::Stroke(s) = it {
|
||||
reorient_stroke(s, o);
|
||||
reorient_stroke(s, o, &lens);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2791,6 +2946,275 @@ mod tests {
|
||||
assert!((rot(0.5, 0.499) - rot(0.5, 0.501)).abs() < 1.0, "no jump where the key started: {:?}", stroke(&blend.at(0.5)).rotation);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stroke_gradients_and_dashes_turn_with_a_key_path_started_elsewhere() {
|
||||
let keyed = |path: PathData, edit: &dyn Fn(&mut StrokeLayer)| {
|
||||
let mut ap = Appearance::default();
|
||||
ap.set_stroke(Paint::solid(Color::BLACK));
|
||||
if let Some(s) = ap.stroke_mut() {
|
||||
edit(s);
|
||||
}
|
||||
Node::path(NodeId(1), path, ap)
|
||||
};
|
||||
let stroke = |n: &Node| n.appearance.stroke().cloned().unwrap_or_else(|| panic!("a stroke"));
|
||||
// How light the stroke's gradient is at `u` (0 black, 3 white).
|
||||
let light = |s: &StrokeLayer, u: f32| match &s.paint {
|
||||
Paint::Gradient(g) => g.gradient.sample(u).0.to_rgb().iter().sum::<f32>(),
|
||||
p => panic!("a gradient: {p:?}"),
|
||||
};
|
||||
// Whether dash pattern `d` draws a dash `at` this far along its subpath.
|
||||
let dash_at = |d: &Dash, at: f64| {
|
||||
let p = if d.pattern.len() % 2 == 1 { d.pattern.repeat(2) } else { d.pattern.clone() };
|
||||
let mut x = (at + d.offset).rem_euclid(p.iter().sum());
|
||||
for (i, v) in p.iter().enumerate() {
|
||||
if x < *v {
|
||||
return i % 2 == 0;
|
||||
}
|
||||
x -= v;
|
||||
}
|
||||
false
|
||||
};
|
||||
let graded = |mode: StrokeGradientMode| {
|
||||
move |s: &mut StrokeLayer| {
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(Gradient::default())));
|
||||
s.gradient_mode = mode;
|
||||
s.dash = Some(Dash { pattern: vec![1.0, 2.0, 3.0, 1.5], offset: 0.75, align_corners: false });
|
||||
}
|
||||
};
|
||||
// An open key clicked at its last anchor runs the other way: a gradient along it or across
|
||||
// it (whose sides swap) runs the other way too, and its dashes are read from its end.
|
||||
let line = |x: f64| PathData::single(SubPath::polyline(&[Point::new(x, 0.0), Point::new(x + 13.0, 0.0)], false));
|
||||
let plain = keyed(line(0.0), &|_| {});
|
||||
for mode in [StrokeGradientMode::Along, StrokeGradientMode::Across] {
|
||||
let key = keyed(line(100.0), &graded(mode));
|
||||
let s = stroke(&Lerp::new(&plain, &key, (None, Some(1))).at(1.0));
|
||||
assert!(light(&s, 0.0) < 0.01 && light(&s, 1.0) > 2.99, "{mode:?}: {:?}", s.paint);
|
||||
let (own, d) = (stroke(&key).dash.unwrap_or_default(), s.dash.unwrap_or_default());
|
||||
for k in 1..130 {
|
||||
let u = k as f64 / 10.0 + 0.03;
|
||||
assert_eq!(dash_at(&d, u), dash_at(&own, 13.0 - u), "at {u}: {d:?}");
|
||||
}
|
||||
}
|
||||
// A closed key started half way round starts its gradient along it there too, stepping
|
||||
// where its own start was, and its dashes start there.
|
||||
let square = |x: f64| shapes::rectangle(Rect::new(x, 0.0, x + 10.0, 10.0));
|
||||
let key = keyed(square(100.0), &graded(StrokeGradientMode::Along));
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &key, (Some(0), Some(2))).at(1.0));
|
||||
for (u, want) in [(0.0, 1.5), (0.25, 0.75), (0.499, 0.0), (0.501, 3.0), (0.75, 2.25), (1.0, 1.5)] {
|
||||
assert!((light(&s, u) - want).abs() < 0.02, "at {u}: {} for {want}: {:?}", light(&s, u), s.paint);
|
||||
}
|
||||
let (own, d) = (stroke(&key).dash.unwrap_or_default(), s.dash.unwrap_or_default());
|
||||
for k in 1..200 {
|
||||
let u = k as f64 / 10.0 + 0.03;
|
||||
assert_eq!(dash_at(&d, u), dash_at(&own, u + 20.0), "at {u}: {d:?}");
|
||||
}
|
||||
// A closed key that winds the other way runs the other way from the same anchor: its
|
||||
// dashes are read back from the end of its own subpath, which is 40 long and not a whole
|
||||
// number of periods.
|
||||
let wound = |x: f64| {
|
||||
let mut p = square(x);
|
||||
for sp in &mut p.subpaths {
|
||||
sp.reverse();
|
||||
}
|
||||
p
|
||||
};
|
||||
let back = keyed(wound(100.0), &graded(StrokeGradientMode::Along));
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &back, (Some(0), Some(0))).at(1.0));
|
||||
let (own, d) = (stroke(&back).dash.unwrap_or_default(), s.dash.unwrap_or_default());
|
||||
for k in 1..400 {
|
||||
let u = k as f64 / 10.0 + 0.03;
|
||||
assert_eq!(dash_at(&d, u), dash_at(&own, 40.0 - u), "at {u}: {d:?}");
|
||||
}
|
||||
// Stops that reflect twice read the same either way; a link to a swatch stays.
|
||||
let reflected = keyed(line(100.0), &|s| {
|
||||
let mut g = Gradient { spread: GradientSpread::Reflect, repeats: 2, ..Gradient::default() };
|
||||
g.stops[1].swatch = Some("Ink".into());
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
assert_eq!(stroke(&Lerp::new(&plain, &reflected, (None, Some(1))).b).paint, stroke(&reflected).paint);
|
||||
let linked = keyed(square(100.0), &|s| {
|
||||
let mut g = Gradient::default();
|
||||
g.stops[1].swatch = Some("Ink".into());
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &linked, (Some(0), Some(2))).b);
|
||||
let links = match &s.paint {
|
||||
Paint::Gradient(g) => g.gradient.stops.iter().filter(|st| st.swatch.as_deref() == Some("Ink")).map(|st| st.offset).collect::<Vec<_>>(),
|
||||
p => panic!("a gradient: {p:?}"),
|
||||
};
|
||||
assert!(links.contains(&0.5), "the stop the old start ended on keeps its link: {:?}", s.paint);
|
||||
// Each stop of a step keeps its own link.
|
||||
let step = keyed(square(100.0), &|s| {
|
||||
let mut g = Gradient::default();
|
||||
let (mut before, mut after) = (GradientStop::new(0.25, Color::BLACK), GradientStop::new(0.25, Color::WHITE));
|
||||
(before.swatch, after.swatch) = (Some("Ink".into()), Some("Paper".into()));
|
||||
g.stops.splice(1..1, [before, after]);
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &step, (Some(0), Some(2))).b);
|
||||
let links = match &s.paint {
|
||||
Paint::Gradient(g) => g.gradient.stops.iter().filter(|st| st.offset == 0.75).map(|st| st.swatch.clone()).collect::<Vec<_>>(),
|
||||
p => panic!("a gradient: {p:?}"),
|
||||
};
|
||||
assert_eq!(links, vec![Some("Ink".into()), Some("Paper".into())], "{:?}", s.paint);
|
||||
// A step of one color between two swatches, where the turned subpath now starts: the
|
||||
// start takes the link after the step and the end the link before it.
|
||||
let seam_step = keyed(square(100.0), &|s| {
|
||||
let mut g = Gradient::default();
|
||||
let gray = Color::rgb8(128, 128, 128);
|
||||
let (mut before, mut after) = (GradientStop::new(0.5, gray), GradientStop::new(0.5, gray));
|
||||
(before.swatch, after.swatch) = (Some("Ink".into()), Some("Paper".into()));
|
||||
g.stops.splice(1..1, [before, after]);
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &seam_step, (Some(0), Some(2))).b);
|
||||
let ends = match &s.paint {
|
||||
Paint::Gradient(g) => (g.gradient.stops.first().map(|st| st.swatch.clone()), g.gradient.stops.last().map(|st| st.swatch.clone())),
|
||||
p => panic!("a gradient: {p:?}"),
|
||||
};
|
||||
assert_eq!(ends, (Some(Some("Paper".into())), Some(Some("Ink".into()))), "{:?}", s.paint);
|
||||
// A hue gradient that reflects keeps its links on the repeated stops.
|
||||
let hue = keyed(square(100.0), &|s| {
|
||||
let (mut red, mut blue) =
|
||||
(GradientStop::new(0.0, Color::Rgb { r: 1.0, g: 0.0, b: 0.0 }), GradientStop::new(1.0, Color::Rgb { r: 0.0, g: 0.0, b: 1.0 }));
|
||||
(red.swatch, blue.swatch) = (Some("Ink".into()), Some("Paper".into()));
|
||||
let g = Gradient {
|
||||
method: GradientMethod::HueClockwise,
|
||||
spread: GradientSpread::Reflect,
|
||||
repeats: 2,
|
||||
..Gradient::new(vectorcraft_color::GradientKind::Linear, vec![red, blue])
|
||||
};
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &hue, (Some(0), Some(2))).b);
|
||||
let linked = |name: &str| match &s.paint {
|
||||
Paint::Gradient(g) => g.gradient.stops.iter().filter(|st| st.swatch.as_deref() == Some(name)).map(|st| st.offset).collect::<Vec<_>>(),
|
||||
p => panic!("a gradient: {p:?}"),
|
||||
};
|
||||
assert!(linked("Paper").contains(&0.0) && linked("Paper").contains(&1.0), "{:?}", s.paint);
|
||||
assert!(linked("Ink").contains(&0.5), "{:?}", s.paint);
|
||||
// Two stops of one color at one place keep their own links, in reverse in a mirrored run.
|
||||
let hue_step = keyed(square(100.0), &|s| {
|
||||
let green = Color::Rgb { r: 0.0, g: 1.0, b: 0.0 };
|
||||
let (mut before, mut after) = (GradientStop::new(0.5, green), GradientStop::new(0.5, green));
|
||||
(before.swatch, after.swatch) = (Some("Ink".into()), Some("Paper".into()));
|
||||
let stops = vec![
|
||||
GradientStop::new(0.0, Color::Rgb { r: 1.0, g: 0.0, b: 0.0 }),
|
||||
before,
|
||||
after,
|
||||
GradientStop::new(1.0, Color::Rgb { r: 0.0, g: 0.0, b: 1.0 }),
|
||||
];
|
||||
let g = Gradient {
|
||||
method: GradientMethod::HueClockwise,
|
||||
spread: GradientSpread::Reflect,
|
||||
repeats: 2,
|
||||
..Gradient::new(vectorcraft_color::GradientKind::Linear, stops)
|
||||
};
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &hue_step, (Some(0), Some(2))).b);
|
||||
// The links at `u` in order, a link repeated by the next stop listed once.
|
||||
let links_at = |u: f32| match &s.paint {
|
||||
Paint::Gradient(g) => {
|
||||
let mut links =
|
||||
g.gradient.stops.iter().filter(|st| (st.offset - u).abs() < 1e-4).filter_map(|st| st.swatch.clone()).collect::<Vec<_>>();
|
||||
links.dedup();
|
||||
links
|
||||
}
|
||||
p => panic!("a gradient: {p:?}"),
|
||||
};
|
||||
assert_eq!(links_at(0.25), vec!["Paper".to_string(), "Ink".to_string()], "{:?}", s.paint);
|
||||
assert_eq!(links_at(0.75), vec!["Ink".to_string(), "Paper".to_string()], "{:?}", s.paint);
|
||||
// Where two runs meet, each run's stops keep their own links.
|
||||
let hue_end = keyed(square(100.0), &|s| {
|
||||
let green = Color::Rgb { r: 0.0, g: 1.0, b: 0.0 };
|
||||
let (mut a, mut b) = (GradientStop::new(1.0, green), GradientStop::new(1.0, green));
|
||||
(a.swatch, b.swatch) = (Some("Ink".into()), Some("Paper".into()));
|
||||
let g = Gradient {
|
||||
method: GradientMethod::HueClockwise,
|
||||
spread: GradientSpread::Reflect,
|
||||
repeats: 2,
|
||||
..Gradient::new(vectorcraft_color::GradientKind::Linear, vec![GradientStop::new(0.0, Color::Rgb { r: 1.0, g: 0.0, b: 0.0 }), a, b])
|
||||
};
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
let s = stroke(&Lerp::new(&keyed(square(0.0), &|_| {}), &hue_end, (Some(0), Some(1))).b);
|
||||
let links_at = |u: f32| match &s.paint {
|
||||
Paint::Gradient(g) => {
|
||||
let mut links =
|
||||
g.gradient.stops.iter().filter(|st| (st.offset - u).abs() < 1e-4).filter_map(|st| st.swatch.clone()).collect::<Vec<_>>();
|
||||
links.dedup();
|
||||
links
|
||||
}
|
||||
p => panic!("a gradient: {p:?}"),
|
||||
};
|
||||
assert_eq!(links_at(0.25), vec!["Ink".to_string(), "Paper".to_string(), "Ink".to_string()], "{:?}", s.paint);
|
||||
// Blended with a gradient of other stops, the steps keep that step.
|
||||
let three = keyed(square(0.0), &|s| {
|
||||
let mut g = Gradient::default();
|
||||
g.stops.insert(1, GradientStop::new(0.5, Color::BLACK));
|
||||
s.paint = Paint::Gradient(Box::new(GradientPaint::new(g)));
|
||||
s.gradient_mode = StrokeGradientMode::Along;
|
||||
});
|
||||
let s = stroke(&Lerp::new(&three, &key, (Some(0), Some(2))).at(0.75));
|
||||
assert!(light(&s, 0.501) - light(&s, 0.499) > 1.5, "{:?}", s.paint);
|
||||
// Subpaths whose lengths call for different dash offsets keep the offset.
|
||||
let rings = |x: f64, turn: usize| {
|
||||
let mut inner = shapes::rectangle(Rect::new(x, 20.0, x + 7.0, 27.0)).subpaths.remove(0);
|
||||
inner.anchors.rotate_left(turn);
|
||||
PathData::new(vec![square(x).subpaths.remove(0), inner])
|
||||
};
|
||||
let key = keyed(rings(100.0, 2), &graded(StrokeGradientMode::Along));
|
||||
let blend = Lerp::new(&keyed(rings(0.0, 0), &|_| {}), &key, (Some(0), Some(2)));
|
||||
let turned = match &blend.shape {
|
||||
Shape::Path { pair, .. } => pair.orient.1,
|
||||
_ => panic!("a path blend"),
|
||||
};
|
||||
assert!((turned.seam() - 0.5).abs() < 1e-9, "both rings turn half way round: {turned:?}");
|
||||
let s = stroke(&blend.at(1.0));
|
||||
assert_eq!(s.dash.map(|d| d.offset), Some(0.75));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gradients_of_other_stop_counts_keep_their_steps() {
|
||||
let red = Color::Rgb { r: 1.0, g: 0.0, b: 0.0 };
|
||||
let stepped = Gradient::new(
|
||||
vectorcraft_color::GradientKind::Linear,
|
||||
vec![
|
||||
GradientStop::new(0.0, Color::WHITE),
|
||||
GradientStop::new(0.5, Color::BLACK),
|
||||
GradientStop::new(0.5, Color::WHITE),
|
||||
GradientStop::new(0.50015, red),
|
||||
GradientStop::new(1.0, Color::BLACK),
|
||||
],
|
||||
);
|
||||
let (a, b) = common_stops(&stepped, &Gradient::default()).unwrap_or_else(|| panic!("one kind"));
|
||||
let at = |g: &Gradient| g.stops.iter().map(|s| (s.offset, s.color)).collect::<Vec<_>>();
|
||||
assert_eq!(at(&a), vec![(0.0, Color::WHITE), (0.5, Color::BLACK), (0.5, Color::WHITE), (0.50015, red), (1.0, Color::BLACK)]);
|
||||
assert_eq!(b.stops.len(), 5);
|
||||
assert_eq!(b.stops.get(1).map(|s| s.color), b.stops.get(2).map(|s| s.color), "a gradient without the step paints one color there");
|
||||
// A gradient with two stops close to the other's step, but no step of its own, does not step there.
|
||||
let close = Gradient::new(
|
||||
vectorcraft_color::GradientKind::Linear,
|
||||
vec![
|
||||
GradientStop::new(0.0, Color::WHITE),
|
||||
GradientStop::new(0.5, Color::BLACK),
|
||||
GradientStop::new(0.50005, red),
|
||||
GradientStop::new(1.0, Color::BLACK),
|
||||
],
|
||||
);
|
||||
let (_, b) = common_stops(&stepped, &close).unwrap_or_else(|| panic!("one kind"));
|
||||
assert_eq!(b.stops.get(1).map(|s| s.color), Some(Color::BLACK));
|
||||
assert_eq!(b.stops.get(2).map(|s| s.color), Some(Color::BLACK), "{:?}", b.stops);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn odd_dash_blends_to_solid_with_closed_gaps() {
|
||||
let d = lerp_dash(Some(&Dash { pattern: vec![2.0, 3.0, 4.0], ..Default::default() }), None, 1.0).unwrap();
|
||||
|
||||
+466
-37
@@ -56,19 +56,114 @@ fn is_tiff(bytes: &[u8]) -> bool {
|
||||
bytes.starts_with(b"II*\0") || bytes.starts_with(b"MM\0*")
|
||||
}
|
||||
|
||||
/// The width and height of the first image of TIFF `bytes` when it has more strips or tiles than
|
||||
/// the `tiff` decoder can count: strips per plane times planes past `u32::MAX`, or tiles per plane
|
||||
/// times planes past `usize::MAX`. A file that stores one plane per channel (PlanarConfiguration 2)
|
||||
/// has a plane for each channel; other files have one. The decoder multiplies these counts without
|
||||
/// a check, which panics where overflow checks are on. Such an image, when it is at least a pixel
|
||||
/// wide, claims at least 2^32 samples.
|
||||
/// Where a tag repeats, the value giving the most strips or tiles counts. `None` for other images
|
||||
/// What [`jpeg_frames`] found in a JPEG's headers.
|
||||
enum Frames {
|
||||
/// Every frame header declares a size the check accepts, or there is none.
|
||||
Fit,
|
||||
/// The width and height of the first frame header the check refuses.
|
||||
Misfit(u16, u16),
|
||||
/// The steps ran past [`MAX_JPEG_HEADER_STEPS`].
|
||||
OverBudget,
|
||||
}
|
||||
|
||||
/// Checks the width and height each 8-bit baseline, extended or progressive frame header in the
|
||||
/// headers of a JPEG declares with `fits`. The JPEG is the bytes after its start-of-image marker:
|
||||
/// `parts[0]` followed by `parts[1]`. The headers are read as the decoder reads them, up to the
|
||||
/// first start-of-scan or end-of-image marker: every other marker is followed by its segment's
|
||||
/// length, and bytes between segments are passed over, as are fill bytes (0xFF, and 0x00 after
|
||||
/// one) before a marker. `steps` counts each byte looked at and each segment passed over.
|
||||
fn jpeg_frames(parts: [&[u8]; 2], steps: &mut u64, fits: impl Fn(u16, u16) -> bool) -> Frames {
|
||||
let byte = |i: usize| match i.checked_sub(parts[0].len()) {
|
||||
None => parts[0].get(i).copied(),
|
||||
Some(j) => parts[1].get(j).copied(),
|
||||
};
|
||||
let u16_at = |i: usize| Some(u16::from_be_bytes([byte(i)?, byte(i.checked_add(1)?)?]));
|
||||
let mut p = 0usize;
|
||||
loop {
|
||||
*steps += 1;
|
||||
if *steps > MAX_JPEG_HEADER_STEPS {
|
||||
return Frames::OverBudget;
|
||||
}
|
||||
let Some(b) = byte(p) else { return Frames::Fit };
|
||||
p += 1;
|
||||
if b != 0xFF {
|
||||
continue;
|
||||
}
|
||||
while matches!(byte(p), Some(0xFF | 0)) {
|
||||
p += 1;
|
||||
*steps += 1;
|
||||
if *steps > MAX_JPEG_HEADER_STEPS {
|
||||
return Frames::OverBudget;
|
||||
}
|
||||
}
|
||||
let Some(marker) = byte(p) else { return Frames::Fit };
|
||||
p += 1;
|
||||
if matches!(marker, 0xDA | 0xD9) {
|
||||
return Frames::Fit;
|
||||
}
|
||||
// Length (2 bytes), then for a frame header its precision, height and width.
|
||||
let Some(len) = u16_at(p) else { return Frames::Fit };
|
||||
if matches!(marker, 0xC0..=0xC2)
|
||||
&& byte(p.saturating_add(2)) == Some(8)
|
||||
&& let (Some(h), Some(w)) = (u16_at(p.saturating_add(3)), u16_at(p.saturating_add(5)))
|
||||
&& !fits(w, h)
|
||||
{
|
||||
return Frames::Misfit(w, h);
|
||||
}
|
||||
if len < 2 {
|
||||
return Frames::Fit;
|
||||
}
|
||||
p = p.saturating_add(usize::from(len));
|
||||
}
|
||||
}
|
||||
|
||||
/// Most strips or tiles the first image of a TIFF may have: VectorCraft's own limit, 1/1024 of
|
||||
/// [`crate::MAX_RASTER_ALLOC`] (524,288 in the web app, 2,097,152 on the desktop). The decoder
|
||||
/// reads an offset and a byte count of 8 bytes each for every one into memory before anything else.
|
||||
pub const MAX_TIFF_CHUNKS: u64 = crate::MAX_RASTER_ALLOC / 1024;
|
||||
|
||||
/// Most pixels the JPEG of a JPEG-compressed TIFF tile may declare when it declares more pixels
|
||||
/// than the whole image has: VectorCraft's own limit (2048 × 2048, 16 MB as CMYK).
|
||||
pub const MAX_JPEG_TILE_PIXELS: u64 = 1 << 22;
|
||||
|
||||
/// Most steps reading the JPEG headers of a TIFF's strips or tiles may take (a byte looked at, a
|
||||
/// segment passed over or a strip offset read): VectorCraft's own limit.
|
||||
const MAX_JPEG_HEADER_STEPS: u64 = 1 << 24;
|
||||
|
||||
/// The width and height of the first image of TIFF or BigTIFF `bytes` when it has more strips or
|
||||
/// tiles than the `tiff` decoder can count: strips per plane times planes past `u32::MAX`, or tiles
|
||||
/// per plane times planes past `usize::MAX`. A file that stores one plane per channel
|
||||
/// (PlanarConfiguration 2) has a plane for each channel; other files have one. The decoder
|
||||
/// multiplies these counts without a check, which panics where overflow checks are on. Such an
|
||||
/// image, when it is at least a pixel wide, claims at least 2^32 samples.
|
||||
/// It also gives them for an image with more than [`MAX_TIFF_CHUNKS`] strips or tiles, counted from
|
||||
/// its size or from the number of values its StripOffsets and StripByteCounts tags hold, or its
|
||||
/// TileOffsets and TileByteCounts tags for a tiled image. An image the decoder reads as strips (it
|
||||
/// has both strip tables and neither tile table) counts strips, and one it reads as tiles counts
|
||||
/// tiles; the decoder refuses an image with any other mix of these tags before it reads a table.
|
||||
/// For a JPEG-compressed image (Compression 7) it gives the width and height a strip's or tile's
|
||||
/// JPEG declares in a frame header (in the JPEGTables, or in the strip or tile before its first
|
||||
/// scan) when they are wider or taller than the strip or tile, or, for a tile, when they make more
|
||||
/// than [`MAX_JPEG_TILE_PIXELS`] pixels and more than the image has. The decoder allocates the
|
||||
/// pixels the JPEG declares. It gives the image's width and height when reading those headers
|
||||
/// takes more than 16,777,216 steps (a byte looked at, a segment passed over or a strip offset
|
||||
/// read), when the strip or tile offsets are of a type other than BYTE, UNDEFINED, SHORT, LONG,
|
||||
/// IFD, LONG8 or IFD8, and when the image's width and height, a striped image's RowsPerStrip or a
|
||||
/// tiled image's tile size isn't a single value of one of those types.
|
||||
/// Where a tag repeats, the value giving the most strips or tiles counts, and the JPEG check uses
|
||||
/// the last entry of a field type the decoder knows, as the decoder does. `None` for other images
|
||||
/// and for bytes that aren't a TIFF.
|
||||
pub fn oversized_tiff(bytes: &[u8]) -> Option<(u32, u32)> {
|
||||
let le = bytes.starts_with(b"II*\0");
|
||||
if !le && !bytes.starts_with(b"MM\0*") {
|
||||
let le = bytes.starts_with(b"II");
|
||||
let head = bytes.get(..4)?;
|
||||
// A BigTIFF counts and points with 8 bytes where a TIFF uses 4, so its entries are 20 bytes.
|
||||
let big = if head == b"II*\0" || head == b"MM\0*" {
|
||||
false
|
||||
} else if head == b"II+\0" || head == b"MM\0+" {
|
||||
true
|
||||
} else {
|
||||
return None;
|
||||
}
|
||||
};
|
||||
let u16_at = |at: usize| -> Option<u16> {
|
||||
let b: [u8; 2] = bytes.get(at..at.checked_add(2)?)?.try_into().ok()?;
|
||||
Some(if le { u16::from_le_bytes(b) } else { u16::from_be_bytes(b) })
|
||||
@@ -77,32 +172,71 @@ pub fn oversized_tiff(bytes: &[u8]) -> Option<(u32, u32)> {
|
||||
let b: [u8; 4] = bytes.get(at..at.checked_add(4)?)?.try_into().ok()?;
|
||||
Some(if le { u32::from_le_bytes(b) } else { u32::from_be_bytes(b) })
|
||||
};
|
||||
let ifd = usize::try_from(u32_at(4)?).ok()?;
|
||||
// (tag, the entry's single BYTE, SHORT, LONG or IFD value, which sits in the entry, or its
|
||||
// single LONG8 or IFD8 value that fits in 32 bits, which sits where the entry points)
|
||||
let entry = |i: usize| -> Option<(u16, Option<u32>)> {
|
||||
let e = ifd.checked_add(i.checked_mul(12)?.checked_add(2)?)?;
|
||||
let (ty, count, at) = (u16_at(e.checked_add(2)?)?, u32_at(e.checked_add(4)?)?, e.checked_add(8)?);
|
||||
let value = match (ty, count) {
|
||||
(1, 1) => bytes.get(at).map(|&b| u32::from(b)),
|
||||
(3, 1) => u16_at(at).map(u32::from),
|
||||
(4 | 13, 1) => u32_at(at),
|
||||
(16 | 18, 1) => {
|
||||
let at = usize::try_from(u32_at(at)?).ok()?;
|
||||
let (lo, hi) = (u32_at(at)?, u32_at(at.checked_add(4)?)?);
|
||||
let wide = if le { u64::from(hi) << 32 | u64::from(lo) } else { u64::from(lo) << 32 | u64::from(hi) };
|
||||
u32::try_from(wide).ok()
|
||||
}
|
||||
let u64_at = |at: usize| -> Option<u64> {
|
||||
let b: [u8; 8] = bytes.get(at..at.checked_add(8)?)?.try_into().ok()?;
|
||||
Some(if le { u64::from_le_bytes(b) } else { u64::from_be_bytes(b) })
|
||||
};
|
||||
let word_len: usize = if big { 8 } else { 4 };
|
||||
let word = |at: usize| if big { u64_at(at) } else { u32_at(at).map(u64::from) };
|
||||
// The bytes one value of each field type takes; 0 for types the decoder doesn't know.
|
||||
let width_of = |ty: u16| -> usize {
|
||||
match ty {
|
||||
1 | 2 | 6 | 7 => 1,
|
||||
3 | 8 => 2,
|
||||
4 | 9 | 11 | 13 => 4,
|
||||
5 | 10 | 12 | 16..=18 => 8,
|
||||
_ => 0,
|
||||
}
|
||||
};
|
||||
let ifd = usize::try_from(word(if big { 8 } else { 4 })?).ok()?;
|
||||
let entries = if big { u64_at(ifd)? } else { u64::from(u16_at(ifd)?) };
|
||||
let first = ifd.checked_add(if big { 8 } else { 2 })?;
|
||||
// (tag, field type, number of values, where the values are: in the entry when they fit in its
|
||||
// last word, otherwise where that word points)
|
||||
let entry = |i: usize| -> Option<(u16, u16, u64, Option<usize>)> {
|
||||
let e = first.checked_add(i.checked_mul(4 + 2 * word_len)?)?;
|
||||
let (tag, ty, count) = (u16_at(e)?, u16_at(e.checked_add(2)?)?, word(e.checked_add(4)?)?);
|
||||
let at = e.checked_add(4 + word_len)?;
|
||||
let fits = u64::try_from(width_of(ty)).ok()?.checked_mul(count).is_some_and(|n| n <= word_len as u64);
|
||||
let values = if fits { Some(at) } else { word(at).and_then(|p| usize::try_from(p).ok()) };
|
||||
Some((tag, ty, count, values))
|
||||
};
|
||||
// Value `i` of an entry's BYTE, UNDEFINED, SHORT, LONG, IFD, LONG8 or IFD8 values at `at`.
|
||||
let nth = |ty: u16, at: usize, i: u64| -> Option<u64> {
|
||||
let p = at.checked_add(usize::try_from(i).ok()?.checked_mul(width_of(ty))?)?;
|
||||
match ty {
|
||||
1 | 7 => bytes.get(p).map(|&b| u64::from(b)),
|
||||
3 => u16_at(p).map(u64::from),
|
||||
4 | 13 => u32_at(p).map(u64::from),
|
||||
16 | 18 => u64_at(p),
|
||||
_ => None,
|
||||
};
|
||||
Some((u16_at(e)?, value))
|
||||
}
|
||||
};
|
||||
let (mut width, mut height, mut planes, mut planar) = (0u32, 0u32, 1u32, false);
|
||||
let (mut rows, mut tile_w, mut tile_h) = (None::<u32>, None::<u32>, None::<u32>);
|
||||
// The most values a strip table and a tile table hold.
|
||||
let (mut strip_chunks, mut tile_chunks) = (0u64, 0u64);
|
||||
// The decoder keeps the last entry of a tag whose field type it knows. These are the last such
|
||||
// entries (type, count, where) of the tags `LAST` lists.
|
||||
const LAST: [u16; 11] = [256, 257, 259, 278, 322, 323, 273, 279, 324, 325, 347];
|
||||
let mut last = [None::<(u16, u64, Option<usize>)>; LAST.len()];
|
||||
let least = |was: Option<u32>, v: u32| Some(was.map_or(v, |w| w.min(v)));
|
||||
for i in 0..usize::from(u16_at(ifd)?) {
|
||||
let Some((tag, value)) = entry(i) else { break };
|
||||
let Some(v) = value else { continue };
|
||||
// The entry's single BYTE, UNDEFINED, SHORT, LONG or IFD value, or its single LONG8 or IFD8
|
||||
// value when that fits in 32 bits.
|
||||
let single = |ty: u16, count: u64, at: Option<usize>| at.filter(|_| count == 1).and_then(|at| nth(ty, at, 0)).and_then(|v| u32::try_from(v).ok());
|
||||
for i in 0..usize::try_from(entries).unwrap_or(usize::MAX) {
|
||||
let Some((tag, ty, count, at)) = entry(i) else { break };
|
||||
match tag {
|
||||
273 | 279 => strip_chunks = strip_chunks.max(count),
|
||||
324 | 325 => tile_chunks = tile_chunks.max(count),
|
||||
_ => {}
|
||||
}
|
||||
if width_of(ty) > 0
|
||||
&& let Some(slot) = LAST.iter().position(|&t| t == tag).and_then(|k| last.get_mut(k))
|
||||
{
|
||||
*slot = Some((ty, count, at));
|
||||
}
|
||||
let Some(v) = single(ty, count, at) else { continue };
|
||||
match tag {
|
||||
256 => width = width.max(v),
|
||||
257 => height = height.max(v),
|
||||
@@ -115,13 +249,87 @@ pub fn oversized_tiff(bytes: &[u8]) -> Option<(u32, u32)> {
|
||||
}
|
||||
}
|
||||
let planes = if planar { u128::from(planes) } else { 1 };
|
||||
let tiles = match (tile_w, tile_h) {
|
||||
(Some(tw @ 1..), Some(th @ 1..)) => u128::from(width.div_ceil(tw)) * u128::from(height.div_ceil(th)) * planes > usize::MAX as u128,
|
||||
_ => false,
|
||||
let tiled = match (tile_w, tile_h) {
|
||||
(Some(tw @ 1..), Some(th @ 1..)) => u128::from(width.div_ceil(tw)) * u128::from(height.div_ceil(th)) * planes,
|
||||
_ => 0,
|
||||
};
|
||||
let tiles = tiled > usize::MAX as u128;
|
||||
let rows = rows.unwrap_or(height);
|
||||
let strips = rows > 0 && u128::from(height.saturating_sub(1) / rows + 1) * planes > u128::from(u32::MAX);
|
||||
(tiles || strips).then_some((width, height))
|
||||
let striped = height.saturating_sub(1).checked_div(rows).map_or(0, |n| u128::from(n + 1) * planes);
|
||||
let strips = striped > u128::from(u32::MAX);
|
||||
if tiles || strips {
|
||||
return Some((width, height));
|
||||
}
|
||||
let last_of = |tag: u16| LAST.iter().position(|&t| t == tag).and_then(|k| last.get(k).copied().flatten());
|
||||
// The single value the decoder reads from the last entry of `tag`: `None` without one, and
|
||||
// `Some(None)` when that entry doesn't hold a single value read here.
|
||||
let value_of = |tag: u16| last_of(tag).map(|(ty, count, at)| single(ty, count, at));
|
||||
// The decoder reads strips when the image has both strip tables and neither tile table, tiles
|
||||
// in the opposite case, and refuses every other image before it reads a table.
|
||||
let layout = match [273, 279, 324, 325].map(|tag| last_of(tag).is_some()) {
|
||||
[true, true, false, false] => Some((273, striped.max(u128::from(strip_chunks)))),
|
||||
[false, false, true, true] => Some((324, tiled.max(u128::from(tile_chunks)))),
|
||||
_ => None,
|
||||
};
|
||||
let (offsets_tag, chunks) = layout?;
|
||||
if chunks > u128::from(MAX_TIFF_CHUNKS) {
|
||||
return Some((width, height));
|
||||
}
|
||||
if value_of(259) != Some(Some(7)) {
|
||||
return None;
|
||||
}
|
||||
// The JPEG check uses the sizes the decoder reads. A size it needs that isn't a single value
|
||||
// read here refuses the image.
|
||||
let (Some(Some(w_img)), Some(Some(h_img))) = (value_of(256), value_of(257)) else { return Some((width, height)) };
|
||||
let tile = offsets_tag == 324;
|
||||
// RowsPerStrip, which the decoder reads only for strips.
|
||||
let rows = if tile { Some(h_img) } else { value_of(278).unwrap_or(Some(h_img)) };
|
||||
let Some(rows) = rows else { return Some((width, height)) };
|
||||
let (tw, th) = match (value_of(322).flatten(), value_of(323).flatten()) {
|
||||
(Some(tw), Some(th)) => (tw, th),
|
||||
_ if tile => return Some((width, height)),
|
||||
_ => (0, 0),
|
||||
};
|
||||
// A strip is as wide as the image and RowsPerStrip tall (at most the image's height); a tile's
|
||||
// JPEG may be as large as the tile, which the edge tiles of the image overhang.
|
||||
let fits = |w: u16, h: u16| {
|
||||
let (w, h) = (u32::from(w), u32::from(h));
|
||||
if tile {
|
||||
let pixels = u64::from(w) * u64::from(h);
|
||||
w <= tw && h <= th && (pixels <= MAX_JPEG_TILE_PIXELS || pixels <= u64::from(w_img) * u64::from(h_img))
|
||||
} else {
|
||||
w <= w_img && h <= rows.min(h_img)
|
||||
}
|
||||
};
|
||||
// The decoder reads the JPEGTables after their start-of-image marker and without their last two
|
||||
// bytes, followed by each strip or tile after its first two bytes; without JPEGTables, each
|
||||
// strip or tile after its start-of-image marker.
|
||||
let tables = last_of(347)
|
||||
.and_then(|(_, count, at)| {
|
||||
let at = at?;
|
||||
let end = at.checked_add(usize::try_from(count).ok()?)?.min(bytes.len());
|
||||
bytes.get(at.checked_add(2)?..end.checked_sub(2)?)
|
||||
})
|
||||
.unwrap_or_default();
|
||||
let (ty, count, at) = last_of(offsets_tag)?;
|
||||
let at = at?;
|
||||
// The decoder also takes offsets of other types (a RATIONAL or ASCII value), which aren't read
|
||||
// here: such an image is refused.
|
||||
if !matches!(ty, 1 | 3 | 4 | 7 | 13 | 16 | 18) {
|
||||
return Some((width, height));
|
||||
}
|
||||
let mut steps = 0u64;
|
||||
for i in 0..count {
|
||||
steps += 1;
|
||||
let Some(at) = nth(ty, at, i).and_then(|o| usize::try_from(o).ok()) else { break };
|
||||
let part = bytes.get(at.saturating_add(2)..).unwrap_or_default();
|
||||
match jpeg_frames([tables, part], &mut steps, fits) {
|
||||
Frames::Fit => {}
|
||||
Frames::Misfit(w, h) => return Some((u32::from(w), u32::from(h))),
|
||||
Frames::OverBudget => return Some((width, height)),
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// The color type of TIFF `bytes` and its decoder; `None` for [`oversized_tiff`] images too.
|
||||
@@ -891,7 +1099,7 @@ mod tests {
|
||||
f
|
||||
};
|
||||
assert_eq!(oversized_tiff(&header(2)), Some((u32::MAX, u32::MAX)));
|
||||
assert_eq!(oversized_tiff(&header(1)), None, "one plane: (2^32 − 1)² tiles can be counted in 64 bits");
|
||||
assert_eq!(oversized_tiff(&header(1)), Some((u32::MAX, u32::MAX)), "one plane: countable, but past MAX_TIFF_CHUNKS");
|
||||
assert!(tiff(&header(2)).is_none(), "not decoded");
|
||||
}
|
||||
|
||||
@@ -933,6 +1141,227 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
/// A little-endian TIFF, or BigTIFF when `big`, holding `data` right after its header (from
|
||||
/// byte 8, or 16 in a BigTIFF), then one directory of `entries` (tag, field type, values). An
|
||||
/// entry's values sit in the entry when they fit, otherwise after the directory.
|
||||
fn tiff_file(big: bool, entries: &[(u16, u16, Vec<u64>)], data: &[u8]) -> Vec<u8> {
|
||||
let (word, head) = if big { (8, 16) } else { (4, 8) };
|
||||
let put = |f: &mut Vec<u8>, v: u64, n: usize| f.extend(&v.to_le_bytes()[..n]);
|
||||
let mut f = if big { b"II+\0\x08\0\0\0".to_vec() } else { b"II*\0".to_vec() };
|
||||
let ifd = head + data.len();
|
||||
put(&mut f, ifd as u64, word);
|
||||
f.extend(data);
|
||||
put(&mut f, entries.len() as u64, if big { 8 } else { 2 });
|
||||
let after = f.len() + entries.len() * (4 + 2 * word) + word;
|
||||
let mut tail = vec![];
|
||||
for (tag, ty, values) in entries {
|
||||
let width = match ty {
|
||||
1 | 7 => 1,
|
||||
3 => 2,
|
||||
4 => 4,
|
||||
_ => 8,
|
||||
};
|
||||
f.extend([tag.to_le_bytes(), ty.to_le_bytes()].concat());
|
||||
put(&mut f, values.len() as u64, word);
|
||||
let mut v = vec![];
|
||||
for &x in values {
|
||||
put(&mut v, x, width);
|
||||
}
|
||||
if v.len() <= word {
|
||||
v.resize(word, 0);
|
||||
f.extend(v);
|
||||
} else {
|
||||
put(&mut f, (after + tail.len()) as u64, word);
|
||||
tail.extend(v);
|
||||
}
|
||||
}
|
||||
put(&mut f, 0, word);
|
||||
f.extend(tail);
|
||||
f
|
||||
}
|
||||
|
||||
/// A JPEG of four components whose progressive frame header declares `w` × `h` pixels, with a
|
||||
/// scan header and no scan data.
|
||||
fn jpeg_header(w: u16, h: u16) -> Vec<u8> {
|
||||
let mut j = vec![0xFF, 0xD8, 0xFF, 0xC2, 0, 20, 8];
|
||||
j.extend(h.to_be_bytes());
|
||||
j.extend(w.to_be_bytes());
|
||||
j.push(4);
|
||||
for id in 1..=4 {
|
||||
j.extend([id, 0x11, 0]);
|
||||
}
|
||||
j.extend([0xFF, 0xDA, 0, 14, 4, 1, 0, 2, 0, 3, 0, 4, 0, 0, 63, 0, 0xFF, 0xD9]);
|
||||
j
|
||||
}
|
||||
|
||||
/// The directory of a 1 × 1 CMYK image with alpha, JPEG-compressed in one strip of `len` bytes
|
||||
/// at byte `at`.
|
||||
fn jpeg_strip_entries(at: u64, len: u64) -> Vec<(u16, u16, Vec<u64>)> {
|
||||
vec![
|
||||
(256, 4, vec![1]),
|
||||
(257, 4, vec![1]),
|
||||
(258, 3, vec![8; 5]),
|
||||
(259, 3, vec![7]),
|
||||
(262, 3, vec![5]),
|
||||
(273, 4, vec![at]),
|
||||
(277, 3, vec![5]),
|
||||
(278, 4, vec![1]),
|
||||
(279, 4, vec![len]),
|
||||
(338, 3, vec![2]),
|
||||
]
|
||||
}
|
||||
|
||||
/// A strip's JPEG that declares more pixels than the strip holds would have the decoder
|
||||
/// allocate them: a 1 × 1 image whose JPEG claims 16384 × 16384 is refused before any decoder
|
||||
/// opens it, in a TIFF or a BigTIFF, with fill bytes or other bytes before the frame header,
|
||||
/// and with the frame header in the JPEGTables.
|
||||
#[test]
|
||||
fn a_jpeg_strip_declaring_more_than_its_strip_is_refused() {
|
||||
let big = jpeg_header(16384, 16384);
|
||||
let file = tiff_file(false, &jpeg_strip_entries(8, big.len() as u64), &big);
|
||||
assert_eq!(oversized_tiff(&file), Some((16384, 16384)));
|
||||
assert!(tiff(&file).is_none(), "not decoded");
|
||||
let bigtiff = tiff_file(true, &jpeg_strip_entries(16, big.len() as u64), &big);
|
||||
assert_eq!(oversized_tiff(&bigtiff), Some((16384, 16384)), "BigTIFF");
|
||||
// The decoder reads the last ImageWidth and ImageLength: 1 × 1 after 16384 × 16384, in one
|
||||
// strip without RowsPerStrip.
|
||||
let mut entries = jpeg_strip_entries(8, big.len() as u64);
|
||||
entries.retain(|e| e.0 != 278);
|
||||
entries.splice(0..0, [(256, 4, vec![16384]), (257, 4, vec![16384])]);
|
||||
assert_eq!(oversized_tiff(&tiff_file(false, &entries, &big)), Some((16384, 16384)), "repeated sizes");
|
||||
// StripOffsets as a BYTE, which the decoder reads, and as a RATIONAL, which it reads as two
|
||||
// offsets.
|
||||
for (ty, expected) in [(1, (16384, 16384)), (5, (1, 1))] {
|
||||
let mut entries = jpeg_strip_entries(8, big.len() as u64);
|
||||
for e in &mut entries {
|
||||
if e.0 == 273 {
|
||||
e.1 = ty;
|
||||
}
|
||||
}
|
||||
assert_eq!(oversized_tiff(&tiff_file(false, &entries, &big)), Some(expected), "StripOffsets of type {ty}");
|
||||
}
|
||||
let one = jpeg_header(1, 1);
|
||||
assert_eq!(oversized_tiff(&tiff_file(false, &jpeg_strip_entries(8, one.len() as u64), &one)), None, "a JPEG as large as its strip");
|
||||
let wide = jpeg_header(2, 1);
|
||||
assert_eq!(oversized_tiff(&tiff_file(false, &jpeg_strip_entries(8, wide.len() as u64), &wide)), Some((2, 1)), "one pixel too wide");
|
||||
for (what, prefix) in [("fill bytes", &[0xFF, 0x00, 0xFF][..]), ("other bytes", &[0x12, 0x34][..])] {
|
||||
let mut j = big[..2].to_vec();
|
||||
j.extend(prefix);
|
||||
j.extend(&big[2..]);
|
||||
let file = tiff_file(false, &jpeg_strip_entries(8, j.len() as u64), &j);
|
||||
assert_eq!(oversized_tiff(&file), Some((16384, 16384)), "{what} before the frame header");
|
||||
}
|
||||
// The JPEGTables hold the frame header; the strip holds only the scan.
|
||||
let tables = [&big[..24], &[0xFF, 0xD9][..]].concat();
|
||||
let scan = [&[0xFF, 0xD8][..], &big[24..]].concat();
|
||||
let mut entries = jpeg_strip_entries(8 + tables.len() as u64, scan.len() as u64);
|
||||
entries.push((347, 7, tables.iter().map(|&b| u64::from(b)).collect()));
|
||||
let file = tiff_file(false, &entries, &[tables, scan].concat());
|
||||
assert_eq!(oversized_tiff(&file), Some((16384, 16384)), "frame header in the JPEGTables");
|
||||
// An encoder's 8 × 8 RGB JPEG, with its own segments before the frame header, in an
|
||||
// 8 × 8 image of one strip, and of strips 4 rows tall.
|
||||
let mut real = Vec::new();
|
||||
image::codecs::jpeg::JpegEncoder::new(&mut real).encode(&[90; 8 * 8 * 3], 8, 8, image::ExtendedColorType::Rgb8).unwrap();
|
||||
let rgb = |rows: u64| {
|
||||
let entries = [
|
||||
(256, 4, vec![8]),
|
||||
(257, 4, vec![8]),
|
||||
(258, 3, vec![8; 3]),
|
||||
(259, 3, vec![7]),
|
||||
(262, 3, vec![2]),
|
||||
(273, 4, vec![8]),
|
||||
(277, 3, vec![3]),
|
||||
(278, 4, vec![rows]),
|
||||
(279, 4, vec![real.len() as u64]),
|
||||
];
|
||||
oversized_tiff(&tiff_file(false, &entries, &real))
|
||||
};
|
||||
assert_eq!(rgb(8), None, "an encoder's JPEG as large as its strip");
|
||||
assert_eq!(rgb(4), Some((8, 8)), "an encoder's JPEG taller than its strip");
|
||||
}
|
||||
|
||||
/// A tile's JPEG may be as large as the tile, which overhangs the image, and when it is more
|
||||
/// than MAX_JPEG_TILE_PIXELS, no larger than the image.
|
||||
#[test]
|
||||
fn a_jpeg_tile_declaring_more_than_its_tile_is_refused() {
|
||||
let tiled_with = |tile: u64, j: &[u8], rows: Vec<u64>| {
|
||||
let mut entries: Vec<_> = jpeg_strip_entries(0, 0).into_iter().filter(|e| !matches!(e.0, 273 | 278 | 279)).collect();
|
||||
if !rows.is_empty() {
|
||||
entries.push((278, 4, rows));
|
||||
}
|
||||
entries.extend([(322, 4, vec![tile]), (323, 4, vec![tile]), (324, 4, vec![8]), (325, 4, vec![j.len() as u64])]);
|
||||
oversized_tiff(&tiff_file(false, &entries, j))
|
||||
};
|
||||
let tiled = |tile: u64, j: &[u8]| tiled_with(tile, j, vec![]);
|
||||
assert_eq!(tiled_with(16, &jpeg_header(16, 16), vec![1, 1]), None, "RowsPerStrip, unread in a tiled image");
|
||||
assert_eq!(tiled(16, &jpeg_header(16, 16)), None, "as large as the tile");
|
||||
assert_eq!(tiled(16, &jpeg_header(17, 16)), Some((17, 16)), "wider than the tile");
|
||||
assert_eq!(tiled(16, &jpeg_header(16, 17)), Some((16, 17)), "taller than the tile");
|
||||
assert_eq!(tiled(4096, &jpeg_header(2048, 2048)), None, "MAX_JPEG_TILE_PIXELS");
|
||||
assert_eq!(tiled(4096, &jpeg_header(2048, 2049)), Some((2048, 2049)), "past MAX_JPEG_TILE_PIXELS and the image");
|
||||
}
|
||||
|
||||
/// The decoder reads every strip's offset and byte count before anything else: an image with
|
||||
/// more than MAX_TIFF_CHUNKS strips, counted from its size or from its tables, is refused.
|
||||
#[test]
|
||||
fn tiffs_with_more_strips_than_their_tables_may_hold_are_refused() {
|
||||
let file = |height: u64, count: u32| {
|
||||
let entries = [
|
||||
(256, 4, vec![1]),
|
||||
(257, 4, vec![height]),
|
||||
(258, 3, vec![8]),
|
||||
(262, 3, vec![1]),
|
||||
(273, 4, vec![8]),
|
||||
(278, 4, vec![1]),
|
||||
(279, 4, vec![1]),
|
||||
];
|
||||
let mut f = tiff_file(false, &entries, &[0]);
|
||||
// StripOffsets' count, its values left out of the file.
|
||||
let at = 8 + 1 + 2 + 4 * 12 + 4;
|
||||
f[at..at + 4].copy_from_slice(&count.to_le_bytes());
|
||||
f
|
||||
};
|
||||
let most = MAX_TIFF_CHUNKS;
|
||||
assert_eq!(oversized_tiff(&file(most, 1)), None, "MAX_TIFF_CHUNKS rows of a strip each");
|
||||
assert_eq!(oversized_tiff(&file(most + 1, 1)), Some((1, u32::try_from(most + 1).unwrap())), "one strip more");
|
||||
assert_eq!(oversized_tiff(&file(1, u32::try_from(most).unwrap())), None, "MAX_TIFF_CHUNKS offsets");
|
||||
assert_eq!(oversized_tiff(&file(1, u32::try_from(most + 1).unwrap())), Some((1, 1)), "one offset more");
|
||||
assert!(tiff(&file(1, 1 << 25)).is_none(), "not decoded");
|
||||
// Tile sizes without tile tables: the decoder reads the strips and never counts the
|
||||
// 4,194,304 tiles of a pixel the sizes give.
|
||||
let strips_with_tile_sizes = |offsets: Option<u16>| {
|
||||
let mut entries = vec![
|
||||
(256, 4, vec![2048]),
|
||||
(257, 4, vec![2048]),
|
||||
(258, 3, vec![8]),
|
||||
(262, 3, vec![1]),
|
||||
(273, 4, vec![8]),
|
||||
(279, 4, vec![2048 * 2048]),
|
||||
(322, 4, vec![1]),
|
||||
(323, 4, vec![1]),
|
||||
];
|
||||
entries.extend(offsets.map(|tag| (tag, 4, vec![8])));
|
||||
entries.sort_by_key(|e| e.0);
|
||||
oversized_tiff(&tiff_file(false, &entries, &[0]))
|
||||
};
|
||||
assert_eq!(strips_with_tile_sizes(None), None, "a strip image with tile sizes of one pixel");
|
||||
assert_eq!(strips_with_tile_sizes(Some(324)), None, "strip and tile tables: the decoder refuses it unread");
|
||||
}
|
||||
|
||||
/// Strips whose JPEG headers take more than MAX_JPEG_HEADER_STEPS steps to read refuse the
|
||||
/// file: here every strip points at the same 1 MB without a marker.
|
||||
#[test]
|
||||
fn jpeg_strips_that_take_too_long_to_read_are_refused() {
|
||||
let file = |strips: u64| {
|
||||
let mut entries = jpeg_strip_entries(0, 0);
|
||||
entries.retain(|e| !matches!(e.0, 257 | 273 | 279));
|
||||
entries.extend([(257, 4, vec![strips]), (273, 4, vec![8; strips as usize]), (279, 4, vec![1 << 20; strips as usize])]);
|
||||
tiff_file(false, &entries, &std::iter::repeat_n(0, 1 << 20).collect::<Vec<u8>>())
|
||||
};
|
||||
assert_eq!(oversized_tiff(&file(8)), None, "about 8 million steps");
|
||||
assert_eq!(oversized_tiff(&file(17)), Some((1, 17)), "about 17 million steps");
|
||||
}
|
||||
|
||||
fn inks() -> Inks {
|
||||
Inks::new(3, 2, vec![0, 40, 100, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 255, 12, 34, 56, 78]).unwrap()
|
||||
}
|
||||
|
||||
+54
-27
@@ -379,6 +379,22 @@ pub struct SeriesPaint {
|
||||
/// Object blend mode of each path directly in the series group, as [`Self::opacity`]. Absent: Normal.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub blend: Option<vectorcraft_color::BlendMode>,
|
||||
/// Object opacity (0..1) of the series group itself, taken from the transparency set on the group. Absent: fully opaque.
|
||||
/// Graph labels keep none.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub group_opacity: Option<f32>,
|
||||
/// Object blend mode of the series group itself, as [`Self::group_opacity`]. Absent: Normal.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub group_blend: Option<vectorcraft_color::BlendMode>,
|
||||
/// Isolate Blending of the series group itself, as [`Self::group_opacity`]. Absent: off.
|
||||
#[serde(skip_serializing_if = "std::ops::Not::not")]
|
||||
pub group_isolate: bool,
|
||||
/// Knockout Group state of the series group itself, as [`Self::group_opacity`]. Absent: neutral.
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub group_knockout: Option<crate::Knockout>,
|
||||
/// Knockout Shape of the series group itself, as [`Self::group_opacity`]. Absent: off.
|
||||
#[serde(skip_serializing_if = "std::ops::Not::not")]
|
||||
pub group_knockout_shape: bool,
|
||||
/// A gradient in [`Self::fill`] is placed relative to the unit box (0, 0)–(1, 1), and each mark takes it on its own
|
||||
/// geometric bounds. False: the gradient is in document coordinates, and every mark takes it unchanged.
|
||||
#[serde(skip_serializing_if = "std::ops::Not::not")]
|
||||
@@ -527,7 +543,7 @@ pub struct GraphSpec {
|
||||
/// Bounds of the art when it was last generated (detects moves/scales of the graph group).
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub placed: Option<Rect>,
|
||||
/// Bounds of the art other than type when it was last generated ([`art_bounds`]). Moves and scales of the graph
|
||||
/// Bounds of the art other than type when it was last generated ([`graph_art_without_type`]). Moves and scales of the graph
|
||||
/// group are measured on these when present; graphs saved without them are measured on [`Self::placed`].
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub placed_art: Option<Rect>,
|
||||
@@ -546,6 +562,43 @@ fn edge_to_edge_before_the_option() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
/// The geometric bounds of a graph's art `children` leaving out their type: the plot, axes, tick marks and legend
|
||||
/// swatches without the labels. None when there is nothing else. [`GraphSpec::placed_art`] keeps these.
|
||||
pub fn graph_art_without_type(children: &[std::sync::Arc<crate::Node>]) -> Option<Rect> {
|
||||
children.iter().filter_map(|c| without_type(c).0).reduce(|a, b| a.union(b))
|
||||
}
|
||||
|
||||
/// The geometric bounds of `n` leaving out the type in it, and whether its own geometric bounds depend on that type. A
|
||||
/// group without such type gives its own bounds, and a clipping group whose clip does not depend on type gives the
|
||||
/// bounds of its clip. Objects other than groups, layers and compound paths, blends, envelopes and repeats among them,
|
||||
/// give their own bounds.
|
||||
fn without_type(n: &crate::Node) -> (Option<Rect>, bool) {
|
||||
use crate::NodeKind::{Compound, Group, Layer, Text};
|
||||
if matches!(n.kind, Text(_)) {
|
||||
return (None, true);
|
||||
}
|
||||
let children: &[std::sync::Arc<crate::Node>] = match &n.kind {
|
||||
Group { clip: true, children } | Layer { clip: true, children, .. } => children,
|
||||
Group { .. } | Layer { .. } | Compound { .. } => n.editing_children(),
|
||||
_ => return (n.geometric_bounds(), false),
|
||||
};
|
||||
let mut bounds: Option<Rect> = None;
|
||||
let mut had_type = false;
|
||||
let mut clip_has_type = false;
|
||||
let hidden_layer_member = |c: &crate::Node| !c.visible && matches!(n.kind, Layer { clip: false, .. });
|
||||
for (i, c) in children.iter().enumerate().filter(|(_, c)| !hidden_layer_member(c)) {
|
||||
let (b, t) = without_type(c);
|
||||
had_type |= t;
|
||||
clip_has_type |= i == 0 && t;
|
||||
bounds = match (bounds, b) {
|
||||
(Some(a), Some(b)) => Some(a.union(b)),
|
||||
(a, b) => a.or(b),
|
||||
};
|
||||
}
|
||||
let clip = matches!(n.kind, Group { clip: true, .. } | Layer { clip: true, .. });
|
||||
if had_type && (!clip || clip_has_type) { (bounds, true) } else { (n.geometric_bounds(), false) }
|
||||
}
|
||||
|
||||
impl GraphSpec {
|
||||
/// The type series `s` is drawn as: its own type when it combines with the graph's, else the graph's.
|
||||
pub fn series_kind(&self, s: usize) -> GraphKind {
|
||||
@@ -614,32 +667,6 @@ impl GraphSpec {
|
||||
}
|
||||
}
|
||||
|
||||
/// The geometric bounds of a graph's art `children` leaving out their type: the plot, axes, tick marks and legend
|
||||
/// swatches without the labels. None when there is nothing else. [`GraphSpec::placed_art`] keeps these.
|
||||
pub fn art_bounds(children: &[std::sync::Arc<crate::Node>]) -> Option<Rect> {
|
||||
children.iter().filter_map(|c| art_bounds_of(c).0).reduce(|a, b| a.union(b))
|
||||
}
|
||||
|
||||
/// The geometric bounds of `n` leaving out the type in it, and whether there was type to leave out. A group without type
|
||||
/// gives its own bounds, so a clipping group gives the bounds of its clip.
|
||||
fn art_bounds_of(n: &crate::Node) -> (Option<Rect>, bool) {
|
||||
if matches!(n.kind, crate::NodeKind::Text(_)) {
|
||||
return (None, true);
|
||||
}
|
||||
let Some(children) = n.children() else { return (n.geometric_bounds(), false) };
|
||||
let mut bounds: Option<Rect> = None;
|
||||
let mut had_type = false;
|
||||
for c in children {
|
||||
let (b, t) = art_bounds_of(c);
|
||||
had_type |= t;
|
||||
bounds = match (bounds, b) {
|
||||
(Some(a), Some(b)) => Some(a.union(b)),
|
||||
(a, b) => a.or(b),
|
||||
};
|
||||
}
|
||||
if had_type { (bounds, true) } else { (n.geometric_bounds(), false) }
|
||||
}
|
||||
|
||||
impl Default for GraphSpec {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
|
||||
+376
-88
@@ -1,7 +1,7 @@
|
||||
//! Hit testing over the document tree.
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::collections::HashSet;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::rc::Rc;
|
||||
use std::sync::{Arc, OnceLock};
|
||||
|
||||
@@ -279,13 +279,16 @@ pub fn selected_hidden_at(doc: &Document, p: Point, opt: HitOptions, selected: &
|
||||
return false;
|
||||
}
|
||||
// How a click reaches it, if one does.
|
||||
let start = opt;
|
||||
let Some(opt) = path_options(&nodes, &chain, opt) else { return false };
|
||||
// Hidden by a mask: one of the containers around it clips, and not to `p`.
|
||||
let masked = nodes
|
||||
.iter()
|
||||
.rev()
|
||||
.skip(1)
|
||||
.any(|n| n.clips() && n.children().and_then(|c| c.first()).is_some_and(|clip| clip.id != id && !clip_contains(clip, p)));
|
||||
// Hidden by a mask: one of the containers around it clips, and not to `p`. A container
|
||||
// tests its clipping path in outline from the first layer with Preview off down to it, as
|
||||
// a click going down to it does ([`path_options`]).
|
||||
let below = start.scope.and_then(|s| chain.iter().position(|a| *a == s)).map_or(0, |i| i + 1);
|
||||
let masked = nodes.iter().enumerate().rev().skip(1).any(|(k, n)| {
|
||||
let outline = start.outline || nodes.get(below..=k).is_some_and(|ns| ns.iter().any(|n| previews_off(n)));
|
||||
n.clips() && n.children().and_then(|c| c.first()).is_some_and(|clip| clip.id != id && !clip_contains(clip, p, outline))
|
||||
});
|
||||
// A click may reach it there ([`may_hit`]: not a guide while guides are locked or
|
||||
// hidden, nor a Shaper group's hidden part), and its own art is what a click would hit
|
||||
// in it: a group's hidden, locked or masked contents don't count.
|
||||
@@ -359,6 +362,7 @@ pub fn objects_at(doc: &Document, p: Point, opt: HitOptions, scope: Option<NodeI
|
||||
/// measured by their art ([`Node::geometric_bounds_with`]).
|
||||
fn objects_at_layer(layer: &Node, p: Point, opt: HitOptions, symbols: &SymbolBoxes, tops: &mut Vec<NodeId>, seen: &mut HashSet<NodeId>) -> bool {
|
||||
let Some(children) = layer.children() else { return true };
|
||||
let opt = if matches!(layer.kind, NodeKind::Layer { preview: false, .. }) { HitOptions { outline: true, ..opt } } else { opt };
|
||||
if layer.clips()
|
||||
&& let Some(clip) = children.first()
|
||||
{
|
||||
@@ -366,11 +370,10 @@ fn objects_at_layer(layer: &Node, p: Point, opt: HitOptions, symbols: &SymbolBox
|
||||
if clip_outline_hit(layer, clip, p, opt, symbols, true).is_some() && seen.insert(clip.id) {
|
||||
tops.push(clip.id);
|
||||
}
|
||||
if !clip_contains(clip, p) {
|
||||
if !clip_contains(clip, p, opt.outline) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
let opt = if matches!(layer.kind, NodeKind::Layer { preview: false, .. }) { HitOptions { outline: true, ..opt } } else { opt };
|
||||
for (i, c) in children.iter().enumerate().rev() {
|
||||
if !may_hit(layer, i, c, p, opt, symbols, true) || seen.contains(&c.id) {
|
||||
continue;
|
||||
@@ -452,7 +455,7 @@ pub fn locked_objects_at(doc: &Document, p: Point, opt: HitOptions) -> Vec<NodeI
|
||||
/// whole, and an unlocked layer, group, blend or envelope in Edit Contents is searched inside.
|
||||
fn locked_children(parent: &Node, p: Point, opt: HitOptions, symbols: &SymbolBoxes, out: &mut Vec<NodeId>) {
|
||||
let Some(children) = parent.children() else { return };
|
||||
if parent.clips() && !edits_inside(parent, opt.scope) && children.first().is_some_and(|clip| !clip_contains(clip, p)) {
|
||||
if parent.clips() && !edits_inside(parent, opt.scope) && children.first().is_some_and(|clip| !clip_contains(clip, p, opt.outline)) {
|
||||
return;
|
||||
}
|
||||
for i in hit_order(parent, children, p) {
|
||||
@@ -561,14 +564,170 @@ fn edits_contents(n: &Node) -> bool {
|
||||
matches!(n.kind, NodeKind::Envelope { editing: true, .. })
|
||||
}
|
||||
|
||||
/// Is `p` inside the region `clip` clips to ([`Node::clip_shapes`])? Text counts by its frame:
|
||||
/// glyph outlines need the font engine, above this crate.
|
||||
fn clip_contains(clip: &Node, p: Point) -> bool {
|
||||
clip_regions(clip).iter().any(|(bp, rule)| fill_contains(bp, *rule, p))
|
||||
/// Is `p` inside the region `clip` clips to ([`clip_areas`])? In outline mode ([`HitOptions::outline`])
|
||||
/// the canvas draws no effects, so the plain shapes of `clip` ([`clip_regions`]) count.
|
||||
fn clip_contains(clip: &Node, p: Point, outline: bool) -> bool {
|
||||
let areas = if outline { clip_regions(clip) } else { clip_areas(clip) };
|
||||
areas.iter().any(|(bp, rule)| fill_contains(bp, *rule, p))
|
||||
}
|
||||
|
||||
/// The regions `clip` clips to ([`Node::clip_shapes`]), text counted by its frame as in
|
||||
/// [`clip_contains`].
|
||||
/// The region of a clip group's clipping path as the canvas clips by it, with the live geometry
|
||||
/// effects of the clipping path and of what it clips by applied, as one path and fill rule
|
||||
/// (`Some(None)` when nothing is left to clip by). `None` when nothing in the clipping path has a
|
||||
/// live geometry effect: its plain shapes ([`clip_regions`]) count then. Effects are evaluated
|
||||
/// above this crate, so the engine registers one with [`set_clip_region`].
|
||||
pub type ClipRegion = fn(&Node) -> Option<Option<(BezPath, FillRule)>>;
|
||||
|
||||
static CLIP_REGION: OnceLock<ClipRegion> = OnceLock::new();
|
||||
|
||||
/// Register how the region of a clipping path with live effects is found (the first registration
|
||||
/// stays).
|
||||
pub fn set_clip_region(f: ClipRegion) {
|
||||
// Already set: the same engine, registered by another session.
|
||||
let _ = CLIP_REGION.set(f);
|
||||
}
|
||||
|
||||
/// Does `clip`, or anything it holds, have a visible effect of its own or on a fill or stroke? Only
|
||||
/// then can the registered [`ClipRegion`] find a geometry effect in it.
|
||||
fn has_effects(clip: &Node) -> bool {
|
||||
let mut found = false;
|
||||
clip.walk(&mut |n| {
|
||||
let visible = |e: &crate::Effect| e.visible;
|
||||
found |= n.appearance.effects.iter().any(visible) || n.appearance.items.iter().any(|i| i.effects().iter().any(visible));
|
||||
});
|
||||
found
|
||||
}
|
||||
|
||||
/// A clipping path's region evaluated by [`clip_region`] on this thread: the clipping path and the
|
||||
/// [`LiveInputs`] as they were, the region (`None` without geometry effects) and the number of its
|
||||
/// path elements.
|
||||
struct EvaluatedClip {
|
||||
clip: Node,
|
||||
inputs: u64,
|
||||
region: Option<Rc<Option<(BezPath, FillRule)>>>,
|
||||
size: usize,
|
||||
}
|
||||
|
||||
/// How many regions [`clip_region`] keeps on each thread: every click and every hover over a clip
|
||||
/// group whose clipping path has live effects asks for its region, and clip groups can be nested.
|
||||
const CLIPS_KEPT: usize = 16;
|
||||
|
||||
thread_local! {
|
||||
/// The regions [`clip_region`] keeps, the latest first.
|
||||
static CLIPS: RefCell<Vec<EvaluatedClip>> = const { RefCell::new(Vec::new()) };
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
thread_local! {
|
||||
/// How many regions [`clip_region`] evaluated on this thread.
|
||||
static CLIPS_EVALUATED: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
}
|
||||
|
||||
/// The region clipping path `clip` clips to with its live geometry effects applied
|
||||
/// ([`set_clip_region`]), or `None` when it has none or nothing is registered; its plain shapes
|
||||
/// ([`clip_regions`]) are the region then. The region is evaluated again when `clip` or the
|
||||
/// [`LiveInputs`] have changed since.
|
||||
fn clip_region(clip: &Node) -> Option<Rc<Option<(BezPath, FillRule)>>> {
|
||||
let f = CLIP_REGION.get()?;
|
||||
if !has_effects(clip) {
|
||||
return None;
|
||||
}
|
||||
let inputs = live_inputs();
|
||||
let kept = CLIPS.with_borrow_mut(|kept| {
|
||||
let i = kept.iter().position(|e| e.inputs == inputs && e.clip == *clip)?;
|
||||
let e = kept.remove(i);
|
||||
let region = e.region.clone();
|
||||
kept.insert(0, e);
|
||||
Some(region)
|
||||
});
|
||||
if let Some(region) = kept {
|
||||
return region;
|
||||
}
|
||||
#[cfg(test)]
|
||||
CLIPS_EVALUATED.with(|c| c.set(c.get() + 1));
|
||||
let region = f(clip).map(Rc::new);
|
||||
let elements = region.as_deref().and_then(Option::as_ref).map_or(0, |(bp, _)| bp.elements().len());
|
||||
let size = elements.saturating_add(art_size(std::slice::from_ref(clip)));
|
||||
if size <= LIVE_KEPT_SIZE {
|
||||
let e = EvaluatedClip { clip: clip.clone(), inputs, region: region.clone(), size };
|
||||
CLIPS.with_borrow_mut(|kept| {
|
||||
kept.insert(0, e);
|
||||
kept.truncate(CLIPS_KEPT);
|
||||
let mut total = 0usize;
|
||||
kept.retain(|e| {
|
||||
total = total.saturating_add(e.size);
|
||||
total <= LIVE_KEPT_SIZE
|
||||
});
|
||||
});
|
||||
}
|
||||
region
|
||||
}
|
||||
|
||||
/// The box of a clipping path's region found by [`reshaped_clip_box`]: the clipping path and the
|
||||
/// [`LiveInputs`] as they were, the box and the [`art_size`] of the clipping path.
|
||||
struct ClipBox {
|
||||
clip: Node,
|
||||
inputs: u64,
|
||||
rect: Option<Rect>,
|
||||
size: usize,
|
||||
}
|
||||
|
||||
/// How many boxes [`reshaped_clip_box`] keeps on each thread. Every pointer move measures every clip
|
||||
/// group it passes, so the boxes of all of a document's clip groups with live effects are kept, not
|
||||
/// only the latest few as with the regions.
|
||||
const CLIP_BOXES_KEPT: usize = 4096;
|
||||
|
||||
thread_local! {
|
||||
/// The boxes [`reshaped_clip_box`] keeps, by clipping path, and the sum of their sizes.
|
||||
static CLIP_BOXES: RefCell<(HashMap<NodeId, ClipBox>, usize)> = RefCell::new((HashMap::new(), 0));
|
||||
}
|
||||
|
||||
/// The box of the region `clip` clips to with its live geometry effects applied ([`clip_region`]),
|
||||
/// `None` when it has none or no region. The box is kept until `clip` or the [`LiveInputs`] change.
|
||||
/// When the boxes kept are full, a new box replaces as many others as it needs room for, so the
|
||||
/// pointer moving over more clip groups than fit still finds most of their boxes.
|
||||
pub(crate) fn reshaped_clip_box(clip: &Node) -> Option<Rect> {
|
||||
use vectorcraft_geom::kurbo::Shape;
|
||||
CLIP_REGION.get()?;
|
||||
if !has_effects(clip) {
|
||||
return None;
|
||||
}
|
||||
let inputs = live_inputs();
|
||||
let kept = CLIP_BOXES.with_borrow(|(boxes, _)| boxes.get(&clip.id).filter(|b| b.inputs == inputs && b.clip == *clip).map(|b| b.rect));
|
||||
if let Some(rect) = kept {
|
||||
return rect;
|
||||
}
|
||||
let rect = clip_region(clip).and_then(|r| r.as_ref().as_ref().filter(|(bp, _)| !bp.elements().is_empty()).map(|(bp, _)| bp.bounding_box()));
|
||||
let size = art_size(std::slice::from_ref(clip));
|
||||
if size <= LIVE_KEPT_SIZE {
|
||||
CLIP_BOXES.with_borrow_mut(|(boxes, total)| {
|
||||
if let Some(old) = boxes.remove(&clip.id) {
|
||||
*total = total.saturating_sub(old.size);
|
||||
}
|
||||
while boxes.len() >= CLIP_BOXES_KEPT || total.saturating_add(size) > LIVE_KEPT_SIZE {
|
||||
let Some(other) = boxes.keys().next().copied() else { break };
|
||||
if let Some(old) = boxes.remove(&other) {
|
||||
*total = total.saturating_sub(old.size);
|
||||
}
|
||||
}
|
||||
boxes.insert(clip.id, ClipBox { clip: clip.clone(), inputs, rect, size });
|
||||
*total = total.saturating_add(size);
|
||||
});
|
||||
}
|
||||
rect
|
||||
}
|
||||
|
||||
/// The regions a click inside a clip group must fall in: those `clip` clips to with its live
|
||||
/// effects applied, as the canvas clips ([`clip_region`]), else its plain shapes ([`clip_regions`]).
|
||||
fn clip_areas(clip: &Node) -> Vec<(BezPath, FillRule)> {
|
||||
match clip_region(clip) {
|
||||
Some(region) => region.as_ref().iter().cloned().collect(),
|
||||
None => clip_regions(clip),
|
||||
}
|
||||
}
|
||||
|
||||
/// The regions `clip` clips to by its plain shapes ([`Node::clip_shapes`]), without its live
|
||||
/// effects. Text counts by its frame: glyph outlines need the font engine, above this crate.
|
||||
pub fn clip_regions(clip: &Node) -> Vec<(vectorcraft_geom::BezPath, vectorcraft_geom::FillRule)> {
|
||||
let frame = |n: &Node| {
|
||||
let b = n.geometric_bounds()?;
|
||||
@@ -698,7 +857,7 @@ fn hit_children(
|
||||
// Elsewhere a clip group (or a layer with a clipping mask) only hits inside it, except for
|
||||
// the selection tools in isolation mode within it.
|
||||
let edited = opt.clip_outlines && editable_only && edits_inside(parent, opt.scope);
|
||||
if !edited && !clip_contains(clip, p) {
|
||||
if !edited && !clip_contains(clip, p, opt.outline) {
|
||||
return None;
|
||||
}
|
||||
}
|
||||
@@ -960,7 +1119,7 @@ fn hit_any(n: &Node, p: Point, opt: HitOptions, symbols: &SymbolBoxes) -> Option
|
||||
match &n.kind {
|
||||
// A clip group only hits inside its clipping path.
|
||||
NodeKind::Group { children, clip } => {
|
||||
if *clip && children.first().is_some_and(|c| !clip_contains(c, p)) {
|
||||
if *clip && children.first().is_some_and(|c| !clip_contains(c, p, opt.outline)) {
|
||||
return None;
|
||||
}
|
||||
children.iter().rev().find_map(|c| hit_any(c, p, opt, symbols))
|
||||
@@ -1048,7 +1207,9 @@ fn moved(n: &Node, xf: vectorcraft_geom::Affine) -> Node {
|
||||
/// group's original shapes, which the canvas does not draw, and guide paths with
|
||||
/// [`HitOptions::skip_guides`]. Nothing is picked in art that placing through the symbol's 9-slice
|
||||
/// guides could make more than [`crate::MAX_SYMBOL_NODES`] objects of, which the canvas does not
|
||||
/// draw. `None` when `inst` is not a symbol instance or no editable object of its art is under `p`.
|
||||
/// draw. Art in a layer of the symbol whose Preview is off, and the art of an instance below such a
|
||||
/// 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>> {
|
||||
struct Find<'a> {
|
||||
art: &'a InstanceArt<'a>,
|
||||
@@ -1057,35 +1218,34 @@ pub fn symbol_part_at(doc: &Document, inst: &Node, p: Point, opt: HitOptions) ->
|
||||
symbols: &'a SymbolBoxes<'a>,
|
||||
}
|
||||
impl Find<'_> {
|
||||
fn hit(&self, n: &Node, whole: Option<vectorcraft_geom::Affine>) -> bool {
|
||||
self.art.place(n, whole).is_some_and(|n| hit_any(&n, self.p, self.opt, self.symbols).is_some())
|
||||
fn hit(&self, n: &Node, whole: Option<vectorcraft_geom::Affine>, opt: HitOptions) -> bool {
|
||||
self.art.place(n, whole).is_some_and(|n| hit_any(&n, self.p, opt, self.symbols).is_some())
|
||||
}
|
||||
fn skips_guide(&self, n: &Node) -> bool {
|
||||
self.opt.skip_guides && matches!(n.kind, NodeKind::Path { guide: true, .. })
|
||||
}
|
||||
fn find(&self, n: &Node, path: &mut Vec<u32>, whole: Option<vectorcraft_geom::Affine>) -> bool {
|
||||
/// `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) -> bool {
|
||||
if !n.visible || n.locked || n.is_template() || self.skips_guide(n) {
|
||||
return false;
|
||||
}
|
||||
let (NodeKind::Group { children, .. } | NodeKind::Layer { children, .. }) = &n.kind else { return self.hit(n, whole) };
|
||||
let outline = outline || previews_off(n);
|
||||
let opt = HitOptions { outline, ..self.opt };
|
||||
let (NodeKind::Group { children, .. } | NodeKind::Layer { children, .. }) = &n.kind else { return self.hit(n, whole, opt) };
|
||||
if path.len() >= crate::symbol_overrides::MAX_PATH_DEPTH {
|
||||
return self.hit(n, whole);
|
||||
return self.hit(n, whole, opt);
|
||||
}
|
||||
let whole = self.art.whole(n, whole);
|
||||
if n.clips()
|
||||
&& let Some(first) = children.first()
|
||||
{
|
||||
let Some(clip) = self.art.place_unclipped(first, whole) else { return false };
|
||||
if self.opt.clip_outlines
|
||||
&& first.visible
|
||||
&& !first.locked
|
||||
&& !self.skips_guide(first)
|
||||
&& clip_outline(&clip, self.p, self.opt).is_some()
|
||||
if self.opt.clip_outlines && first.visible && !first.locked && !self.skips_guide(first) && clip_outline(&clip, self.p, opt).is_some()
|
||||
{
|
||||
path.push(0);
|
||||
return true;
|
||||
}
|
||||
if !clip_contains(&clip, self.p) {
|
||||
if !clip_contains(&clip, self.p, outline) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1096,7 +1256,7 @@ pub fn symbol_part_at(doc: &Document, inst: &Node, p: Point, opt: HitOptions) ->
|
||||
}
|
||||
let Ok(i) = u32::try_from(i) else { continue };
|
||||
path.push(i);
|
||||
if self.find(c, path, whole) {
|
||||
if self.find(c, path, whole, outline) {
|
||||
return true;
|
||||
}
|
||||
path.pop();
|
||||
@@ -1107,7 +1267,17 @@ pub fn symbol_part_at(doc: &Document, inst: &Node, p: Point, opt: HitOptions) ->
|
||||
let art = InstanceArt::of(doc, inst)?;
|
||||
let symbols = doc.symbol_boxes();
|
||||
let mut path = vec![];
|
||||
Find { art: &art, p, opt, symbols: &symbols }.find(&art.art, &mut path, None).then_some(path)
|
||||
let outline = opt.outline || below_preview_off(doc, inst, opt.scope);
|
||||
Find { art: &art, p, opt, symbols: &symbols }.find(&art.art, &mut path, None, outline).then_some(path)
|
||||
}
|
||||
|
||||
/// 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.
|
||||
fn below_preview_off(doc: &Document, n: &Node, scope: Option<NodeId>) -> bool {
|
||||
let Some(chain) = doc.ancestry(n.id) else { return false };
|
||||
let below = scope.and_then(|s| chain.iter().position(|a| *a == s)).map_or(0, |i| i + 1);
|
||||
chain.iter().skip(below).any(|a| doc.node(*a).is_some_and(previews_off))
|
||||
}
|
||||
|
||||
/// The outlines of the object at `path` in symbol instance `inst`'s art (see [`symbol_part_at`]),
|
||||
@@ -1116,11 +1286,23 @@ pub fn symbol_part_at(doc: &Document, inst: &Node, p: Point, opt: HitOptions) ->
|
||||
/// group per cell) they are cut to the bounds of the group's clip path, which is not outlined. An
|
||||
/// object inside a clip group or a clipping layer of the art, other than its clipping path, is cut
|
||||
/// to the bounds of that clipping path as well, which contain the region where [`symbol_part_at`]
|
||||
/// picks it.
|
||||
/// picks it: the bounds of the region its live geometry effects give it ([`clip_region`]) when it
|
||||
/// has any.
|
||||
/// `None` for art past the 9-slice object limit that [`symbol_part_at`] applies.
|
||||
pub fn symbol_part_outline(doc: &Document, inst: &Node, path: &[u32]) -> Option<BezPath> {
|
||||
symbol_part_outline_in_view(doc, inst, path, HitOptions::default())
|
||||
}
|
||||
|
||||
/// [`symbol_part_outline`] in the view the canvas shows, for the clicks of `opt`: in Outline view
|
||||
/// ([`HitOptions::outline`]) and below a layer whose Preview is off, in the art or around the
|
||||
/// instance (the isolated container [`HitOptions::scope`] and the layers around it apart), the
|
||||
/// outlines are cut to the bounds of the plain clipping paths, without their live effects, as
|
||||
/// [`symbol_part_at`] counts them. The outline is empty when the effects of a clipping path around
|
||||
/// the object leave no region.
|
||||
pub fn symbol_part_outline_in_view(doc: &Document, inst: &Node, path: &[u32], opt: HitOptions) -> Option<BezPath> {
|
||||
let art = InstanceArt::of(doc, inst)?;
|
||||
let part = crate::symbol_overrides::part(&art.art, path)?;
|
||||
let mut outline = opt.outline || below_preview_off(doc, inst, opt.scope);
|
||||
let mut out = BezPath::new();
|
||||
let mut limit = None;
|
||||
let mut whole = None;
|
||||
@@ -1128,24 +1310,40 @@ pub fn symbol_part_outline(doc: &Document, inst: &Node, path: &[u32]) -> Option<
|
||||
for &i in path {
|
||||
let children = n.children()?;
|
||||
whole = art.whole(n, whole);
|
||||
outline = outline || previews_off(n);
|
||||
if i != 0
|
||||
&& n.clips()
|
||||
&& let Some(first) = children.first()
|
||||
&& let Some(clip) = art.place_unclipped(first, whole)?.geometric_bounds()
|
||||
{
|
||||
match meet(Some(clip), limit) {
|
||||
Some(r) => limit = Some(r),
|
||||
None => return Some(out),
|
||||
}
|
||||
let Some(within) = limit_within(&art.place_unclipped(first, whole)?, limit, outline) else { return Some(out) };
|
||||
limit = within;
|
||||
}
|
||||
n = children.get(usize::try_from(i).ok()?)?;
|
||||
}
|
||||
outline_within(&art.place(part, whole)?, limit, &mut out);
|
||||
outline_within(&art.place(part, whole)?, limit, outline, &mut out);
|
||||
Some(out)
|
||||
}
|
||||
|
||||
/// [`symbol_part_outline`] for placed object `n`, cut to `limit` when there is one.
|
||||
fn outline_within(n: &Node, limit: Option<Rect>, out: &mut BezPath) {
|
||||
/// `limit` cut to the box that the art clipped by `clip` is drawn in: the bounds of the region the
|
||||
/// live geometry effects of `clip` give it ([`clip_region`]), or the bounds of `clip` when it has no
|
||||
/// such effects and with `outline`, where the canvas draws no effects. `None` when none of that art
|
||||
/// is drawn: the effects leave no region, or the box is outside `limit`.
|
||||
fn limit_within(clip: &Node, limit: Option<Rect>, outline: bool) -> Option<Option<Rect>> {
|
||||
use vectorcraft_geom::kurbo::Shape;
|
||||
let region = if outline { None } else { clip_region(clip) };
|
||||
let bounds = match region.as_deref() {
|
||||
Some(Some((bp, _))) if !bp.elements().is_empty() => Some(bp.bounding_box()),
|
||||
Some(_) => return None,
|
||||
None => clip.geometric_bounds(),
|
||||
};
|
||||
match bounds {
|
||||
Some(b) => meet(Some(b), limit).map(Some),
|
||||
None => Some(limit),
|
||||
}
|
||||
}
|
||||
|
||||
/// [`symbol_part_outline_in_view`] for placed object `n`, cut to `limit` when there is one.
|
||||
fn outline_within(n: &Node, limit: Option<Rect>, outline: bool, out: &mut BezPath) {
|
||||
use vectorcraft_geom::kurbo::Shape;
|
||||
if let Some(pd) = n.path_data() {
|
||||
match limit {
|
||||
@@ -1159,20 +1357,15 @@ fn outline_within(n: &Node, limit: Option<Rect>, out: &mut BezPath) {
|
||||
out.extend(b.to_path(0.1));
|
||||
}
|
||||
let Some(children) = n.children() else { return };
|
||||
let outline = outline || previews_off(n);
|
||||
if n.clips()
|
||||
&& let Some((first, rest)) = children.split_first()
|
||||
{
|
||||
let inner = match first.geometric_bounds() {
|
||||
Some(c) => match meet(Some(c), limit) {
|
||||
Some(r) => Some(r),
|
||||
None => return,
|
||||
},
|
||||
None => limit,
|
||||
};
|
||||
rest.iter().for_each(|c| outline_within(c, inner, out));
|
||||
let Some(inner) = limit_within(first, limit, outline) else { return };
|
||||
rest.iter().for_each(|c| outline_within(c, inner, outline, out));
|
||||
return;
|
||||
}
|
||||
children.iter().for_each(|c| outline_within(c, limit, out));
|
||||
children.iter().for_each(|c| outline_within(c, limit, outline, out));
|
||||
}
|
||||
|
||||
/// The overlap of `a` and `b` (`a` alone without `b`), `None` when they do not overlap.
|
||||
@@ -1248,31 +1441,48 @@ pub fn compound_part_at(n: &Node, p: Point, tol: f64) -> Option<NodeId> {
|
||||
/// or of the parent of the single object isolated, does not limit the marquee, as it does not limit
|
||||
/// the selection tools' clicks.
|
||||
pub fn marquee(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool) -> Vec<NodeId> {
|
||||
marquee_with(doc, r, scope, leaves, false)
|
||||
marquee_with(doc, r, scope, leaves, false, false)
|
||||
}
|
||||
|
||||
/// [`marquee`] in the view the canvas shows: with `outline` (Outline view), and below a layer
|
||||
/// whose Preview is off, a clipping path counts by its plain shapes, without its live effects, as
|
||||
/// the clicks of [`HitOptions::outline`] do.
|
||||
pub fn marquee_in_view(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, outline: bool) -> Vec<NodeId> {
|
||||
marquee_with(doc, r, scope, leaves, false, outline)
|
||||
}
|
||||
|
||||
/// Candidates for whole-object enclosure by a loop bounded by `r`. Eligibility and group
|
||||
/// traversal follow [`marquee`]; compounds contribute the complete path they paint.
|
||||
pub fn enclosure_candidates(doc: &Document, r: Rect, scope: Option<NodeId>) -> Vec<NodeId> {
|
||||
marquee_with(doc, r, scope, true, true)
|
||||
/// traversal follow [`marquee_in_view`]; compounds contribute the complete path they paint.
|
||||
pub fn enclosure_candidates(doc: &Document, r: Rect, scope: Option<NodeId>, outline: bool) -> Vec<NodeId> {
|
||||
marquee_with(doc, r, scope, true, true, outline)
|
||||
}
|
||||
|
||||
fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, whole_compounds: bool) -> Vec<NodeId> {
|
||||
/// Is `n` a layer whose Preview is off (its art is drawn and clicked in outline)?
|
||||
fn previews_off(n: &Node) -> bool {
|
||||
matches!(n.kind, NodeKind::Layer { preview: false, .. })
|
||||
}
|
||||
|
||||
fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, whole_compounds: bool, outline: bool) -> Vec<NodeId> {
|
||||
let mut out = Vec::new();
|
||||
// `tops` pairs each object with the part of `r` in which the marquee can touch it.
|
||||
let tops: Vec<(&std::sync::Arc<Node>, Rect)> = match scope.and_then(|s| doc.node(s)) {
|
||||
// The objects the marquee may touch ([`Top`]).
|
||||
let tops: Vec<Top> = match scope.and_then(|s| doc.node(s)) {
|
||||
// Isolated art whose layer, or a group around it, was locked or hidden afterwards: the
|
||||
// marquee touches none of it, as clicks don't (#5309).
|
||||
Some(s) if !doc.is_editable(s.id) => vec![],
|
||||
Some(s) => match s.children() {
|
||||
Some(c) => c.iter().enumerate().filter(|(i, c)| !c.is_ruler_guide() && !shaper_hides(s, *i, scope)).map(|(_, c)| (c, r)).collect(),
|
||||
Some(c) => c
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|(i, c)| !c.is_ruler_guide() && !shaper_hides(s, *i, scope))
|
||||
.map(|(_, c)| (c, Some(r), outline, None))
|
||||
.collect(),
|
||||
// A single object isolated: only it.
|
||||
None => doc
|
||||
.parent_of(s.id)
|
||||
.and_then(|p| doc.node(p))
|
||||
.and_then(|p| p.children())
|
||||
.into_iter()
|
||||
.flat_map(|c| c.iter().filter(|c| c.id == s.id).map(|c| (c, r)))
|
||||
.flat_map(|c| c.iter().filter(|c| c.id == s.id).map(|c| (c, Some(r), outline, None)))
|
||||
.collect(),
|
||||
},
|
||||
// The objects of the layers, looking through sublayers (hidden, locked and template ones
|
||||
@@ -1281,42 +1491,88 @@ fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, wh
|
||||
.layers
|
||||
.iter()
|
||||
.filter(|l| l.visible && !l.locked && !l.is_template() && doc.pattern_edit.as_ref().is_none_or(|e| e.layer == l.id))
|
||||
.flat_map(|l| layer_objects(l, r))
|
||||
.flat_map(|l| layer_objects(l, r, outline))
|
||||
.collect(),
|
||||
};
|
||||
/// The objects of layer `l`, each with the part of `r` that the clipping masks of `l` and of
|
||||
/// the sublayers it is in leave.
|
||||
fn layer_objects(l: &Node, r: Rect) -> Vec<(&std::sync::Arc<Node>, Rect)> {
|
||||
/// the sublayers it is in leave, whether it is in outline, and for the clipping mask of `l`,
|
||||
/// `r` for its edge test. The clipping mask itself counts by its own geometry within its plain
|
||||
/// shapes ([`mask_marquee`]).
|
||||
fn layer_objects(l: &Node, r: Rect, outline: bool) -> Vec<Top<'_>> {
|
||||
let mut out = vec![];
|
||||
let Some(r) = marquee_in(l, r) else { return out };
|
||||
for c in l.children().into_iter().flatten() {
|
||||
let outline = outline || previews_off(l);
|
||||
let inner = marquee_in_parent(l, r, outline);
|
||||
for (i, c) in l.children().into_iter().flatten().enumerate() {
|
||||
if c.is_layer() {
|
||||
if c.visible && !c.locked && !c.is_template() {
|
||||
out.extend(layer_objects(c, r));
|
||||
if let Some(inner) = inner
|
||||
&& c.visible
|
||||
&& !c.locked
|
||||
&& !c.is_template()
|
||||
{
|
||||
out.extend(layer_objects(c, inner, outline));
|
||||
}
|
||||
} else if !c.is_ruler_guide() {
|
||||
out.push((c, r));
|
||||
if i == 0 && l.clips() {
|
||||
out.push((c, mask_marquee(l, r), outline, Some(r)));
|
||||
} else if inner.is_some() {
|
||||
out.push((c, inner, outline, None));
|
||||
}
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
/// The part of `r` in which the marquee can touch the clipping path of `parent` by its own
|
||||
/// geometry: within the bounds of its plain shapes ([`marquee_in`]), where clicks find its
|
||||
/// outline too ([`clip_outline_hit`]), whatever its live effects do to the region it clips to.
|
||||
fn mask_marquee(parent: &Node, r: Rect) -> Option<Rect> {
|
||||
marquee_in_parent(parent, r, true)
|
||||
}
|
||||
/// Does the marquee `r` touch `clip`, the clipping path of a clip group or of a layer with a
|
||||
/// clipping mask, on the edge of the region its live effects give it ([`clip_region`]), where
|
||||
/// the clip shows? Never in outline, nor without live effects: its own geometry counts then.
|
||||
fn clip_edge_touches(clip: &Node, r: Rect, outline: bool) -> bool {
|
||||
if outline {
|
||||
return false;
|
||||
}
|
||||
clip_region(clip).is_some_and(|region| {
|
||||
region.as_ref().as_ref().is_some_and(|(bp, _)| {
|
||||
// The edge of the region is its outline with each open subpath closed, as `fill_contains` fills it.
|
||||
let mut edge = PathData::from_bezpath(bp);
|
||||
edge.subpaths.iter_mut().for_each(|sp| sp.closed = true);
|
||||
vectorcraft_geom::hit::intersects_rect(&edge, r)
|
||||
})
|
||||
})
|
||||
}
|
||||
/// Is `n` collected whole by [`collect_leaves`], not by its members?
|
||||
fn is_leaf(n: &Node) -> bool {
|
||||
!matches!(n.kind, NodeKind::Layer { .. } | NodeKind::Group { .. } | NodeKind::Intertwine { .. })
|
||||
}
|
||||
/// Does the marquee `r` touch `n`? It skips the children of a Shaper Group that clicks skip
|
||||
/// ([`shaper_hides`]). An Intertwine group is touched by its members, and a repeat is touched
|
||||
/// by the copies it draws, as clicks hit them. Objects of every other kind except paths,
|
||||
/// compound paths, layers and groups are touched by their box.
|
||||
fn touches(n: &Node, s: &SymbolBoxes, r: Rect, scope: Option<NodeId>, whole_compounds: bool) -> bool {
|
||||
/// compound paths, layers and groups are touched by their box. A clipping path is touched by
|
||||
/// its own geometry ([`mask_marquee`]) and on the edge of its region ([`clip_edge_touches`]).
|
||||
fn touches(n: &Node, s: &SymbolBoxes, r: Rect, scope: Option<NodeId>, whole_compounds: bool, outline: bool) -> bool {
|
||||
match &n.kind {
|
||||
NodeKind::Path { path, .. } => vectorcraft_geom::hit::intersects_rect(path, r),
|
||||
NodeKind::Layer { children, .. } | NodeKind::Group { children, .. } | NodeKind::Intertwine { children } => {
|
||||
marquee_in(n, r).is_some_and(|r| {
|
||||
children.iter().enumerate().any(|(i, c)| c.visible && !shaper_hides(n, i, scope) && touches(c, s, r, scope, whole_compounds))
|
||||
let outline = outline || previews_off(n);
|
||||
let inner = marquee_in_parent(n, r, outline);
|
||||
children.iter().enumerate().any(|(i, c)| {
|
||||
c.visible
|
||||
&& !shaper_hides(n, i, scope)
|
||||
&& if i == 0 && n.clips() {
|
||||
mask_marquee(n, r).is_some_and(|r| touches(c, s, r, scope, whole_compounds, outline)) || clip_edge_touches(c, r, outline)
|
||||
} else {
|
||||
inner.is_some_and(|r| touches(c, s, r, scope, whole_compounds, outline))
|
||||
}
|
||||
})
|
||||
}
|
||||
NodeKind::Compound { children, .. } if whole_compounds => {
|
||||
children.iter().filter_map(|c| c.path_data()).any(|path| vectorcraft_geom::hit::intersects_rect(path, r))
|
||||
}
|
||||
NodeKind::Compound { children, .. } => children.iter().any(|c| c.visible && touches(c, s, r, scope, whole_compounds)),
|
||||
NodeKind::Repeat(spec) => spec.expand(Some(s.document())).iter().any(|copy| touches(copy, s, r, scope, whole_compounds)),
|
||||
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 box with no width or no height (an instance of a symbol that draws a straight
|
||||
// line) is touched where the marquee crosses it.
|
||||
_ => n.geometric_bounds_with(s).is_some_and(|b| {
|
||||
@@ -1325,18 +1581,30 @@ fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, wh
|
||||
}),
|
||||
}
|
||||
}
|
||||
fn collect_leaves(n: &Node, s: &SymbolBoxes, r: Rect, scope: Option<NodeId>, whole_compounds: bool, out: &mut Vec<NodeId>) {
|
||||
fn collect_leaves(n: &Node, s: &SymbolBoxes, r: Rect, scope: Option<NodeId>, whole_compounds: bool, outline: bool, out: &mut Vec<NodeId>) {
|
||||
match &n.kind {
|
||||
NodeKind::Layer { children, .. } | NodeKind::Group { children, .. } | NodeKind::Intertwine { children } => {
|
||||
let Some(r) = marquee_in(n, r) else { return };
|
||||
let outline = outline || previews_off(n);
|
||||
let inner = marquee_in_parent(n, r, outline);
|
||||
for (i, c) in children.iter().enumerate() {
|
||||
if c.visible && !c.locked && !shaper_hides(n, i, scope) {
|
||||
collect_leaves(c, s, r, scope, whole_compounds, out);
|
||||
if !c.visible || c.locked || shaper_hides(n, i, scope) {
|
||||
continue;
|
||||
}
|
||||
if i == 0 && n.clips() {
|
||||
let before = out.len();
|
||||
if let Some(r) = mask_marquee(n, r) {
|
||||
collect_leaves(c, s, r, scope, whole_compounds, outline, out);
|
||||
}
|
||||
if out.len() == before && is_leaf(c) && clip_edge_touches(c, r, outline) {
|
||||
out.push(c.id);
|
||||
}
|
||||
} else if let Some(r) = inner {
|
||||
collect_leaves(c, s, r, scope, whole_compounds, outline, out);
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
if touches(n, s, r, scope, whole_compounds) {
|
||||
if touches(n, s, r, scope, whole_compounds, outline) {
|
||||
out.push(n.id);
|
||||
}
|
||||
}
|
||||
@@ -1344,36 +1612,56 @@ fn marquee_with(doc: &Document, r: Rect, scope: Option<NodeId>, leaves: bool, wh
|
||||
}
|
||||
let symbols = doc.symbol_boxes();
|
||||
let locks = doc.locked_artboards();
|
||||
for (t, r) in tops {
|
||||
for (t, r, outline, edge) in tops {
|
||||
if !t.visible || t.locked || locks.holds_id(t.id) {
|
||||
continue;
|
||||
}
|
||||
if leaves {
|
||||
collect_leaves(t, &symbols, r, scope, whole_compounds, &mut out);
|
||||
} else if touches(t, &symbols, r, scope, whole_compounds) {
|
||||
let before = out.len();
|
||||
if let Some(r) = r {
|
||||
collect_leaves(t, &symbols, r, scope, whole_compounds, outline, &mut out);
|
||||
}
|
||||
if edge.is_some_and(|e| out.len() == before && is_leaf(t) && clip_edge_touches(t, e, outline)) {
|
||||
out.push(t.id);
|
||||
}
|
||||
} else if r.is_some_and(|r| touches(t, &symbols, r, scope, whole_compounds, outline))
|
||||
|| edge.is_some_and(|e| clip_edge_touches(t, e, outline))
|
||||
{
|
||||
out.push(t.id);
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// An object a marquee may touch ([`marquee_with`]): the object, the part of the marquee in which
|
||||
/// it can be touched (`None` when nowhere), whether it is in outline, and for the clipping mask of a
|
||||
/// layer, the marquee whose edge test it also takes (`clip_edge_touches`).
|
||||
type Top<'a> = (&'a std::sync::Arc<Node>, Option<Rect>, bool, Option<Rect>);
|
||||
|
||||
/// The part of a marquee `r` in which it can touch the children of `parent`. For a clip group or a
|
||||
/// layer with a clipping mask, this is what [`marquee_in_clip`] returns for its clipping path (None
|
||||
/// when the marquee misses it); otherwise it is all of `r`.
|
||||
/// layer with a clipping mask, this is what [`marquee_in_clip`] returns for the plain shapes of its
|
||||
/// clipping path ([`clip_regions`]; None when the marquee misses them); otherwise it is all of `r`.
|
||||
pub fn marquee_in(parent: &Node, r: Rect) -> Option<Rect> {
|
||||
marquee_in_parent(parent, r, true)
|
||||
}
|
||||
|
||||
/// The part of a marquee `r` in which it can touch the children of `parent`, by the region its
|
||||
/// clipping path clips to ([`clip_areas`]), or by that path's plain shapes with `outline`
|
||||
/// ([`marquee_in_view`]).
|
||||
fn marquee_in_parent(parent: &Node, r: Rect, outline: bool) -> Option<Rect> {
|
||||
match parent.children().and_then(|c| c.first()) {
|
||||
Some(clip) if parent.clips() => marquee_in_clip(clip, r),
|
||||
Some(clip) if parent.clips() => marquee_in_clip(clip, r, outline),
|
||||
_ => Some(r),
|
||||
}
|
||||
}
|
||||
|
||||
/// The part of a marquee `r` in which it can touch the art that `clip` clips (the clipping path of
|
||||
/// a clip group or of a layer with a clipping mask): `r` cut to the bounds of the regions `clip`
|
||||
/// clips to ([`clip_regions`]), or `None` when `r` meets none of those regions. Within those
|
||||
/// bounds, art outside a region that is not a rectangle still counts.
|
||||
fn marquee_in_clip(clip: &Node, r: Rect) -> Option<Rect> {
|
||||
/// clips to ([`clip_areas`], its plain shapes with `outline`), or `None` when `r` meets none of
|
||||
/// those regions. Within those bounds, art outside a region that is not a rectangle still counts.
|
||||
fn marquee_in_clip(clip: &Node, r: Rect, outline: bool) -> Option<Rect> {
|
||||
use vectorcraft_geom::kurbo::Shape;
|
||||
let regions = clip_regions(clip);
|
||||
let regions = if outline { clip_regions(clip) } else { clip_areas(clip) };
|
||||
// The edge of a region is its outline with each open subpath closed, as `fill_contains` fills it.
|
||||
let meets = |(bp, rule): &(vectorcraft_geom::BezPath, vectorcraft_geom::FillRule)| {
|
||||
let mut edge = vectorcraft_geom::PathData::from_bezpath(bp);
|
||||
|
||||
@@ -110,6 +110,252 @@ fn half_clipped(d: &mut Document) -> (Node, Node) {
|
||||
(mask, art)
|
||||
}
|
||||
|
||||
/// A stand-in for the engine's [`ClipRegion`]: with an effect named `test.move` in the clipping
|
||||
/// path, its first shape moved 100 pt right; with one named `test.empty`, no region left to clip
|
||||
/// by; without either, no geometry effect.
|
||||
fn moved_clip_region(clip: &Node) -> Option<Option<(BezPath, FillRule)>> {
|
||||
let (mut moves, mut empty) = (false, false);
|
||||
clip.walk(&mut |n| {
|
||||
moves |= n.appearance.effects.iter().any(|e| e.visible && e.id == "test.move");
|
||||
empty |= n.appearance.effects.iter().any(|e| e.visible && e.id == "test.empty");
|
||||
});
|
||||
if empty {
|
||||
return Some(None);
|
||||
}
|
||||
if !moves {
|
||||
return None;
|
||||
}
|
||||
Some(clip_regions(clip).into_iter().next().map(|(mut bp, rule)| {
|
||||
bp.apply_affine(vectorcraft_geom::Affine::translate((100.0, 0.0)));
|
||||
(bp, rule)
|
||||
}))
|
||||
}
|
||||
|
||||
/// A visible effect named `test.move`, which [`moved_clip_region`] reads as moving the region.
|
||||
fn test_move() -> crate::Effect {
|
||||
crate::Effect { id: "test.move".into(), params: serde_json::json!({}), visible: true }
|
||||
}
|
||||
|
||||
/// Clicks inside a clip group whose clipping path has a live effect fall in the region the
|
||||
/// registered [`ClipRegion`] gives it. The pointer moving over it evaluates the region once, and
|
||||
/// again after the clipping path changes; a clipping path without effects is not evaluated.
|
||||
#[test]
|
||||
fn clicks_in_a_clip_group_evaluate_its_clipping_paths_region_once_until_it_changes() {
|
||||
set_clip_region(moved_clip_region);
|
||||
let mut d = Document::new(300.0, 200.0);
|
||||
let l = d.layers[0].id;
|
||||
let (mut mask, art) = half_clipped(&mut d);
|
||||
mask.appearance.effects.push(crate::Effect { id: "test.move".into(), params: serde_json::json!({}), visible: true });
|
||||
let (g, mask_id, art_id) = (d.alloc_id(), mask.id, art.id);
|
||||
let mut clip = Node::group(g, vec![Arc::new(mask), Arc::new(art)]);
|
||||
clip.set_clips(true);
|
||||
d.insert(Some(l), 0, clip).unwrap();
|
||||
let evaluated = || CLIPS_EVALUATED.with(std::cell::Cell::get);
|
||||
let before = evaluated();
|
||||
let leaf = |d: &Document, x: f64| hit_test(d, Point::new(x, 50.0), HitOptions::default()).map(|h| h.leaf);
|
||||
for x in [148.0, 150.0, 152.0] {
|
||||
assert_eq!(leaf(&d, x), Some(art_id), "in the moved region");
|
||||
}
|
||||
assert_eq!(leaf(&d, 50.0), None, "the clipping path's own place");
|
||||
assert_eq!(evaluated(), before + 1);
|
||||
// Outline mode draws no effects: the art's edge shows within the clipping path's own shape.
|
||||
let outline = HitOptions { outline: true, ..HitOptions::default() };
|
||||
assert_eq!(hit_test(&d, Point::new(50.0, 0.5), outline).map(|h| h.leaf), Some(art_id), "outline mode");
|
||||
// So with a marquee across the art's left edge: in the view, only in Outline view. The
|
||||
// clipping path's own left edge lies there too, and counts in both.
|
||||
let edge = Rect::new(-5.0, 40.0, 5.0, 60.0);
|
||||
assert_eq!(marquee_in_view(&d, edge, None, true, false), [mask_id]);
|
||||
assert_eq!(marquee_in_view(&d, edge, None, true, true), [mask_id, art_id]);
|
||||
// `marquee_in` measures by the plain shapes, as its callers clip by them.
|
||||
assert!(marquee_in(d.node(g).unwrap(), edge).is_some());
|
||||
// Hidden, the effect no longer moves the region.
|
||||
d.node_mut(mask_id).unwrap().appearance.effects[0].visible = false;
|
||||
assert_eq!(leaf(&d, 50.0), Some(art_id));
|
||||
assert_eq!(leaf(&d, 150.0), None);
|
||||
assert_eq!(evaluated(), before + 1);
|
||||
// Shown again and widened, the region is evaluated again.
|
||||
let mask = d.node_mut(mask_id).unwrap();
|
||||
mask.appearance.effects[0].visible = true;
|
||||
if let NodeKind::Path { path, .. } = &mut mask.kind {
|
||||
*path = shapes::rectangle(Rect::new(0.0, 0.0, 90.0, 100.0));
|
||||
}
|
||||
assert_eq!(leaf(&d, 180.0), Some(art_id));
|
||||
assert_eq!(leaf(&d, 195.0), None);
|
||||
assert_eq!(evaluated(), before + 2);
|
||||
}
|
||||
|
||||
/// A marquee around a clipping path that an effect moved into the middle of large art touches the
|
||||
/// clipping path on the edge of its moved region, in a clip group and in a clipping layer.
|
||||
#[test]
|
||||
fn a_marquee_touches_a_moved_clipping_path_on_its_region() {
|
||||
set_clip_region(moved_clip_region);
|
||||
let parts = |d: &mut Document| {
|
||||
let mut mask = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(20.0, 20.0, 60.0, 60.0)), Appearance::default());
|
||||
mask.appearance.effects.push(crate::Effect { id: "test.move".into(), params: serde_json::json!({}), visible: true });
|
||||
let art = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(0.0, 0.0, 300.0, 300.0)), Appearance::default_art());
|
||||
(mask, art)
|
||||
};
|
||||
// Around the moved region (120..160) and the clipping path's own place, inside the art.
|
||||
let around = Rect::new(10.0, 10.0, 170.0, 70.0);
|
||||
let mut d = Document::new(400.0, 400.0);
|
||||
let l = d.layers[0].id;
|
||||
let (mask, art) = parts(&mut d);
|
||||
let (g, mask_id) = (d.alloc_id(), mask.id);
|
||||
let mut clip = Node::group(g, vec![Arc::new(mask), Arc::new(art)]);
|
||||
clip.set_clips(true);
|
||||
d.insert(Some(l), 0, clip).unwrap();
|
||||
assert_eq!(marquee(&d, around, None, false), [g]);
|
||||
assert_eq!(marquee(&d, around, None, true), [mask_id]);
|
||||
// Only over the clipping path's own place, the marquee misses the region but touches the
|
||||
// clipping path's anchors, which a click on its outline also finds.
|
||||
let own = Rect::new(10.0, 10.0, 70.0, 70.0);
|
||||
assert_eq!(marquee(&d, own, None, false), [g]);
|
||||
assert_eq!(marquee(&d, own, None, true), [mask_id]);
|
||||
// Away from both, nothing.
|
||||
assert!(marquee(&d, Rect::new(70.0, 10.0, 110.0, 70.0), None, true).is_empty());
|
||||
|
||||
let mut d = Document::new(400.0, 400.0);
|
||||
let top = d.layers[0].id;
|
||||
let (mask, art) = parts(&mut d);
|
||||
let mask_id = mask.id;
|
||||
let mut sublayer = (*d.layers[0]).clone();
|
||||
sublayer.id = d.alloc_id();
|
||||
if let NodeKind::Layer { children, clip, .. } = &mut sublayer.kind {
|
||||
(*children, *clip) = (vec![Arc::new(mask), Arc::new(art)], true);
|
||||
}
|
||||
d.insert(Some(top), 0, sublayer).unwrap();
|
||||
assert_eq!(marquee(&d, around, None, false), [mask_id]);
|
||||
}
|
||||
|
||||
/// A clipping layer whose Preview is off draws its art in outline: clicks, the objects at a point
|
||||
/// and marquees count its clipping path by its plain shape, without the effect that moves it.
|
||||
#[test]
|
||||
fn a_clipping_layer_with_preview_off_counts_its_plain_clipping_path() {
|
||||
set_clip_region(moved_clip_region);
|
||||
let mut d = Document::new(300.0, 200.0);
|
||||
let top = d.layers[0].id;
|
||||
let (mut mask, art) = half_clipped(&mut d);
|
||||
mask.appearance.effects.push(crate::Effect { id: "test.move".into(), params: serde_json::json!({}), visible: true });
|
||||
let art_id = art.id;
|
||||
let mut sublayer = (*d.layers[0]).clone();
|
||||
sublayer.id = d.alloc_id();
|
||||
if let NodeKind::Layer { children, clip, preview, .. } = &mut sublayer.kind {
|
||||
(*children, *clip, *preview) = (vec![Arc::new(mask), Arc::new(art)], true, false);
|
||||
}
|
||||
d.insert(Some(top), 0, sublayer).unwrap();
|
||||
// The art's top edge, within the clipping path's own shape.
|
||||
let p = Point::new(50.0, 0.5);
|
||||
assert_eq!(hit_test(&d, p, HitOptions::default()).map(|h| h.leaf), Some(art_id));
|
||||
assert_eq!(objects_at(&d, p, HitOptions::default(), None).first(), Some(&art_id));
|
||||
assert!(marquee(&d, Rect::new(45.0, -5.0, 55.0, 5.0), None, true).contains(&art_id));
|
||||
}
|
||||
|
||||
/// The pointer moving over empty canvas past more clip groups with live effects than the regions
|
||||
/// kept measures each group's box once: the boxes are kept for every clip group.
|
||||
#[test]
|
||||
fn hovers_past_many_clip_groups_evaluate_each_clipping_path_once() {
|
||||
set_clip_region(moved_clip_region);
|
||||
let mut d = Document::new(1000.0, 1000.0);
|
||||
let l = d.layers[0].id;
|
||||
for i in 0..(2 * CLIPS_KEPT) {
|
||||
let x = 20.0 * i as f64;
|
||||
let mut mask = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, 0.0, x + 10.0, 10.0)), Appearance::default());
|
||||
mask.appearance.effects.push(crate::Effect { id: "test.move".into(), params: serde_json::json!({}), visible: true });
|
||||
let art = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, 0.0, x + 20.0, 10.0)), Appearance::default_art());
|
||||
let mut clip = Node::group(d.alloc_id(), vec![Arc::new(mask), Arc::new(art)]);
|
||||
clip.set_clips(true);
|
||||
d.insert(Some(l), 0, clip).unwrap();
|
||||
}
|
||||
let evaluated = || CLIPS_EVALUATED.with(std::cell::Cell::get);
|
||||
let empty = Point::new(500.0, 500.0);
|
||||
assert!(hit_test(&d, empty, HitOptions::default()).is_none());
|
||||
let first = evaluated();
|
||||
for _ in 0..3 {
|
||||
assert!(hit_test(&d, empty, HitOptions::default()).is_none());
|
||||
}
|
||||
assert_eq!(evaluated(), first);
|
||||
}
|
||||
|
||||
/// With more clip groups with live effects than the boxes kept, a new box replaces only as many
|
||||
/// others as it needs room for: the next hover finds most of the boxes and evaluates few regions.
|
||||
#[test]
|
||||
fn hovers_past_more_clip_groups_than_the_boxes_kept_evaluate_few_again() {
|
||||
set_clip_region(moved_clip_region);
|
||||
let mut d = Document::new(1000.0, 1000.0);
|
||||
let l = d.layers[0].id;
|
||||
let groups = CLIP_BOXES_KEPT + 64;
|
||||
let mut members = Vec::with_capacity(groups);
|
||||
for i in 0..groups {
|
||||
let x = (i % 100) as f64 * 5.0;
|
||||
let y = (i / 100) as f64 * 5.0;
|
||||
let mut mask = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, y, x + 2.0, y + 2.0)), Appearance::default());
|
||||
mask.appearance.effects.push(test_move());
|
||||
let art = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, y, x + 4.0, y + 2.0)), Appearance::default_art());
|
||||
let mut clip = Node::group(d.alloc_id(), vec![Arc::new(mask), Arc::new(art)]);
|
||||
clip.set_clips(true);
|
||||
members.push(Arc::new(clip));
|
||||
}
|
||||
if let Some(children) = d.node_mut(l).and_then(|n| n.children_mut()) {
|
||||
*children = members;
|
||||
}
|
||||
let evaluated = || CLIPS_EVALUATED.with(std::cell::Cell::get);
|
||||
let empty = Point::new(900.0, 900.0);
|
||||
assert!(hit_test(&d, empty, HitOptions::default()).is_none());
|
||||
let first = evaluated();
|
||||
assert!(hit_test(&d, empty, HitOptions::default()).is_none());
|
||||
let again = evaluated() - first;
|
||||
assert!(again < groups / 8, "{again} of {groups} regions evaluated again");
|
||||
}
|
||||
|
||||
/// Every test of a clip group by its clipping path follows the region a live effect moved it to:
|
||||
/// the selected art hidden by the mask, a click into a group holding the clip group, the locked
|
||||
/// objects under the pointer, and, below a clipping layer whose Preview is on, art on a sublayer
|
||||
/// whose Preview is off, which is clicked in outline while the layer above clips by its region.
|
||||
#[test]
|
||||
fn every_clip_test_follows_the_moved_region() {
|
||||
set_clip_region(moved_clip_region);
|
||||
let (moved, own) = (Point::new(150.0, 50.0), Point::new(50.0, 50.0));
|
||||
let mut d = Document::new(300.0, 200.0);
|
||||
let l = d.layers[0].id;
|
||||
let (mut mask, art) = half_clipped(&mut d);
|
||||
mask.appearance.effects.push(test_move());
|
||||
let (g, art_id) = (d.alloc_id(), art.id);
|
||||
let mut clip = Node::group(g, vec![Arc::new(mask), Arc::new(art)]);
|
||||
clip.set_clips(true);
|
||||
let outer = Node::group(d.alloc_id(), vec![Arc::new(clip)]);
|
||||
d.insert(Some(l), 0, outer.clone()).unwrap();
|
||||
let opt = HitOptions::default();
|
||||
assert_eq!(selected_hidden_at(&d, own, opt, &[art_id]), Some(art_id), "hidden at the clipping path's own place");
|
||||
assert_eq!(selected_hidden_at(&d, moved, opt, &[art_id]), None, "shown in the moved region");
|
||||
let symbols = d.symbol_boxes();
|
||||
assert_eq!(hit_any(&outer, moved, opt, &symbols), Some(HitKind::Fill));
|
||||
assert_eq!(hit_any(&outer, own, opt, &symbols), None);
|
||||
d.node_mut(art_id).unwrap().locked = true;
|
||||
assert_eq!(locked_objects_at(&d, moved, opt), [art_id]);
|
||||
assert!(locked_objects_at(&d, own, opt).is_empty());
|
||||
|
||||
// A clipping layer holding the mask and a sublayer whose Preview is off, with the art.
|
||||
let mut d = Document::new(300.0, 200.0);
|
||||
let top = d.layers[0].id;
|
||||
let (mut mask, art) = half_clipped(&mut d);
|
||||
mask.appearance.effects.push(test_move());
|
||||
let art_id = art.id;
|
||||
let mut sublayer = (*d.layers[0]).clone();
|
||||
sublayer.id = d.alloc_id();
|
||||
if let NodeKind::Layer { children, preview, .. } = &mut sublayer.kind {
|
||||
(*children, *preview) = (vec![Arc::new(art)], false);
|
||||
}
|
||||
d.insert(Some(top), 0, sublayer).unwrap();
|
||||
d.insert(Some(top), 0, mask).unwrap();
|
||||
d.node_mut(top).unwrap().set_clips(true);
|
||||
// The art's top edge, at the clipping path's own place and in the moved region.
|
||||
let (own, moved) = (Point::new(50.0, 0.5), Point::new(150.0, 0.5));
|
||||
assert!(hit_test(&d, own, opt).is_none());
|
||||
assert_eq!(hit_test(&d, moved, opt).map(|h| h.leaf), Some(art_id));
|
||||
assert_eq!(selected_hidden_at(&d, own, opt, &[art_id]), Some(art_id));
|
||||
assert_eq!(selected_hidden_at(&d, moved, opt, &[art_id]), None);
|
||||
}
|
||||
|
||||
/// The art a mask hides counts only for a selected object: there a click hits nothing, and the
|
||||
/// selection tools grab the selection by that art. Not where the art shows (the click hits it),
|
||||
/// beyond the art, for the clip group selected as a whole, nor for art a click can't hit (locked,
|
||||
@@ -1549,6 +1795,63 @@ fn an_object_a_clipping_layer_in_symbol_art_hides_is_not_picked_there() {
|
||||
assert!((b.x1 - 100.0).abs() < 1e-6, "the layer's outline is cut to the mask: {b:?}");
|
||||
}
|
||||
|
||||
/// In a dynamic symbol's art, an object in a clipping layer whose clipping path has a live effect
|
||||
/// is picked and outlined in the region the effect gives the clipping path. In Outline view, and
|
||||
/// when Preview is off for the layer in the art or for the layer the instance is on, the plain
|
||||
/// clipping path counts, as the canvas draws it. An effect that leaves no region leaves no outline.
|
||||
#[test]
|
||||
fn a_symbol_part_follows_the_region_its_clipping_layers_effects_give_it() {
|
||||
set_clip_region(moved_clip_region);
|
||||
// The instance of a symbol whose art is a clipping layer; `preview` is the Preview of that
|
||||
// layer and of the document layer the instance is on.
|
||||
let instance = |effect: &str, preview: [bool; 2]| {
|
||||
let mut d = Document::new(300.0, 200.0);
|
||||
if let NodeKind::Layer { preview: p, .. } = &mut Arc::make_mut(&mut d.layers[0]).kind {
|
||||
*p = preview[1];
|
||||
}
|
||||
let l = d.layers[0].id;
|
||||
let (mut mask, art) = half_clipped(&mut d);
|
||||
mask.appearance.effects.push(crate::Effect { id: effect.into(), ..test_move() });
|
||||
let mut layer = Node::layer(d.alloc_id(), "Masked", crate::LayerColor::Preset(2));
|
||||
if let NodeKind::Layer { children, preview: p, .. } = &mut layer.kind {
|
||||
(*children, *p) = (vec![Arc::new(mask), Arc::new(art)], preview[0]);
|
||||
}
|
||||
layer.set_clips(true);
|
||||
let root = Node::group(d.alloc_id(), vec![Arc::new(layer)]);
|
||||
d.symbols.push(crate::Symbol { dynamic: true, name: "Clipped".into(), art: Arc::new(root) });
|
||||
let inst = d.alloc_id();
|
||||
d.insert(Some(l), 0, Node::new(inst, NodeKind::SymbolInstance { symbol: "Clipped".into(), xf: vectorcraft_geom::Affine::IDENTITY })).unwrap();
|
||||
(d, inst)
|
||||
};
|
||||
let outline_box = |d: &Document, inst: NodeId, opt: HitOptions| {
|
||||
let o = symbol_part_outline_in_view(d, d.node(inst).unwrap(), &[0, 1], opt).unwrap();
|
||||
vectorcraft_geom::kurbo::Shape::bounding_box(&o)
|
||||
};
|
||||
let opt = HitOptions::default();
|
||||
let (d, inst) = instance("test.move", [true, true]);
|
||||
let n = d.node(inst).unwrap();
|
||||
assert_eq!(symbol_part_at(&d, n, Point::new(150.0, 50.0), opt), Some(vec![0, 1]), "in the moved region");
|
||||
assert_eq!(symbol_part_at(&d, n, Point::new(50.0, 50.0), opt), None, "where the clipping path was");
|
||||
let b = outline_box(&d, inst, opt);
|
||||
assert!((b.x0 - 100.0).abs() < 1e-6 && (b.x1 - 200.0).abs() < 1e-6, "the outline is cut to the moved region: {b:?}");
|
||||
let b = outline_box(&d, inst, HitOptions { outline: true, ..opt });
|
||||
assert!(b.x0.abs() < 1e-6 && (b.x1 - 100.0).abs() < 1e-6, "in Outline view, to the plain clipping path: {b:?}");
|
||||
// With Preview off, the art's top edge counts within the plain clipping path.
|
||||
for (preview, what) in [([false, true], "the layer in the art"), ([true, false], "the layer the instance is on")] {
|
||||
let (d, inst) = instance("test.move", preview);
|
||||
let n = d.node(inst).unwrap();
|
||||
assert_eq!(symbol_part_at(&d, n, Point::new(50.0, 0.5), opt), Some(vec![0, 1]), "on the edge the canvas draws, Preview off for {what}");
|
||||
assert_eq!(symbol_part_at(&d, n, Point::new(150.0, 0.5), opt), None, "past the plain clipping path, Preview off for {what}");
|
||||
let b = outline_box(&d, inst, opt);
|
||||
assert!(b.x0.abs() < 1e-6 && (b.x1 - 100.0).abs() < 1e-6, "Preview off for {what}: the plain clipping path: {b:?}");
|
||||
}
|
||||
// An effect that leaves the clipping path no region hides the art: no pick and no outline.
|
||||
let (d, inst) = instance("test.empty", [true, true]);
|
||||
let n = d.node(inst).unwrap();
|
||||
assert_eq!(symbol_part_at(&d, n, Point::new(50.0, 50.0), opt), None);
|
||||
assert!(symbol_part_outline(&d, n, &[0, 1]).unwrap().elements().is_empty(), "nothing is drawn, so nothing is outlined");
|
||||
}
|
||||
|
||||
/// 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.
|
||||
|
||||
@@ -119,6 +119,7 @@ pub use slices::{CellAlign, CellVAlign, Slice, SliceArea, SliceKind, SliceOption
|
||||
pub use style_libs::StyleLibrary;
|
||||
pub use text::FontHeightReference;
|
||||
pub use text::GlyphChoice;
|
||||
pub use text::GlyphForm;
|
||||
pub use text::WarichuAlign;
|
||||
pub use text::{
|
||||
AreaFit, AreaOptions, Burasagari, CharAlign, CharPosition, CharStyle, Composer, Digits, FirstBaseline, HyphenationOptions, InlineArt,
|
||||
|
||||
@@ -211,7 +211,9 @@ impl Node {
|
||||
|
||||
/// A quick box round everything the object can paint, for culling clicks: paths and compound
|
||||
/// paths grow their geometric bounds by the farthest their strokes can reach from any path
|
||||
/// ([`Appearance::outset`]) instead of measuring along their shape. An image's box takes in
|
||||
/// ([`Appearance::outset`]) instead of measuring along their shape. A clip group's or a
|
||||
/// clipping layer's box takes in the region that the live geometry effects of its clipping
|
||||
/// path give it ([`crate::hit::set_clip_region`]). An image's box takes in
|
||||
/// the shapes its own fills and strokes paint ([`crate::hit::set_image_paint`]). Groups, layers
|
||||
/// without a clipping mask and Intertwine groups take in their members' boxes, grown by their
|
||||
/// own strokes. Symbol instances are measured as in [`Node::visual_bounds`]. A blend's box
|
||||
@@ -261,6 +263,11 @@ impl Node {
|
||||
NodeKind::Blend { children, spec } => {
|
||||
vectorcraft_geom::union_opt(self.visual(symbols), crate::blend::rail_reach(children, spec, symbols))
|
||||
}
|
||||
// The live geometry effects of a clipping path can move or grow the region it clips to
|
||||
// past its plain shape ([`crate::hit::set_clip_region`]).
|
||||
NodeKind::Layer { children, clip: true, .. } | NodeKind::Group { children, clip: true } => {
|
||||
vectorcraft_geom::union_opt(self.visual(symbols), children.first().and_then(|c| crate::hit::reshaped_clip_box(c)))
|
||||
}
|
||||
_ => self.visual(symbols),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,8 @@ mod wrap;
|
||||
pub use area::{AreaFit, AreaOptions, PathAlign, PathEffect, TextFlow, TextWrap, VerticalAlign, WrapShape};
|
||||
use char_style::yes;
|
||||
pub use char_style::{
|
||||
CharAlign, CharPosition, CharStyle, Digits, FontHeightReference, GlyphChoice, MAX_AKI, MAX_TSUME, MAX_WARICHU_GAP, ScriptMetrics, WARICHU_LINES,
|
||||
WARICHU_SCALE, WarichuAlign,
|
||||
CharAlign, CharPosition, CharStyle, Digits, FontHeightReference, GlyphChoice, GlyphForm, MAX_AKI, MAX_TSUME, MAX_WARICHU_GAP, ScriptMetrics,
|
||||
WARICHU_LINES, WARICHU_SCALE, WarichuAlign,
|
||||
};
|
||||
pub use composite::{
|
||||
COMPOSITE_BASELINE, COMPOSITE_FONTS_MAX, COMPOSITE_NAME_MAX, COMPOSITE_SCALE, COMPOSITE_SIZE, CharClass, CompositeFont, CompositePart,
|
||||
|
||||
@@ -205,6 +205,99 @@ pub struct CharStyle {
|
||||
/// default glyph otherwise. Saved only when set.
|
||||
#[serde(default, rename = "glyphAlternate", skip_serializing_if = "Option::is_none")]
|
||||
pub glyph_alternate: Option<GlyphChoice>,
|
||||
/// The East Asian glyph form these characters are drawn in (Glyphs panel menu, with Show East
|
||||
/// Asian Options): one OpenType feature of the font, such as JIS 78 forms (`jp78`), or the
|
||||
/// font's default glyphs. The text keeps its characters. Saved only when set.
|
||||
/// <https://helpx.adobe.com/illustrator/using/formatting-asian-characters.html>
|
||||
#[serde(default, rename = "glyphForm", skip_serializing_if = "crate::skip::is_default")]
|
||||
pub glyph_form: GlyphForm,
|
||||
}
|
||||
|
||||
/// The East Asian glyph form characters are drawn in ([`CharStyle::glyph_form`]): the font's
|
||||
/// default glyphs, or the glyphs one OpenType feature substitutes. One form at a time.
|
||||
/// <https://learn.microsoft.com/en-us/typography/opentype/spec/featurelist>
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub enum GlyphForm {
|
||||
/// The font's default glyphs.
|
||||
#[default]
|
||||
Default,
|
||||
/// Traditional forms (`trad`).
|
||||
Traditional,
|
||||
/// Expert forms (`expt`).
|
||||
Expert,
|
||||
/// JIS 2004 forms (`jp04`).
|
||||
Jis04,
|
||||
/// JIS 90 forms (`jp90`).
|
||||
Jis90,
|
||||
/// JIS 78 forms (`jp78`).
|
||||
Jis78,
|
||||
/// JIS 83 forms (`jp83`).
|
||||
Jis83,
|
||||
/// Monospaced full-width forms (`fwid`).
|
||||
FullWidth,
|
||||
/// Monospaced half-width forms (`hwid`).
|
||||
HalfWidth,
|
||||
/// Monospaced third-width forms (`twid`).
|
||||
ThirdWidth,
|
||||
/// Monospaced quarter-width forms (`qwid`).
|
||||
QuarterWidth,
|
||||
}
|
||||
|
||||
impl GlyphForm {
|
||||
/// Every form, in menu order, the default last.
|
||||
pub const ALL: [GlyphForm; 11] = [
|
||||
GlyphForm::Traditional,
|
||||
GlyphForm::Expert,
|
||||
GlyphForm::Jis04,
|
||||
GlyphForm::Jis90,
|
||||
GlyphForm::Jis78,
|
||||
GlyphForm::Jis83,
|
||||
GlyphForm::FullWidth,
|
||||
GlyphForm::HalfWidth,
|
||||
GlyphForm::ThirdWidth,
|
||||
GlyphForm::QuarterWidth,
|
||||
GlyphForm::Default,
|
||||
];
|
||||
|
||||
/// The name files and commands give this form (as it is saved).
|
||||
pub fn id(self) -> &'static str {
|
||||
match self {
|
||||
GlyphForm::Default => "default",
|
||||
GlyphForm::Traditional => "traditional",
|
||||
GlyphForm::Expert => "expert",
|
||||
GlyphForm::Jis04 => "jis04",
|
||||
GlyphForm::Jis90 => "jis90",
|
||||
GlyphForm::Jis78 => "jis78",
|
||||
GlyphForm::Jis83 => "jis83",
|
||||
GlyphForm::FullWidth => "fullWidth",
|
||||
GlyphForm::HalfWidth => "halfWidth",
|
||||
GlyphForm::ThirdWidth => "thirdWidth",
|
||||
GlyphForm::QuarterWidth => "quarterWidth",
|
||||
}
|
||||
}
|
||||
|
||||
/// The form [`GlyphForm::id`] names; `None` for any other name.
|
||||
pub fn from_id(id: &str) -> Option<GlyphForm> {
|
||||
GlyphForm::ALL.into_iter().find(|f| f.id() == id)
|
||||
}
|
||||
|
||||
/// The OpenType feature that draws this form; `None` for the default glyphs.
|
||||
pub fn feature(self) -> Option<&'static [u8; 4]> {
|
||||
Some(match self {
|
||||
GlyphForm::Default => return None,
|
||||
GlyphForm::Traditional => b"trad",
|
||||
GlyphForm::Expert => b"expt",
|
||||
GlyphForm::Jis04 => b"jp04",
|
||||
GlyphForm::Jis90 => b"jp90",
|
||||
GlyphForm::Jis78 => b"jp78",
|
||||
GlyphForm::Jis83 => b"jp83",
|
||||
GlyphForm::FullWidth => b"fwid",
|
||||
GlyphForm::HalfWidth => b"hwid",
|
||||
GlyphForm::ThirdWidth => b"twid",
|
||||
GlyphForm::QuarterWidth => b"qwid",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// A glyph chosen for one character ([`CharStyle::glyph_alternate`]): the glyph id and the face it
|
||||
@@ -586,6 +679,7 @@ impl Default for CharStyle {
|
||||
no_break: false,
|
||||
language: None,
|
||||
glyph_alternate: None,
|
||||
glyph_form: GlyphForm::Default,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -476,14 +476,18 @@ fn clip_group_with_type_clip(d: &mut Document, n: &Node) -> Option<Node> {
|
||||
|
||||
/// `m`, art evaluated from an object, with its children baked and then given ids of their own (the
|
||||
/// pieces copied from the source keep the source's ids until then). The pieces are baked with the
|
||||
/// ids the renderer draws them with: Random in a Transform effect takes its seed from the id.
|
||||
/// ids the renderer draws them with: Random in a Transform effect takes its seed from the id. When
|
||||
/// `m` clips, its clipping path, unless it is type, first takes the geometry effects in it as the
|
||||
/// canvas clips by it ([`crate::clip::with_clip_effects_applied`]).
|
||||
fn bake_pieces(d: &mut Document, mut m: Node) -> Node {
|
||||
let mut seen = std::collections::HashSet::from([m.id]);
|
||||
let clip = usize::from(m.clips() && !m.children().and_then(|ch| ch.first()).is_some_and(|c| matches!(c.kind, NodeKind::Text(_))));
|
||||
let children = m.children().cloned().unwrap_or_default();
|
||||
let children = children
|
||||
.into_iter()
|
||||
.map(|c| {
|
||||
let c = Arc::unwrap_or_clone(c);
|
||||
.enumerate()
|
||||
.map(|(i, c)| {
|
||||
let c = (i < clip).then(|| crate::clip::with_clip_effects_applied(&c)).flatten().unwrap_or_else(|| Arc::unwrap_or_clone(c));
|
||||
let mut c = one_deeper(|| bake_node(d, &c)).unwrap_or(c);
|
||||
fresh_ids(d, &mut c, &mut seen);
|
||||
Arc::new(c)
|
||||
|
||||
@@ -12,10 +12,14 @@ use vectorcraft_geom::{BezPath, FillRule, PathData};
|
||||
/// fills and strokes: the region is then the union of the paths they give, as an export bakes them.
|
||||
/// `None` when there is nothing to clip by (the clipped art is then hidden).
|
||||
pub fn clip_outline(clip: &Node) -> Option<(BezPath, FillRule)> {
|
||||
match clip_effects_applied(clip, true, || true) {
|
||||
Some(m) => m.clip_outline(Some(&outline_text), &unite),
|
||||
None => clip.clip_outline(Some(&outline_text), &unite),
|
||||
}
|
||||
reshaped_clip_outline(clip).unwrap_or_else(|| clip.clip_outline(Some(&outline_text), &unite))
|
||||
}
|
||||
|
||||
/// [`clip_outline`] of a clipping path that a live geometry effect reshapes; `None` when nothing
|
||||
/// `clip` clips by has a geometry effect of its own or on a fill or stroke. A hidden member of a
|
||||
/// group or layer does not clip, so its effects are not counted.
|
||||
pub fn reshaped_clip_outline(clip: &Node) -> Option<Option<(BezPath, FillRule)>> {
|
||||
clip_effects_applied(clip, true, || true).map(|m| m.clip_outline(Some(&outline_text), &unite))
|
||||
}
|
||||
|
||||
/// `n`, the clipping path of a clip group, with the live geometry effects of everything it clips by
|
||||
|
||||
@@ -72,7 +72,7 @@ pub use bake::{
|
||||
StrokeArt, WrittenLayers, bake_appearance, bake_document, bake_document_placing_symbols, bake_type_appearance, expand_art, expand_leaf,
|
||||
fresh_ids, needs_bake,
|
||||
};
|
||||
pub use clip::{WarpSeams, clip_outline, knockout_silhouette, warp_pieces_translucent};
|
||||
pub use clip::{WarpSeams, clip_outline, knockout_silhouette, reshaped_clip_outline, warp_pieces_translucent};
|
||||
pub use group::{
|
||||
OutlineHook, PATHFINDER_EFFECTS, compound_shape_area, compound_shape_art, evaluate_container, has_container_appearance, has_pathfinder,
|
||||
is_pathfinder, member_leaves, member_shapes, paints, pathfinder_children, shape_art,
|
||||
@@ -85,7 +85,7 @@ pub use raster::{RASTERIZE, RasterFx, Rasterize, color_param, follow_items, item
|
||||
pub use reshape::{
|
||||
SYMBOL_ART_MAX_NODES, expand_outlined, follows_image_pixels, gives_image_shape, has_gradient_copies, has_instance_row_raster, has_item_geometry,
|
||||
has_painted_effects, has_transform_art, has_transform_copies, has_transform_options, image_paint, needs_outline, outer_effects, outline_art,
|
||||
outline_text, reshape,
|
||||
outline_text, paint_type_piece, reshape,
|
||||
};
|
||||
pub use revolve::{
|
||||
CLASSIC_REVOLVE, REVOLVE, has_revolve, is_revolve, revolve_art, revolve_art_in, revolve_options, validate_revolve, validate_revolve_in,
|
||||
|
||||
@@ -508,6 +508,20 @@ fn laid_out(t: &vectorcraft_doc::TextObject) -> (Vec<kurbo::BezPath>, kurbo::Bez
|
||||
(runs, all, layout.bounds, colours)
|
||||
}
|
||||
|
||||
/// Paint `piece`, a piece of type's outline in text space (glyphs, ruby glyphs or an underline or
|
||||
/// strikethrough bar), with `style`, the fills and strokes of its run, and place it in the document
|
||||
/// by `xf`, the type's transform, as the renderer paints the run: its unplaced gradients are fixed
|
||||
/// to `bounds`, the layout's bounds in text space, so every piece of the type shows the one
|
||||
/// gradient fitted across the whole layout, and the transform also scales its stroke weights and
|
||||
/// dashes and transforms its pattern tiles. Placed gradients keep their place in text space and
|
||||
/// move with the type.
|
||||
pub fn paint_type_piece(piece: &mut Node, style: &vectorcraft_doc::CharStyle, bounds: Rect, xf: Affine) {
|
||||
let mut ap = style.appearance();
|
||||
ap.pin_gradients(bounds);
|
||||
piece.appearance = ap.into();
|
||||
piece.transform(xf, vectorcraft_doc::Scaling { strokes: true, patterns: true, ..Default::default() });
|
||||
}
|
||||
|
||||
/// Type as glyph outlines in document space: one path per run with the run's fill and stroke,
|
||||
/// over its colour glyphs (images, art), and (when the object has its own fills/strokes) the whole
|
||||
/// outline with the object's items below the characters under them and the others over them, as
|
||||
@@ -520,7 +534,6 @@ pub fn outline_text(n: &Node) -> Option<Node> {
|
||||
let NodeKind::Text(t) = &n.kind else { return None };
|
||||
let (runs, all, bounds, colours) = laid_out(t);
|
||||
let path = |bp: &kurbo::BezPath| PathData::from_bezpath(bp).transformed(t.xf);
|
||||
let scaling = vectorcraft_doc::Scaling { strokes: true, patterns: true, ..Default::default() };
|
||||
let mut children: Vec<Arc<Node>> = vec![];
|
||||
for (i, (bp, run)) in runs.iter().zip(&t.runs).enumerate() {
|
||||
// Colour glyphs paint themselves, under their run's fill, as the renderer paints them.
|
||||
@@ -528,10 +541,8 @@ pub fn outline_text(n: &Node) -> Option<Node> {
|
||||
if bp.elements().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let mut ap = run.style.appearance();
|
||||
ap.pin_gradients(bounds);
|
||||
let mut piece = Node::path(n.id, PathData::from_bezpath(bp), ap);
|
||||
piece.transform(t.xf, scaling);
|
||||
let mut piece = Node::path(n.id, PathData::from_bezpath(bp), Appearance::default());
|
||||
paint_type_piece(&mut piece, &run.style, bounds, t.xf);
|
||||
children.push(Arc::new(piece));
|
||||
}
|
||||
if !n.appearance.items.is_empty() && !all.elements().is_empty() {
|
||||
|
||||
+153
-25
@@ -6,7 +6,7 @@ use serde_json::Value;
|
||||
use vectorcraft_doc::color::{Color, Paint};
|
||||
use vectorcraft_doc::{Appearance, AppearanceItem, Document, Effect, FillLayer, Node, NodeId, NodeKind};
|
||||
use vectorcraft_geom::{PathData, PathEl, Point, Rect, Vec2};
|
||||
use vectorcraft_three_d::{Edge, Revolve};
|
||||
use vectorcraft_three_d::{Edge, Revolve, SolidFaces};
|
||||
|
||||
use crate::solids::wireframe::WireFace;
|
||||
use crate::solids::{
|
||||
@@ -338,34 +338,80 @@ fn geometry(path: &PathData, fx: &[Effect], ctx: &GeomContext) -> PathData {
|
||||
/// `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.
|
||||
fn shadow_of(id: NodeId, fx: &Effect, path: &PathData, item: &AppearanceItem, b: Rect, options: Revolve) -> Result<Option<Node>, String> {
|
||||
///
|
||||
/// `kept` holds the faces the surface drawn kept for its shadow ([`surface`]); without them the
|
||||
/// surface is swept again for its shadow alone.
|
||||
fn shadow_of(
|
||||
id: NodeId,
|
||||
fx: &Effect,
|
||||
path: &PathData,
|
||||
item: &AppearanceItem,
|
||||
b: Rect,
|
||||
options: Revolve,
|
||||
kept: Option<SolidFaces>,
|
||||
) -> 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 {
|
||||
return Ok(None);
|
||||
}
|
||||
let mut caster = vectorcraft_three_d::ShadowCaster::new();
|
||||
caster.revolve(path, vectorcraft_geom::FillRule::NonZero, b, options)?;
|
||||
cast_surface(&mut caster, path, b, options, kept)?;
|
||||
Ok(crate::solids::shadow::art(id, &caster, settings, crate::solids::shadow::Ink { opacity, blend }))
|
||||
}
|
||||
|
||||
/// 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()
|
||||
}
|
||||
|
||||
/// Add the surface of `path` about the axis of `b` to `caster`: the faces it kept when it was
|
||||
/// drawn, or without them, the surface swept for its shadow alone.
|
||||
fn cast_surface(
|
||||
caster: &mut vectorcraft_three_d::ShadowCaster,
|
||||
path: &PathData,
|
||||
b: Rect,
|
||||
options: Revolve,
|
||||
kept: Option<SolidFaces>,
|
||||
) -> Result<std::ops::Range<usize>, String> {
|
||||
match kept {
|
||||
Some(kept) => caster.add_solid(kept),
|
||||
None => {
|
||||
#[cfg(test)]
|
||||
crate::solids::SOLIDS_BUILT.with(|n| n.set(n.get() + 1));
|
||||
caster.revolve(path, vectorcraft_geom::FillRule::NonZero, b, options)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The shadow of group Revolve `fx` cast by the surfaces of the members `shapes` that have one,
|
||||
/// about the axis of `b`, on one plane; each member's part is as dark as its surface is opaque,
|
||||
/// in its paint's blending mode, and its opacity mask and blending mode apply to that part
|
||||
/// ([`crate::solids::shadow::scoped_art`]). An error when the surfaces it is cast from are past the
|
||||
/// limits.
|
||||
fn group_shadow(id: NodeId, fx: &Effect, shapes: &[Profile], b: Rect, options: Revolve) -> Result<Vec<Arc<Node>>, String> {
|
||||
/// limits. `kept` holds, member by member, the faces each surface drawn kept for its shadow
|
||||
/// ([`surface`]); a member without them is swept again for its shadow alone.
|
||||
fn group_shadow(
|
||||
id: NodeId,
|
||||
fx: &Effect,
|
||||
shapes: &[Profile],
|
||||
b: Rect,
|
||||
options: Revolve,
|
||||
kept: Vec<Option<SolidFaces>>,
|
||||
) -> Result<Vec<Arc<Node>>, String> {
|
||||
let Some(settings) = crate::solids::shadow::options(&merged_params(&fx.id, &fx.params)) else { return Ok(vec![]) };
|
||||
let mut caster = vectorcraft_three_d::ShadowCaster::new();
|
||||
let mut cast = vec![];
|
||||
let mut kept = kept.into_iter();
|
||||
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.
|
||||
let ink = crate::solids::shadow::Ink { opacity: opacity * s.opacity, blend };
|
||||
if ink.opacity <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
let faces = caster.revolve(&s.path, vectorcraft_geom::FillRule::NonZero, b, options)?;
|
||||
let faces = cast_surface(&mut caster, &s.path, b, options, kept)?;
|
||||
cast.push((s.scopes.as_slice(), ink, faces));
|
||||
}
|
||||
Ok(crate::solids::shadow::scoped_art(id, &caster, settings, cast, crate::solids::has_masks(shapes)))
|
||||
@@ -377,7 +423,8 @@ fn group_shadow(id: NodeId, fx: &Effect, shapes: &[Profile], b: Rect, options: R
|
||||
/// the bytes of the paint copies of every surface and graphic of the object. Revolve (Classic) draws every face
|
||||
/// with its classic surface, as Extrude & Bevel (Classic) does. Revolve's graphics, with the
|
||||
/// symbols of `doc`, are drawn on the faces of the side ([`crate::solids::graphics::surface_parts`]):
|
||||
/// a face with a part of a graphic is a group of the face and that part.
|
||||
/// a face with a part of a graphic is a group of the face and that part. With `cast`, the sweep
|
||||
/// that draws the surface also keeps the faces its shadow is cast from ([`SolidFaces`]).
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn surface(
|
||||
doc: Option<&Document>,
|
||||
@@ -391,11 +438,18 @@ fn surface(
|
||||
blend: vectorcraft_doc::color::BlendMode,
|
||||
expand: bool,
|
||||
copies: &mut Copies,
|
||||
) -> Option<(Vec<Drawn>, Node)> {
|
||||
cast: bool,
|
||||
) -> Option<(Vec<Drawn>, Node, Option<SolidFaces>)> {
|
||||
#[cfg(test)]
|
||||
crate::solids::SOLIDS_BUILT.with(|n| n.set(n.get() + 1));
|
||||
// A loaded file or a profile edited past the limits keeps drawing its source path instead
|
||||
// of crashing the frame. Commands validate the same evaluator and report its errors.
|
||||
if fx.id == CLASSIC_REVOLVE {
|
||||
let facets = vectorcraft_three_d::revolve_facets(path, b, options).ok()?;
|
||||
let (facets, kept) = if cast {
|
||||
vectorcraft_three_d::revolve_facets_shadowed(path, b, options).ok().map(|(f, kept)| (f, Some(kept)))?
|
||||
} else {
|
||||
(vectorcraft_three_d::revolve_facets(path, b, options).ok()?, None)
|
||||
};
|
||||
copies.surfaces = copies.surfaces.saturating_add(paint_copies(facets.len(), &paint));
|
||||
if copies.surfaces > MAX_PAINT_COPIES {
|
||||
return None;
|
||||
@@ -405,10 +459,14 @@ fn surface(
|
||||
let drawn =
|
||||
facets.iter().map(|f| Drawn { depth: f.depth, points: f.contours.first().cloned().unwrap_or_default(), plane: f.plane }).collect();
|
||||
let p = merged_params(&fx.id, &fx.params);
|
||||
return Some((drawn, crate::solids::classic::surface(n, facets, &paint, opacity, blend, &p)));
|
||||
return Some((drawn, crate::solids::classic::surface(n, facets, &paint, opacity, blend, &p), kept));
|
||||
}
|
||||
let colored = options.light_color != [1.0; 3] || options.lights.is_some();
|
||||
let faces = vectorcraft_three_d::revolve(path, b, options).ok()?;
|
||||
let (faces, kept) = if cast {
|
||||
vectorcraft_three_d::revolve_shadowed(path, b, options).ok().map(|(f, kept)| (f, Some(kept)))?
|
||||
} else {
|
||||
(vectorcraft_three_d::revolve(path, b, options).ok()?, None)
|
||||
};
|
||||
copies.surfaces = copies.surfaces.saturating_add(paint_copies(faces.len(), &paint));
|
||||
if copies.surfaces > MAX_PAINT_COPIES {
|
||||
return None;
|
||||
@@ -532,7 +590,7 @@ fn surface(
|
||||
let mut group = Node::group(n.id, children);
|
||||
group.opacity = opacity;
|
||||
group.blend = blend;
|
||||
Some((keys, group))
|
||||
Some((keys, group, kept))
|
||||
}
|
||||
|
||||
/// A face [`surface`] draws: its depth and, for [`crate::solids::surface_order`], its polygon on the
|
||||
@@ -549,8 +607,9 @@ fn in_order<T>(items: Vec<T>, order: &[usize]) -> Vec<T> {
|
||||
order.iter().filter_map(|&k| slots.get_mut(k).and_then(Option::take)).collect()
|
||||
}
|
||||
|
||||
/// A surface of one object about the bounds of `path`, built with options derived from `fx`.
|
||||
/// `copies` is the count [`surface`] adds to; its graphics take the symbols of `doc`.
|
||||
/// A surface of one object about the bounds of `path`, built with options derived from `fx`, and
|
||||
/// when `fx` casts a shadow from it, the faces it is cast from ([`surface`]). `copies` is the count
|
||||
/// [`surface`] adds to; its graphics take the symbols of `doc`.
|
||||
fn object_surface(
|
||||
doc: Option<&Document>,
|
||||
n: &Node,
|
||||
@@ -559,10 +618,11 @@ fn object_surface(
|
||||
item: &AppearanceItem,
|
||||
expand: bool,
|
||||
copies: &mut Copies,
|
||||
) -> Option<Node> {
|
||||
) -> Option<(Node, Option<SolidFaces>)> {
|
||||
let b = path.bounds()?;
|
||||
let (paint, opacity, blend) = paint_of(item);
|
||||
surface(doc, n, path, b, fx_options(fx), fx, paint, opacity, blend, expand, copies).map(|(_, art)| art)
|
||||
let cast = casts(fx, opacity);
|
||||
surface(doc, n, path, b, fx_options(fx), fx, paint, opacity, blend, expand, copies, cast).map(|(_, art, kept)| (art, kept))
|
||||
}
|
||||
|
||||
/// The paint of a graphic's solid color `c` on `face`, shaded as the face shades a solid fill of
|
||||
@@ -692,7 +752,7 @@ pub(crate) fn revolve_face_paths(doc: Option<&Document>, n: &Node) -> Result<cra
|
||||
for s in shapes.iter().filter(|s| surface_item(&s.items).is_some()) {
|
||||
out.extend(faces(&s.path, b, fx, options)?);
|
||||
}
|
||||
return Ok((out, group_shadow(n.id, fx, &shapes, b, options)?));
|
||||
return Ok((out, group_shadow(n.id, fx, &shapes, b, options, vec![])?));
|
||||
}
|
||||
let (path, _) = object_profile(n, "Revolve")?;
|
||||
let ctx = GeomContext::of(n);
|
||||
@@ -703,7 +763,7 @@ pub(crate) fn revolve_face_paths(doc: Option<&Document>, n: &Node) -> Result<cra
|
||||
let item = surface_item(&paints).ok_or("the revolved object has no fill or stroke")?;
|
||||
let b = path.bounds().ok_or("Revolve requires a shape with at least two anchors")?;
|
||||
let surface = faces(&path, b, fx, fx_options(fx))?;
|
||||
let shadow = shadow_of(n.id, fx, &path, item, b, fx_options(fx))?;
|
||||
let shadow = shadow_of(n.id, fx, &path, item, b, fx_options(fx), None)?;
|
||||
return Ok((surface, shadow.into_iter().map(Arc::new).collect()));
|
||||
}
|
||||
let path = geometry(&path, &n.appearance.effects, &ctx);
|
||||
@@ -764,9 +824,9 @@ fn art(doc: Option<&Document>, n: &Node, expand: bool) -> Option<Node> {
|
||||
let paints = solid_paints(n);
|
||||
let item = surface_item(&paints)?;
|
||||
let expand = expand && !n.appearance.effects.iter().skip(index + 1).any(|e| e.visible && is_geometry(&e.id));
|
||||
let surface = object_surface(doc, n, &path, fx, item, expand, &mut copies)?;
|
||||
let (surface, kept) = object_surface(doc, n, &path, fx, item, expand, &mut copies)?;
|
||||
if let Some(b) = path.bounds()
|
||||
&& let Some(shadow) = shadow_of(n.id, fx, &path, item, b, fx_options(fx)).ok()?
|
||||
&& let Some(shadow) = shadow_of(n.id, fx, &path, item, b, fx_options(fx), kept).ok()?
|
||||
{
|
||||
children.push(Arc::new(shadow));
|
||||
}
|
||||
@@ -790,10 +850,10 @@ fn art(doc: Option<&Document>, n: &Node, expand: bool) -> Option<Node> {
|
||||
let fx = item.effects().get(index)?;
|
||||
let p = geometry(&path, item.effects().get(..index)?, &ctx.item(original));
|
||||
let expand = expand && !item.effects().iter().skip(index + 1).any(|e| e.visible && is_geometry(&e.id));
|
||||
let mut art = object_surface(doc, n, &p, fx, item, expand, &mut copies)?;
|
||||
let (mut art, kept) = object_surface(doc, n, &p, fx, item, expand, &mut copies)?;
|
||||
art.appearance.effects = item.effects().iter().skip(index + 1).filter(|e| !is_revolve(&e.id)).cloned().collect();
|
||||
if let Some(b) = p.bounds()
|
||||
&& let Some(mut shadow) = shadow_of(n.id, fx, &p, item, b, fx_options(fx)).ok()?
|
||||
&& let Some(mut shadow) = shadow_of(n.id, fx, &p, item, b, fx_options(fx), kept).ok()?
|
||||
{
|
||||
shadow.appearance.effects = art.appearance.effects.clone();
|
||||
shadows.push(Arc::new(shadow));
|
||||
@@ -942,21 +1002,28 @@ fn group_art(doc: Option<&Document>, n: &Node, expand: bool) -> Option<Node> {
|
||||
let expand = expand && !n.appearance.effects.iter().skip(index + 1).any(|e| e.visible && is_geometry(&e.id));
|
||||
let mut copies = Copies::default();
|
||||
let mut surfaces = vec![];
|
||||
// The faces each member's surface kept for the shadow, member by member.
|
||||
let mut kept = vec![];
|
||||
let mut opaque = true;
|
||||
// The graphics go once, on the side of the member with the longest profile. Without graphics
|
||||
// no member is measured for them.
|
||||
let mapped = fx.id == REVOLVE && !crate::solids::mapped_graphics(&merged_params(&fx.id, &fx.params)).is_empty();
|
||||
let longest = if mapped { graphics_member(&shapes, b, options) } else { None };
|
||||
for (k, s) in shapes.iter().enumerate() {
|
||||
let Some(item) = surface_item(&s.items) else { continue };
|
||||
let Some(item) = surface_item(&s.items) else {
|
||||
kept.push(None);
|
||||
continue;
|
||||
};
|
||||
// The opacity and blending of the member and the groups it is in apply through its scopes.
|
||||
let (paint, opacity, blend) = paint_of(item);
|
||||
opaque &= opacity >= 1.0 && blend == Default::default() && s.scopes.is_empty();
|
||||
// A member with transparency of its own keeps every face, as a transparent object does.
|
||||
let expand = expand && s.scopes.is_empty();
|
||||
let doc = doc.filter(|_| longest == Some(k));
|
||||
let (depths, art) = surface(doc, n, &s.path, b, options, fx, paint, opacity, blend, expand, &mut copies)?;
|
||||
let cast = casts(fx, opacity * s.opacity);
|
||||
let (depths, art, faces) = surface(doc, n, &s.path, b, options, fx, paint, opacity, blend, expand, &mut copies, cast)?;
|
||||
surfaces.push((depths, art, s.scopes.as_slice()));
|
||||
kept.push(faces);
|
||||
}
|
||||
if surfaces.is_empty() {
|
||||
return None;
|
||||
@@ -1057,7 +1124,7 @@ fn group_art(doc: Option<&Document>, n: &Node, expand: bool) -> Option<Node> {
|
||||
};
|
||||
// One shadow for every member's surface, behind them all.
|
||||
let mut children = children;
|
||||
children.splice(0..0, group_shadow(n.id, fx, &shapes, b, options).ok()?);
|
||||
children.splice(0..0, group_shadow(n.id, fx, &shapes, b, options, kept).ok()?);
|
||||
let remaining = past_effect(&n.appearance.effects, index);
|
||||
let mut art = n.clone();
|
||||
art.kind = NodeKind::Group { children, clip: false };
|
||||
@@ -1682,6 +1749,67 @@ mod tests {
|
||||
}
|
||||
assert_eq!(expand_revolve_art(&sample), revolve_art(&sample));
|
||||
}
|
||||
|
||||
/// The settings the shadows are compared with: the defaults, a partial sweep turned with
|
||||
/// perspective, and an open surface away from its axis under a colored light.
|
||||
fn shadow_settings() -> [Value; 3] {
|
||||
[
|
||||
json!({"shadow": true}),
|
||||
json!({"shadow": true, "rotationX": -25, "rotationY": 35, "perspective": 50, "angle": 220, "shadowDistance": 40}),
|
||||
json!({"shadow": true, "shadowDistance": 30, "lightColor": "#ff8040", "offset": 20, "cap": false}),
|
||||
]
|
||||
}
|
||||
|
||||
/// The shadow of the faces Revolve and Revolve (Classic) kept when they swept their surfaces,
|
||||
/// to the bit: the shadow of surfaces swept for the shadow alone, for one object, for an
|
||||
/// object whose fill is half transparent, and for a group of two members, one at half opacity.
|
||||
#[test]
|
||||
fn the_shadow_cast_from_the_surfaces_drawn_is_the_shadow_of_surfaces_swept_for_it() {
|
||||
for id in [REVOLVE, CLASSIC_REVOLVE] {
|
||||
for params in shadow_settings() {
|
||||
// Revolve (Classic) takes no shadow settings from commands, but a file can carry them.
|
||||
let mut fx = crate::new_effect(id, &json!({})).unwrap();
|
||||
fx.params = params.clone();
|
||||
let n = profile_node();
|
||||
let (path, _) = profile(&n).unwrap();
|
||||
let b = path.bounds().unwrap();
|
||||
let mut half = n.clone();
|
||||
if let AppearanceItem::Fill(f) = &mut half.appearance.items[0] {
|
||||
f.opacity = 0.5;
|
||||
}
|
||||
for n in [n, half] {
|
||||
let item = surface_item(&n.appearance.items).unwrap();
|
||||
let (_, kept) = object_surface(None, &n, &path, &fx, item, false, &mut Copies::default()).unwrap();
|
||||
let drawn = shadow_of(n.id, &fx, &path, item, b, fx_options(&fx), kept).unwrap();
|
||||
let alone = shadow_of(n.id, &fx, &path, item, b, fx_options(&fx), None).unwrap();
|
||||
assert!(alone.is_some() || id == CLASSIC_REVOLVE, "{id} {params}");
|
||||
assert_eq!(format!("{drawn:?}"), format!("{alone:?}"), "{id} {params}");
|
||||
}
|
||||
let mut other = profile_node();
|
||||
other.id = NodeId(2);
|
||||
other.transform(Affine::translate((120.0, 0.0)), false);
|
||||
other.opacity = 0.5;
|
||||
let mut g = Node::group(NodeId(9), vec![Arc::new(profile_node()), Arc::new(other)]);
|
||||
g.appearance.effects.push(fx.clone());
|
||||
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();
|
||||
assert!(kept.iter().all(Option::is_some), "{id} {params}");
|
||||
let drawn = group_shadow(g.id, &fx, &shapes, b, options, kept).unwrap();
|
||||
let alone = group_shadow(g.id, &fx, &shapes, b, options, vec![]).unwrap();
|
||||
assert!(!alone.is_empty() || id == CLASSIC_REVOLVE, "{id} {params}");
|
||||
assert_eq!(format!("{drawn:?}"), format!("{alone:?}"), "{id} {params}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
+167
-21
@@ -7,7 +7,9 @@ use vectorcraft_doc::color::{BlendMode, Paint};
|
||||
use vectorcraft_doc::{Appearance, AppearanceItem, Document, Effect, Node, NodeId, NodeKind, OpacityMask};
|
||||
use vectorcraft_geom::{BezPath, FillRule, PathData, Point, Rect, Vec2};
|
||||
use vectorcraft_pathops::BoolOp;
|
||||
use vectorcraft_three_d::{Bevel, BevelShape, DepthPlane, Extrude, Facet, Inflate, MAX_OBJECT_FACES, Mesh, MeshedSolid, PlanarFace, View};
|
||||
use vectorcraft_three_d::{
|
||||
Bevel, BevelShape, DepthPlane, Extrude, Facet, Inflate, MAX_OBJECT_FACES, Mesh, MeshedSolid, PlanarFace, SolidFaces, View,
|
||||
};
|
||||
|
||||
#[cfg(test)]
|
||||
use vectorcraft_doc::color::Color;
|
||||
@@ -236,6 +238,30 @@ fn facets(id: &str, path: &PathData, rule: FillRule, bounds: Rect, p: &Value) ->
|
||||
}
|
||||
}
|
||||
|
||||
/// [`facets`], and with `cast` for Extrude & Bevel or Rotate the faces the solid's shadow is cast
|
||||
/// from, from the same build. Inflate's solids are built together ([`built_solids_cast`]), and the
|
||||
/// classic effects cast no shadow: they keep no faces.
|
||||
fn facets_and_faces(
|
||||
id: &str,
|
||||
path: &PathData,
|
||||
rule: FillRule,
|
||||
bounds: Rect,
|
||||
p: &Value,
|
||||
cast: bool,
|
||||
) -> Result<(Vec<Facet>, Option<SolidFaces>), String> {
|
||||
let view = view_options(p);
|
||||
#[cfg(test)]
|
||||
if cast && id == EXTRUDE {
|
||||
SOLID_GEOMETRY_BUILT.with(|n| n.set(n.get() + 1));
|
||||
}
|
||||
let built = match id {
|
||||
EXTRUDE if cast => vectorcraft_three_d::extrude_shadowed(path, rule, bounds, extrude_options(p), view),
|
||||
ROTATE if cast => vectorcraft_three_d::plane_shadowed(path, rule, bounds, view),
|
||||
_ => return facets(id, path, rule, bounds, p).map(|f| (f, None)),
|
||||
};
|
||||
built.map(|(f, faces)| (f, Some(faces)))
|
||||
}
|
||||
|
||||
/// Check solid `id`'s parameter values `p` alone: the part of [`validate_solid`] that does not
|
||||
/// need the object.
|
||||
fn validate_solid_params(id: &str, p: &Value) -> Result<(), String> {
|
||||
@@ -693,7 +719,9 @@ fn solid_parts(shapes: &[Profile], fallback: Rect) -> (Vec<Part<'_>>, Rect) {
|
||||
#[cfg(test)]
|
||||
thread_local! {
|
||||
/// How many solids [`built_solids`] and [`meshes_for`] have built on this thread, for the tests.
|
||||
static SOLIDS_BUILT: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
/// Rotate's planes drawn, the solids built to cast a shadow ([`cast_shadow`]) and Revolve's
|
||||
/// surfaces count too.
|
||||
pub(crate) static SOLIDS_BUILT: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
/// How many Extrude & Bevel (Classic included) and Inflate solids [`facets`] and
|
||||
/// [`built_solids`] have built on this thread, for the tests.
|
||||
static SOLID_GEOMETRY_BUILT: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
||||
@@ -712,10 +740,35 @@ fn built_solids<'a>(
|
||||
bounds: Rect,
|
||||
limit: usize,
|
||||
) -> impl Iterator<Item = Result<Option<Vec<Facet>>, String>> + 'a {
|
||||
built_solids_cast(id, p, parts, bounds, limit, false).map(|r| r.map(|s| s.map(|(f, _)| f)))
|
||||
}
|
||||
|
||||
/// One solid's facets and, when its shadow is cast, the faces it is cast from.
|
||||
type CastingSolid = (Vec<Facet>, Option<SolidFaces>);
|
||||
|
||||
/// The surfaces of an object's solids, and the faces each solid kept for its shadow
|
||||
/// ([`surfaces_for`]).
|
||||
type SurfacesAndFaces = (Vec<Arc<Node>>, Vec<Option<SolidFaces>>);
|
||||
|
||||
/// [`built_solids`], and with `cast` for Extrude & Bevel or Inflate each solid's faces its shadow
|
||||
/// is cast from, from the same build ([`SolidFaces`]).
|
||||
fn built_solids_cast<'a>(
|
||||
id: &'a str,
|
||||
p: &'a Value,
|
||||
parts: &'a [Part<'a>],
|
||||
bounds: Rect,
|
||||
limit: usize,
|
||||
cast: bool,
|
||||
) -> impl Iterator<Item = Result<Option<CastingSolid>, String>> + 'a {
|
||||
// Inflate's eye is placed for every puff together, as far away as the highest needs.
|
||||
let mut inflated = (id == INFLATE).then(|| {
|
||||
let mut inflated = (id == INFLATE).then(|| -> Box<dyn Iterator<Item = Result<CastingSolid, String>>> {
|
||||
let shapes: Vec<(&PathData, FillRule)> = parts.iter().map(|(_, _, area, rule, _, _)| (area, *rule)).collect();
|
||||
vectorcraft_three_d::inflate_each(&shapes, bounds, inflate_options(p), view_options(p))
|
||||
let (o, view) = (inflate_options(p), view_options(p));
|
||||
if cast {
|
||||
Box::new(vectorcraft_three_d::inflate_shadowed(&shapes, bounds, o, view).map(|r| r.map(|(f, faces)| (f, Some(faces)))))
|
||||
} else {
|
||||
Box::new(vectorcraft_three_d::inflate_each(&shapes, bounds, o, view).map(|r| r.map(|f| (f, None))))
|
||||
}
|
||||
});
|
||||
let mut kept = 0usize;
|
||||
let mut ended = false;
|
||||
@@ -729,13 +782,13 @@ fn built_solids<'a>(
|
||||
Some(each) => {
|
||||
#[cfg(test)]
|
||||
SOLID_GEOMETRY_BUILT.with(|n| n.set(n.get() + 1));
|
||||
each.next().unwrap_or_else(|| Ok(vec![]))
|
||||
each.next().unwrap_or_else(|| Ok((vec![], None)))
|
||||
}
|
||||
None => facets(id, area, *rule, bounds, p),
|
||||
None => facets_and_faces(id, area, *rule, bounds, p, cast),
|
||||
};
|
||||
let result = match built {
|
||||
Ok(f) => {
|
||||
kept = kept.saturating_add(f.len());
|
||||
kept = kept.saturating_add(f.0.len());
|
||||
if kept > limit { Err(vectorcraft_three_d::TOO_COMPLEX_SOLID.to_string()) } else { Ok(Some(f)) }
|
||||
}
|
||||
Err(_) if matches!(item, AppearanceItem::Stroke(_)) => Ok(None),
|
||||
@@ -1364,12 +1417,19 @@ type ShadowAndSurfaces = (Vec<Arc<Node>>, Vec<Arc<Node>>);
|
||||
/// otherwise each solid is a surface of its own, in that order. A member's opacity mask and
|
||||
/// blending mode, and those of a group it is in, apply to the surfaces of the members it holds
|
||||
/// ([`masked`]). The art comes in two parts: the effect's shadow ([`cast_shadow`], none with it
|
||||
/// off), to be drawn behind every surface of the object, and the surfaces.
|
||||
/// off), cast from the faces the solids drawn kept ([`cast_built`]), to be drawn behind every
|
||||
/// surface of the object, and the surfaces.
|
||||
fn art_for(doc: Option<&Document>, n: &Node, fx: &Effect, shapes: &[Profile]) -> Option<ShadowAndSurfaces> {
|
||||
let art = surfaces_for(doc, n, fx, shapes)?;
|
||||
let p = crate::merged_params(&fx.id, &fx.params);
|
||||
let cast = !is_classic_three_d(&fx.id) && shadow::options(&p).is_some();
|
||||
let (art, built) = surfaces_for(doc, n, fx, shapes, cast)?;
|
||||
// A shadow past the limits draws the source path, as a solid past them does; commands report
|
||||
// the error ([`validate_solid_in`]).
|
||||
let shadow = shadow_for(n.id, fx, shapes).ok()?;
|
||||
let shadow = if cast { cast_built(&fx.id, &p, shapes, built) } else { Ok(None) };
|
||||
let shadow = match shadow.ok()? {
|
||||
Some((caster, settings, cast)) => shadow::scoped_art(n.id, &caster, settings, cast, has_masks(shapes)),
|
||||
None => vec![],
|
||||
};
|
||||
Some((shadow, art))
|
||||
}
|
||||
|
||||
@@ -1408,6 +1468,8 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result<Option<
|
||||
for s in shapes {
|
||||
for item in s.items.iter().filter(|i| ink(i, s.opacity).opacity > 0.0) {
|
||||
let (area, rule) = region(&s.path, s.rule, item);
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + 1));
|
||||
let faces = caster.plane(&area, rule, b, view)?;
|
||||
cast.push((s.scopes.as_slice(), ink(item, s.opacity), faces));
|
||||
}
|
||||
@@ -1419,10 +1481,14 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result<Option<
|
||||
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();
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + shapes.len()));
|
||||
caster.inflate(&shapes, &casts, bounds, inflate_options(p), view)
|
||||
} else {
|
||||
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)));
|
||||
added.push(if ink.opacity > 0.0 { caster.extrude(area, *rule, bounds, extrude_options(p), view) } else { Ok(0..0) });
|
||||
}
|
||||
added
|
||||
@@ -1444,6 +1510,76 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result<Option<
|
||||
Ok(Some((caster, settings, cast)))
|
||||
}
|
||||
|
||||
/// [`cast_shadow`] from `built`, the faces the solids drawn kept ([`surfaces_for`] with its shadow
|
||||
/// cast), one entry for each solid in the order they are built: for Rotate each fill and stroke of
|
||||
/// each shape, otherwise each part ([`solid_parts`]). A stroke's solid left out of the art (past its
|
||||
/// own limits) kept no faces. Its Extrude & Bevel solid is built for the shadow alone, as
|
||||
/// [`cast_shadow`] builds it, and when an Inflate solid of visible art kept no faces the whole
|
||||
/// shadow is cast as [`cast_shadow`] casts it, since Inflate's solids share one eye.
|
||||
fn cast_built<'a>(id: &str, p: &Value, shapes: &'a [Profile], built: Vec<Option<SolidFaces>>) -> Result<Option<Cast<'a>>, String> {
|
||||
if id == CLASSIC_EXTRUDE || id == CLASSIC_ROTATE {
|
||||
return Ok(None);
|
||||
}
|
||||
let (Some(settings), Some(b)) = (shadow::options(p), union_bounds(shapes)) else { return Ok(None) };
|
||||
let view = view_options(p);
|
||||
let mut caster = vectorcraft_three_d::ShadowCaster::new();
|
||||
let mut cast: Vec<shadow::Cast> = vec![];
|
||||
let ink = |item: &AppearanceItem, member: f32| {
|
||||
let (_, opacity, blend) = paint_of(item, member);
|
||||
shadow::Ink { opacity, blend }
|
||||
};
|
||||
if id == ROTATE {
|
||||
let items: Vec<(&Profile, &AppearanceItem)> = shapes.iter().flat_map(|s| s.items.iter().map(move |item| (s, item))).collect();
|
||||
if items.len() != built.len() {
|
||||
return cast_shadow(id, p, shapes);
|
||||
}
|
||||
for ((s, item), kept) in items.into_iter().zip(built) {
|
||||
let ink = ink(item, s.opacity);
|
||||
if ink.opacity <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
let faces = match kept {
|
||||
Some(kept) => caster.add_solid(kept)?,
|
||||
None => {
|
||||
let (area, rule) = region(&s.path, s.rule, item);
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + 1));
|
||||
caster.plane(&area, rule, b, view)?
|
||||
}
|
||||
};
|
||||
cast.push((s.scopes.as_slice(), ink, faces));
|
||||
}
|
||||
return Ok(Some((caster, settings, cast)));
|
||||
}
|
||||
let (parts, bounds) = solid_parts(shapes, b);
|
||||
let inks: Vec<shadow::Ink> = parts.iter().map(|(item, member, ..)| ink(item, *member)).collect();
|
||||
if parts.len() != built.len() || (id == INFLATE && inks.iter().zip(&built).any(|(ink, kept)| ink.opacity > 0.0 && kept.is_none())) {
|
||||
return cast_shadow(id, p, shapes);
|
||||
}
|
||||
for (((item, _, area, rule, scopes, _), ink), kept) in parts.iter().zip(inks).zip(built) {
|
||||
if ink.opacity <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
let faces = match kept {
|
||||
Some(kept) => caster.add_solid(kept),
|
||||
None => {
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + 1));
|
||||
caster.extrude(area, *rule, bounds, extrude_options(p), view)
|
||||
}
|
||||
};
|
||||
// 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 faces {
|
||||
Ok(faces) => faces,
|
||||
Err(e) if matches!(item, AppearanceItem::Stroke(_)) && e != vectorcraft_three_d::TOO_COMPLEX_SHADOW => continue,
|
||||
Err(e) => return Err(e),
|
||||
};
|
||||
cast.push((*scopes, ink, faces));
|
||||
}
|
||||
Ok(Some((caster, settings, cast)))
|
||||
}
|
||||
|
||||
/// The faces a shadow is cast from, its settings, and the faces of each solid of visible art with
|
||||
/// its member's scopes and ink ([`cast_shadow`]).
|
||||
type Cast<'a> = (vectorcraft_three_d::ShadowCaster, vectorcraft_three_d::Shadow, Vec<shadow::Cast<'a>>);
|
||||
@@ -1582,8 +1718,10 @@ fn seen_ends(f: &[Facet]) -> impl Iterator<Item = &Facet> {
|
||||
}
|
||||
|
||||
/// [`art_for`] without the shadow: the solids' surfaces, with the graphics mapped onto their planar
|
||||
/// faces drawn right after the last of the solids' surfaces that holds that face.
|
||||
fn surfaces_for(doc: Option<&Document>, n: &Node, fx: &Effect, shapes: &[Profile]) -> Option<Vec<Arc<Node>>> {
|
||||
/// faces drawn right after the last of the solids' surfaces that holds that face. With `cast`, each
|
||||
/// solid built also keeps the faces its shadow is cast from, from the same build, in the order the
|
||||
/// solids are built ([`cast_built`]); `None` for a stroke's solid left out of the art.
|
||||
fn surfaces_for(doc: Option<&Document>, n: &Node, fx: &Effect, shapes: &[Profile], cast: bool) -> Option<SurfacesAndFaces> {
|
||||
let b = union_bounds(shapes)?;
|
||||
let p = crate::merged_params(&fx.id, &fx.params);
|
||||
let classic = fx.id == CLASSIC_EXTRUDE || fx.id == CLASSIC_ROTATE;
|
||||
@@ -1598,11 +1736,15 @@ fn surfaces_for(doc: Option<&Document>, n: &Node, fx: &Effect, shapes: &[Profile
|
||||
// the centre of theirs), so they stay together.
|
||||
let mut out = vec![];
|
||||
let mut filled = vec![];
|
||||
let mut built = vec![];
|
||||
for (member, s) in shapes.iter().enumerate() {
|
||||
for item in &s.items {
|
||||
let (paint, opacity, blend) = paint_of(item, s.opacity);
|
||||
let (area, rule) = region(&s.path, s.rule, item);
|
||||
let f = facets(ROTATE, &area, rule, b, &p).ok()?;
|
||||
#[cfg(test)]
|
||||
SOLIDS_BUILT.with(|n| n.set(n.get() + 1));
|
||||
let (f, faces) = facets_and_faces(ROTATE, &area, rule, b, &p, cast).ok()?;
|
||||
built.push(faces);
|
||||
if !crate::revolve::paint_copies_add(&mut paint_bytes, facet_copies(&f, &paint, colored), &paint) {
|
||||
return None;
|
||||
}
|
||||
@@ -1619,19 +1761,23 @@ fn surfaces_for(doc: Option<&Document>, n: &Node, fx: &Effect, shapes: &[Profile
|
||||
}
|
||||
let arts = placed_graphics(doc, n.id, (ROTATE, &p), b, &filled, masks);
|
||||
let out = with_graphics(out, 0, &arts);
|
||||
return Some(if masks { masked(n.id, out) } else { out.into_iter().map(|(_, s)| s).collect() });
|
||||
return Some((if masks { masked(n.id, out) } else { out.into_iter().map(|(_, s)| s).collect() }, built));
|
||||
}
|
||||
let (parts, bounds) = solid_parts(shapes, b);
|
||||
let mut solids = vec![];
|
||||
for ((item, opacity, _, _, scopes, member), f) in parts.iter().zip(built_solids(&fx.id, &p, &parts, bounds, MAX_OBJECT_FACES)) {
|
||||
let mut built = vec![];
|
||||
for ((item, opacity, _, _, scopes, member), f) in parts.iter().zip(built_solids_cast(&fx.id, &p, &parts, bounds, MAX_OBJECT_FACES, cast)) {
|
||||
let item: &AppearanceItem = item;
|
||||
match f {
|
||||
Ok(Some(f)) if !crate::revolve::paint_copies_add(&mut paint_bytes, facet_copies(&f, paint_ref(item), colored), paint_ref(item)) => {
|
||||
Ok(Some((f, _))) if !crate::revolve::paint_copies_add(&mut paint_bytes, facet_copies(&f, paint_ref(item), colored), paint_ref(item)) => {
|
||||
return None;
|
||||
}
|
||||
Ok(Some(f)) => solids.push((item, *opacity, *scopes, f, *member)),
|
||||
Ok(Some((f, faces))) => {
|
||||
solids.push((item, *opacity, *scopes, f, *member));
|
||||
built.push(faces);
|
||||
}
|
||||
// A stroke's outline past the limits is left out; the fill's solid still draws.
|
||||
Ok(None) => {}
|
||||
Ok(None) => built.push(None),
|
||||
// A loaded file or a shape edited past the limits (its own, or those of the object's
|
||||
// solids together) keeps drawing its source path instead of failing the frame;
|
||||
// commands validate the same evaluator and report its errors.
|
||||
@@ -1760,14 +1906,14 @@ fn surfaces_for(doc: Option<&Document>, n: &Node, fx: &Effect, shapes: &[Profile
|
||||
out.extend(with_graphics(run.collect(), first, &arts));
|
||||
}
|
||||
}
|
||||
return Some(masked(n.id, out));
|
||||
return Some((masked(n.id, out), built));
|
||||
}
|
||||
if !opaque || !surfaces.iter().all(plain) {
|
||||
let surfaces =
|
||||
surfaces.into_iter().enumerate().map(|(k, (d, s, scopes, e))| (d, underlaid_surface(n.id, s, seal(k..k + 1)), scopes, e)).collect();
|
||||
return Some(whole_surfaces(surfaces, &arts).into_iter().map(|(_, s)| s).collect());
|
||||
return Some((whole_surfaces(surfaces, &arts).into_iter().map(|(_, s)| s).collect(), built));
|
||||
}
|
||||
Some(vec![Arc::new(Node::group(n.id, in_one_order(n.id, surfaces, 0, &arts, sealed, &seals)))])
|
||||
Some((vec![Arc::new(Node::group(n.id, in_one_order(n.id, surfaces, 0, &arts, sealed, &seals)))], built))
|
||||
}
|
||||
|
||||
/// A plain `surface` ([`surface`]: a group of its facets) over an underlay of its facets when
|
||||
|
||||
@@ -223,3 +223,92 @@ fn expand_appearance_keeps_the_shadow_as_a_path() {
|
||||
assert!((after.x0 - before.x0 - 40.0).abs() < 1e-6, "{id}: {before:?} {after:?}");
|
||||
}
|
||||
}
|
||||
|
||||
/// A square filled red and stroked blue, its stroke as opaque as `stroke`.
|
||||
fn stroked_square(id: u64, dx: f64, stroke: f32) -> Node {
|
||||
let mut n = square_node(id, dx);
|
||||
n.appearance = Appearance::basic(Paint::solid(RED), Paint::solid(Color::rgb(0.1, 0.2, 0.9)), 6.0).into();
|
||||
for item in &mut n.appearance.items {
|
||||
if let AppearanceItem::Stroke(s) = item {
|
||||
s.opacity = stroke;
|
||||
}
|
||||
}
|
||||
n
|
||||
}
|
||||
|
||||
/// Objects with 3D effect `id` and its shadow on (`params`): a filled and stroked square, one whose
|
||||
/// stroke is half transparent, one whose stroke is fully transparent, and a group of two members,
|
||||
/// one of them at half opacity.
|
||||
fn shadowed(id: &str, params: &Value) -> Vec<Node> {
|
||||
let with = |mut n: Node| {
|
||||
n.appearance.effects.push(crate::new_effect(id, params).unwrap());
|
||||
n
|
||||
};
|
||||
let mut half = stroked_square(2, 200.0, 1.0);
|
||||
half.opacity = 0.5;
|
||||
let group = Node::group(NodeId(9), vec![Arc::new(stroked_square(1, 0.0, 1.0)), Arc::new(half)]);
|
||||
vec![with(stroked_square(1, 0.0, 1.0)), with(stroked_square(1, 0.0, 0.5)), with(stroked_square(1, 0.0, 0.0)), with(group)]
|
||||
}
|
||||
|
||||
/// The settings the shadows of effect `id` are compared with: the defaults, turned with
|
||||
/// perspective, and under a colored light, below the object for Extrude & Bevel, Inflate and
|
||||
/// Rotate and behind it for Revolve.
|
||||
fn shadow_settings(id: &str) -> [Value; 3] {
|
||||
let position = if id == crate::REVOLVE { "behind" } else { "below" };
|
||||
[
|
||||
json!({"shadow": true}),
|
||||
json!({"shadow": true, "rotationX": -25, "rotationY": 35, "perspective": 50, "shadowDistance": 40}),
|
||||
json!({"shadow": true, "shadowPosition": position, "shadowDistance": 30, "lightColor": "#ff8040", "twist": 30}),
|
||||
]
|
||||
}
|
||||
|
||||
/// How many solids drawing the art of `n` with effect `id` builds.
|
||||
fn solids_built(n: &Node, id: &str) -> usize {
|
||||
let start = SOLIDS_BUILT.with(std::cell::Cell::get);
|
||||
assert!(art(n, id).is_some(), "{id}");
|
||||
SOLIDS_BUILT.with(std::cell::Cell::get) - start
|
||||
}
|
||||
|
||||
/// Drawing a 3D object with its shadow on builds each of its solids once: the shadow is cast from
|
||||
/// the faces the solids drawn kept, so it builds no more solids than the art without a shadow.
|
||||
#[test]
|
||||
fn a_shadowed_3d_object_builds_each_solid_once() {
|
||||
for id in CASTING {
|
||||
for params in shadow_settings(id) {
|
||||
for (lit, mut plain) in shadowed(id, ¶ms).into_iter().zip(shadowed(id, ¶ms)) {
|
||||
plain.appearance.effects.iter_mut().for_each(|e| e.params["shadow"] = json!(false));
|
||||
let mut cast = 0;
|
||||
art(&lit, id).unwrap().walk(&mut |c| cast += usize::from(shadow_opacity(c).is_some()));
|
||||
assert!(cast > 0, "{id} {params}");
|
||||
let built = solids_built(&plain, id);
|
||||
assert!(built > 0, "{id}");
|
||||
assert_eq!(solids_built(&lit, id), built, "{id} {params}: the shadow builds no solid of its own");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The shadow of the faces Extrude & Bevel, Inflate and Rotate kept when they drew their solids,
|
||||
/// to the bit: the shadow [`cast_shadow`] casts from solids built for the shadow alone.
|
||||
#[test]
|
||||
fn the_shadow_cast_from_the_solids_drawn_is_the_shadow_of_solids_built_for_it() {
|
||||
for id in [EXTRUDE, INFLATE, ROTATE] {
|
||||
for params in shadow_settings(id) {
|
||||
for n in shadowed(id, ¶ms) {
|
||||
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 (drawn, _) = art_for(None, &n, fx, &shapes).unwrap();
|
||||
let p = crate::merged_params(&fx.id, &fx.params);
|
||||
let (caster, settings, cast) = cast_shadow(&fx.id, &p, &shapes).unwrap().unwrap();
|
||||
let alone = shadow::scoped_art(n.id, &caster, settings, cast, has_masks(&shapes));
|
||||
assert!(!alone.is_empty(), "{id} {params}");
|
||||
assert_eq!(format!("{drawn:?}"), format!("{alone:?}"), "{id} {params}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,7 @@ use vectorcraft_geom::{Affine, Rect, Vec2};
|
||||
use crate::pixel::PixelSpace;
|
||||
use crate::util::{num, text};
|
||||
|
||||
pub mod defaults;
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
|
||||
@@ -0,0 +1,248 @@
|
||||
//! The default SVG filters: the filters Effect › SVG Filters and Apply SVG Filter list in every
|
||||
//! document. The set, the names and the values are VectorCraft's own, written with the filter
|
||||
//! primitives of SVG 1.1 (<https://www.w3.org/TR/SVG11/filters.html>). A default is not part of a
|
||||
//! document until it is applied or edited there: the document then holds a copy under the
|
||||
//! default's name, and that copy stands in the default's place in the lists. Every default computes
|
||||
//! in sRGB (`color-interpolation-filters="sRGB"`), so art a filter passes through keeps its colors.
|
||||
|
||||
use vectorcraft_doc::SvgFilter;
|
||||
|
||||
/// A default SVG filter: its name (the `<filter>` element's `id`) and the element's XML.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub struct DefaultFilter {
|
||||
pub name: &'static str,
|
||||
pub xml: &'static str,
|
||||
}
|
||||
|
||||
/// The default filters, in the order the lists show them.
|
||||
pub const DEFAULT_FILTERS: [DefaultFilter; 14] = [
|
||||
DefaultFilter {
|
||||
name: "Soft Blur",
|
||||
xml: r#"<filter id="Soft Blur" x="-20%" y="-20%" width="140%" height="140%" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="2"/></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Heavy Blur",
|
||||
xml: r#"<filter id="Heavy Blur" x="-50%" y="-50%" width="200%" height="200%" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="6"/></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Soft Shadow",
|
||||
xml: r#"<filter id="Soft Shadow" x="-30%" y="-30%" width="170%" height="170%" color-interpolation-filters="sRGB"><feGaussianBlur in="SourceAlpha" stdDeviation="3"/><feOffset dx="4" dy="4"/><feComponentTransfer><feFuncA type="linear" slope="0.5"/></feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Hard Shadow",
|
||||
xml: r#"<filter id="Hard Shadow" x="-20%" y="-20%" width="150%" height="150%" color-interpolation-filters="sRGB"><feOffset in="SourceAlpha" dx="3" dy="3"/><feComponentTransfer><feFuncA type="linear" slope="0.6"/></feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Glow",
|
||||
xml: r##"<filter id="Glow" x="-40%" y="-40%" width="180%" height="180%" color-interpolation-filters="sRGB"><feGaussianBlur in="SourceAlpha" stdDeviation="4" result="spread"/><feFlood flood-color="#ffd24a"/><feComposite in2="spread" operator="in"/><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter>"##,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Bevel",
|
||||
xml: r##"<filter id="Bevel" color-interpolation-filters="sRGB"><feGaussianBlur in="SourceAlpha" stdDeviation="2" result="height"/><feSpecularLighting in="height" surfaceScale="4" specularConstant="0.8" specularExponent="16" lighting-color="#ffffff" result="light"><feDistantLight azimuth="225" elevation="45"/></feSpecularLighting><feComposite in="light" in2="SourceAlpha" operator="in" result="lit"/><feComposite in="SourceGraphic" in2="lit" operator="arithmetic" k1="0" k2="1" k3="1" k4="0"/></filter>"##,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Emboss",
|
||||
xml: r#"<filter id="Emboss" color-interpolation-filters="sRGB"><feConvolveMatrix order="3" kernelMatrix="-2 -1 0 -1 1 1 0 1 2" preserveAlpha="true"/></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Thicken",
|
||||
xml: r#"<filter id="Thicken" x="-20%" y="-20%" width="140%" height="140%" color-interpolation-filters="sRGB"><feMorphology operator="dilate" radius="1.5"/></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Thin",
|
||||
xml: r#"<filter id="Thin" color-interpolation-filters="sRGB"><feMorphology operator="erode" radius="1.5"/></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Rough Edges",
|
||||
xml: r#"<filter id="Rough Edges" x="-20%" y="-20%" width="140%" height="140%" color-interpolation-filters="sRGB"><feTurbulence type="turbulence" baseFrequency="0.05" numOctaves="2" result="waves"/><feDisplacementMap in="SourceGraphic" in2="waves" scale="6" xChannelSelector="R" yChannelSelector="G"/></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Grain",
|
||||
xml: r#"<filter id="Grain" color-interpolation-filters="sRGB"><feTurbulence type="fractalNoise" baseFrequency="0.9" numOctaves="2"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.35 0"/><feComposite in2="SourceAlpha" operator="in" result="specks"/><feMerge><feMergeNode in="SourceGraphic"/><feMergeNode in="specks"/></feMerge></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Grayscale",
|
||||
xml: r#"<filter id="Grayscale" color-interpolation-filters="sRGB"><feColorMatrix type="saturate" values="0"/></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Invert",
|
||||
xml: r#"<filter id="Invert" color-interpolation-filters="sRGB"><feComponentTransfer><feFuncR type="table" tableValues="1 0"/><feFuncG type="table" tableValues="1 0"/><feFuncB type="table" tableValues="1 0"/></feComponentTransfer></filter>"#,
|
||||
},
|
||||
DefaultFilter {
|
||||
name: "Hue Shift",
|
||||
xml: r#"<filter id="Hue Shift" color-interpolation-filters="sRGB"><feColorMatrix type="hueRotate" values="180"/></filter>"#,
|
||||
},
|
||||
];
|
||||
|
||||
/// The default filter named `name`.
|
||||
pub fn default_filter(name: &str) -> Option<DefaultFilter> {
|
||||
DEFAULT_FILTERS.iter().copied().find(|f| f.name == name)
|
||||
}
|
||||
|
||||
impl DefaultFilter {
|
||||
/// The filter as a document holds it once it is applied or edited there.
|
||||
pub fn to_filter(self) -> SvgFilter {
|
||||
SvgFilter { name: self.name.to_string(), xml: self.xml.to_string() }
|
||||
}
|
||||
}
|
||||
|
||||
/// A filter of the lists ([`listed`]), and whether it is a default the document does not hold.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct Listed {
|
||||
pub filter: SvgFilter,
|
||||
/// A default the document has no filter named for: applying or editing it adds a copy.
|
||||
pub default: bool,
|
||||
}
|
||||
|
||||
/// The filters Effect › SVG Filters and Apply SVG Filter list for a document that holds `held`,
|
||||
/// and how many of them come first as the defaults: each default in [`DEFAULT_FILTERS`]' order (the
|
||||
/// document's filter of that name in its place), then the document's other filters in their order.
|
||||
pub fn listed(held: &[SvgFilter]) -> (Vec<Listed>, usize) {
|
||||
let mut out: Vec<Listed> = DEFAULT_FILTERS
|
||||
.iter()
|
||||
.map(|d| match held.iter().find(|f| f.name == d.name) {
|
||||
Some(f) => Listed { filter: f.clone(), default: false },
|
||||
None => Listed { filter: d.to_filter(), default: true },
|
||||
})
|
||||
.collect();
|
||||
let defaults = out.len();
|
||||
out.extend(held.iter().filter(|f| default_filter(&f.name).is_none()).map(|f| Listed { filter: f.clone(), default: false }));
|
||||
(out, defaults)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use serde_json::json;
|
||||
use vectorcraft_doc::Effect;
|
||||
use vectorcraft_geom::{Affine, Point};
|
||||
|
||||
use super::*;
|
||||
use crate::pixel::{Channels, PixelSpace};
|
||||
use crate::svg_filter::{SVG_FILTER, SvgFilterFx, check, with_id};
|
||||
use crate::{PixelFx, RasterFx, raster_effects};
|
||||
|
||||
/// A `w` × `w` raster whose pixels are one point wide.
|
||||
fn space(w: usize) -> PixelSpace {
|
||||
let wd = w as f64;
|
||||
PixelSpace {
|
||||
to_doc: Affine::scale(1.0),
|
||||
px: 1.0,
|
||||
center: Point::new(wd / 2.0, wd / 2.0),
|
||||
channels: Channels::Rgb,
|
||||
line: 1.0,
|
||||
extent: 0.5 * wd.hypot(wd),
|
||||
}
|
||||
}
|
||||
|
||||
/// The default named `name` as the renderer reads it.
|
||||
fn fx(name: &str) -> SvgFilterFx {
|
||||
let d = default_filter(name).unwrap_or_else(|| panic!("no default {name}"));
|
||||
let e = Effect { id: SVG_FILTER.into(), params: json!({"name": d.name, "xml": d.xml}), visible: true };
|
||||
match raster_effects(&[e]).first() {
|
||||
Some(RasterFx::Pixel(PixelFx::Svg(f))) => f.clone(),
|
||||
other => panic!("{name}: {other:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// A 40 × 40 raster with an opaque square of `rgb` from 10 to 30, run through default `name`.
|
||||
fn run(name: &str, rgb: [u8; 3]) -> Vec<u8> {
|
||||
let mut data: Vec<u8> = (0..40usize)
|
||||
.flat_map(|y| (0..40usize).map(move |x| (x, y)))
|
||||
.flat_map(|(x, y)| if (10..30).contains(&x) && (10..30).contains(&y) { [rgb[0], rgb[1], rgb[2], 255] } else { [0; 4] })
|
||||
.collect();
|
||||
fx(name).apply(&mut data, 40, 40, &space(40));
|
||||
data
|
||||
}
|
||||
|
||||
fn at(d: &[u8], x: usize, y: usize) -> [u8; 4] {
|
||||
let i = (y * 40 + x) * 4;
|
||||
[d[i], d[i + 1], d[i + 2], d[i + 3]]
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_default_is_a_filter_the_check_takes_under_its_own_name() {
|
||||
let mut seen = std::collections::BTreeSet::new();
|
||||
for d in DEFAULT_FILTERS {
|
||||
assert_eq!(check(d.xml), Ok(d.name.to_string()), "{}", d.name);
|
||||
assert!(seen.insert(d.name), "{} is listed twice", d.name);
|
||||
assert_eq!(d.name, d.name.trim());
|
||||
// Edit SVG Filter keeps the name by writing it as the id: a default's code comes back as it is.
|
||||
assert_eq!(with_id(d.xml, d.name).as_deref(), Some(d.xml), "{}", d.name);
|
||||
assert_eq!(default_filter(d.name), Some(d));
|
||||
assert!(d.xml.contains(r#" color-interpolation-filters="sRGB""#), "{} computes in sRGB", d.name);
|
||||
}
|
||||
assert!(DEFAULT_FILTERS.len() <= SvgFilter::MAX);
|
||||
assert_eq!(default_filter("soft blur"), None, "names match exactly");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_default_draws_and_is_written_to_svg_as_a_filter() {
|
||||
let plain = {
|
||||
let mut d = vec![0u8; 40 * 40 * 4];
|
||||
for y in 10..30 {
|
||||
for x in 10..30 {
|
||||
d[(y * 40 + x) * 4..(y * 40 + x) * 4 + 4].copy_from_slice(&[200, 60, 20, 255]);
|
||||
}
|
||||
}
|
||||
d
|
||||
};
|
||||
for d in DEFAULT_FILTERS {
|
||||
assert_ne!(run(d.name, [200, 60, 20]), plain, "{} changes what is drawn", d.name);
|
||||
assert!(fx(d.name).writes_as_svg11(), "{} is written as SVG 1.1", d.name);
|
||||
}
|
||||
}
|
||||
|
||||
/// The color defaults against SVG 1.1's own arithmetic, in sRGB as each filter asks.
|
||||
#[test]
|
||||
fn the_color_defaults_compute_what_svg_1_1_defines() {
|
||||
let near = |got: [u8; 4], want: [u8; 4]| got.iter().zip(want).all(|(g, w)| g.abs_diff(w) <= 1);
|
||||
// feComponentTransfer, type="table" with values 1 0: C' = 1 - C (§15.11).
|
||||
let inv = at(&run("Invert", [200, 60, 20]), 20, 20);
|
||||
assert!(near(inv, [55, 195, 235, 255]), "{inv:?}");
|
||||
// feColorMatrix type="saturate" values="0": every channel is 0.213 R + 0.715 G + 0.072 B (§15.10).
|
||||
let grey = at(&run("Grayscale", [200, 60, 20]), 20, 20);
|
||||
let l = (0.213 * 200.0 + 0.715 * 60.0 + 0.072 * 20.0f64).round() as u8;
|
||||
assert!(near(grey, [l, l, l, 255]), "{grey:?} for {l}");
|
||||
// feColorMatrix type="hueRotate" values="180" (§15.10): cos = -1 and sin = 0 leave
|
||||
// R' = (2·0.213 - 1) R + 2·0.715 G + 2·0.072 B, and likewise for G' and B'.
|
||||
let hue = at(&run("Hue Shift", [200, 60, 20]), 20, 20);
|
||||
let lum2 = 2.0 * (0.213 * 200.0 + 0.715 * 60.0 + 0.072 * 20.0f64);
|
||||
let turned = [lum2 - 200.0, lum2 - 60.0, lum2 - 20.0].map(|v| v.round().clamp(0.0, 255.0) as u8);
|
||||
assert!(near(hue, [turned[0], turned[1], turned[2], 255]), "{hue:?} for {turned:?}");
|
||||
}
|
||||
|
||||
/// The shape defaults against what their primitives define: an offset copy of the alpha behind
|
||||
/// the art (feOffset, §15.21), and a shape grown or shrunk by its radius (feMorphology, §15.20).
|
||||
#[test]
|
||||
fn the_shape_defaults_move_and_resize_the_alpha() {
|
||||
let shadow = run("Hard Shadow", [200, 60, 20]);
|
||||
assert_eq!(at(&shadow, 20, 20), [200, 60, 20, 255], "the art is on top");
|
||||
// Right of and below the art by up to 3: black at 60% alpha (premultiplied 153).
|
||||
assert_eq!(at(&shadow, 31, 31), [0, 0, 0, 153]);
|
||||
assert_eq!(at(&shadow, 34, 34)[3], 0, "past the offset");
|
||||
assert_eq!(at(&shadow, 8, 8)[3], 0, "nothing up and left");
|
||||
let thick = run("Thicken", [200, 60, 20]);
|
||||
assert_eq!((at(&thick, 9, 20)[3], at(&thick, 7, 20)[3]), (255, 0), "grown by its radius");
|
||||
let thin = run("Thin", [200, 60, 20]);
|
||||
assert_eq!((at(&thin, 10, 20)[3], at(&thin, 13, 20)[3]), (0, 255), "shrunk by its radius");
|
||||
let soft = run("Soft Shadow", [200, 60, 20]);
|
||||
assert_eq!(at(&soft, 20, 20), [200, 60, 20, 255]);
|
||||
let below = at(&soft, 33, 33);
|
||||
assert!(below[3] > 0 && below[3] < 128 && below[0] == 0, "a blurred, half-strength shadow: {below:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_lists_show_the_defaults_first_with_the_documents_copy_in_place() {
|
||||
let (all, defaults) = listed(&[]);
|
||||
assert_eq!((all.len(), defaults), (DEFAULT_FILTERS.len(), DEFAULT_FILTERS.len()));
|
||||
assert!(all.iter().all(|l| l.default));
|
||||
let mine = SvgFilter { name: "Mine".into(), xml: "<filter id=\"Mine\"><feOffset/></filter>".into() };
|
||||
let glow = SvgFilter { name: "Glow".into(), xml: "<filter id=\"Glow\"><feOffset dx=\"1\"/></filter>".into() };
|
||||
let (all, defaults) = listed(&[mine.clone(), glow.clone()]);
|
||||
assert_eq!((all.len(), defaults), (DEFAULT_FILTERS.len() + 1, DEFAULT_FILTERS.len()));
|
||||
let at = DEFAULT_FILTERS.iter().position(|d| d.name == "Glow").unwrap();
|
||||
assert_eq!(all[at], Listed { filter: glow, default: false }, "the document's Glow where the default was");
|
||||
assert_eq!(all.last(), Some(&Listed { filter: mine, default: false }));
|
||||
assert_eq!(all.iter().filter(|l| l.default).count(), DEFAULT_FILTERS.len() - 1);
|
||||
}
|
||||
}
|
||||
@@ -172,6 +172,48 @@ fn the_clipping_paths_effects_apply_before_the_clip_groups() {
|
||||
assert!((b.x0 - want.x0).abs() < 0.5 && (b.x1 - want.x1).abs() < 0.5, "exported: {b:?} against {want:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_clip_group_with_a_fill_or_stroke_of_its_own_clips_as_the_canvas_does() {
|
||||
// A clip group with a fill or a stroke of its own and no effects: the export turns its paint
|
||||
// into art and still clips by the outline the canvas clips by, Transform copies included.
|
||||
let items = [
|
||||
vectorcraft_doc::AppearanceItem::Fill(vectorcraft_doc::FillLayer::new(Paint::solid(Color::BLACK))),
|
||||
vectorcraft_doc::AppearanceItem::Stroke(vectorcraft_doc::StrokeLayer::new(Paint::solid(Color::BLACK), 2.0)),
|
||||
];
|
||||
let copies = || fx("distort.transform", json!({"moveH": 60, "copies": 1}));
|
||||
let roughen = fx("distort.roughen", json!({"size": 10, "detail": 10, "relative": false}));
|
||||
// A ring: a compound path of two squares with effects `own`, its hole with effects `hole_fx`.
|
||||
let ring = |hole_fx: Vec<Effect>, own: Vec<Effect>| {
|
||||
let outer = Node::path(NodeId(3), shapes::rectangle(Rect::new(50.0, 50.0, 150.0, 150.0)), Appearance::default());
|
||||
let mut hole = Node::path(NodeId(4), shapes::rectangle(Rect::new(75.0, 75.0, 125.0, 125.0)), Appearance::default());
|
||||
hole.appearance.effects = hole_fx;
|
||||
let mut c =
|
||||
Node::new(NodeId(2), NodeKind::Compound { children: vec![Arc::new(outer), Arc::new(hole)], rule: vectorcraft_geom::FillRule::EvenOdd });
|
||||
c.appearance.effects = own;
|
||||
c
|
||||
};
|
||||
let clips = [
|
||||
("copies", clipping_path(2, vec![copies()])),
|
||||
("roughen", clipping_path(2, vec![roughen])),
|
||||
("a compound path's copies", ring(vec![], vec![copies()])),
|
||||
("a compound path member's copies", ring(vec![copies()], vec![])),
|
||||
];
|
||||
for item in &items {
|
||||
for (what, clip) in &clips {
|
||||
let mut d = Document::new(400.0, 400.0);
|
||||
let layer = d.layers[0].id;
|
||||
let live = clip_outline(clip).unwrap();
|
||||
let mut group = clip_group(1, clip.clone());
|
||||
group.appearance.items.push(item.clone());
|
||||
d.insert(Some(layer), 0, group).unwrap();
|
||||
let exported = clip_outline(&baked_clip(&d)).unwrap();
|
||||
assert_eq!(live, exported, "{what} with {item:?}: the canvas clips by the outline the export writes");
|
||||
}
|
||||
}
|
||||
let b = bounds(&clips[0].1);
|
||||
assert!((b.x0 - 50.0).abs() < 1e-6 && (b.x1 - 210.0).abs() < 1e-6, "the clip covers both copies: {b:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nested_effects_apply_before_the_clip_groups() {
|
||||
// The clip group grows its clipping path by 10 (Offset Path). Inside the clipping path a
|
||||
|
||||
@@ -827,7 +827,7 @@ pub use docmenu::guide_indexes;
|
||||
pub(crate) use edit::{settle_interaction, typing_in_progress};
|
||||
pub(crate) use object::bounds_rewrite;
|
||||
pub(crate) use object::{keep_aligned_in, refresh_pixel_aligned};
|
||||
pub use plugin_call::{Location, key_location, location_in, location_keys};
|
||||
pub use plugin_call::{Location, ParamsPlace, key_location, location_in, location_keys};
|
||||
pub(crate) use vectorcraft_doc::range::parse_range;
|
||||
|
||||
/// A date param in Unix seconds that defaults to the clock: `None` when absent (now, see
|
||||
|
||||
@@ -23,7 +23,7 @@ use vectorcraft_render::effects;
|
||||
use super::super::appearance::series_children_in_paint_order;
|
||||
use super::super::colorcmds::edit_if_changed;
|
||||
use super::super::edit::selected_roots;
|
||||
use super::super::graph::capture_series_object_opacity;
|
||||
use super::super::graph::{capture_series_object_opacity, series_groups_among};
|
||||
use super::super::menucmds::whole_or;
|
||||
use super::super::object::{choice, object_bounds_transform, scaling, transform_node, transform_patterns};
|
||||
use super::super::typecmd::refresh_bounds_of;
|
||||
@@ -93,7 +93,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Randomize Opacity",
|
||||
["Object", "Plug-ins", "Arrange Tools"],
|
||||
None,
|
||||
"{min?: % 0..100 (30), max?: % 0..100 (100; not less than min), seed?: whole number (0; the same seed, objects and range give the same opacities), ids?: [id…] (default: the selection)} give each selected object (the top-level ones) its own opacity, picked at random and evenly from min to max, as one undo step (none when no opacity changes); it is the object's opacity, as the Transparency panel sets it. On paths directly in a graph series whose opacity changes, the graph stores the opacity and blend mode of the frontmost of them for its next redraw (docs/mcp.md) → {count}",
|
||||
"{min?: % 0..100 (30), max?: % 0..100 (100; not less than min), seed?: whole number (0; the same seed, objects and range give the same opacities), ids?: [id…] (default: the selection)} give each selected object (the top-level ones) its own opacity, picked at random and evenly from min to max, as one undo step (none when no opacity changes); it is the object's opacity, as the Transparency panel sets it. On paths directly in a graph series whose opacity changes, the graph stores the opacity and blend mode of the frontmost of them for its next redraw, and on a series group, the group's own (docs/mcp.md) → {count}",
|
||||
has_selection,
|
||||
randomize_opacity
|
||||
),
|
||||
@@ -102,7 +102,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Sort Objects",
|
||||
["Object", "Plug-ins", "Arrange Tools"],
|
||||
None,
|
||||
"{by?: \"width\" | \"height\" | \"area\" (width × height) | \"x\" (left edge) | \"y\" (top edge) | \"opacity\" (%) | \"stacking\" (stacking order, from the back) (\"area\"), apply?: one of the same (\"stacking\"), order?: \"ascending\" (small to large) | \"descending\" (large to small) | \"random\" (\"ascending\"), distribute?: false (true: the values step evenly from the smallest to the largest; false: the objects trade the values they have), seed?: whole number (0; the order \"random\" picks), scaleStrokes?: the Scale Strokes & Effects preference (width, height and area), ids?: [id…] (default: the selection)} sort the selected objects (the top-level ones, at most 20000) by the attribute `by` and give them the values of `apply` in that order, as one undo step: the first in order gets the smallest value. Sizes and places are measured and set as object.setBounds measures them (Use Preview Bounds), a width, height or area about each object's centre (an area in proportion); stacking order always trades places, and only among the objects in the same layer or group. With apply \"opacity\", on paths directly in a graph series whose opacity changes, the graph stores the opacity and blend mode of the frontmost of them for its next redraw (docs/mcp.md). A run that changes nothing makes no step → {count}",
|
||||
"{by?: \"width\" | \"height\" | \"area\" (width × height) | \"x\" (left edge) | \"y\" (top edge) | \"opacity\" (%) | \"stacking\" (stacking order, from the back) (\"area\"), apply?: one of the same (\"stacking\"), order?: \"ascending\" (small to large) | \"descending\" (large to small) | \"random\" (\"ascending\"), distribute?: false (true: the values step evenly from the smallest to the largest; false: the objects trade the values they have), seed?: whole number (0; the order \"random\" picks), scaleStrokes?: the Scale Strokes & Effects preference (width, height and area), ids?: [id…] (default: the selection)} sort the selected objects (the top-level ones, at most 20000) by the attribute `by` and give them the values of `apply` in that order, as one undo step: the first in order gets the smallest value. Sizes and places are measured and set as object.setBounds measures them (Use Preview Bounds), a width, height or area about each object's centre (an area in proportion); stacking order always trades places, and only among the objects in the same layer or group. With apply \"opacity\", on paths directly in a graph series whose opacity changes, the graph stores the opacity and blend mode of the frontmost of them for its next redraw, and on a series group, the group's own (docs/mcp.md). A run that changes nothing makes no step → {count}",
|
||||
has_multi,
|
||||
sort
|
||||
),
|
||||
@@ -418,9 +418,11 @@ fn randomize_opacity(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
|
||||
/// Store on their graphs the opacity just given to the paths among `changed` (objects whose opacity changed) that are
|
||||
/// directly in a graph series, with their blend mode, so that every path of the series has them when the graph is drawn
|
||||
/// again; the frontmost of them in a series sets them.
|
||||
/// again; the frontmost of them in a series sets them. A series group among `changed` has its own opacity stored for the
|
||||
/// group.
|
||||
fn keep_series_opacity(d: &mut vectorcraft_doc::Document, changed: &[NodeId]) {
|
||||
let marks = series_children_in_paint_order(d, changed);
|
||||
let mut marks = series_children_in_paint_order(d, changed);
|
||||
marks.extend(series_groups_among(d, changed));
|
||||
capture_series_object_opacity(d, &marks);
|
||||
}
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Remove Breaks",
|
||||
["Object", "Plug-ins", "Artwork Cleanup"],
|
||||
None,
|
||||
"{kind: \"line\"|\"paragraph\", ids?: [id…] (the type they name is taken locked or hidden too)} remove the forced line breaks (line) or paragraph returns (paragraph) in the characters selected with a Type tool (after Select All in a frame of threaded text, in the text of every frame of the story), else in all the text of the selected type, as one undo step; a break between two words becomes a space, the frames of a threaded story selected all together being read as one text → {ids, removed}",
|
||||
"{kind: \"line\"|\"paragraph\", ids?: [id…] (the type they name is taken locked or hidden too)} remove the forced line breaks (line) or paragraph returns (paragraph) in the characters selected with a Type tool (after Select All in a frame of threaded text, in the text of every frame of the story, locked and hidden frames included), else in all the text of the selected type, as one undo step; a break between two words becomes a space, the frames of a threaded story selected all together being read as one text → {ids, removed}",
|
||||
has_selection,
|
||||
remove_breaks
|
||||
),
|
||||
@@ -821,9 +821,9 @@ fn apply_cuts(t: &mut TextObject, cuts: &[(usize, bool)], brk: char) -> usize {
|
||||
}
|
||||
|
||||
/// The breaks `brk` in the text of the frames of `story`, read as one text: a break at the end or
|
||||
/// start of a frame between words of the frames on either side becomes a space. Each editable frame
|
||||
/// (each frame when `all`) comes with its own breaks, at its own bytes.
|
||||
fn story_cuts(d: &Document, story: &[NodeId], brk: char, all: bool) -> Vec<(NodeId, Vec<(usize, bool)>)> {
|
||||
/// start of a frame between words of the frames on either side becomes a space. Each frame comes
|
||||
/// with its own breaks, at its own bytes, its locked and hidden frames included.
|
||||
fn story_cuts(d: &Document, story: &[NodeId], brk: char) -> Vec<(NodeId, Vec<(usize, bool)>)> {
|
||||
let texts: Vec<(NodeId, String)> = story.iter().filter_map(|id| Some((*id, text_of(d, *id)?.plain_text()))).collect();
|
||||
let joined: String = texts.iter().map(|(_, t)| t.as_str()).collect();
|
||||
// The breaks in story order, handed to the frames in one pass.
|
||||
@@ -836,9 +836,7 @@ fn story_cuts(d: &Document, story: &[NodeId], brk: char, all: bool) -> Vec<(Node
|
||||
while let Some((at, space)) = cuts.next_if(|(at, _)| *at < end) {
|
||||
own.push((at - start, space));
|
||||
}
|
||||
if all || d.is_editable(id) {
|
||||
out.push((id, own));
|
||||
}
|
||||
out.push((id, own));
|
||||
start = end;
|
||||
}
|
||||
out
|
||||
@@ -859,7 +857,7 @@ fn remove_breaks(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let d = &s.doc()?.doc;
|
||||
// Each type object with the breaks that go from it.
|
||||
let targets: Vec<(NodeId, Vec<(usize, bool)>)> = match editing {
|
||||
Some(_) if !story.is_empty() => story_cuts(d, &story, brk, false),
|
||||
Some(_) if !story.is_empty() => story_cuts(d, &story, brk),
|
||||
Some((id, a, b)) => vec![(id, a.min(b), a.max(b))]
|
||||
.into_iter()
|
||||
.filter(|(id, ..)| d.is_editable(*id))
|
||||
@@ -886,8 +884,7 @@ fn remove_breaks(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
};
|
||||
if !story.is_empty() && story.iter().all(|f| named.contains(f)) {
|
||||
done.extend(story.iter().copied());
|
||||
// Every frame is among them, so each one keeps its breaks.
|
||||
out.extend(story_cuts(d, &story, brk, true));
|
||||
out.extend(story_cuts(d, &story, brk));
|
||||
} else if let Some(t) = text_of(d, id) {
|
||||
// `id` is type, so the story of its thread is the same for each of its frames.
|
||||
partial.extend(thread);
|
||||
|
||||
@@ -498,8 +498,9 @@ pub(crate) fn stood_for(own: &[NodeId], ids: &[NodeId]) -> Vec<NodeId> {
|
||||
}
|
||||
|
||||
/// Clear Appearance on each series group a command gave a whole new appearance through its paths, so the group's own
|
||||
/// opacity, blend mode, isolation, knockout, effects and style link do not stay on top of it.
|
||||
pub(crate) fn clear_stood_for(d: &mut Document, groups: &[NodeId]) {
|
||||
/// opacity, blend mode, isolation, knockout, effects and style link do not stay on top of it. The graph stops keeping the
|
||||
/// groups' opacity, blend mode, isolation and knockout. Returns whether what a graph keeps changed.
|
||||
pub(crate) fn clear_stood_for(d: &mut Document, groups: &[NodeId]) -> bool {
|
||||
for id in groups {
|
||||
if let Some(n) = d.node_mut(*id) {
|
||||
clear(n);
|
||||
@@ -507,6 +508,7 @@ pub(crate) fn clear_stood_for(d: &mut Document, groups: &[NodeId]) {
|
||||
n.extras_mut().graphic_style = None;
|
||||
}
|
||||
}
|
||||
super::graph::capture_series_object_opacity(d, groups)
|
||||
}
|
||||
|
||||
/// [`whole_targets`] of `cmd`, which needs at least one.
|
||||
@@ -943,7 +945,7 @@ fn transfer(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
(src.opacity, src.blend, src.isolate, src.knockout, src.knockout_shape);
|
||||
super::object::snap_if_aligned(to);
|
||||
}
|
||||
clear_stood_for(d, &group);
|
||||
let forgot = clear_stood_for(d, &group);
|
||||
for id in &cleared {
|
||||
if let Some(n) = d.node_mut(*id) {
|
||||
clear(n);
|
||||
@@ -961,7 +963,7 @@ fn transfer(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
// The targets last: on two labels of one kind, the target's rows are the ones the kind keeps.
|
||||
let labels = super::graph::capture_label_rows(d, &changed);
|
||||
let all: Vec<NodeId> = from.iter().chain(&targets).chain(&group).copied().collect();
|
||||
Ok(count_changed(d, &before, &all) + usize::from(kept || painted || object || labels))
|
||||
Ok(count_changed(d, &before, &all) + usize::from(kept || painted || object || labels || forgot))
|
||||
})?;
|
||||
s.active_appearance_item = None;
|
||||
Ok(json!({ "source": source.0, "target": target.0 }))
|
||||
|
||||
@@ -54,7 +54,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Shape Builder",
|
||||
[],
|
||||
None,
|
||||
"{ids?|id?: [id…] (default: selection), points: [[x,y]…] (drag path; one point = click; may be left out with rect), rect?: [x, y, width, height] (Shift-drag marquee from where the drag started, x and y, to x+width and y+height; width and height may be negative: touches every region whose outline crosses the rectangle or has an anchor inside it and the region holding the whole rectangle, the region under x, y comes first and the one under the opposite corner comes next; with points, it also touches the regions along them; for pickColorFrom, x, y is the drag's first point and the opposite corner is its last), erase?: bool (erase mode, Alt: deletes the regions touched, and the pieces of open paths that cut regions and the edges (outline pieces between the points where paths meet; see shapeBuilder.regions) within tolerance, except that a point in a region no more than twice the tolerance across there touches the region; a deleted edge opens its path there, and edges bounding a deleted region go with it; what is left of each path keeps its look, with gradients fitted to its bounds kept where they were on it, its name, opacity mask and attributes, and its fill rule unless merged regions shaped it), splitStroke?: false (In Merge Mode, Clicking Stroke Splits the Path; not with erase or rect: when the one point of a click is within tolerance of a stroke, the path that stroke is on splits in two instead of a merge: the path keeps the rest of it, and a copy of the path holding the run of it from the anchor or crossing point before the click to the one after it, in the path's direction, goes directly above it; both keep the path's gradients where they were on it; the other objects stay as they are; with pickColorFrom \"swatches\" or fill, the run's stroke takes that paint; a path in a Live Paint group or a Shaper Group does not split, and nor does a path the run is all of, such as a lone line, or all but 0.05 pt or less of (a ten-thousandth of the larger side of a path over 500 pt)), tolerance?: pt (2, erase or splitStroke), gap?: pt (0–72; 0: Gap Detection off), openFilledAsClosed?: true (Consider Open Filled Paths as Closed: a filled open path bounds a region as if an invisible edge closed it; false: it cuts the regions it crosses like an unfilled one), pickColorFrom?: \"artwork\" (default: the merged shape takes the look of the front-most object under the first point, else under the last point, else of the front-most object) | \"swatches\" (the current fill, with the rest of the look of the front-most object over the first region the drag touches that an object covers, else of the front-most object), fill?: \"#rrggbb\" | {color|swatch|gradient|none} (overrides pickColorFrom)} replaces the paths it uses where they are; other selected objects (type, hidden or locked objects, clipping paths) stay, and a group goes only when it is left empty → {ids (selected after: each selected object still there, or what took its place), merged, regions, lines, edges (counts deleted, merged or split), split?: id (the run split off, after a split)}; after a split, ids are the roots, with the rest and the run in place of the path when it was one",
|
||||
"{ids?|id?: [id…] (default: selection), points: [[x,y]…] (drag path; one point = click; may be left out with rect), rect?: [x, y, width, height] (Shift-drag marquee from where the drag started, x and y, to x+width and y+height; width and height may be negative: touches every region whose outline crosses the rectangle or has an anchor inside it and the region holding the whole rectangle, the region under x, y comes first and the one under the opposite corner comes next; with points, it also touches the regions along them; for pickColorFrom, x, y is the drag's first point and the opposite corner is its last), erase?: bool (erase mode, Alt: deletes the regions touched, and the pieces of open paths that cut regions and the edges (outline pieces between the points where paths meet; see shapeBuilder.regions) within tolerance, except that a point in a region no more than twice the tolerance across there touches the region; a deleted edge opens its path there, and edges bounding a deleted region go with it; what is left of each path keeps its look, with gradients fitted to its bounds kept where they were on it, its name, opacity mask and attributes, and its fill rule unless merged regions shaped it), splitStroke?: false (In Merge Mode, Clicking Stroke Splits the Path; not with erase or rect: when the one point of a click is within tolerance of a stroke, the path that stroke is on splits in two instead of a merge: the path keeps the rest of it, and a copy of the path holding the run of it from the anchor or crossing point before the click to the one after it, in the path's direction, goes directly above it; both keep the path's gradients where they were on it; the other objects stay as they are; with pickColorFrom \"swatches\" or fill, the run's stroke takes that paint; a path in a Live Paint group or a Shaper Group does not split, and nor does a path the run is all of, such as a lone line, or all but 0.05 pt or less of (a ten-thousandth of the larger side of a path over 500 pt)), tolerance?: pt (2, erase or splitStroke), gap?: pt (0–72; 0: Gap Detection off), openFilledAsClosed?: true (Consider Open Filled Paths as Closed: a filled open path bounds a region as if an invisible edge closed it, where filled means any fill row is shown, painted and above 0% opacity, whichever row is on top; false: it cuts the regions it crosses like an unfilled one), pickColorFrom?: \"artwork\" (default: the merged shape takes the look of the front-most object under the first point, else under the last point, else of the front-most object) | \"swatches\" (the current fill, with the rest of the look of the front-most object over the first region the drag touches that an object covers, else of the front-most object), fill?: \"#rrggbb\" | {color|swatch|gradient|none} (overrides pickColorFrom)} replaces the paths it uses where they are; other selected objects (type, hidden or locked objects, clipping paths) stay, and a group goes only when it is left empty → {ids (selected after: each selected object still there, or what took its place), merged, regions, lines, edges (counts deleted, merged or split), split?: id (the run split off, after a split)}; after a split, ids are the roots, with the rest and the run in place of the path when it was one",
|
||||
has_selection_or_ids,
|
||||
sb_merge
|
||||
),
|
||||
|
||||
@@ -63,7 +63,7 @@ pub(super) fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
&& let Some(&q) = pts.first()
|
||||
&& let Some((i, run)) = map.stroke_at(&outlines, q, tol)
|
||||
&& let (Some(leaf), Some(drawn)) = (leaves.get(i), outlines.get(i))
|
||||
&& let Some(rest) = po::cut_out(drawn, &run, open_filled_as_closed && !leaf.appearance.fill_paint().is_none(), b::outline_snap(drawn))
|
||||
&& let Some(rest) = po::cut_out(drawn, &run, open_filled_as_closed && leaf.appearance.has_drawn_fill(), b::outline_snap(drawn))
|
||||
&& rest.length() > b::outline_snap(drawn)
|
||||
{
|
||||
// The path keeps the rest of it, and a copy of it with the run under the click goes
|
||||
|
||||
@@ -288,9 +288,10 @@ fn trace_library(c: &str, s: &Session, params: &mut tr::TraceParams) -> Result<V
|
||||
/// The most anchor points an Image Trace may make, a guard for memory: a trace past it is refused
|
||||
/// with advice instead (#525). A trace keeps about 90 bytes an anchor in the document (measured on
|
||||
/// code-drawn photos of 2000 × 2000 to 6000 × 4000 pixels), so 8,000,000 anchors are about
|
||||
/// 0.7 GB, with a peak of about 1 GB while tracing: a 4000 × 3000 photo at High Fidelity Photo
|
||||
/// makes about 1.9 million, and even at Paths 100, Noise 1 and every tone about 7.9 million. On the
|
||||
/// web, where a page has at most 4 GB of memory, the limit stays at 2,000,000.
|
||||
/// 0.7 GB, with a peak of about 1 GB while tracing: a 4000 × 3000 photo at Limited 64 colors,
|
||||
/// Paths 90, Corners 25 and Noise 4 makes about 1.9 million, and even at Paths 100, Noise 1 and
|
||||
/// every tone about 7.9 million. On the web, where a page has at most 4 GB of memory, the limit
|
||||
/// stays at 2,000,000.
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
pub const MAX_TRACE_ANCHORS: usize = 8_000_000;
|
||||
|
||||
@@ -1139,7 +1140,7 @@ mod trace_limit_tests {
|
||||
assert_eq!(w, ["Flat Logo traced the image at 946 × 710 pixels, averaged down from 16000 × 12000."]);
|
||||
}
|
||||
|
||||
// A 4000 × 3000 photo at High Fidelity Photo makes about 1.9 million anchors, which must fit;
|
||||
// the limit still guards memory (about 90 bytes an anchor). Checked when the tests build.
|
||||
// A 4000 × 3000 photo at Limited 64 colors, Paths 90, Corners 25 and Noise 4 makes about
|
||||
// 1.9 million anchors, which must fit; the limit still guards memory (about 90 bytes an anchor). Checked when the tests build.
|
||||
const _: () = assert!(MAX_TRACE_ANCHORS >= 2_000_000 && MAX_TRACE_ANCHORS <= 16_000_000);
|
||||
}
|
||||
@@ -70,13 +70,26 @@ pub(super) fn grid_show(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
None | Some(Value::Null) => None,
|
||||
Some(_) => Some(switch_or(p, "visible", false, C)?),
|
||||
};
|
||||
let g = silent(s, |g| g.visible = want.unwrap_or(!g.visible))?;
|
||||
// A hidden grid holds no plane for Automatic Plane Positioning.
|
||||
let g = silent(s, |g| {
|
||||
g.visible = want.unwrap_or(!g.visible);
|
||||
if !g.visible {
|
||||
g.inferred = None;
|
||||
}
|
||||
})?;
|
||||
Ok(json!({ "visible": g.visible }))
|
||||
}
|
||||
|
||||
pub(super) fn plane_set(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let plane = str_param(p, "plane").and_then(Plane::parse).ok_or_else(|| bad("perspective.plane.set", "plane must be left|right|ground|none"))?;
|
||||
silent(s, |g| g.plane = plane)?;
|
||||
// The new active plane passes through the point Automatic Plane Positioning holds, unless no
|
||||
// plane is active or that would put the plane behind the viewer.
|
||||
silent(s, |g| {
|
||||
g.plane = plane;
|
||||
if g.inferred.is_some() && (plane == Plane::None || g.validate().is_err()) {
|
||||
g.inferred = None;
|
||||
}
|
||||
})?;
|
||||
Ok(json!({ "plane": plane.id() }))
|
||||
}
|
||||
|
||||
@@ -138,6 +151,9 @@ pub(super) fn attach(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
store_grid(d, &g);
|
||||
Ok(())
|
||||
})?;
|
||||
if !ids.is_empty() {
|
||||
crate::cmd::perspgrid::plane_positioning_used(s, plane)?;
|
||||
}
|
||||
Ok(json!({ "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>(), "plane": plane.id() }))
|
||||
}
|
||||
|
||||
@@ -205,8 +221,13 @@ fn persp_edit(
|
||||
return Err(EngineError::Other("select the objects to transform in perspective".into()));
|
||||
}
|
||||
let mut g = grid_of(&s.doc()?.doc);
|
||||
// An object not in perspective yet attaches to `fallback` where that plane is now.
|
||||
let attaches = {
|
||||
let d = &s.doc()?.doc;
|
||||
fallback.filter(|_| ids.iter().any(|id| g.attachment_of(d, *id).is_none()))
|
||||
};
|
||||
let kept = if copy && !stores_attachments(&s.doc()?.doc) { crate::cmd::object::preview_copies(s, ids, false)? } else { None };
|
||||
s.edit(label, |d, sel| {
|
||||
let edited = s.edit(label, |d, sel| {
|
||||
g.adopt_stored_attachments(d);
|
||||
let targets = match &kept {
|
||||
// The document becomes the snapshot with the kept copies, not yet mapped, and the loop
|
||||
@@ -236,7 +257,11 @@ fn persp_edit(
|
||||
}
|
||||
store_grid(d, &g);
|
||||
Ok((targets, first))
|
||||
})
|
||||
})?;
|
||||
if let Some(plane) = attaches {
|
||||
crate::cmd::perspgrid::plane_positioning_used(s, plane)?;
|
||||
}
|
||||
Ok(edited)
|
||||
}
|
||||
|
||||
/// Where the first of `ids` is in perspective (its plane and depth) when `ids` is not empty, every one
|
||||
@@ -430,6 +455,9 @@ pub(super) fn plane_move(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
check_numbers(p, &["offset", "by"], C)?;
|
||||
let old = grid_of(&s.doc()?.doc);
|
||||
let plane = plane_param(&old, p, C)?;
|
||||
// A plane that Automatic Plane Positioning holds moves from where it is held, and the move
|
||||
// places it there for good: the moved grid holds no plane (undoing the move holds it again).
|
||||
let held = old.inferred;
|
||||
let from = old.offset(plane);
|
||||
let to = match (p.get("offset").and_then(Value::as_f64), p.get("by").and_then(Value::as_f64)) {
|
||||
(Some(o), _) => o,
|
||||
@@ -440,7 +468,7 @@ pub(super) fn plane_move(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
if !matches!(objects, "none" | "move" | "copy") {
|
||||
return Err(bad(C, "objects must be none, move or copy"));
|
||||
}
|
||||
let mut g = old.clone();
|
||||
let mut g = PerspectiveGrid { inferred: None, ..old.clone() };
|
||||
g.set_offset(plane, to);
|
||||
g.validate().map_err(|e| bad(C, e))?;
|
||||
let label = match objects {
|
||||
@@ -458,8 +486,9 @@ pub(super) fn plane_move(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
.collect()
|
||||
};
|
||||
// A plane moved to where it is, with its objects or without them, moves nothing: when the
|
||||
// document holds the grid already, the document and its undo history stay as they are.
|
||||
if to == from && objects != "copy" && grid_kept(&s.doc()?.doc, &g) {
|
||||
// document holds the grid already, the document and its undo history stay as they are (a
|
||||
// plane held where it was placed stays held).
|
||||
if to == from && objects != "copy" && grid_kept(&s.doc()?.doc, &PerspectiveGrid { inferred: held, ..g.clone() }) {
|
||||
let ids = if objects == "move" { on_plane(&s.doc()?.doc) } else { vec![] };
|
||||
return Ok(json!({ "plane": plane.id(), "offset": to, "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>() }));
|
||||
}
|
||||
@@ -507,12 +536,19 @@ pub(super) fn plane_match(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
named_id(p)?.or_else(|| st.selection.objects.first().copied()).ok_or_else(|| EngineError::Other("select an object in perspective".into()))?;
|
||||
let mut g = grid_of(&st.doc);
|
||||
let (plane, depth) = g.attachment_of(&st.doc, id).ok_or_else(|| EngineError::Other("the object isn't in perspective".into()))?;
|
||||
// The moved grid holds no plane for Automatic Plane Positioning (undoing the move holds it
|
||||
// again).
|
||||
let held = g.inferred.take();
|
||||
g.set_offset(plane, depth);
|
||||
g.plane = plane;
|
||||
g.validate().map_err(|e| bad("perspective.plane.matchObject", e))?;
|
||||
// When the plane is at the object and active already, and the document holds that grid, the
|
||||
// document and its undo history stay as they are.
|
||||
if grid_kept(&st.doc, &g) {
|
||||
// document and its undo history stay as they are; a plane held elsewhere goes back to that
|
||||
// place as view state.
|
||||
if grid_kept(&st.doc, &PerspectiveGrid { inferred: held, ..g.clone() }) {
|
||||
if held.is_some() {
|
||||
silent(s, |g| g.inferred = None)?;
|
||||
}
|
||||
return Ok(json!({ "plane": plane.id(), "offset": depth }));
|
||||
}
|
||||
s.edit("Move Plane to Match Object", |d, _| {
|
||||
@@ -573,6 +609,7 @@ pub(super) fn persp_draw(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
st.history.recost_last(&st.doc);
|
||||
}
|
||||
res?;
|
||||
crate::cmd::perspgrid::plane_positioning_used(s, plane)?;
|
||||
Ok(json!({ "id": id.0, "plane": plane.id() }))
|
||||
}
|
||||
|
||||
|
||||
@@ -718,7 +718,7 @@ fn lighting_preset(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
/// sets its Warp style (`warpStyle`), its 3D type (`threeDType`) or visibility (`visible`), as one
|
||||
/// undo step. They are checked as `effect.apply` checks them, and a visible 3D effect must still
|
||||
/// fit; a hidden one has its given values checked. → `{ids}`.
|
||||
fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
pub(crate) fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "effect.setParams";
|
||||
let index = index_param(p, "index", C)?;
|
||||
let mut params = p.get("params").cloned().unwrap_or(Value::Null);
|
||||
|
||||
@@ -265,25 +265,27 @@ fn gradient_expands(d: &Document, l: &Node) -> bool {
|
||||
|
||||
/// Whether type `t` has a gradient fill that Fill expands once Object has outlined it: one of the
|
||||
/// paths `type.createOutlines` makes of its glyphs, ruby glyphs and underline and strikethrough
|
||||
/// bars, each painted as its run, has one ([`gradient_expands`] on that path's own box). Inline
|
||||
/// graphics and color glyphs become other art. Leaves the document as it is and stops at the
|
||||
/// first such path.
|
||||
/// bars, each painted as its run with its unplaced gradients fitted to the layout's bounds, has one
|
||||
/// ([`gradient_expands`] on that path). Inline graphics and color glyphs become other art. Leaves
|
||||
/// the document as it is and stops at the first such path.
|
||||
fn text_gradient_expands(d: &Document, t: &TextObject) -> bool {
|
||||
if !t.runs.iter().any(|r| matches!(r.style.fill, Paint::Gradient(_))) {
|
||||
return false;
|
||||
}
|
||||
let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t);
|
||||
let first = t.first_style();
|
||||
let expands = |run: usize, outline: &BezPath| {
|
||||
let style = t.runs.get(run).map(|r| &r.style);
|
||||
if !matches!(style.map_or_else(|| t.first_style().fill, |s| s.fill.clone()), Paint::Gradient(_)) {
|
||||
let style = t.runs.get(run).map_or(&first, |r| &r.style);
|
||||
if !matches!(style.fill, Paint::Gradient(_)) {
|
||||
return false;
|
||||
}
|
||||
let path = PathData::from_bezpath(outline).transformed(t.xf);
|
||||
let path = PathData::from_bezpath(outline);
|
||||
if path.is_empty() {
|
||||
return false;
|
||||
}
|
||||
let appearance = style.map_or_else(|| t.first_style().appearance(), |s| s.appearance());
|
||||
gradient_expands(d, &Node::path(NodeId(u64::MAX), path, appearance))
|
||||
let mut piece = Node::path(NodeId(u64::MAX), path, Appearance::default());
|
||||
vectorcraft_render::effects::paint_type_piece(&mut piece, style, lay.bounds, t.xf);
|
||||
gradient_expands(d, &piece)
|
||||
};
|
||||
let inline = |gi: usize| lay.inlines.iter().find(|i| i.glyph == gi).is_some_and(|i| t.runs.get(i.run).is_some_and(|r| r.inline.is_some()));
|
||||
lay.glyphs.iter().enumerate().any(|(gi, g)| !inline(gi) && g.image.is_none() && g.colour.is_none() && expands(g.run, &g.outline))
|
||||
|
||||
@@ -9,7 +9,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Open Document",
|
||||
[],
|
||||
None,
|
||||
"{path | name | dataBase64 (a file's path, or its name with its bytes), pages?: \"2-3, 5\" (PDF/.ai: 1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds; trim: the bleed box round it becomes the document's bleed; a PDF-compatible .ai or a PDF saved with its editing data opens on its trim boxes for crop), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, lines wrapped in a frame as area type where they lay out the same, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page; a PSD file's layers become layers holding their pixels, with their names, visibility, opacity and blend modes, groups as layers of sublayers, layer masks as opacity masks, clipped layers and layers in blend modes VectorCraft doesn't have merged with the layers below) | false (one layer per page, without the art that is off; Save then asks for a name; a PSD file opens as its merged image), hiddenLayers?: false (a PSD file's hidden layers come in hidden instead of being left out), editingData?: true (default: an EPS, .ai or PDF that carries its editor's own copy of the art opens from it, with its layers, hidden objects, guides, artboards and the art outside them; a .ai or PDF whose type shows opens from its PDF part with textAs: outlines) | \"always\" (as true, and a .ai's editing copy is used even where it draws differently from its PDF part, which can be older; the warnings say so) | false (only what its page or PDF part prints, for print pipelines; a .ai saved without PDF compatibility then can't be opened), legacyNameEncoding?: windows-1252 (default) | macintosh | windows-949 (also euc-kr) | shift_jis | gbk | big5 (the code page names in the editing data of a .ai or an EPS are read in when they aren't UTF-8: layers, objects, artboards, colors, gradients, patterns, graphic styles, swatches, brushes, symbols, variables and data sets, and data sets' text values; warnings list the first three such names as read, and count the rest), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does, grays? as there; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), grays?: as file.documentColorMode, dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} (DXF), crop?: as cropTo (its older name), importer?: \"plugin.<id>\" (an importer plug-in's format id, see document.formats: it opens the file, which must have an extension it lists, also one a built-in format reads), params?: {…} (the importer's own parameters, see plugin.info)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its size at the resolution it declares, as file.place sizes it; 72 ppi, 1 px = 1 pt, when it declares none), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), PICT .pct/.pic/.pict (QuickDraw versions 1 and 2, with or without the file's 512-byte header: one artboard, the picture's frame; shapes, lines and regions as paths, text as point type, bitmaps, pixel maps and QuickTime JPEG images as images; what isn't read is listed in warnings), HP-GL plot files .plt/.hpgl/.hgl/.hpg (one artboard round the art; what isn't drawn is listed in warnings), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read by a PostScript interpreter — paths, colours and spot inks, clips, gradients, images, type in the fonts named — and come in as their TIFF preview, with a warning, when their PostScript can't be read). A PDF/.ai/.ait or SVG saved with Preserve Editing restores the native document it carries (restored: true; a PDF only when no pages are picked), unless the file was changed elsewhere since or the data can't be read: then its artwor
Line truncated
|
||||
"{path | name | dataBase64 (a file's path, or its name with its bytes), pages?: \"2-3, 5\" (PDF/.ai: 1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds; trim: the bleed box round it becomes the document's bleed; a PDF-compatible .ai or a PDF saved with its editing data opens on its trim boxes for crop), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, lines wrapped in a frame as area type where they lay out the same, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page; a PSD file's layers become layers holding their pixels, with their names, visibility, opacity and blend modes, groups as layers of sublayers, layer masks as opacity masks, clipped layers and layers in blend modes VectorCraft doesn't have merged with the layers below) | false (one layer per page, without the art that is off; Save then asks for a name; a PSD file opens as its merged image), hiddenLayers?: false (a PSD file's hidden layers come in hidden instead of being left out), editingData?: true (default: an EPS, .ai or PDF that carries its editor's own copy of the art opens from it, with its layers, hidden objects, guides, artboards and the art outside them; a .ai or PDF whose type shows opens from its PDF part with textAs: outlines) | \"always\" (as true, and a .ai's editing copy is used even where it draws differently from its PDF part, which can be older; the warnings say so) | false (only what its page or PDF part prints, for print pipelines; a .ai saved without PDF compatibility then can't be opened), legacyNameEncoding?: windows-1252 (default) | macintosh | windows-949 (also euc-kr) | shift_jis | gbk | big5 (the code page names in the editing data of a .ai or an EPS are read in when they aren't UTF-8: layers, objects, artboards, colors, gradients, patterns, graphic styles, swatches, brushes, symbols, variables and data sets, and data sets' text values; warnings list the first three such names as read, and count the rest), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does, grays? as there; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), grays?: as file.documentColorMode, dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} (DXF), crop?: as cropTo (its older name), linkPages?: false (true: each page `pages` picks of a PDF or PDF-compatible .ai opens as a placed document linked to that page of the file, as file.place with link places one, on an artboard of its cropTo box (bounding: its art's bounds), in a row, and a layer named after the page; links.embed makes a page editable art; refused for any other file, without a path, with a password or with textAs: outlines; Save then asks for a name), importer?: \"plugin.<id>\" (an importer plug-in's format id, see document.formats: it opens the file, which must have an extension it lists, also one a built-in format reads), params?: {…} (the importer's own parameters, see plugin.info)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its size at the resolution it declares, as file.place sizes it; 72 ppi, 1 px = 1 pt, when it declares none), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), PICT .pct/.pic/.pict (QuickDraw versions 1 and 2, with or without the file's 512-byte header: one artboard, the picture's frame; shapes, lines and regions as paths, text as point type, bitmaps, pixel maps and QuickTime JPEG images as images; what isn't read is listed in warnings), HP-GL plot files .plt/.hpgl/.hgl/.hpg (one artboard round the art; what isn't drawn is listed in warnings), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read
Line truncated
|
||||
always,
|
||||
load::open
|
||||
),
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
//! (unknown keys are ignored, so one params object can carry the options of several formats).
|
||||
|
||||
use std::borrow::Cow;
|
||||
use std::collections::HashSet;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::sync::Arc;
|
||||
|
||||
use serde::Deserialize;
|
||||
use serde::de::DeserializeOwned;
|
||||
use serde_json::Value;
|
||||
use vectorcraft_doc::{Artboard, Document, Node, NodeKind};
|
||||
use vectorcraft_doc::{Artboard, Document, Node, NodeKind, SymbolOverride};
|
||||
use vectorcraft_geom::Rect;
|
||||
use vectorcraft_render::AntiAlias;
|
||||
use vectorcraft_render::encode::jpeg::{self, JpegOptions};
|
||||
@@ -450,31 +450,85 @@ pub fn export_art_bounds(doc: &Document, format: &str) -> Option<Rect> {
|
||||
/// The bounds of the visible art of `doc` with the objects that `left_out` picks hidden
|
||||
/// ([`hidden_nodes`]) and the ones in the art of the symbols that instances show taken out
|
||||
/// ([`without_nodes`]: symbol art is measured with its hidden objects). An instance of a symbol
|
||||
/// whose art is all picked or hidden is hidden too. The art of a dynamic symbol is measured whole:
|
||||
/// an instance can paint its objects, and finds them by their places in the art.
|
||||
/// whose art is all picked or hidden is hidden too. The drawn instances of a dynamic symbol that
|
||||
/// make the same appearance changes to its art are measured on a copy of the symbol of their own,
|
||||
/// in which each object is judged with those changes ([`as_drawn`]); the objects taken out of
|
||||
/// a dynamic symbol's art leave empty groups in their places, by which instances find the objects
|
||||
/// they change.
|
||||
fn bounds_without(doc: &Document, left_out: &dyn Fn(&Node) -> bool) -> Option<Rect> {
|
||||
// The symbols instances show (the first of each name) that aren't dynamic.
|
||||
// The symbols instances show (the first of each name).
|
||||
let mut names = HashSet::new();
|
||||
let shown: Vec<(usize, &vectorcraft_doc::Symbol)> =
|
||||
doc.symbols.iter().enumerate().filter(|(_, s)| names.insert(s.name.as_str())).filter(|(_, s)| !s.dynamic).collect();
|
||||
let shown: Vec<usize> = doc.symbols.iter().enumerate().filter(|(_, s)| names.insert(s.name.as_str())).map(|(i, _)| i).collect();
|
||||
// The sets of appearance changes the drawn instances of each dynamic symbol make to its art;
|
||||
// `None` for a symbol with more than `MAX_ART_COPIES`, which is measured whole.
|
||||
let mut sets: HashMap<&str, Option<Vec<Vec<&SymbolOverride>>>> =
|
||||
shown.iter().filter_map(|i| doc.symbols.get(*i)).filter(|s| s.dynamic).map(|s| (s.name.as_str(), Some(Vec::new()))).collect();
|
||||
if !sets.is_empty() {
|
||||
let mut walked = HashSet::new();
|
||||
for l in &doc.layers {
|
||||
drawn_changes(doc, l, left_out, true, &mut walked, &mut sets);
|
||||
}
|
||||
}
|
||||
// Each set of changes gets a copy of its symbol, appended after the symbols, which the instances
|
||||
// that make those changes show instead.
|
||||
let variant = |symbol: &str, n: &Node| -> Option<String> {
|
||||
let k = sets.get(symbol)?.as_ref()?.iter().position(|c| *c == own_changes(n))?;
|
||||
Some(format!("{symbol}\u{0}{k}"))
|
||||
};
|
||||
let mut copies: Vec<(usize, &[&SymbolOverride])> = Vec::new();
|
||||
let remapped_doc = sets.values().flatten().any(|v| !v.is_empty()).then(|| {
|
||||
let mut d = doc.clone();
|
||||
for l in &mut d.layers {
|
||||
if let Some(n) = remapped(l, &variant) {
|
||||
*l = n;
|
||||
}
|
||||
}
|
||||
for s in &mut d.symbols {
|
||||
if let Some(n) = remapped(&s.art, &variant) {
|
||||
s.art = n;
|
||||
}
|
||||
}
|
||||
for i in &shown {
|
||||
let Some(s) = d.symbols.get(*i).cloned() else { continue };
|
||||
for (k, c) in sets.get(s.name.as_str()).into_iter().flatten().flatten().enumerate() {
|
||||
copies.push((d.symbols.len(), c.as_slice()));
|
||||
d.symbols.push(vectorcraft_doc::Symbol { name: format!("{}\u{0}{k}", s.name), ..s.clone() });
|
||||
}
|
||||
}
|
||||
d
|
||||
});
|
||||
let src = remapped_doc.as_ref().unwrap_or(doc);
|
||||
// The symbols to measure with the changes their instances make (`None` for a static symbol),
|
||||
// without the dynamic symbols measured whole.
|
||||
let entries: Vec<(usize, Option<&[&SymbolOverride]>)> = shown
|
||||
.iter()
|
||||
.filter_map(|i| src.symbols.get(*i).map(|s| (*i, s)))
|
||||
.filter(|(_, s)| !s.dynamic || sets.get(s.name.as_str()).is_some_and(Option::is_some))
|
||||
.map(|(i, s)| (i, s.dynamic.then_some(&[][..])))
|
||||
.chain(copies.iter().map(|(i, c)| (*i, Some(*c))))
|
||||
.collect();
|
||||
// The symbols whose art `left_out` leaves nothing of, those that only hold instances of such
|
||||
// symbols included.
|
||||
let mut empty: HashSet<&str> = HashSet::new();
|
||||
while let Some((_, s)) = shown.iter().find(|(_, s)| !empty.contains(s.name.as_str()) && all_left_out(&s.art, left_out, &empty)) {
|
||||
while let Some(s) = entries.iter().find_map(|(i, c)| {
|
||||
src.symbols.get(*i).filter(|s| !empty.contains(s.name.as_str()) && all_left_out(&s.art, left_out, &empty, *c, &mut Vec::new()))
|
||||
}) {
|
||||
empty.insert(&s.name);
|
||||
}
|
||||
let left_out =
|
||||
&|n: &Node| left_out(n) || matches!(&n.kind, NodeKind::SymbolInstance { symbol, .. } if empty.contains(symbol.as_str()) && !has_effects(n));
|
||||
let layers = hidden_nodes(&doc.layers, left_out);
|
||||
let symbols: Vec<(usize, Arc<Node>)> = shown
|
||||
let layers = hidden_nodes(&src.layers, left_out);
|
||||
let symbols: Vec<(usize, Arc<Node>)> = entries
|
||||
.iter()
|
||||
.filter(|(_, s)| !empty.contains(s.name.as_str()))
|
||||
.filter_map(|(i, s)| without_nodes(&s.art, left_out).map(|art| (*i, art)))
|
||||
.filter_map(|(i, c)| {
|
||||
let s = src.symbols.get(*i).filter(|s| !empty.contains(s.name.as_str()))?;
|
||||
without_nodes(&s.art, left_out, *c, &mut Vec::new()).map(|art| (*i, art))
|
||||
})
|
||||
.collect();
|
||||
if layers.is_none() && symbols.is_empty() {
|
||||
return vectorcraft_render::encode::art_bounds(doc);
|
||||
return vectorcraft_render::encode::art_bounds(src);
|
||||
}
|
||||
let mut d = doc.clone();
|
||||
let mut d = remapped_doc.unwrap_or_else(|| doc.clone());
|
||||
if let Some(layers) = layers {
|
||||
d.layers = layers;
|
||||
}
|
||||
@@ -486,22 +540,126 @@ fn bounds_without(doc: &Document, left_out: &dyn Fn(&Node) -> bool) -> Option<Re
|
||||
vectorcraft_render::encode::art_bounds(&d)
|
||||
}
|
||||
|
||||
/// The appearance changes instance `n` makes to its symbol's art, without those that change nothing.
|
||||
fn own_changes(n: &Node) -> Vec<&SymbolOverride> {
|
||||
n.extras().symbol_overrides.iter().filter(|o| !o.is_empty()).collect()
|
||||
}
|
||||
|
||||
/// `n` with each instance at any depth that `variant` gives another symbol (from the instance's
|
||||
/// symbol and the instance) made an instance of that symbol; `None` when none is.
|
||||
fn remapped(n: &Arc<Node>, variant: &dyn Fn(&str, &Node) -> Option<String>) -> Option<Arc<Node>> {
|
||||
if let NodeKind::SymbolInstance { symbol, .. } = &n.kind {
|
||||
let name = variant(symbol, n)?;
|
||||
let mut m = (**n).clone();
|
||||
if let NodeKind::SymbolInstance { symbol, .. } = &mut m.kind {
|
||||
*symbol = name;
|
||||
}
|
||||
return Some(Arc::new(m));
|
||||
}
|
||||
let children = n.children()?;
|
||||
let mut out: Option<Vec<Arc<Node>>> = None;
|
||||
for (i, c) in children.iter().enumerate() {
|
||||
if let Some(new) = remapped(c, variant)
|
||||
&& let Some(slot) = out.get_or_insert_with(|| children.clone()).get_mut(i)
|
||||
{
|
||||
*slot = new;
|
||||
}
|
||||
}
|
||||
out.map(|c| {
|
||||
let mut m = (**n).clone();
|
||||
if let Some(children) = m.children_mut() {
|
||||
*children = c;
|
||||
}
|
||||
Arc::new(m)
|
||||
})
|
||||
}
|
||||
|
||||
/// Whether `n` is hidden, picked by `left_out`, an instance of one of the `empty` symbols, or a
|
||||
/// layer or a group holding only such objects (its clipping path among them when it clips). A
|
||||
/// Shaper group, or a layer, group or instance with effects, fills or strokes of its own, is none
|
||||
/// of these unless it is hidden or picked.
|
||||
fn all_left_out(n: &Node, left_out: &dyn Fn(&Node) -> bool, empty: &HashSet<&str>) -> bool {
|
||||
/// of these unless it is hidden or picked. In the art of a dynamic symbol (`changed`, the changes
|
||||
/// an instance makes to it; `n` is at place `at`), each object is judged with those changes
|
||||
/// ([`as_drawn`]).
|
||||
fn all_left_out(n: &Node, left_out: &dyn Fn(&Node) -> bool, empty: &HashSet<&str>, changed: Option<&[&SymbolOverride]>, at: &mut Vec<u32>) -> bool {
|
||||
let m = as_drawn(n, changed, at);
|
||||
!n.visible
|
||||
|| left_out(n)
|
||||
|| !has_effects(n)
|
||||
|| left_out(&m)
|
||||
|| !has_effects(&m)
|
||||
&& n.extras().shaper.is_none()
|
||||
&& match &n.kind {
|
||||
NodeKind::Layer { children, .. } | NodeKind::Group { children, .. } => children.iter().all(|c| all_left_out(c, left_out, empty)),
|
||||
NodeKind::Layer { children, .. } | NodeKind::Group { children, .. } => children.iter().enumerate().all(|(i, c)| {
|
||||
at.push(i as u32);
|
||||
let out = all_left_out(c, left_out, empty, changed, at);
|
||||
at.pop();
|
||||
out
|
||||
}),
|
||||
NodeKind::SymbolInstance { symbol, .. } => empty.contains(symbol.as_str()),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Add the sets of appearance changes that the instances in `n` and its subtree make to the art of
|
||||
/// the symbols `sets` names, each set once, and those of the instances in the art of the symbols the
|
||||
/// instances show (`walked`, the symbols already looked in). The instances that `left_out` picks or
|
||||
/// that are in an object it picks are left out, and with `hidden` (in a layer) the hidden ones and
|
||||
/// those in a hidden object. A symbol with more than [`MAX_ART_COPIES`] sets gets `None`.
|
||||
fn drawn_changes<'a>(
|
||||
doc: &'a Document,
|
||||
n: &'a Node,
|
||||
left_out: &dyn Fn(&Node) -> bool,
|
||||
hidden: bool,
|
||||
walked: &mut HashSet<&'a str>,
|
||||
sets: &mut HashMap<&'a str, Option<Vec<Vec<&'a SymbolOverride>>>>,
|
||||
) {
|
||||
if hidden && !n.visible || left_out(n) {
|
||||
return;
|
||||
}
|
||||
if let NodeKind::SymbolInstance { symbol, .. } = &n.kind {
|
||||
let changes = own_changes(n);
|
||||
if let Some(entry) = sets.get_mut(symbol.as_str())
|
||||
&& !changes.is_empty()
|
||||
{
|
||||
let full = match entry {
|
||||
Some(list) if !list.contains(&changes) && list.len() < MAX_ART_COPIES => {
|
||||
list.push(changes);
|
||||
false
|
||||
}
|
||||
Some(list) => !list.contains(&changes),
|
||||
None => false,
|
||||
};
|
||||
if full {
|
||||
*entry = None;
|
||||
}
|
||||
}
|
||||
if walked.insert(symbol.as_str())
|
||||
&& let Some(s) = doc.symbols.iter().find(|s| s.name == *symbol)
|
||||
{
|
||||
drawn_changes(doc, &s.art, left_out, false, walked, sets);
|
||||
}
|
||||
}
|
||||
for c in n.children().into_iter().flatten() {
|
||||
drawn_changes(doc, c, left_out, hidden, walked, sets);
|
||||
}
|
||||
}
|
||||
|
||||
/// The most copies of one dynamic symbol's art [`bounds_without`] measures, one for each set of
|
||||
/// appearance changes its instances make; a symbol whose instances make more sets is measured whole.
|
||||
const MAX_ART_COPIES: usize = 64;
|
||||
|
||||
/// `n`, the object at place `at` of a symbol's art, with the appearance changes `changed` that an
|
||||
/// instance makes to it applied in their order; `n` itself for the art of a symbol that is not
|
||||
/// dynamic (`changed` is `None`) and when no change names `at`.
|
||||
fn as_drawn<'a>(n: &'a Node, changed: Option<&[&SymbolOverride]>, at: &[u32]) -> Cow<'a, Node> {
|
||||
let here: Vec<SymbolOverride> =
|
||||
changed.into_iter().flatten().filter(|o| o.path == at).map(|o| SymbolOverride { path: Vec::new(), ..(*o).clone() }).collect();
|
||||
if here.is_empty() {
|
||||
return Cow::Borrowed(n);
|
||||
}
|
||||
let mut m = n.clone();
|
||||
vectorcraft_doc::symbol_overrides::apply(&mut m, &here);
|
||||
Cow::Owned(m)
|
||||
}
|
||||
|
||||
/// Whether `n` has a visible effect, fill or stroke of its own, which the objects it holds can
|
||||
/// take part in.
|
||||
fn has_effects(n: &Node) -> bool {
|
||||
@@ -511,25 +669,32 @@ fn has_effects(n: &Node) -> bool {
|
||||
/// `n` without the objects that `left_out` picks in it, when it is a layer or a group, and in the
|
||||
/// layers and groups in it at any depth; `None` when it picks none of them. A clipping layer or
|
||||
/// group keeps its clipping path, its first object, and a Shaper group and a layer or group with
|
||||
/// effects, fills or strokes of its own keep all they hold.
|
||||
fn without_nodes(n: &Arc<Node>, left_out: &dyn Fn(&Node) -> bool) -> Option<Arc<Node>> {
|
||||
/// effects, fills or strokes of its own keep all they hold. In the art of a dynamic symbol
|
||||
/// (`changed`, the changes an instance makes to it, as for [`all_left_out`]; `n` is at place
|
||||
/// `at`), each object is judged with those changes ([`as_drawn`]), and an object taken out leaves
|
||||
/// an empty group in its place.
|
||||
fn without_nodes(n: &Arc<Node>, left_out: &dyn Fn(&Node) -> bool, changed: Option<&[&SymbolOverride]>, at: &mut Vec<u32>) -> Option<Arc<Node>> {
|
||||
let (NodeKind::Layer { children, clip, .. } | NodeKind::Group { children, clip }) = &n.kind else { return None };
|
||||
if has_effects(n) || n.extras().shaper.is_some() {
|
||||
if has_effects(&as_drawn(n, changed, at)) || n.extras().shaper.is_some() {
|
||||
return None;
|
||||
}
|
||||
let mut changed = false;
|
||||
let mut taken = false;
|
||||
let kept: Vec<Arc<Node>> = children
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter_map(|(i, c)| {
|
||||
if left_out(c) && !(*clip && i == 0) {
|
||||
changed = true;
|
||||
return None;
|
||||
}
|
||||
Some(without_nodes(c, left_out).inspect(|_| changed = true).unwrap_or_else(|| c.clone()))
|
||||
at.push(i as u32);
|
||||
let out = if left_out(&as_drawn(c, changed, at)) && !(*clip && i == 0) {
|
||||
taken = true;
|
||||
changed.map(|_| Arc::new(Node::group(c.id, Vec::new())))
|
||||
} else {
|
||||
Some(without_nodes(c, left_out, changed, at).inspect(|_| taken = true).unwrap_or_else(|| c.clone()))
|
||||
};
|
||||
at.pop();
|
||||
out
|
||||
})
|
||||
.collect();
|
||||
changed.then(|| {
|
||||
taken.then(|| {
|
||||
let mut new = (**n).clone();
|
||||
if let NodeKind::Layer { children, .. } | NodeKind::Group { children, .. } = &mut new.kind {
|
||||
*children = kept;
|
||||
|
||||
@@ -678,15 +678,28 @@ impl ReadFile {
|
||||
/// ([`super::importer`]).
|
||||
pub fn read_for_open(name: &str, bytes: &[u8], path: Option<String>, p: &Value, update_links: bool, low_res_proxy_eps: bool) -> Result<ReadFile> {
|
||||
let opts = LoadOptions::from_params("document.open", p)?;
|
||||
let mut loaded = match super::importer::pick(name, bytes, p)? {
|
||||
Some(plugin) => super::importer::load(name, bytes, &plugin, p)?,
|
||||
None => load_with(name, bytes, &opts)?,
|
||||
let mut loaded = if opts.link_pages {
|
||||
linked_pages(name, bytes, path.as_deref(), &opts)?
|
||||
} else {
|
||||
match super::importer::pick(name, bytes, p)? {
|
||||
Some(plugin) => super::importer::load(name, bytes, &plugin, p)?,
|
||||
None => load_with(name, bytes, &opts)?,
|
||||
}
|
||||
};
|
||||
let links = crate::cmd::links::resolve(&mut loaded.doc, crate::cmd::links::LinkBase::file(path.as_deref()), update_links, low_res_proxy_eps);
|
||||
Session::refresh_text_bounds(&mut loaded.doc);
|
||||
Ok(ReadFile { loaded, opts, path, links })
|
||||
}
|
||||
|
||||
/// The PDF `name` (`bytes`, read from `path`) opened with `linkPages`: its pages as placed documents
|
||||
/// linked to them ([`super::pdfimport::linked_pages`]), named after the file.
|
||||
fn linked_pages(name: &str, bytes: &[u8], path: Option<&str>, opts: &LoadOptions) -> Result<Loaded> {
|
||||
let (mut doc, warnings) = super::pdfimport::linked_pages(name, bytes, path, opts)?;
|
||||
doc.title = file_name(name);
|
||||
let format = detect(name, bytes).ok_or_else(|| err(format!("can't open `{}`: not a PDF", file_name(name))))?;
|
||||
Ok(Loaded { doc, format, warnings, restored: false, converted: false, preview_only: false, editing_data: false, native_pdf_compatible: None })
|
||||
}
|
||||
|
||||
/// The second half of [`open_bytes_with`]: open a file [`read_for_open`] read as the new active
|
||||
/// document → `document.open`'s result.
|
||||
pub fn open_read(s: &mut Session, file: ReadFile) -> Result<Value> {
|
||||
|
||||
@@ -2,11 +2,15 @@
|
||||
//! and `file.place` read ([`LoadOptions`]), the pages they import and `document.pdfInfo` (pages,
|
||||
//! boxes, a thumbnail; one page for a PostScript file) for the Import PDF dialog.
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_doc::{ColorMode, Document};
|
||||
use vectorcraft_doc::{Artboard, ColorMode, Document, LayerColor, LinkInfo, Node, NodeKind};
|
||||
use vectorcraft_geom::{Affine, Rect};
|
||||
use vectorcraft_pdf::{Choice, CropTo, ImportOptions, PdfError, TextAs};
|
||||
|
||||
use super::super::colormgmt::Grays;
|
||||
use super::super::place::document;
|
||||
use super::super::{Result, Session, bad, check_numbers, number_or, parse_range, text_param};
|
||||
use super::{err, source};
|
||||
|
||||
@@ -47,6 +51,9 @@ pub struct LoadOptions {
|
||||
/// A PDF or `.ai` saved with Preserve Editing opens from the VectorCraft document it carries;
|
||||
/// off, it opens as another app would open it, from the editing copy of its art or its pages.
|
||||
pub native: bool,
|
||||
/// Each page of a PDF opens as a placed document linked to that page of its file, on an
|
||||
/// artboard of its own, instead of as editable art (`linkPages`; see [`linked_pages`]).
|
||||
pub link_pages: bool,
|
||||
}
|
||||
|
||||
impl Default for LoadOptions {
|
||||
@@ -65,6 +72,7 @@ impl Default for LoadOptions {
|
||||
trust_editing_data: false,
|
||||
legacy_names: vectorcraft_eps::NameEncoding::default(),
|
||||
native: true,
|
||||
link_pages: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -74,8 +82,8 @@ impl LoadOptions {
|
||||
/// `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`),
|
||||
/// `legacyNameEncoding` (one of [`vectorcraft_eps::NameEncoding::LABELS`]) and `dxf` (the DXF
|
||||
/// import options).
|
||||
/// `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> {
|
||||
let pages = match p.get("pages").filter(|v| !v.is_null()).or_else(|| p.get("page").filter(|v| !v.is_null())) {
|
||||
None => None,
|
||||
@@ -115,6 +123,10 @@ impl LoadOptions {
|
||||
.and_then(vectorcraft_eps::NameEncoding::from_label)
|
||||
.ok_or_else(|| bad(cmd, format!("legacyNameEncoding must be one of {}", vectorcraft_eps::NameEncoding::LABELS.join(", "))))?,
|
||||
};
|
||||
let link_pages = match p.get("linkPages").filter(|v| !v.is_null()) {
|
||||
None => false,
|
||||
Some(v) => v.as_bool().ok_or_else(|| bad(cmd, "linkPages must be true or false"))?,
|
||||
};
|
||||
let dxf = super::dxfimport::options(cmd, p.get("dxf"))?;
|
||||
Ok(Self {
|
||||
pages,
|
||||
@@ -130,14 +142,15 @@ impl LoadOptions {
|
||||
trust_editing_data,
|
||||
legacy_names,
|
||||
native: true,
|
||||
link_pages,
|
||||
})
|
||||
}
|
||||
|
||||
/// Does the document read only part of the file, or read it differently (a page range, another
|
||||
/// box, a password, without its hidden layers, without the VectorCraft document it carries)?
|
||||
/// Writing it back would lose the rest, so Save doesn't (it asks for a name).
|
||||
/// box, a password, without its hidden layers, without the VectorCraft document it carries, its
|
||||
/// pages linked)? Writing it back would lose the rest, so Save doesn't (it asks for a name).
|
||||
pub fn is_partial(&self) -> bool {
|
||||
self.pages.is_some() || self.crop != CropTo::default() || self.password.is_some() || !self.layers || !self.native
|
||||
self.pages.is_some() || self.crop != CropTo::default() || self.password.is_some() || !self.layers || !self.native || self.link_pages
|
||||
}
|
||||
|
||||
/// The PDF import options: `pages` resolved against the file's page count. A PDF-compatible
|
||||
@@ -201,6 +214,82 @@ fn page_options(page: usize, o: &LoadOptions) -> ImportOptions {
|
||||
ImportOptions { pages: Some(vec![page]), crop: o.crop, password: o.password.clone(), text_as: o.text_as, layers: false, ..Default::default() }
|
||||
}
|
||||
|
||||
/// `document.open` with `linkPages`: the pages `o` picks of the PDF (or PDF-compatible `.ai` or
|
||||
/// `.ait`) `name`, read from `path`, as a document holding one placed document per page, linked to
|
||||
/// that page of the file as File › Place with Link places one ([`document::source`]). Each page
|
||||
/// gets an artboard of its `o.crop` box (its art's bounds for `bounding`), in a row from the left
|
||||
/// with the gap a PDF's artboards open with, and a layer named after the page. The document opens
|
||||
/// in CMYK when most of the pages read in CMYK, unless `o.color_mode` names a mode. Refused without a
|
||||
/// path, for any other file, with a password (a linked page is read again without one), with
|
||||
/// `textAs: outlines` (a linked page shows the file's own type) and for a file over
|
||||
/// [`document::MAX_FILE`] → the document and the notes of reading its pages.
|
||||
pub(super) fn linked_pages(name: &str, bytes: &[u8], path: Option<&str>, o: &LoadOptions) -> Result<(Document, Vec<String>)> {
|
||||
const C: &str = "document.open";
|
||||
let file = super::file_name(name);
|
||||
if !document::is_pdf(name, bytes) {
|
||||
return Err(bad(C, format!("linkPages: `{file}` isn't a PDF or a PDF-compatible .ai file")));
|
||||
}
|
||||
let path = path.ok_or_else(|| bad(C, "linkPages needs the file's path: linked pages are read from it"))?;
|
||||
if o.password.is_some() {
|
||||
return Err(bad(C, "linkPages can't open a file with a password: linked pages are read again without it"));
|
||||
}
|
||||
if o.text_as != TextAs::Text {
|
||||
return Err(bad(C, "linkPages can't be used with textAs: outlines: linked pages show the file's own type"));
|
||||
}
|
||||
if bytes.len() > document::MAX_FILE {
|
||||
return Err(bad(C, format!("linkPages: `{file}` is over {} MB", document::MAX_FILE >> 20)));
|
||||
}
|
||||
let count = vectorcraft_pdf::open_pdf(bytes, None).map_err(err)?.page_count();
|
||||
let picked = match &o.pages {
|
||||
None => (0..count).collect(),
|
||||
Some(range) => parse_range(range, count).map_err(|e| err(format!("pages: {e}")))?,
|
||||
};
|
||||
let bounding = o.crop == CropTo::Bounding;
|
||||
let mut doc = Document::new(1.0, 1.0);
|
||||
let board = doc.artboards.first().cloned().ok_or_else(|| err("a new document has no artboard"))?;
|
||||
doc.artboards.clear();
|
||||
doc.layers.clear();
|
||||
let link = crate::cmd::links::link_info(path, bytes);
|
||||
let gap = ImportOptions::default().artboard_gap;
|
||||
// Every page's object keeps the same one copy of the file.
|
||||
let shared = Arc::new(bytes.to_vec());
|
||||
let (mut x, mut warnings, mut cmyk_pages) = (0.0, Vec::<String>::new(), 0);
|
||||
for (i, &index) in picked.iter().enumerate() {
|
||||
let page = index as u32 + 1;
|
||||
let s = document::shared_source(name, &shared, Some(path), page, bounding, document::page_box(o.crop), C)?;
|
||||
cmyk_pages += usize::from(s.color_mode == ColorMode::Cmyk);
|
||||
let mut node = document::node(&mut doc, &s, LinkInfo { page: Some(page), ..link.clone() }, bounding);
|
||||
if let NodeKind::PlacedDocument(p) = &mut node.kind {
|
||||
p.xf = Affine::translate((x, 0.0));
|
||||
}
|
||||
node.name = Some(file.clone());
|
||||
let mut layer = Node::layer(doc.alloc_id(), &format!("Page {page}"), LayerColor::Preset((i % 27) as u8));
|
||||
if let NodeKind::Layer { children, .. } = &mut layer.kind {
|
||||
children.push(Arc::new(node));
|
||||
}
|
||||
doc.layers.push(Arc::new(layer));
|
||||
let rect = Rect::new(x, 0.0, x + s.frame.width(), s.frame.height());
|
||||
doc.artboards.push(Artboard { id: i as u32 + 1, name: format!("Artboard {}", i + 1), rect, ..board.clone() });
|
||||
x = rect.x1 + gap;
|
||||
for w in s.warnings {
|
||||
if !warnings.contains(&w) {
|
||||
warnings.push(w);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Pages painted mostly in CMYK read as CMYK documents, as opening them as art does: the
|
||||
// document opens in CMYK (with the CMYK default swatches) when most of its pages do.
|
||||
if cmyk_pages * 2 > picked.len() {
|
||||
doc.color_mode = ColorMode::Cmyk;
|
||||
let (swatches, groups) = vectorcraft_color::default_swatches(ColorMode::Cmyk.model());
|
||||
(doc.swatches, doc.swatch_groups) = (swatches.into(), groups.into());
|
||||
}
|
||||
if let Some(mode) = o.color_mode.filter(|m| *m != doc.color_mode) {
|
||||
super::super::colormgmt::set_color_mode(&mut doc, mode, true, None, o.grays);
|
||||
}
|
||||
Ok((doc, warnings))
|
||||
}
|
||||
|
||||
const INFO: &str = "document.pdfInfo";
|
||||
|
||||
/// `document.pdfInfo`.
|
||||
|
||||
@@ -254,6 +254,90 @@ fn a_plot_of_the_arts_bounds_leaves_out_images_in_symbol_art() {
|
||||
}
|
||||
}
|
||||
|
||||
/// In the art of a dynamic symbol a placed image and a path that paints nothing are left out as
|
||||
/// well, until an instance paints the path, and a document whose only other visible art is an
|
||||
/// instance of a dynamic symbol of an image is refused.
|
||||
#[test]
|
||||
fn a_plot_of_the_arts_bounds_leaves_out_images_in_dynamic_symbol_art() {
|
||||
let mut s = two_boards();
|
||||
let plot = |s: &mut Session| s.execute("document.export", &json!({"format": "hpgl", "useArtboards": false})).map(|v| bytes(&v));
|
||||
let bounds = |s: &Session| super::export_art_bounds(&s.doc().unwrap().doc, "hpgl").unwrap();
|
||||
let same = |a: vectorcraft_geom::Rect, b: vectorcraft_geom::Rect| {
|
||||
[(a.x0, b.x0), (a.y0, b.y0), (a.x1, b.x1), (a.y1, b.y1)].iter().all(|(a, b)| (a - b).abs() < 1e-6)
|
||||
};
|
||||
let printing = s.doc().unwrap().doc.layers[0].id;
|
||||
s.execute("layer.new", &json!({})).unwrap();
|
||||
let mut png = vec![];
|
||||
image::DynamicImage::new_rgb8(4, 4).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
|
||||
let image = s.execute("file.place", &json!({"name": "far.png", "dataBase64": b64(&png), "at": [-600, 800]})).unwrap()["ids"][0].clone();
|
||||
let square = s.execute("shape.rectangle", &json!({"x": 200, "y": 200, "width": 20, "height": 20})).unwrap()["id"].clone();
|
||||
let bare = s.execute("shape.rectangle", &json!({"x": 500, "y": -400, "width": 20, "height": 20})).unwrap()["id"].clone();
|
||||
s.execute("paint.setStroke", &json!({"ids": [bare], "none": true})).unwrap();
|
||||
let before = bounds(&s);
|
||||
let inst = s.execute("symbol.new", &json!({"name": "Mixed", "ids": [image, square, bare], "type": "dynamic"})).unwrap()["id"].clone();
|
||||
let after = bounds(&s);
|
||||
assert!(same(before, after), "{before:?} {after:?}");
|
||||
|
||||
// A change of the path's blending mode leaves it painting nothing; once the instance paints the
|
||||
// path, the path is measured.
|
||||
let art = s.doc().unwrap().doc.symbols[0].art.clone();
|
||||
let x0 = |c: &std::sync::Arc<vectorcraft_doc::Node>| c.visual_bounds().map_or(f64::MIN, |b| b.x0);
|
||||
let at = (0..art.children().unwrap().len()).max_by(|a, b| x0(&art.children().unwrap()[*a]).total_cmp(&x0(&art.children().unwrap()[*b]))).unwrap();
|
||||
s.execute("symbol.instance.setAppearance", &json!({"id": inst, "path": [at], "blend": "multiply"})).unwrap();
|
||||
let blended = bounds(&s);
|
||||
assert!(same(before, blended), "{before:?} {blended:?}");
|
||||
s.execute("symbol.instance.setAppearance", &json!({"id": inst, "path": [at], "stroke": "#000000"})).unwrap();
|
||||
let painted = bounds(&s);
|
||||
assert!(painted.x1 > 500.0 && painted.y0 < -390.0, "{painted:?}");
|
||||
// A later change to the same object, as a file can hold, takes the paint off again.
|
||||
{
|
||||
let id = vectorcraft_doc::NodeId(inst.as_u64().unwrap());
|
||||
let d = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
|
||||
let n = d.node_mut(id).unwrap();
|
||||
let mut overrides = n.extras().symbol_overrides.clone();
|
||||
overrides.push(vectorcraft_doc::SymbolOverride { path: vec![at as u32], opacity: Some(0.0), ..Default::default() });
|
||||
n.extras_mut().symbol_overrides = overrides.clone();
|
||||
let taken_off = bounds(&s);
|
||||
assert!(same(before, taken_off), "{before:?} {taken_off:?}");
|
||||
overrides.pop();
|
||||
let d = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
|
||||
d.node_mut(id).unwrap().extras_mut().symbol_overrides = overrides;
|
||||
}
|
||||
// Another instance, far above, that doesn't paint the path is measured without it, whether or
|
||||
// not the first one paints it.
|
||||
let other = s.execute("symbol.place", &json!({"name": "Mixed", "x": 0, "y": -5000})).unwrap()["id"].clone();
|
||||
let with_paint = bounds(&s);
|
||||
s.execute("symbol.instance.reset", &json!({"ids": [inst]})).unwrap();
|
||||
let without_paint = bounds(&s);
|
||||
assert!((with_paint.y0 - without_paint.y0).abs() < 1e-6, "{with_paint:?} {without_paint:?}");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
let undone = bounds(&s);
|
||||
assert!(same(undone, with_paint), "{undone:?} {with_paint:?}");
|
||||
s.execute("select.set", &json!({"ids": [other]})).unwrap();
|
||||
s.execute("edit.clear", &json!({})).unwrap();
|
||||
|
||||
s.execute("select.set", &json!({"ids": [inst]})).unwrap();
|
||||
s.execute("edit.clear", &json!({})).unwrap();
|
||||
s.execute("layer.setProps", &json!({"id": printing, "visible": false})).unwrap();
|
||||
let image = s.execute("file.place", &json!({"name": "far.png", "dataBase64": b64(&png), "at": [-600, 800]})).unwrap()["ids"][0].clone();
|
||||
s.execute("symbol.new", &json!({"name": "Image", "ids": [image], "type": "dynamic"})).unwrap();
|
||||
let e = plot(&mut s).unwrap_err().to_string();
|
||||
assert!(e.contains("no visible art"), "{e}");
|
||||
|
||||
// An instance that brings a group at 0% opacity back to full opacity still draws nothing when
|
||||
// the group holds only an image.
|
||||
let image = s.execute("file.place", &json!({"name": "far.png", "dataBase64": b64(&png), "at": [-600, 800]})).unwrap()["ids"][0].clone();
|
||||
let group = s.execute("object.group", &json!({"ids": [image]})).unwrap()["id"].clone();
|
||||
s.execute("transparency.set", &json!({"ids": [group], "opacity": 0})).unwrap();
|
||||
let inst = s.execute("symbol.new", &json!({"name": "Clear", "ids": [group], "type": "dynamic"})).unwrap()["id"].clone();
|
||||
let id = vectorcraft_doc::NodeId(inst.as_u64().unwrap());
|
||||
let d = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
|
||||
d.node_mut(id).unwrap().extras_mut().symbol_overrides =
|
||||
[vec![], vec![0]].into_iter().map(|path| vectorcraft_doc::SymbolOverride { path, opacity: Some(1.0), ..Default::default() }).collect();
|
||||
let e = plot(&mut s).unwrap_err().to_string();
|
||||
assert!(e.contains("no visible art"), "{e}");
|
||||
}
|
||||
|
||||
/// A placed image with a Vector Halftone effect is measured when the effect makes dots, and left
|
||||
/// out when it would take more cells than the effect makes.
|
||||
#[test]
|
||||
|
||||
@@ -865,7 +865,8 @@ pub(crate) fn propagate(before: &Document, d: &mut Document, ge: &GlobalEdit, se
|
||||
}
|
||||
|
||||
/// Store on their graphs what the members `edited`, and the objects in them, took on the paths directly in a graph
|
||||
/// series, for the graph's next redraw. The edited member is left to the edit's own command.
|
||||
/// series, and the transparency a series group among them took, for the graph's next redraw. The edited member is left to
|
||||
/// the edit's own command.
|
||||
fn keep_series_changes(before: &Document, d: &mut Document, edited: &[NodeId]) {
|
||||
let mut taken = vec![];
|
||||
for id in edited {
|
||||
@@ -874,6 +875,8 @@ fn keep_series_changes(before: &Document, d: &mut Document, edited: &[NodeId]) {
|
||||
}
|
||||
}
|
||||
super::appearance::capture_series_changes(before, d, &taken);
|
||||
let groups = super::graph::series_groups_among(d, &taken);
|
||||
super::graph::capture_series_object_opacity(d, &groups);
|
||||
}
|
||||
|
||||
/// The outlines of the members of the active document's Global Edit that are not selected, hold
|
||||
|
||||
@@ -48,7 +48,7 @@ use series::default_series_color;
|
||||
pub(crate) use series::{
|
||||
LabelTextChange, capture_label_anti_alias, capture_label_changes, capture_label_object_opacity, capture_label_paragraphs, capture_label_rows,
|
||||
capture_label_styles, capture_label_text, capture_series_object_opacity, capture_series_opacity, capture_series_top_paints, is_design_art,
|
||||
label_object_opacity_differs, labels_in, paint_targets, series_group_marks, series_group_marks_where, series_marks_in,
|
||||
label_object_opacity_differs, labels_in, paint_targets, series_group_marks, series_group_marks_where, series_groups_among, series_marks_in,
|
||||
series_object_opacity_differs, shown_paint,
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use vectorcraft_doc::graph::art_bounds;
|
||||
use vectorcraft_doc::graph::graph_art_without_type as art_bounds;
|
||||
|
||||
use super::axis::{MAX_TICK_MARKS, count_given, one_line};
|
||||
use super::data::apply_data;
|
||||
@@ -21,12 +21,16 @@ fn bound_param(p: &Value, key: &str, cmd: &str) -> Result<Option<Option<f64>>> {
|
||||
|
||||
/// The bounds a redraw of graph `n` measures a move or scale on, as kept at the last generation and as they are now:
|
||||
/// those of its art without type ([`GraphSpec::placed_art`]), or those of all its art when the graph keeps no such
|
||||
/// bounds with a width and a height, or has no art without type now.
|
||||
/// bounds with a width and a height. `None` when the art measured has no width or no height now, or the graph keeps
|
||||
/// bounds of its art without type and has no such art now.
|
||||
fn measured(n: &Node) -> Option<(Rect, Rect)> {
|
||||
let kept = n.extras().graph.as_deref()?;
|
||||
let c = n.children()?;
|
||||
let art = kept.placed_art.filter(|p| p.width() > 1e-9 && p.height() > 1e-9).zip(art_bounds(c));
|
||||
art.or_else(|| kept.placed.zip(children_bounds(c)))
|
||||
let solid = |r: &Rect| r.width() > 1e-9 && r.height() > 1e-9;
|
||||
match kept.placed_art.filter(solid) {
|
||||
Some(placed) => art_bounds(c).filter(solid).map(|now| (placed, now)),
|
||||
None => kept.placed.zip(children_bounds(c).filter(solid)),
|
||||
}
|
||||
}
|
||||
|
||||
/// `r` carried by the change from bounds `from` to bounds `to`: each edge stays at the same place relative to them.
|
||||
@@ -39,14 +43,28 @@ fn carried(r: Rect, from: Rect, to: Rect) -> Option<Rect> {
|
||||
Some(Rect::new(to.x0 + (r.x0 - from.x0) * sx, to.y0 + (r.y0 - from.y0) * sy, to.x0 + (r.x1 - from.x0) * sx, to.y0 + (r.y1 - from.y0) * sy))
|
||||
}
|
||||
|
||||
/// The graphs holding objects `ids`, each with the bounds of its art without type and of all its art. Give them to
|
||||
/// [`keep_placed`] after an edit that changes a graph's art without moving the graph.
|
||||
/// The graphs holding objects `ids`, that are among them or that are inside them, each with the bounds of its art
|
||||
/// without type and of all its art. Give them to [`keep_placed`] after an edit that changes a graph's art without
|
||||
/// moving the graph.
|
||||
pub(crate) fn graphs_holding(d: &Document, ids: &[NodeId]) -> Vec<(NodeId, Option<Rect>, Option<Rect>)> {
|
||||
let mut out: Vec<(NodeId, Option<Rect>, Option<Rect>)> = vec![];
|
||||
let is_graph = |n: &Node| n.extras().graph.is_some();
|
||||
let mut found: Vec<NodeId> = vec![];
|
||||
for id in ids {
|
||||
let Some(chain) = d.ancestry(*id) else { continue };
|
||||
let holder = chain.iter().rev().skip(1).copied().find(|a| d.node(*a).is_some_and(|n| n.extras().graph.is_some()));
|
||||
let Some(gid) = holder.filter(|g| !out.iter().any(|(o, ..)| o == g)) else { continue };
|
||||
found.extend(chain.iter().rev().copied().find(|a| d.node(*a).is_some_and(is_graph)));
|
||||
if let Some(n) = d.node(*id) {
|
||||
n.walk(&mut |c| {
|
||||
if is_graph(c) {
|
||||
found.push(c.id);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
let mut out: Vec<(NodeId, Option<Rect>, Option<Rect>)> = vec![];
|
||||
for gid in found {
|
||||
if out.iter().any(|(o, ..)| *o == gid) {
|
||||
continue;
|
||||
}
|
||||
let children = d.node(gid).and_then(Node::children);
|
||||
out.push((gid, children.and_then(|c| art_bounds(c)), children.and_then(|c| children_bounds(c))));
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ use super::labels::{
|
||||
recolour_text, runs, shadow_of,
|
||||
};
|
||||
use super::markers::{MARKER_BUDGET, marker_cost, marker_designs};
|
||||
use super::series::{picks_legend_fill, series_marks, with_series_gradients, with_series_opacity};
|
||||
use super::series::{picks_legend_fill, series_marks, with_series_gradients, with_series_group_opacity, with_series_opacity};
|
||||
use super::{
|
||||
Arc, BezPath, Color, Document, GraphKind, GraphSpec, Justify, Node, NodeKind, Paint, PathData, Point, Rect, TickLength, ValueAxisSide, shapes,
|
||||
};
|
||||
@@ -1005,7 +1005,7 @@ impl<'a> Plot<'a> {
|
||||
}
|
||||
}
|
||||
let name = g.series.get(s).cloned().filter(|n| !n.is_empty()).unwrap_or_else(|| format!("Series {}", s + 1));
|
||||
let grp = self.b.series(&name, s, with_series_opacity(g, s, with_series_gradients(g, s, items)));
|
||||
let grp = with_series_group_opacity(g, s, self.b.series(&name, s, with_series_opacity(g, s, with_series_gradients(g, s, items))));
|
||||
self.b.out.push(grp);
|
||||
}
|
||||
self.b.out.append(&mut self.on_top);
|
||||
|
||||
@@ -475,15 +475,16 @@ pub(crate) fn capture_series_opacity(doc: &mut Document, edited: &[(NodeId, bool
|
||||
settle_series_paints(doc, before)
|
||||
}
|
||||
|
||||
/// Copy the object opacity and blend mode of generated series art just edited (`edited`) into that series' object opacity
|
||||
/// and blend mode. Called inside the same document edit, so both undo together. Returns whether a series' kept object
|
||||
/// opacity or blend mode changed.
|
||||
/// Copy the object transparency of generated series art just edited (`edited`) into what that series keeps: a path
|
||||
/// directly in a series group sets the paths' object opacity and blend mode, and the series group itself sets the
|
||||
/// group's opacity, blend mode, isolation, knockout and knockout shape. Called inside the same document edit, so both undo
|
||||
/// together. Returns whether what a series keeps changed.
|
||||
pub(crate) fn capture_series_object_opacity(doc: &mut Document, edited: &[NodeId]) -> bool {
|
||||
let mut before = SeriesPaintsBefore::new();
|
||||
for (graph, index, opacity, blend) in object_opacity_captures(doc, edited) {
|
||||
for (graph, index, group, look) in object_opacity_captures(doc, edited) {
|
||||
let Some(spec) = doc.node_mut(graph).and_then(|n| n.extras_if_any().and_then(|e| e.graph.as_deref_mut())) else { continue };
|
||||
// A fully opaque Normal object on a series the graph keeps nothing for leaves the graph as it is.
|
||||
if opacity.is_none() && blend.is_none() && spec.series_paints.len() <= index {
|
||||
if look == ObjectOpacity::default() && spec.series_paints.len() <= index {
|
||||
continue;
|
||||
}
|
||||
before.entry(graph).or_insert_with(|| spec.series_paints.clone());
|
||||
@@ -492,7 +493,12 @@ pub(crate) fn capture_series_object_opacity(doc: &mut Document, edited: &[NodeId
|
||||
spec.series_paints.resize(index + 1, vectorcraft_doc::SeriesPaint::default());
|
||||
}
|
||||
let Some(slot) = spec.series_paints.get_mut(index) else { continue };
|
||||
(slot.opacity, slot.blend) = (opacity, blend);
|
||||
if group {
|
||||
(slot.group_opacity, slot.group_blend) = (look.opacity, look.blend);
|
||||
(slot.group_isolate, slot.group_knockout, slot.group_knockout_shape) = (look.isolate, look.knockout, look.knockout_shape);
|
||||
} else {
|
||||
(slot.opacity, slot.blend) = (look.opacity, look.blend);
|
||||
}
|
||||
}
|
||||
settle_series_paints(doc, before)
|
||||
}
|
||||
@@ -500,20 +506,50 @@ pub(crate) fn capture_series_object_opacity(doc: &mut Document, edited: &[NodeId
|
||||
/// Would [`capture_series_object_opacity`] change what the graph stores for `edited`? Reads the document without copying
|
||||
/// it.
|
||||
pub(crate) fn series_object_opacity_differs(doc: &Document, edited: &[NodeId]) -> bool {
|
||||
let mut after: HashMap<(NodeId, usize), (Option<f32>, Option<BlendMode>)> = HashMap::new();
|
||||
let stored = |graph: NodeId, index: usize| {
|
||||
let mut after: HashMap<(NodeId, usize, bool), ObjectOpacity> = HashMap::new();
|
||||
let stored = |graph: NodeId, index: usize, group: bool| {
|
||||
let spec = doc.node(graph).and_then(|n| n.extras().graph.as_deref());
|
||||
spec.and_then(|g| g.series_paints.get(index)).map_or((None, None), |slot| (slot.opacity, slot.blend))
|
||||
let slot = spec.and_then(|g| g.series_paints.get(index));
|
||||
slot.map_or_else(ObjectOpacity::default, |slot| {
|
||||
if group {
|
||||
ObjectOpacity {
|
||||
opacity: slot.group_opacity,
|
||||
blend: slot.group_blend,
|
||||
isolate: slot.group_isolate,
|
||||
knockout: slot.group_knockout,
|
||||
knockout_shape: slot.group_knockout_shape,
|
||||
}
|
||||
} else {
|
||||
ObjectOpacity { opacity: slot.opacity, blend: slot.blend, ..ObjectOpacity::default() }
|
||||
}
|
||||
})
|
||||
};
|
||||
for (graph, index, opacity, blend) in object_opacity_captures(doc, edited) {
|
||||
after.insert((graph, index), (opacity, blend));
|
||||
for (graph, index, group, look) in object_opacity_captures(doc, edited) {
|
||||
after.insert((graph, index, group), look);
|
||||
}
|
||||
after.into_iter().any(|((graph, index), pair)| stored(graph, index) != pair)
|
||||
after.into_iter().any(|((graph, index, group), look)| stored(graph, index, group) != look)
|
||||
}
|
||||
|
||||
/// The series and object opacity and blend mode (None for 100% and Normal) of each of `edited` that is a path directly in a
|
||||
/// series group, in order.
|
||||
fn object_opacity_captures(doc: &Document, edited: &[NodeId]) -> Vec<(NodeId, usize, Option<f32>, Option<BlendMode>)> {
|
||||
/// The series groups among `ids`, for an edit that changes only what a group's transparency has beyond its opacity and
|
||||
/// blend mode (isolation, knockout and knockout shape), which the graph keeps for series groups alone.
|
||||
pub(crate) fn series_groups_among(doc: &Document, ids: &[NodeId]) -> Vec<NodeId> {
|
||||
ids.iter().copied().filter(|id| doc.node(*id).is_some_and(|n| n.extras().series_index.is_some())).collect()
|
||||
}
|
||||
|
||||
/// An object's transparency as a graph keeps it: the object opacity and blend mode (None for 100% and Normal), and for a
|
||||
/// series group its isolation, knockout (None for neutral) and knockout shape. Paths keep the first two only.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq)]
|
||||
struct ObjectOpacity {
|
||||
opacity: Option<f32>,
|
||||
blend: Option<BlendMode>,
|
||||
isolate: bool,
|
||||
knockout: Option<vectorcraft_doc::Knockout>,
|
||||
knockout_shape: bool,
|
||||
}
|
||||
|
||||
/// The graph, series, whether it is the series group itself (`true`) or a path directly in it, and the object
|
||||
/// transparency of each of `edited` that is one of those, in order.
|
||||
fn object_opacity_captures(doc: &Document, edited: &[NodeId]) -> Vec<(NodeId, usize, bool, ObjectOpacity)> {
|
||||
if edited.is_empty() {
|
||||
return Vec::new();
|
||||
}
|
||||
@@ -524,14 +560,48 @@ fn object_opacity_captures(doc: &Document, edited: &[NodeId]) -> Vec<(NodeId, us
|
||||
edited
|
||||
.iter()
|
||||
.filter_map(|id| {
|
||||
// Only the paths the graph draws again, not the copy of a graph design.
|
||||
let r = members.get(id).filter(|r| doc.parent_of(*id) == Some(r.group))?;
|
||||
let node = doc.node(*id).filter(|n| matches!(n.kind, NodeKind::Path { .. }))?;
|
||||
Some((r.graph, r.index, (node.opacity < 1.0).then_some(node.opacity), (node.blend != BlendMode::Normal).then_some(node.blend)))
|
||||
let r = members.get(id)?;
|
||||
let group = r.group == *id;
|
||||
// Only the series group and the paths the graph draws again, not the copy of a graph design.
|
||||
let node = doc.node(*id).filter(|n| group || (doc.parent_of(*id) == Some(r.group) && matches!(n.kind, NodeKind::Path { .. })))?;
|
||||
let mut look = ObjectOpacity {
|
||||
opacity: (node.opacity < 1.0).then_some(node.opacity),
|
||||
blend: (node.blend != BlendMode::Normal).then_some(node.blend),
|
||||
..ObjectOpacity::default()
|
||||
};
|
||||
if group {
|
||||
look.isolate = node.isolate;
|
||||
look.knockout = (node.knockout != vectorcraft_doc::Knockout::Neutral).then_some(node.knockout);
|
||||
look.knockout_shape = node.knockout_shape;
|
||||
}
|
||||
Some((r.graph, r.index, group, look))
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Series `i`'s group (`group`) with the object opacity, blend mode, isolation, knockout and knockout shape the graph
|
||||
/// keeps for it. An opacity read from a file is held to 0..1, and one that is not a number is left out.
|
||||
pub(super) fn with_series_group_opacity(g: &GraphSpec, i: usize, mut group: Arc<Node>) -> Arc<Node> {
|
||||
let Some(slot) = g.series_paints.get(i) else { return group };
|
||||
let opacity = slot.group_opacity.filter(|o| o.is_finite()).map(|o| o.clamp(0.0, 1.0));
|
||||
if opacity.is_none() && slot.group_blend.is_none() && !slot.group_isolate && slot.group_knockout.is_none() && !slot.group_knockout_shape {
|
||||
return group;
|
||||
}
|
||||
let n = Arc::make_mut(&mut group);
|
||||
if let Some(o) = opacity {
|
||||
n.opacity = o;
|
||||
}
|
||||
if let Some(b) = slot.group_blend {
|
||||
n.blend = b;
|
||||
}
|
||||
if let Some(k) = slot.group_knockout {
|
||||
n.knockout = k;
|
||||
}
|
||||
n.isolate |= slot.group_isolate;
|
||||
n.knockout_shape |= slot.group_knockout_shape;
|
||||
group
|
||||
}
|
||||
|
||||
/// Graph Data › Transpose row/column: categories become series and series categories.
|
||||
pub(super) fn transpose(g: &mut GraphSpec) {
|
||||
let cells = g.cells();
|
||||
|
||||
@@ -923,6 +923,32 @@ fn what_global_edit_gives_the_marks_of_another_series_group_survives_regeneratio
|
||||
assert!(series(&n, 1).children().unwrap().iter().all(|m| m.appearance.fill_paint() == given));
|
||||
}
|
||||
|
||||
/// With a whole series group picked and Global Edit on, the opacity and blend mode set on that group reach the other
|
||||
/// series groups of the same form, and the graph stores them for those groups too.
|
||||
#[test]
|
||||
fn the_transparency_global_edit_gives_another_series_group_survives_regeneration() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({})).unwrap();
|
||||
// Series without names draw no legend, so each series group holds only its columns, laid out like the other's.
|
||||
let csv = ",,\nQ1,3,3\nQ2,5,5";
|
||||
let made = s.execute("graph.create", &json!({"type": "column", "x": 100, "y": 100, "width": 300, "height": 200, "csv": csv})).unwrap();
|
||||
let id = NodeId(made["id"].as_u64().unwrap());
|
||||
let n = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
let (first, other) = (series(&n, 0).id, series(&n, 1).id);
|
||||
s.execute("object.isolate", &json!({"id": id.0})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [first.0]})).unwrap();
|
||||
let r = s.execute("select.globalEdit", &json!({})).unwrap();
|
||||
assert!(r["ids"].as_array().unwrap().contains(&json!(other.0)), "{r}");
|
||||
s.execute("transparency.set", &json!({"ids": [first.0], "opacity": 40, "blend": "multiply"})).unwrap();
|
||||
let g = s.doc().unwrap().doc.node(other).unwrap().clone();
|
||||
assert_eq!((g.opacity, g.blend), (0.4, BlendMode::Multiply), "Global Edit reaches the other group");
|
||||
let kept = spec(&s, id).series_paints[1].clone();
|
||||
assert_eq!((kept.group_opacity, kept.group_blend), (Some(0.4), Some(BlendMode::Multiply)));
|
||||
s.execute("object.exitIsolation", &json!({})).unwrap();
|
||||
s.execute("graph.setData", &json!({"rows": [[1, 2], [3, 4]]})).unwrap();
|
||||
assert_eq!(group_transparency(&s, id, 1).0, (0.4, BlendMode::Multiply));
|
||||
}
|
||||
|
||||
/// A blend mode set on the top fill or stroke row of one series mark is kept by the graph and drawn on every mark of
|
||||
/// the series again; Normal forgets it.
|
||||
#[test]
|
||||
@@ -2210,8 +2236,8 @@ fn appearance_commands_given_a_series_group_edit_its_marks() {
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
|
||||
let (rect, blue) = blue_style(&mut s, "Blue", false);
|
||||
let was = spec(&s, id).series_paints;
|
||||
s.execute("object.setProps", &json!({"ids": [group.0], "opacity": 50})).unwrap();
|
||||
let was = spec(&s, id).series_paints;
|
||||
s.execute("appearance.transfer", &json!({"source": rect.0, "target": group.0, "copy": true})).unwrap();
|
||||
assert!(series_0_group(&s, id).1);
|
||||
assert_eq!(s.doc().unwrap().doc.node(group).unwrap().opacity, 1.0, "the appearance replaces the group's own opacity");
|
||||
@@ -2433,10 +2459,10 @@ fn a_graphic_style_applied_to_a_series_group_styles_its_marks() {
|
||||
let (mut s, id, marks) = stored_red_stroke();
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
let (_, blue) = blue_style(&mut s, "Blue", false);
|
||||
let was = spec(&s, id).series_paints;
|
||||
let own = json!({"ids": [group.0], "opacity": 50, "blend": "multiply", "isolate": true, "knockout": "on", "item": null});
|
||||
s.execute("transparency.set", &own).unwrap();
|
||||
s.execute("effect.apply", &json!({"ids": [group.0], "effect": "distort.twist"})).unwrap();
|
||||
let was = spec(&s, id).series_paints;
|
||||
let g = s.doc().unwrap().doc.node(group).unwrap().clone();
|
||||
assert!(g.isolate && g.knockout != Default::default() && g.blend != vectorcraft_color::BlendMode::Normal);
|
||||
s.execute("graphicStyle.apply", &json!({"name": "Blue", "ids": [group.0]})).unwrap();
|
||||
@@ -2513,6 +2539,161 @@ fn redefining_a_graphic_style_keeps_an_edited_mark_of_a_linked_series_group() {
|
||||
assert!(marks[1..].iter().all(|m| d.node(*m).unwrap().extras().graphic_style == Some(style.id)));
|
||||
}
|
||||
|
||||
/// Series `index`'s group: its object opacity and blend mode, and those of each path directly inside it.
|
||||
fn group_transparency(s: &Session, id: NodeId, index: u32) -> ((f32, BlendMode), Vec<(f32, BlendMode)>) {
|
||||
let n = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
let g = series(&n, index);
|
||||
((g.opacity, g.blend), g.children().unwrap().iter().map(|m| (m.opacity, m.blend)).collect())
|
||||
}
|
||||
|
||||
/// An object opacity and blend mode set on a selected series group are kept by the graph for the group: the series group
|
||||
/// has them after the graph is drawn again, the graph's data reads them back unchanged after it is written to JSON, its
|
||||
/// paths and the other series stay opaque and Normal, setting them again records no step, 100% and Normal forget them,
|
||||
/// and undo takes them back.
|
||||
#[test]
|
||||
fn an_opacity_and_blend_mode_on_a_series_group_survive_regeneration() {
|
||||
let (mut s, id, _, _) = column_marks();
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
s.execute("select.set", &json!({"ids": [group.0]})).unwrap();
|
||||
s.execute("transparency.set", &json!({"opacity": 40, "blend": "multiply"})).unwrap();
|
||||
let kept = spec(&s, id).series_paints[0].clone();
|
||||
assert_eq!((kept.group_opacity, kept.group_blend), (Some(0.4), Some(BlendMode::Multiply)));
|
||||
assert_eq!((kept.opacity, kept.blend), (None, None), "the paths keep their own");
|
||||
let restored: GraphSpec = serde_json::from_value(serde_json::to_value(spec(&s, id)).unwrap()).unwrap();
|
||||
assert_eq!(restored, spec(&s, id));
|
||||
s.execute("graph.setData", &json!({"id": id.0, "rows": [[1, 2], [3, 4]]})).unwrap();
|
||||
let normal = (1.0, BlendMode::Normal);
|
||||
let (own, paths) = group_transparency(&s, id, 0);
|
||||
assert_eq!(own, (0.4, BlendMode::Multiply));
|
||||
assert!(!paths.is_empty() && paths.iter().all(|t| *t == normal), "{paths:?}");
|
||||
let (own, paths) = group_transparency(&s, id, 1);
|
||||
assert_eq!(own, normal);
|
||||
assert!(paths.iter().all(|t| *t == normal), "{paths:?}");
|
||||
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
let undo = s.doc().unwrap().history.undo.len();
|
||||
s.execute("object.setProps", &json!({"id": group.0, "opacity": 40, "blend": "multiply"})).unwrap();
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), undo, "the values the group and the graph have already");
|
||||
s.execute("object.setProps", &json!({"id": group.0, "opacity": 100, "blend": "normal"})).unwrap();
|
||||
let kept = spec(&s, id).series_paints[0].clone();
|
||||
assert_eq!((kept.group_opacity, kept.group_blend), (None, None));
|
||||
s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
|
||||
s.execute("graph.setData", &json!({"rows": [[2, 2], [3, 4]]})).unwrap();
|
||||
assert_eq!(group_transparency(&s, id, 0).0, normal);
|
||||
for _ in 0..4 {
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
}
|
||||
assert!(spec(&s, id).series_paints.is_empty(), "undo takes back the edit and what the graph stored");
|
||||
}
|
||||
|
||||
/// Commands that clear a series group's own opacity and blend mode also remove what the graph keeps for it: Clear
|
||||
/// Appearance on the group, a graphic style applied to it and Move Appearance onto it.
|
||||
#[test]
|
||||
fn clearing_a_series_groups_opacity_forgets_what_the_graph_keeps() {
|
||||
let kept = |s: &Session, id: NodeId| {
|
||||
let slot = spec(s, id).series_paints[0].clone();
|
||||
(slot.group_opacity, slot.group_blend)
|
||||
};
|
||||
let faded = (Some(0.5), Some(BlendMode::Screen));
|
||||
let (mut s, id, _, _) = column_marks();
|
||||
let (rect, _) = blue_style(&mut s, "Blue", false);
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
s.execute("object.setProps", &json!({"id": group.0, "opacity": 50, "blend": "screen"})).unwrap();
|
||||
assert_eq!(kept(&s, id), faded);
|
||||
let commands = [
|
||||
("appearance.clear", json!({"ids": [group.0]})),
|
||||
("graphicStyle.apply", json!({"name": "Blue", "ids": [group.0]})),
|
||||
("appearance.transfer", json!({"source": rect.0, "target": group.0, "copy": true})),
|
||||
];
|
||||
for (cmd, params) in commands {
|
||||
s.execute(cmd, ¶ms).unwrap();
|
||||
assert_eq!(kept(&s, id), (None, None), "{cmd}");
|
||||
s.execute("graph.setData", &json!({"id": id.0, "rows": [[1, 2], [3, 4]]})).unwrap();
|
||||
assert_eq!(group_transparency(&s, id, 0).0, (1.0, BlendMode::Normal), "{cmd}");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(kept(&s, id), faded, "{cmd}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Redefining a graphic style a series group is linked to clears the group's own opacity and blend mode, and removes
|
||||
/// what the graph keeps for them.
|
||||
#[test]
|
||||
fn redefining_a_style_linked_to_a_series_group_forgets_its_kept_opacity() {
|
||||
let (mut s, id, _, _) = column_marks();
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
let (rect, _) = blue_style(&mut s, "Blue", false);
|
||||
let style = s.doc().unwrap().doc.graphic_style("Blue").unwrap().clone();
|
||||
s.edit("Link", |d, _| {
|
||||
let i = d.graphic_style_index("Blue").unwrap();
|
||||
(d.graphic_styles[i].opacity, d.graphic_styles[i].blend) = (0.5, BlendMode::Screen);
|
||||
let g = d.node_mut(group).unwrap();
|
||||
g.appearance = style.appearance.clone().into();
|
||||
(g.opacity, g.blend) = (0.5, BlendMode::Screen);
|
||||
g.extras_mut().graphic_style = Some(style.id);
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
s.execute("object.setProps", &json!({"id": group.0, "opacity": 50, "blend": "screen"})).unwrap();
|
||||
let slot = spec(&s, id).series_paints[0].clone();
|
||||
assert_eq!((slot.group_opacity, slot.group_blend), (Some(0.5), Some(BlendMode::Screen)));
|
||||
assert_eq!(s.doc().unwrap().doc.node(group).unwrap().extras().graphic_style, Some(style.id), "still linked");
|
||||
s.execute("appearance.setItem", &json!({"ids": [rect.0], "index": top_row(&s, rect, true), "color": "#00ff00"})).unwrap();
|
||||
s.execute("graphicStyle.redefine", &json!({"name": "Blue", "id": rect.0})).unwrap();
|
||||
let slot = spec(&s, id).series_paints.first().cloned().unwrap_or_default();
|
||||
assert_eq!((slot.group_opacity, slot.group_blend), (None, None));
|
||||
s.execute("graph.setData", &json!({"id": id.0, "rows": [[1, 2], [3, 4]]})).unwrap();
|
||||
assert_eq!(group_transparency(&s, id, 0).0, (1.0, BlendMode::Normal));
|
||||
}
|
||||
|
||||
/// Isolate Blending, a knockout state and Knockout Shape set on a selected series group are kept by the graph for the
|
||||
/// group, through the graph being drawn again; the other series' group stays as the graph draws it, and turning them off
|
||||
/// forgets them.
|
||||
#[test]
|
||||
fn isolation_and_knockout_on_a_series_group_survive_regeneration() {
|
||||
let (mut s, id, _, _) = column_marks();
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
s.execute("select.set", &json!({"ids": [group.0]})).unwrap();
|
||||
s.execute("transparency.set", &json!({"isolate": true, "knockout": "off", "knockoutShape": true})).unwrap();
|
||||
let slot = spec(&s, id).series_paints[0].clone();
|
||||
assert_eq!((slot.group_isolate, slot.group_knockout, slot.group_knockout_shape), (true, Some(vectorcraft_doc::Knockout::Off), true));
|
||||
assert_eq!((slot.group_opacity, slot.group_blend, slot.opacity, slot.blend), (None, None, None, None));
|
||||
let undo = s.doc().unwrap().history.undo.len();
|
||||
s.execute("object.setProps", &json!({"id": group.0, "isolate": true})).unwrap();
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), undo, "the values the group and the graph have already");
|
||||
s.execute("graph.setData", &json!({"id": id.0, "rows": [[1, 2], [3, 4]]})).unwrap();
|
||||
let n = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
let (g, other) = (series(&n, 0), series(&n, 1));
|
||||
assert_eq!((g.isolate, g.knockout, g.knockout_shape), (true, vectorcraft_doc::Knockout::Off, true));
|
||||
assert_eq!((other.isolate, other.knockout, other.knockout_shape), (false, vectorcraft_doc::Knockout::Neutral, false));
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
s.execute("object.setProps", &json!({"id": group.0, "isolate": false, "knockout": "neutral", "knockoutShape": false})).unwrap();
|
||||
assert!(spec(&s, id).series_paints.iter().all(|p| *p == vectorcraft_doc::SeriesPaint::default()), "nothing is kept");
|
||||
}
|
||||
|
||||
/// Randomize Opacity and Sort Objects given a series group keep the opacity they give it for the group.
|
||||
#[test]
|
||||
fn randomize_and_sort_opacity_on_a_series_group_are_kept() {
|
||||
let (mut s, id, _, _) = column_marks();
|
||||
let (group, _) = series_0_group(&s, id);
|
||||
s.execute("addon.arrange.randomizeOpacity", &json!({"ids": [group.0], "min": 30, "max": 60, "seed": 7})).unwrap();
|
||||
let given = s.doc().unwrap().doc.node(group).unwrap().opacity;
|
||||
assert!(given < 1.0);
|
||||
assert_eq!(spec(&s, id).series_paints[0].group_opacity, Some(given));
|
||||
s.execute("graph.setData", &json!({"id": id.0, "rows": [[1, 2], [3, 4]]})).unwrap();
|
||||
assert_eq!(group_transparency(&s, id, 0).0, (given, BlendMode::Normal));
|
||||
|
||||
let n = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
let (first, second) = (series(&n, 0).id, series(&n, 1).id);
|
||||
s.execute("object.setProps", &json!({"id": second.0, "opacity": 80})).unwrap();
|
||||
s.execute("addon.arrange.sort", &json!({"ids": [first.0, second.0], "by": "x", "apply": "opacity", "order": "descending"})).unwrap();
|
||||
let d = &s.doc().unwrap().doc;
|
||||
let (a, b) = (d.node(first).unwrap().opacity, d.node(second).unwrap().opacity);
|
||||
assert_eq!((a, b), (0.8, given), "the opacities trade places");
|
||||
let kept = &spec(&s, id).series_paints;
|
||||
assert_eq!((kept[0].group_opacity, kept.get(1).and_then(|k| k.group_opacity)), ((a < 1.0).then_some(a), (b < 1.0).then_some(b)));
|
||||
}
|
||||
|
||||
/// Default Fill and Stroke on a series mark stores a white fill and a 1 pt black stroke, both opaque, on the graph.
|
||||
#[test]
|
||||
fn default_fill_and_stroke_on_a_series_mark_is_kept() {
|
||||
@@ -5796,6 +5977,141 @@ fn outlining_a_graphs_labels_leaves_the_plot_in_place() {
|
||||
let moved = spec(&s, id).rect;
|
||||
assert!((moved.x0 - (rect.x0 + 30.0)).abs() < 1e-6 && (moved.y0 - (rect.y0 + 15.0)).abs() < 1e-6, "{moved:?}");
|
||||
assert!((moved.width() - rect.width()).abs() < 1e-6 && (moved.height() - rect.height()).abs() < 1e-6, "{moved:?}");
|
||||
// A scale of the graph made before outlining is still followed.
|
||||
s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
|
||||
s.execute("object.scale", &json!({"sx": 150, "sy": 50, "origin": [moved.x0, moved.y0]})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [text_id(&s, id, "Axes", "Q3").0]})).unwrap();
|
||||
s.execute("type.createOutlines", &json!({})).unwrap();
|
||||
s.execute("graph.setData", &json!({"id": id.0, "csv": csv})).unwrap();
|
||||
let scaled = spec(&s, id).rect;
|
||||
assert!((scaled.x0 - moved.x0).abs() < 1e-6 && (scaled.y0 - moved.y0).abs() < 1e-6, "{scaled:?}");
|
||||
assert!((scaled.width() - 1.5 * rect.width()).abs() < 1e-6 && (scaled.height() - 0.5 * rect.height()).abs() < 1e-6, "{scaled:?}");
|
||||
}
|
||||
|
||||
/// Outline Stroke on a graph's strokes leaves the plot where it is when the graph is drawn again, and a move of the
|
||||
/// graph made before it is still followed.
|
||||
#[test]
|
||||
fn outlining_a_graphs_strokes_leaves_the_plot_in_place() {
|
||||
let csv = ",2024,2025\nQ1,3,2\nQ2,5,4\nQ3,-1,6";
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
|
||||
let id = graph(&mut s, "column");
|
||||
let rect = spec(&s, id).rect;
|
||||
s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
|
||||
s.execute("object.move", &json!({"dx": 20, "dy": 10})).unwrap();
|
||||
s.execute("object.path.outlineStroke", &json!({})).unwrap();
|
||||
s.execute("graph.setData", &json!({"id": id.0, "csv": csv})).unwrap();
|
||||
let moved = spec(&s, id).rect;
|
||||
assert!((moved.x0 - (rect.x0 + 20.0)).abs() < 1e-6 && (moved.y0 - (rect.y0 + 10.0)).abs() < 1e-6, "{moved:?}");
|
||||
assert!((moved.width() - rect.width()).abs() < 1e-6 && (moved.height() - rect.height()).abs() < 1e-6, "{moved:?}");
|
||||
}
|
||||
|
||||
/// A graph left with only its labels, or with its labels and one vertical line, leaves the plot where it is when it is
|
||||
/// drawn again after a label edit.
|
||||
#[test]
|
||||
fn a_graph_left_with_only_its_labels_leaves_the_plot_in_place() {
|
||||
for keep_a_line in [false, true] {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
|
||||
let id = graph(&mut s, "column");
|
||||
let rect = spec(&s, id).rect;
|
||||
let (mut art, mut line) = (vec![], None);
|
||||
s.doc().unwrap().doc.node(id).unwrap().walk(&mut |n| {
|
||||
if n.children().is_none() && !matches!(n.kind, NodeKind::Text(_)) {
|
||||
let vertical = n.geometric_bounds().is_some_and(|b| b.width() < 1e-9 && b.height() > 1.0);
|
||||
if keep_a_line && vertical && line.is_none() {
|
||||
line = n.geometric_bounds();
|
||||
} else {
|
||||
art.push(n.id.0);
|
||||
}
|
||||
}
|
||||
});
|
||||
assert!(!art.is_empty() && line.is_some() == keep_a_line);
|
||||
s.execute("select.set", &json!({"ids": art})).unwrap();
|
||||
s.execute("edit.clear", &json!({})).unwrap();
|
||||
let left = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
assert_eq!(vectorcraft_doc::graph::graph_art_without_type(left.children().unwrap()), line, "{:#?}", left.children());
|
||||
s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
|
||||
s.execute("text.setStyle", &json!({"size": 20})).unwrap();
|
||||
s.execute("graph.setData", &json!({"id": id.0, "csv": ",2024,2025\nQ1,3,2\nQ2,5,4\nQ3,-1,6"})).unwrap();
|
||||
assert_eq!(spec(&s, id).rect, rect, "keeping a line: {keep_a_line}");
|
||||
}
|
||||
}
|
||||
|
||||
/// A graph saved without the bounds of its art without type, left with one vertical line, keeps its plot's size when
|
||||
/// it is drawn again.
|
||||
#[test]
|
||||
fn a_graph_saved_with_only_its_whole_bounds_and_left_with_a_line_keeps_its_plot() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
|
||||
let id = graph(&mut s, "column");
|
||||
let rect = spec(&s, id).rect;
|
||||
let mut old = spec(&s, id);
|
||||
old.placed_art = None;
|
||||
std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).node_mut(id).unwrap().extras_mut().graph = Some(Box::new(old));
|
||||
let (mut art, mut line) = (vec![], None);
|
||||
s.doc().unwrap().doc.node(id).unwrap().walk(&mut |n| {
|
||||
if n.children().is_none() {
|
||||
let vertical = !matches!(n.kind, NodeKind::Text(_)) && n.geometric_bounds().is_some_and(|b| b.width() < 1e-9 && b.height() > 1.0);
|
||||
if vertical && line.is_none() {
|
||||
line = Some(n.id);
|
||||
} else {
|
||||
art.push(n.id.0);
|
||||
}
|
||||
}
|
||||
});
|
||||
assert!(line.is_some());
|
||||
s.execute("select.set", &json!({"ids": art})).unwrap();
|
||||
s.execute("edit.clear", &json!({})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
|
||||
s.execute("graph.setData", &json!({"id": id.0, "csv": ",2024,2025\nQ1,3,2\nQ2,5,4\nQ3,-1,6"})).unwrap();
|
||||
assert_eq!(spec(&s, id).rect, rect);
|
||||
}
|
||||
|
||||
/// The bounds a graph measures moves on take a clipping group holding type at the bounds of its clip, so art outside the
|
||||
/// clip does not change them; a clipping group whose clip is type is measured on its other art.
|
||||
#[test]
|
||||
fn a_clipping_group_holding_type_is_measured_on_its_clip() {
|
||||
use std::sync::Arc;
|
||||
use vectorcraft_doc::graph::graph_art_without_type as measure;
|
||||
use vectorcraft_geom::Affine;
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
|
||||
let id = graph(&mut s, "column");
|
||||
let n = s.doc().unwrap().doc.node(id).unwrap().clone();
|
||||
let label: Arc<vectorcraft_doc::Node> =
|
||||
group(&n, "Legend").children().unwrap().iter().find(|c| matches!(c.kind, NodeKind::Text(_))).unwrap().clone();
|
||||
let mut paths = vec![];
|
||||
n.walk(&mut |c| {
|
||||
if matches!(c.kind, NodeKind::Path { .. }) {
|
||||
paths.push(c.clone());
|
||||
}
|
||||
});
|
||||
let (clip, art) = (Arc::new(paths[0].clone()), paths[1].clone());
|
||||
let clipped = |dx: f64, first: Arc<vectorcraft_doc::Node>, second: Arc<vectorcraft_doc::Node>| {
|
||||
let mut far = art.clone();
|
||||
far.transform(Affine::translate((dx, 0.0)), false);
|
||||
let mut g = vectorcraft_doc::Node::group(NodeId(999_999), vec![first, second, Arc::new(far)]);
|
||||
if let NodeKind::Group { clip, .. } = &mut g.kind {
|
||||
*clip = true;
|
||||
}
|
||||
measure(&[Arc::new(g)])
|
||||
};
|
||||
assert_eq!(clipped(500.0, clip.clone(), label.clone()), clip.geometric_bounds());
|
||||
assert_eq!(clipped(500.0, clip.clone(), label.clone()), clipped(900.0, clip.clone(), label.clone()));
|
||||
// A clip that is type leaves the other art to measure.
|
||||
assert_ne!(clipped(500.0, label.clone(), clip.clone()), clipped(900.0, label.clone(), clip.clone()));
|
||||
// A clip that is a clipping group holding type in its clipped art is measured on its own clip.
|
||||
let mut inner = vectorcraft_doc::Node::group(NodeId(999_998), vec![clip.clone(), label.clone()]);
|
||||
if let NodeKind::Group { clip, .. } = &mut inner.kind {
|
||||
*clip = true;
|
||||
}
|
||||
let inner = Arc::new(inner);
|
||||
assert_eq!(clipped(500.0, inner.clone(), label.clone()), clip.geometric_bounds());
|
||||
assert_eq!(clipped(500.0, inner.clone(), label.clone()), clipped(900.0, inner.clone(), label.clone()));
|
||||
// A blend holding type is measured whole, as it is drawn.
|
||||
let blend = vectorcraft_doc::Node::new(NodeId(999_997), NodeKind::Blend { children: vec![clip.clone(), label.clone()], spec: Box::default() });
|
||||
assert_eq!(measure(&[Arc::new(blend.clone())]), blend.geometric_bounds());
|
||||
}
|
||||
|
||||
/// A graph whose kept bounds of its art without type have no width follows a move with the bounds of all of its art.
|
||||
@@ -7113,9 +7429,17 @@ fn a_graph_opened_from_ai_measures_moves_without_its_labels() {
|
||||
assert_eq!((graphs.len(), labels.len()), (1, 1));
|
||||
let (id, label) = (graphs[0], labels[0]);
|
||||
let before = spec(&s, id);
|
||||
assert!(before.placed_art.is_some());
|
||||
s.execute("select.set", &json!({"ids": [label.0]})).unwrap();
|
||||
s.execute("text.setStyle", &json!({"size": 30})).unwrap();
|
||||
s.execute("object.move", &json!({"dx": 80, "dy": -40})).unwrap();
|
||||
s.execute("graph.setData", &json!({"id": id.0, "csv": ",East\nQ1,8\nQ2,2"})).unwrap();
|
||||
assert_eq!(spec(&s, id).rect, before.rect);
|
||||
let rect = spec(&s, id).rect;
|
||||
assert_eq!(rect, before.rect, "after restyling and moving a label");
|
||||
// A move of the whole opened graph is still followed.
|
||||
s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
|
||||
s.execute("object.move", &json!({"dx": 15, "dy": 25})).unwrap();
|
||||
s.execute("graph.setData", &json!({"id": id.0, "csv": ",East\nQ1,8\nQ2,2"})).unwrap();
|
||||
let moved = spec(&s, id).rect;
|
||||
assert!((moved.x0 - (rect.x0 + 15.0)).abs() < 1e-6 && (moved.y0 - (rect.y0 + 25.0)).abs() < 1e-6, "{moved:?}");
|
||||
assert!((moved.width() - rect.width()).abs() < 1e-6 && (moved.height() - rect.height()).abs() < 1e-6, "{moved:?}");
|
||||
}
|
||||
@@ -81,7 +81,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Links",
|
||||
[],
|
||||
None,
|
||||
"{show?: all (default)|missing|modified|embedded, sort?: name|kind (file format)|status (missing, modified, ok, embedded); default: stacking order; top first, dcsTransparency?: false (Show DCS Transparency Interactions: mark the images placed from DCS files that are transparent, themselves or a group or layer holding them, or that overlap a visible object with its own transparency; it looks at every object, so it takes longer)} every image object and placed document the document stores, as the Links panel lists them: those in the layers, then those in opacity-mask art and in the art of symbols, graph designs, patterns and stored brushes (one row per stored object, never one per symbol instance, pattern tile or brushed stroke) → {links: [{id, name, linked, status: ok|modified|missing|embedded, format (DCS for an image placed from a DCS file), pixelWidth, pixelHeight, path?, found?: path (found away from its path), page?, preview?: true (showing the saved preview), note?: said of an image past the decode allowance (shown at reduced size, or too large to draw), document?: true (a placed document: pageWidth and pageHeight in pt instead of pixels), dcsTransparency?: true (with dcsTransparency), owner?: {kind: layers|symbol|graphDesign|pattern|brush, name? (of the symbol, graph design, pattern or brush), index? (a brush's place in the Brushes panel, from 0), tile?: side|outerCorner|innerCorner|start|end (a pattern brush's tile), maskOf?: id (in the opacity-mask art of that object)} (an object outside the layer tree)}], missing, modified, embedded}; under automation read roots, path and found are left out when the file they name is outside the roots",
|
||||
"{show?: all (default)|missing|modified|embedded, sort?: name|kind (file format)|status (missing, modified, ok, embedded)|size (the linked file's size in bytes as Link Info shows it, smallest first; rows without one, embedded images and missing files whose size is not kept, last; equal sizes by name); default: stacking order; top first, dcsTransparency?: false (Show DCS Transparency Interactions: mark the images placed from DCS files that are transparent, themselves or a group or layer holding them, or that overlap a visible object with its own transparency; it looks at every object, so it takes longer)} every image object and placed document the document stores, as the Links panel lists them: those in the layers, then those in opacity-mask art and in the art of symbols, graph designs, patterns and stored brushes (one row per stored object, never one per symbol instance, pattern tile or brushed stroke) → {links: [{id, name, linked, status: ok|modified|missing|embedded, format (DCS for an image placed from a DCS file), pixelWidth, pixelHeight, path?, found?: path (found away from its path), page?, preview?: true (showing the saved preview), note?: said of an image past the decode allowance (shown at reduced size, or too large to draw), document?: true (a placed document: pageWidth and pageHeight in pt instead of pixels), dcsTransparency?: true (with dcsTransparency), owner?: {kind: layers|symbol|graphDesign|pattern|brush, name? (of the symbol, graph design, pattern or brush), index? (a brush's place in the Brushes panel, from 0), tile?: side|outerCorner|innerCorner|start|end (a pattern brush's tile), maskOf?: id (in the opacity-mask art of that object)} (an object outside the layer tree)}], missing, modified, embedded}; under automation read roots, path and found are left out when the file they name is outside the roots",
|
||||
has_doc,
|
||||
list
|
||||
),
|
||||
@@ -2211,6 +2211,16 @@ fn document_row(p: &PlacedDocument) -> Value {
|
||||
json!({ "format": pdf.map_or("VectorCraft", |f| f.label), "document": true, "pageWidth": p.width, "pageHeight": p.height })
|
||||
}
|
||||
|
||||
/// The size in bytes of the file that link `l` (of `st`) names, as Link Info shows it: the file's
|
||||
/// size now, else the size the document keeps of it when the caller may see its path.
|
||||
fn link_file_size(st: &crate::DocState, l: &LinkInfo) -> Option<u64> {
|
||||
let doc_path = LinkBase::of(st).doc;
|
||||
let kept = l.size.filter(|_| path_shown(&l.path, doc_path));
|
||||
let roots = crate::file_access::current().or_else(|| st.opened_by.clone());
|
||||
let now = crate::file_access::confine(roots.as_ref(), || fileio::document_path(&l.path, doc_path).ok().as_deref().and_then(file_stamp));
|
||||
now.map(|s| s.0).or(kept)
|
||||
}
|
||||
|
||||
/// Sort rank of a `links.list` status: missing, modified, ok, embedded.
|
||||
fn status_rank(status: &str) -> usize {
|
||||
["missing", "modified", "ok", "embedded"].iter().position(|s| *s == status).unwrap_or(4)
|
||||
@@ -2277,8 +2287,14 @@ fn list(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
if !matches!(show, "all" | "missing" | "modified" | "embedded") {
|
||||
return Err(bad(C, format!("show `{show}`: all, missing, modified or embedded")));
|
||||
}
|
||||
let sort = str_param(p, "sort");
|
||||
if let Some(x) = sort.filter(|x| !matches!(*x, "name" | "kind" | "status" | "size")) {
|
||||
return Err(bad(C, format!("sort `{x}`: name, kind, status or size")));
|
||||
}
|
||||
let interactions = if switch_or(p, "dcsTransparency", false, C)? { dcs_transparency(&st.doc) } else { BTreeSet::new() };
|
||||
let statuses = statuses(st);
|
||||
// The file size of each listed row's link, read only to sort by size.
|
||||
let mut sizes: BTreeMap<u64, u64> = BTreeMap::new();
|
||||
// The layer tree's objects, top first as the Layers panel lists them, then the others in the
|
||||
// order they are stored (opacity-mask art, symbols, graph designs, patterns, the art of the
|
||||
// stored brushes), each once.
|
||||
@@ -2326,6 +2342,11 @@ fn list(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
let doc_path = LinkBase::of(st).doc;
|
||||
if let Some(l) = link {
|
||||
if sort == Some("size")
|
||||
&& let Some(size) = link_file_size(st, l)
|
||||
{
|
||||
sizes.insert(n.id.0, size);
|
||||
}
|
||||
note_path(&mut row, "path", &l.path, doc_path);
|
||||
if let Some(page) = l.page {
|
||||
row["page"] = json!(page);
|
||||
@@ -2346,12 +2367,17 @@ fn list(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
rows.push(row);
|
||||
}
|
||||
let text = |r: &Value, k: &str| r[k].as_str().unwrap_or_default().to_lowercase();
|
||||
match str_param(p, "sort") {
|
||||
None => {}
|
||||
match sort {
|
||||
Some("name") => rows.sort_by_cached_key(|r| text(r, "name")),
|
||||
Some("kind") => rows.sort_by_cached_key(|r| (text(r, "format"), text(r, "name"))),
|
||||
Some("status") => rows.sort_by_cached_key(|r| (status_rank(r["status"].as_str().unwrap_or_default()), text(r, "name"))),
|
||||
Some(x) => return Err(bad(C, format!("sort `{x}`: name, kind or status"))),
|
||||
// Smallest file first; rows without a file size (embedded images, a missing file whose
|
||||
// size the document does not keep) come last; equal sizes by name.
|
||||
Some("size") => rows.sort_by_cached_key(|r| {
|
||||
let size = r["id"].as_u64().and_then(|id| sizes.get(&id).copied());
|
||||
(size.is_none(), size.unwrap_or(0), text(r, "name"))
|
||||
}),
|
||||
_ => {}
|
||||
}
|
||||
let count = |k: &str| counts.get(k).copied().unwrap_or(0);
|
||||
Ok(json!({ "links": rows, "missing": count("missing"), "modified": count("modified"), "embedded": count("embedded") }))
|
||||
|
||||
@@ -251,7 +251,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Object Properties",
|
||||
[],
|
||||
None,
|
||||
"{ids?|id?, name?, visible?, locked? (visible: false or locked: true deselects every selected object hidden or locked after the call, the key object included), opacity?: 0..100, blend?: \"Multiply\"…, isolate?, knockout?: \"on\"|\"off\"|\"neutral\"|bool (true = on, false = neutral), knockoutShape?: bool, data?: {key: \"value\" | null (removes it)} (the object's own data, SVG data-* attributes: {pivot: \"100,180\"} is data-pivot; document.node → attrs.data)}. On a path directly in a graph series, the graph also stores the object's opacity and blend mode (exceptions: docs/mcp.md); on a graph label, the graph stores the label's opacity and blend mode for every label of its kind",
|
||||
"{ids?|id?, name?, visible?, locked? (visible: false or locked: true deselects every selected object hidden or locked after the call, the key object included), opacity?: 0..100, blend?: \"Multiply\"…, isolate?, knockout?: \"on\"|\"off\"|\"neutral\"|bool (true = on, false = neutral), knockoutShape?: bool, data?: {key: \"value\" | null (removes it)} (the object's own data, SVG data-* attributes: {pivot: \"100,180\"} is data-pivot; document.node → attrs.data)}. On a path directly in a graph series, the graph also stores the object's opacity and blend mode, and on a series group the group's opacity, blend mode, isolate, knockout and knockoutShape (exceptions: docs/mcp.md); on a graph label, the graph stores the label's opacity and blend mode for every label of its kind",
|
||||
has_doc,
|
||||
set_props
|
||||
),
|
||||
|
||||
@@ -68,8 +68,14 @@ pub(super) fn set_props(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
// A graph keeps the object opacity and blend mode set on a mark of a series for the whole series, and set on a label
|
||||
// for its kind of label, so a value a mark or label already has still replaces the one another left on the graph.
|
||||
let transparency = opacity.is_some() || blend.is_some();
|
||||
let stores =
|
||||
|| transparency && (crate::cmd::graph::series_object_opacity_differs(d, &ids) || crate::cmd::graph::label_object_opacity_differs(d, &ids));
|
||||
// A series group's isolation, knockout and knockout shape are kept for the group alone.
|
||||
let group_only = !transparency && ["isolate", "knockout", "knockoutShape"].iter().any(|k| p.get(*k).is_some());
|
||||
let kept = if group_only { crate::cmd::graph::series_groups_among(d, &ids) } else { ids.clone() };
|
||||
let stores = || {
|
||||
(transparency || group_only)
|
||||
&& (crate::cmd::graph::series_object_opacity_differs(d, &kept)
|
||||
|| transparency && crate::cmd::graph::label_object_opacity_differs(d, &ids))
|
||||
};
|
||||
if ids.iter().all(|id| d.node(*id).is_some_and(has_values)) && !stores() {
|
||||
// Hidden or locked objects can't stay selected.
|
||||
if hides {
|
||||
@@ -123,8 +129,10 @@ pub(super) fn set_props(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
});
|
||||
}
|
||||
}
|
||||
if transparency || group_only {
|
||||
crate::cmd::graph::capture_series_object_opacity(d, &kept);
|
||||
}
|
||||
if transparency {
|
||||
crate::cmd::graph::capture_series_object_opacity(d, &ids);
|
||||
crate::cmd::graph::capture_label_object_opacity(d, &ids);
|
||||
}
|
||||
// Hidden or locked objects can't stay selected.
|
||||
|
||||
@@ -81,7 +81,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Transparency",
|
||||
["Window", "Transparency"],
|
||||
None,
|
||||
"{ids?|id?, opacity?: 0..100, blend?: name, isolate?, knockout?: \"on\"|\"off\"|\"neutral\"|bool (true = on, false = neutral), knockoutShape?: bool, item?: appearance item index|null, target?: \"object\"|\"contents\", aligned?: bool (index and item are rows of the first target's stack: each other target edits its equal one, as the Appearance panel does for a mixed selection)} for `ids`, the selection, or the object whose opacity mask is being edited; opacity and blend go to the targeted fill/stroke item (omitted: the Appearance panel's active item, else the objects; when every target is a gradient mesh with points picked by the Mesh tool, Direct Selection or the Lasso, those points take the opacity themselves). With an object of a dynamic symbol instance selected by Direct Selection and no ids, id or item, opacity and blend change that object for this instance only (isolate, knockout, knockoutShape, aligned and target are refused). On a path directly in a graph series (for a fill or stroke item, a series group's id stands for those paths), the graph also stores the opacity and blend mode of the object and of the topmost visible fill and stroke (exceptions: docs/mcp.md); on a graph label, the graph stores the label's object opacity and blend mode for every label of its kind, and with `item` its topmost visible fill and stroke rows too",
|
||||
"{ids?|id?, opacity?: 0..100, blend?: name, isolate?, knockout?: \"on\"|\"off\"|\"neutral\"|bool (true = on, false = neutral), knockoutShape?: bool, item?: appearance item index|null, target?: \"object\"|\"contents\", aligned?: bool (index and item are rows of the first target's stack: each other target edits its equal one, as the Appearance panel does for a mixed selection)} for `ids`, the selection, or the object whose opacity mask is being edited; opacity and blend go to the targeted fill/stroke item (omitted: the Appearance panel's active item, else the objects; when every target is a gradient mesh with points picked by the Mesh tool, Direct Selection or the Lasso, those points take the opacity themselves). With an object of a dynamic symbol instance selected by Direct Selection and no ids, id or item, opacity and blend change that object for this instance only (isolate, knockout, knockoutShape, aligned and target are refused). On a path directly in a graph series (for a fill or stroke item, a series group's id stands for those paths), the graph also stores the opacity and blend mode of the object and of the topmost visible fill and stroke, and on a series group without an item, the group's own opacity, blend mode, isolate, knockout and knockoutShape (exceptions: docs/mcp.md); on a graph label, the graph stores the label's object opacity and blend mode for every label of its kind, and with `item` its topmost visible fill and stroke rows too",
|
||||
has_doc,
|
||||
transparency
|
||||
),
|
||||
|
||||
@@ -67,7 +67,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Character / Paragraph",
|
||||
[],
|
||||
None,
|
||||
"{ids?|id?, kerning?: 1/1000 em|\"auto\"|\"optical\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg counter-clockwise (0: upright), underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), antiAlias?: \"none\"|\"sharp\"|\"crisp\"|\"strong\" (Character panel › Anti-aliasing Method, how the type's edges are drawn as pixels; it sets each targeted type object, with or without a range; each frame of a thread keeps its own method; graph labels keep it for every label of their kind when the graph is drawn again; new type: \"sharp\"), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt (±1296), list?: \"none\"|\"bullet\"|\"number\", bullet?: \"none\"|\"dot\"|\"dash\"|\"circle\"|\"square\", number?: \"none\"|\"arabic\"|\"upperLetters\"|\"lowerLetters\"|\"upperRoman\"|\"lowerRoman\"|\"twoDigits\"|\"threeDigits\", listAlign?: \"left\"|\"right\", listLevel?: 1..9 (Paragraph panel › Bullets and Numbered List: each paragraph of a list starts with its marker, drawn in the font, size and color of the paragraph's first character, and its text starts at the next tab stop after the marker, the left indent counting as a stop; a bulleted list's marker is its bullet, and a numbered list's is the paragraph's number and a period: 1, 2, 3; A to Z, then AA, BB; a to z, then aa, bb; I, II, III; i, ii, iii; 01 to 99, then 100; 001 to 999, then 1000; letters and roman numerals past 3999 in Arabic digits; the numbers count the story's numbered paragraphs, its threaded frames included, from 1 after a paragraph in no list, and an empty or bulleted paragraph is not counted; list \"bullet\" keeps a list's bullet, else a dot, and list \"number\" keeps a numbered list's style, else arabic; without list, a number style makes a numbered list and a bullet makes a bulleted one; \"none\" in any of the three turns the list off; a paragraph that joins a list with left and first-line indents of 0 gets 18 and -18 unless the call sets an indent; a horizontal right-to-left list paragraph has its indents mirrored, measured from the right; listAlign \"right\" (Bullets and Numbering…'s Alignment) puts the marker against the text, and \"left\" (the default) puts it at the first line's start, the text starting at the same place with either; it sets the paragraphs that are in a list or that the call puts in one, and a list keeps it when it changes between bullets and numbers; listLevel (Tab and Shift+Tab at the start of a list paragraph, Bullets and Numbering…'s Level) is a whole number from 1 to 9 that sets the paragraphs in a list or that the call puts in one, a list keeping it when it changes between bullets and numbers, and a list turned on without listLevel starting at level 1; each level past the first sets the paragraph 18 pt further in than its left indent, and each level counts its own numbers: a list paragraph with text sets the counts of the levels deeper than its own back to 0, so a deeper numbered paragraph after it counts from 1, and a paragraph back at a shallower level goes on with that level's count), hyphenate?: bool, wordsLongerThan?: letters 1..25 (5), afterFirst?, beforeLast?: letters 1..15 (3), hyphenLimit?: lines 0..25 (0: no limit), hyphenationZone?: pt 0..1296 (0; Single-line Composer only), hyphenateCapitalized?: bool (true) (Paragraph panel menu › Hyphenation…: only words longer than wordsLongerThan break, keeping afterFirst letters before the hyphen and beforeLast after it; at most hyphenLimit lines in a row end with a hyphen; a line whose text already ends within hyphenationZone of its right edge breaks before the next word instead of hyphenating it; the counts are rounded, and every value is clamped to its range), wordSpacing?: % 0..1000 (80, 100, 133), letterSpacing?: % of a word space -100..500 (0, 0, 0), glyphScaling?: % 50..200 (100, 100, 100): each [min, desired, max] or {min?, desired?, max?} (Paragraph panel menu › Justification…: Desired applies to every line, Minimum and Maximum bound what justified lines may use; values are clamped to their range, and Minimum ≤ Desired ≤ Maximum must hold afterwards or nothing changes), autoLeading?: % of the size 0..500 (120; the leading of characters whose leading is Auto), singleWordJustification?: \"fullJustify\"|\"alignLeft\"|\"alignCenter\"|\"alignRight\" (a justified line holding one word), mojikumi?: \"none\"|\"yakumonoHankaku\"|\"gyomatsuYakumonoHankaku\"|\"gyomatsuYakumonoZenkaku\"|\"yakumonoZenkaku\"|\"lineEndHalf\" (Mojikumi Set: Japanese punctuation spacing), kinsoku?: \"none\"|\"hard\"|\"soft\" (Kinsoku Set: Soft lets 々, ー and small kana start a line), kinsokuType?: \"pushInFirst\"|\"pushOutFirst\"|\"pushOutOnly\" (Paragraph panel menu › Kinsoku Shori Type: how area type keeps those characters off a line's ends; pushInFirst sets them on the line when its gaps next to CJK characters can close up enough, by at most a tent
Line truncated
|
||||
"{ids?|id?, kerning?: 1/1000 em|\"auto\"|\"optical\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg counter-clockwise (0: upright), underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), antiAlias?: \"none\"|\"sharp\"|\"crisp\"|\"strong\" (Character panel › Anti-aliasing Method, how the type's edges are drawn as pixels; it sets each targeted type object, with or without a range; each frame of a thread keeps its own method; graph labels keep it for every label of their kind when the graph is drawn again; new type: \"sharp\"), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt (±1296), list?: \"none\"|\"bullet\"|\"number\", bullet?: \"none\"|\"dot\"|\"dash\"|\"circle\"|\"square\", number?: \"none\"|\"arabic\"|\"upperLetters\"|\"lowerLetters\"|\"upperRoman\"|\"lowerRoman\"|\"twoDigits\"|\"threeDigits\", listAlign?: \"left\"|\"right\", listLevel?: 1..9 (Paragraph panel › Bullets and Numbered List: each paragraph of a list starts with its marker, drawn in the font, size and color of the paragraph's first character, and its text starts at the next tab stop after the marker, the left indent counting as a stop; a bulleted list's marker is its bullet, and a numbered list's is the paragraph's number and a period: 1, 2, 3; A to Z, then AA, BB; a to z, then aa, bb; I, II, III; i, ii, iii; 01 to 99, then 100; 001 to 999, then 1000; letters and roman numerals past 3999 in Arabic digits; the numbers count the story's numbered paragraphs, its threaded frames included, from 1 after a paragraph in no list, and an empty or bulleted paragraph is not counted; list \"bullet\" keeps a list's bullet, else a dot, and list \"number\" keeps a numbered list's style, else arabic; without list, a number style makes a numbered list and a bullet makes a bulleted one; \"none\" in any of the three turns the list off; a paragraph that joins a list with left and first-line indents of 0 gets 18 and -18 unless the call sets an indent; a horizontal right-to-left list paragraph has its indents mirrored, measured from the right; listAlign \"right\" (Bullets and Numbering…'s Alignment) puts the marker against the text, and \"left\" (the default) puts it at the first line's start, the text starting at the same place with either; it sets the paragraphs that are in a list or that the call puts in one, and a list keeps it when it changes between bullets and numbers; listLevel (Tab and Shift+Tab at the start of a list paragraph, Bullets and Numbering…'s Level) is a whole number from 1 to 9 that sets the paragraphs in a list or that the call puts in one, a list keeping it when it changes between bullets and numbers, and a list turned on without listLevel starting at level 1; each level past the first sets the paragraph 18 pt further in than its left indent, and each level counts its own numbers: a list paragraph with text sets the counts of the levels deeper than its own back to 0, so a deeper numbered paragraph after it counts from 1, and a paragraph back at a shallower level goes on with that level's count), hyphenate?: bool, wordsLongerThan?: letters 1..25 (5), afterFirst?, beforeLast?: letters 1..15 (3), hyphenLimit?: lines 0..25 (0: no limit), hyphenationZone?: pt 0..1296 (0; Single-line Composer only), hyphenateCapitalized?: bool (true) (Paragraph panel menu › Hyphenation…: only words longer than wordsLongerThan break, keeping afterFirst letters before the hyphen and beforeLast after it; at most hyphenLimit lines in a row end with a hyphen; a line whose text already ends within hyphenationZone of its right edge breaks before the next word instead of hyphenating it; the counts are rounded, and every value is clamped to its range), wordSpacing?: % 0..1000 (80, 100, 133), letterSpacing?: % of a word space -100..500 (0, 0, 0), glyphScaling?: % 50..200 (100, 100, 100): each [min, desired, max] or {min?, desired?, max?} (Paragraph panel menu › Justification…: Desired applies to every line, Minimum and Maximum bound what justified lines may use; values are clamped to their range, and Minimum ≤ Desired ≤ Maximum must hold afterwards or nothing changes), autoLeading?: % of the size 0..500 (120; the leading of characters whose leading is Auto), singleWordJustification?: \"fullJustify\"|\"alignLeft\"|\"alignCenter\"|\"alignRight\" (a justified line holding one word), mojikumi?: \"none\"|\"yakumonoHankaku\"|\"gyomatsuYakumonoHankaku\"|\"gyomatsuYakumonoZenkaku\"|\"yakumonoZenkaku\"|\"lineEndHalf\" (Mojikumi Set: Japanese punctuation spacing), kinsoku?: \"none\"|\"hard\"|\"soft\" (Kinsoku Set: Soft lets 々, ー and small kana start a line), kinsokuType?: \"pushInFirst\"|\"pushOutFirst\"|\"pushOutOnly\" (Paragraph panel menu › Kinsoku Shori Type: how area type keeps those characters off a line's ends; pushInFirst sets them on the line when its gaps next to CJK characters can close up enough, by at most a tent
Line truncated
|
||||
has_doc,
|
||||
set_format
|
||||
),
|
||||
@@ -76,7 +76,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Convert to Text",
|
||||
[],
|
||||
None,
|
||||
"{ids?|id?, start?: byte, end?: byte} (Type › Bullets and Numbering › Convert to Text: the paragraphs of the selected type, or of `ids`, or those a start/end range touches; after Select All in a frame of threaded text, without `ids`, `id` or a range, every paragraph of the story's frames that are neither locked nor hidden; while the story is selected, its locked and hidden frames are not converted even when named, nor a paragraph whose text starts in one) the marker of each list paragraph becomes characters of its text: the bullet, or the number and its period as the paragraph showed it, then a tab, at the start of the paragraph in the marker's font, size and color; the list is turned off. When the marker's tab went to the left indent, the paragraph gets a left-aligned tab stop without a leader there, in place of any stop there, which keeps the text after the tab where it started; when it went to a tab stop and a stop there or past it has a leader or is not left-aligned, or a right, center or decimal stop lies between the marker and that place, the paragraph gets a left-aligned stop without a leader where the marker's tab ended, in place of any stop there and of those right, center and decimal stops before it (past the left indent only in a paragraph with no tab of its own). In threaded type the numbers are those counted through the story's frames, and a paragraph that continues into a later frame is converted where its text starts. An empty list paragraph has no marker and only leaves the list. A paragraph with no direction set gets the direction it ran in when the characters would change it (a letter or roman numeral before right-to-left text). With the Every-line Composer, a paragraph with a tab is broken line by line, so a converted paragraph can break its lines at other places. While the Type tool edits, its typing ends first and its anchor and caret move past the characters inserted at or before them (a whole story that Select All selected stays selected when the call converts all of it); in threaded type, when the caret's character moved to another frame, the tool edits that frame, which becomes the selection when it was not selected. One undo step → {ids, converted: paragraphs, inserted: [{id, at: byte before the change, length: bytes}]}",
|
||||
"{ids?|id?, start?: byte, end?: byte} (Type › Bullets and Numbering › Convert to Text: the paragraphs of the selected type, or of `ids`, or those a start/end range touches; after Select All in a frame of threaded text, without `ids`, `id` or a range, every paragraph of every frame of the story, locked and hidden frames included) the marker of each list paragraph becomes characters of its text: the bullet, or the number and its period as the paragraph showed it, then a tab, at the start of the paragraph in the marker's font, size and color; the list is turned off. When the marker's tab went to the left indent, the paragraph gets a left-aligned tab stop without a leader there, in place of any stop there, which keeps the text after the tab where it started; when it went to a tab stop and a stop there or past it has a leader or is not left-aligned, or a right, center or decimal stop lies between the marker and that place, the paragraph gets a left-aligned stop without a leader where the marker's tab ended, in place of any stop there and of those right, center and decimal stops before it (past the left indent only in a paragraph with no tab of its own). In threaded type the numbers are those counted through the story's frames, and a paragraph that continues into a later frame is converted where its text starts. An empty list paragraph has no marker and only leaves the list. A paragraph with no direction set gets the direction it ran in when the characters would change it (a letter or roman numeral before right-to-left text). With the Every-line Composer, a paragraph with a tab is broken line by line, so a converted paragraph can break its lines at other places. While the Type tool edits, its typing ends first and its anchor and caret move past the characters inserted at or before them (a whole story that Select All selected stays selected when the call converts all of it); in threaded type, when the caret's character moved to another frame, the tool edits that frame, which becomes the selection when it was not selected. One undo step → {ids, converted: paragraphs, inserted: [{id, at: byte before the change, length: bytes}]}",
|
||||
has_doc,
|
||||
convert_list_to_text
|
||||
),
|
||||
@@ -617,6 +617,7 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
"standardVerticalRoman",
|
||||
"noBreak",
|
||||
"digits",
|
||||
"glyphForm",
|
||||
"fontHeightReference",
|
||||
"language",
|
||||
"fontAxes",
|
||||
@@ -651,6 +652,7 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let char_align = super::textedit::char_align_param(p, C)?;
|
||||
let char_direction = super::textedit::char_direction_param(p, C)?;
|
||||
let digits = super::textedit::digits_param(p, C)?;
|
||||
let glyph_form = super::textedit::glyph_form_param(p, C)?;
|
||||
let language = super::textedit::language_param(p, C)?;
|
||||
let font_axes = super::textedit::font_axes_param(p, C)?;
|
||||
let font_height_reference = super::textedit::font_height_reference_param(p, C)?;
|
||||
@@ -821,6 +823,9 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
if let Some(v) = digits {
|
||||
st.digits = v;
|
||||
}
|
||||
if let Some(v) = glyph_form {
|
||||
st.glyph_form = v;
|
||||
}
|
||||
if let Some(v) = &language {
|
||||
st.language.clone_from(v);
|
||||
}
|
||||
@@ -1335,19 +1340,11 @@ fn convert_list_to_text(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
use vectorcraft_doc::text::ParaList;
|
||||
let range = super::typecmd::TextRange::parse(p, C)?;
|
||||
// After Select All in a frame of threaded text, a call that names no type and no range takes
|
||||
// every paragraph of the story's editable frames; its locked and hidden frames stay as they are
|
||||
// whichever way they are named.
|
||||
let full = super::textedit::editing_story(s);
|
||||
let story: Vec<NodeId> = full.iter().copied().filter(|f| s.doc().is_ok_and(|st| st.doc.is_editable(*f))).collect();
|
||||
// every paragraph of every frame of the story, its locked and hidden frames included: the story
|
||||
// is one text.
|
||||
let story = super::textedit::editing_story(s);
|
||||
let named = ["ids", "id"].iter().any(|k| p.get(*k).is_some_and(|v| !v.is_null()));
|
||||
let ids = if !story.is_empty() && !named && range.is_none() {
|
||||
story.clone()
|
||||
} else {
|
||||
super::typecmd::text_targets(s, p, C)?.into_iter().filter(|id| !full.contains(id) || story.contains(id)).collect()
|
||||
};
|
||||
// The selected story's locked and hidden frames: no paragraph whose text starts in one is
|
||||
// converted, and none of their paragraphs is restyled.
|
||||
let held: Vec<NodeId> = full.iter().copied().filter(|f| !story.contains(f)).collect();
|
||||
let ids = if !story.is_empty() && !named && range.is_none() { story.clone() } else { super::typecmd::text_targets(s, p, C)? };
|
||||
// Converting the whole story leaves it selected.
|
||||
let whole_story = !story.is_empty() && range.is_none() && story.iter().all(|f| ids.contains(f));
|
||||
let editing = match super::textedit::editing_range(s)? {
|
||||
@@ -1381,7 +1378,6 @@ fn convert_list_to_text(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let mut converted = 0;
|
||||
for story in &stories {
|
||||
let frames: Vec<&vectorcraft_doc::TextObject> = story.iter().filter_map(|id| text(*id)).collect();
|
||||
let is_held = |f: usize| story.get(f).is_some_and(|id| held.contains(id));
|
||||
let mut paras: Vec<StoryParagraph> = vec![];
|
||||
let mut named_parts = vec![];
|
||||
let plains: Vec<String> = frames.iter().map(|t| t.plain_text()).collect();
|
||||
@@ -1407,7 +1403,7 @@ fn convert_list_to_text(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
for (i, named) in named_parts {
|
||||
if let Some(para) = paras.get_mut(i) {
|
||||
let listed = para.main_part().is_some_and(|p| p.list.is_some() && !is_held(p.frame));
|
||||
let listed = para.main_part().is_some_and(|p| p.list.is_some());
|
||||
para.converts |= named && listed;
|
||||
}
|
||||
}
|
||||
@@ -1497,7 +1493,7 @@ fn convert_list_to_text(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let tab = vectorcraft_doc::TabStop { position: x, align: vectorcraft_doc::TabAlign::Left, leader: String::new(), align_on: '.' };
|
||||
style.tabs.insert(i, tab);
|
||||
}
|
||||
for part in story_para.parts.iter().filter(|q| (std::ptr::eq(*q, para) || q.bytes.is_empty()) && !is_held(q.frame)) {
|
||||
for part in story_para.parts.iter().filter(|q| std::ptr::eq(*q, para) || q.bytes.is_empty()) {
|
||||
if let Some((stops, _)) = frame_edits.get_mut(part.frame) {
|
||||
stops.push((part.index, style.clone()));
|
||||
}
|
||||
|
||||
@@ -183,7 +183,7 @@ pub(crate) fn accepted_keys(doc: &'static str) -> Option<Vec<&'static str>> {
|
||||
|
||||
/// Does the description `doc` name `key` as a parameter (its own keys, and those of the commands
|
||||
/// its `…` entries name)?
|
||||
pub(crate) fn takes_key(doc: &'static str, key: &str) -> bool {
|
||||
pub fn takes_key(doc: &'static str, key: &str) -> bool {
|
||||
doc_keys(doc).is_ok_and(|parsed| parsed.keys.contains(&key)) || accepted(doc, 0).is_some_and(|keys| keys.contains(&key))
|
||||
}
|
||||
|
||||
|
||||
@@ -1188,6 +1188,8 @@ fn outline_stroke(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
let roots = selected_roots(s)?;
|
||||
let ids = s.edit("Outline Stroke", |d, sel| {
|
||||
let before = d.clone();
|
||||
// Outlining the strokes in a graph does not move or scale its plot at the next redraw.
|
||||
let graphs = super::graph::graphs_holding(d, &roots);
|
||||
// A dimension selected with the art it measures keeps its own lines: it is out of the
|
||||
// document while the art is outlined.
|
||||
let lifted = super::dimension::lift(d, &roots);
|
||||
@@ -1207,6 +1209,7 @@ fn outline_stroke(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
if changed == 0 || (kept && d.layers == before.layers) {
|
||||
return Err(EngineError::Other("Outline Stroke: no stroked paths selected".into()));
|
||||
}
|
||||
super::graph::keep_placed(d, &graphs);
|
||||
sel.set(new_sel.iter().copied());
|
||||
Ok(new_sel)
|
||||
})?;
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
//! fields; `perspective.grid.preset` applies one, `perspective.presets.*` manage them.
|
||||
//!
|
||||
//! View options (Lock Grid, Lock Station Point, Snap to Grid, Show Rulers) are view state on
|
||||
//! the grid: they toggle without an undo step, as Show Grid does.
|
||||
//! the grid: they toggle without an undo step, as Show Grid does. So is the point Automatic Plane
|
||||
//! Positioning holds the active plane through (`perspective.plane.infer`).
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{Value, json};
|
||||
@@ -15,12 +16,15 @@ use vectorcraft_doc::{Document, NodeId};
|
||||
use vectorcraft_geom::{Point, Rect, Vec2};
|
||||
use vectorcraft_tools::distort::perspective::Plane;
|
||||
use vectorcraft_tools::distort::perspective::define::{BUILTINS, LETTER, first_artboard, is_builtin};
|
||||
use vectorcraft_tools::distort::perspective::infer::{HIT_PX, InferSource};
|
||||
use vectorcraft_tools::distort::perspective::widget::{WidgetCorner, WidgetPlace};
|
||||
use vectorcraft_tools::distort::perspective::{GridDefinition, PerspectiveGrid};
|
||||
use vectorcraft_tools::distort::perspective::{GridDefinition, MAX_DEPTH, PerspectiveGrid};
|
||||
use vectorcraft_tools::{PointerEvent, PointerKind, ToolKey};
|
||||
|
||||
use super::distortcmds::{grid_kept, grid_of, silent, store_grid};
|
||||
use super::{CommandSpec, EngineError, Result, Session, always, bad, bool_or, cmd, has_doc, str_param, switch_or, unique_name};
|
||||
use super::{
|
||||
CommandSpec, EngineError, Result, Session, always, bad, bool_or, cmd, finite_numbers, has_doc, number_or, str_param, switch_or, unique_name,
|
||||
};
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
vec![
|
||||
@@ -92,10 +96,19 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Perspective Grid Options",
|
||||
[],
|
||||
None,
|
||||
"{show?: bool, position?: topLeft|topRight|bottomLeft|bottomRight} the Plane Switching Widget: shown or not, and the corner of the document window it stays in (kept with the preferences; no params reads them) → {show, position}",
|
||||
"{show?: bool, position?: topLeft|topRight|bottomLeft|bottomRight, anchorPoint?: bool, gridlineIntersection?: bool} the Plane Switching Widget: shown or not, and the corner of the document window it stays in; Automatic Plane Positioning: whether it takes a point from an anchor point of art in perspective and from a gridline intersection (both on by default; see perspective.plane.infer). Kept with the preferences; no params reads them → {show, position, anchorPoint, gridlineIntersection}",
|
||||
always,
|
||||
widget_options
|
||||
),
|
||||
cmd!(
|
||||
"perspective.plane.infer",
|
||||
"Automatic Plane Positioning",
|
||||
[],
|
||||
None,
|
||||
"{at?: [x, y], tolerance?: pt around `at` (default 6), clear?: bool} with `at` on an anchor point of shown art in perspective, or on a gridline intersection of a plane that shows, the active plane moves through that point for now and the other planes hide (the Perspective Selection tool: Shift held over one with no button down). An anchor point within reach wins over an intersection, and perspective.widget.options turns either off. Making another plane active (perspective.plane.set) brings that plane through the same point. The plane goes back to its place when an object is drawn on it or attached to it (perspective.draw, perspective.attach, an object brought into perspective by perspective.move or perspective.transform), when a plane is moved (perspective.plane.move, perspective.plane.matchObject), when the grid hides or no plane is active, when the file is opened again, and with `clear` (Escape with the Perspective Selection tool). View state: not an undo step; no params reads it → {active, plane, offset: where the active plane is, point?: [x, y, z] in the grid's frame, source?: anchor|gridline (what `at` found; absent when nothing was within reach)}",
|
||||
has_doc,
|
||||
plane_infer
|
||||
),
|
||||
cmd!(
|
||||
"perspective.grid.lock",
|
||||
"Lock Grid",
|
||||
@@ -259,21 +272,32 @@ pub(crate) fn grid_preset(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let old = grid_of(&s.doc()?.doc);
|
||||
let ab = s.doc()?.doc.artboards.first().map(|a| a.rect).ok_or_else(|| EngineError::Other("no artboard".into()))?;
|
||||
let g = s.perspective_preset_grid(&name, ab).ok_or_else(|| bad(C, format!("no perspective grid preset named `{name}`")))?;
|
||||
// The objects stay attached and the view options stay as they were.
|
||||
let g = PerspectiveGrid { attached: old.attached, locked: old.locked, lock_station: old.lock_station, snap: old.snap, rulers: old.rulers, ..g };
|
||||
// The objects stay attached and the view options stay as they were, and so does a plane held
|
||||
// by Automatic Plane Positioning while the new grid can hold it.
|
||||
let mut g = PerspectiveGrid {
|
||||
attached: old.attached,
|
||||
locked: old.locked,
|
||||
lock_station: old.lock_station,
|
||||
snap: old.snap,
|
||||
rulers: old.rulers,
|
||||
inferred: old.inferred,
|
||||
..g
|
||||
};
|
||||
g.keep_positioning_valid();
|
||||
// When the document holds this grid already, apart from whether it shows and its active plane,
|
||||
// the preset only sets those two, without an undo step (as perspective.grid.show and
|
||||
// perspective.plane.set do).
|
||||
let view = PerspectiveGrid { visible: old.visible, plane: old.plane, ..g.clone() };
|
||||
let view = PerspectiveGrid { visible: old.visible, plane: old.plane, inferred: old.inferred, ..g.clone() };
|
||||
if !grid_kept(&s.doc()?.doc, &view) {
|
||||
s.edit("Perspective Grid Preset", |d, _| {
|
||||
store_grid(d, &g);
|
||||
Ok(())
|
||||
})?;
|
||||
} else if (old.visible, old.plane) != (g.visible, g.plane) {
|
||||
} else if (old.visible, old.plane, old.inferred) != (g.visible, g.plane, g.inferred) {
|
||||
silent(s, |cur| {
|
||||
cur.visible = g.visible;
|
||||
cur.plane = g.plane;
|
||||
cur.inferred = g.inferred;
|
||||
})?;
|
||||
}
|
||||
Ok(g.definition_json())
|
||||
@@ -460,10 +484,100 @@ fn widget_options(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
o.position =
|
||||
v.as_str().and_then(WidgetCorner::parse).ok_or_else(|| bad(C, "position must be topLeft, topRight, bottomLeft or bottomRight"))?;
|
||||
}
|
||||
if let Some(v) = p.get("anchorPoint") {
|
||||
o.anchor_point = v.as_bool().ok_or_else(|| bad(C, "anchorPoint must be true or false"))?;
|
||||
}
|
||||
if let Some(v) = p.get("gridlineIntersection") {
|
||||
o.gridline_intersection = v.as_bool().ok_or_else(|| bad(C, "gridlineIntersection must be true or false"))?;
|
||||
}
|
||||
s.prefs.perspective_widget = o;
|
||||
Ok(json!(o))
|
||||
}
|
||||
|
||||
/// What `perspective.plane.infer` reports for `g`.
|
||||
fn infer_info(g: &PerspectiveGrid, source: Option<InferSource>) -> Value {
|
||||
let active = g.inferred.is_some() && g.plane != Plane::None;
|
||||
let mut v = json!({ "active": active, "plane": g.plane.id(), "offset": g.offset(g.plane) });
|
||||
if let Some(at) = g.inferred.filter(|_| active) {
|
||||
v["point"] = json!(at);
|
||||
}
|
||||
if let Some(source) = source {
|
||||
v["source"] = json!(source.id());
|
||||
}
|
||||
v
|
||||
}
|
||||
|
||||
fn plane_infer(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "perspective.plane.infer";
|
||||
let clear = switch_or(p, "clear", false, C)?;
|
||||
let at = match p.get("at") {
|
||||
None | Some(Value::Null) => None,
|
||||
Some(v) => Some(finite_numbers(v).map(|[x, y]| Point::new(x, y)).ok_or_else(|| bad(C, "`at` must be [x, y]"))?),
|
||||
};
|
||||
let tol = number_or(p, "tolerance", HIT_PX, C)?;
|
||||
if !(tol.is_finite() && (0.0..=MAX_DEPTH).contains(&tol)) {
|
||||
return Err(bad(C, "tolerance must be 0 or more"));
|
||||
}
|
||||
if clear && at.is_some() {
|
||||
return Err(bad(C, "give `at` or `clear`, not both"));
|
||||
}
|
||||
let doc = &s.doc()?.doc;
|
||||
let g = PerspectiveGrid::current(doc);
|
||||
let mut source = None;
|
||||
let next = match at {
|
||||
_ if clear => None,
|
||||
None => g.inferred,
|
||||
Some(at) => {
|
||||
if !g.visible {
|
||||
return Err(EngineError::Other("the perspective grid is hidden".into()));
|
||||
}
|
||||
if g.plane == Plane::None {
|
||||
return Err(EngineError::Other("no active perspective plane".into()));
|
||||
}
|
||||
let targets = s.prefs.perspective_widget.targets();
|
||||
if !targets.any() {
|
||||
return Err(EngineError::Other(
|
||||
"Automatic Plane Positioning is off: turn on anchorPoint or gridlineIntersection (perspective.widget.options)".into(),
|
||||
));
|
||||
}
|
||||
match g.infer_at(doc, at, tol, targets) {
|
||||
Some((found, point)) => {
|
||||
source = Some(found);
|
||||
Some(point)
|
||||
}
|
||||
None => g.inferred,
|
||||
}
|
||||
}
|
||||
};
|
||||
if next == g.inferred {
|
||||
return Ok(infer_info(&g, source));
|
||||
}
|
||||
// A plane through the point stays in front of the viewer.
|
||||
if next.is_some() {
|
||||
PerspectiveGrid { inferred: next, ..g }.validate().map_err(|e| bad(C, e))?;
|
||||
}
|
||||
let g = silent(s, |g| g.inferred = next)?;
|
||||
Ok(infer_info(&g, source))
|
||||
}
|
||||
|
||||
/// An object was drawn on, or attached to, `plane`: when Automatic Plane Positioning holds that
|
||||
/// plane, it goes back to its place as view state, not an undo step (a plane it doesn't hold
|
||||
/// leaves it as it is). In a drag that happens once the drag is committed
|
||||
/// ([`Session::commit_interaction`]), so the plane stays put while the object is drawn.
|
||||
pub(crate) fn plane_positioning_used(s: &mut Session, plane: Plane) -> Result<()> {
|
||||
let st = s.doc_mut()?;
|
||||
let g = grid_of(&st.doc);
|
||||
if g.inferred.is_none() || g.plane != plane {
|
||||
return Ok(());
|
||||
}
|
||||
if let Some(it) = &mut st.interaction {
|
||||
it.plane_placed = true;
|
||||
return Ok(());
|
||||
}
|
||||
silent(s, |g| g.inferred = None)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
impl Session {
|
||||
/// The Plane Switching Widget's part of a pointer event: a press on it picks the plane (its
|
||||
/// drag and release go nowhere); None when the event isn't the widget's.
|
||||
|
||||
@@ -20,7 +20,7 @@ use std::sync::Arc;
|
||||
|
||||
use vectorcraft_doc::links::hash_bytes;
|
||||
use vectorcraft_doc::placed_document::{PREVIEW_MAX, PREVIEW_PX_PER_PT, key_for};
|
||||
use vectorcraft_doc::{Document, ImageBlob, LinkInfo, Node, NodeKind, PageBox, PlacedDocument, PlacementOptions};
|
||||
use vectorcraft_doc::{ColorMode, Document, ImageBlob, LinkInfo, Node, NodeKind, PageBox, PlacedDocument, PlacementOptions};
|
||||
use vectorcraft_geom::{Affine, Rect};
|
||||
use vectorcraft_pdf::CropTo;
|
||||
|
||||
@@ -221,22 +221,57 @@ pub(crate) struct Source {
|
||||
/// What is shown, in the file's coordinates: the artboard, the page's box or the art's bounds.
|
||||
pub frame: Rect,
|
||||
pub warnings: Vec<String>,
|
||||
/// The colour mode the file's art was read in (a PDF page painted mostly in CMYK reads in CMYK).
|
||||
pub color_mode: ColorMode,
|
||||
}
|
||||
|
||||
/// The VectorCraft document `name` (`bytes`, from `path` when there is one) read for showing
|
||||
/// artboard `page`, or the PDF or `.ai` file for showing page `page` clipped to its box
|
||||
/// `page_box` (its art's bounds when `bounding`).
|
||||
pub(crate) fn source(name: &str, bytes: &[u8], path: Option<&str>, page: u32, bounding: bool, page_box: PageBox, cmd: &str) -> Result<Source> {
|
||||
read_source(name, bytes, None, path, (page, bounding, page_box), cmd)
|
||||
}
|
||||
|
||||
/// [`source`] of the file whose bytes `bytes` holds, kept by the blob without a copy of its own:
|
||||
/// several pages of one file read this way share one copy of it.
|
||||
pub(crate) fn shared_source(
|
||||
name: &str,
|
||||
bytes: &Arc<Vec<u8>>,
|
||||
path: Option<&str>,
|
||||
page: u32,
|
||||
bounding: bool,
|
||||
page_box: PageBox,
|
||||
cmd: &str,
|
||||
) -> Result<Source> {
|
||||
read_source(name, bytes, Some(bytes), path, (page, bounding, page_box), cmd)
|
||||
}
|
||||
|
||||
/// [`source`], the blob keeping `shared` when given (else a copy of `bytes`); `shown` is the page
|
||||
/// (or artboard), whether the art's bounds are shown, and the page's box.
|
||||
fn read_source(
|
||||
name: &str,
|
||||
bytes: &[u8],
|
||||
shared: Option<&Arc<Vec<u8>>>,
|
||||
path: Option<&str>,
|
||||
shown: (u32, bool, PageBox),
|
||||
cmd: &str,
|
||||
) -> Result<Source> {
|
||||
let (page, bounding, page_box) = shown;
|
||||
// The same document placed the same way is read once (placing it again is free).
|
||||
let key = key_for(&hash_bytes(bytes), page, bounding, page_box);
|
||||
// Resolving its links depends on where the file is and on what the caller may read, so a hit
|
||||
// needs the same path, and nothing is shared with or from a confined (automation) caller.
|
||||
let confined = crate::file_access::current().is_some();
|
||||
if !confined && let Some((_, s)) = lock_memo().iter().find(|(at, s)| s.key == key && at.as_deref() == path).cloned() {
|
||||
if !confined && let Some((_, mut s)) = lock_memo().iter().find(|(at, s)| s.key == key && at.as_deref() == path).cloned() {
|
||||
// The same bytes: the copy given is kept instead, so the pages that share it go on sharing.
|
||||
if let Some(b) = shared {
|
||||
s.blob.bytes = b.clone();
|
||||
}
|
||||
return Ok(s);
|
||||
}
|
||||
let a = document_art(name, bytes, path, page, bounding, page_box, cmd)?;
|
||||
let mut blob = ImageBlob::new(mime(name, bytes), bytes.to_vec());
|
||||
let bytes = shared.cloned().unwrap_or_else(|| Arc::new(bytes.to_vec()));
|
||||
let mut blob = ImageBlob { mime: mime(name, &bytes).into(), bytes, proxy: None };
|
||||
let shown = PlacedDocument {
|
||||
link: LinkInfo { page: Some(page), ..LinkInfo::new(path.unwrap_or(name)) },
|
||||
key: key.clone(),
|
||||
@@ -249,9 +284,10 @@ pub(crate) fn source(name: &str, bytes: &[u8], path: Option<&str>, page: u32, bo
|
||||
};
|
||||
let art = group(a.nodes, a.clip);
|
||||
blob.proxy = preview(&a.doc, &art, a.frame).map(Arc::new);
|
||||
let color_mode = a.doc.color_mode;
|
||||
// Drawing it needn't read it again.
|
||||
vectorcraft_doc::placed_document::prime(&shown, blob.bytes.clone(), (a.doc, art, a.frame));
|
||||
let s = Source { blob, key, page_box, frame: a.frame, warnings: a.warnings };
|
||||
let s = Source { blob, key, page_box, frame: a.frame, warnings: a.warnings, color_mode };
|
||||
if !confined {
|
||||
let mut m = lock_memo();
|
||||
if m.len() >= MEMO_SIZE {
|
||||
|
||||
@@ -101,12 +101,30 @@ const FILE_WORDS: &[&str] = &[
|
||||
"clipboard",
|
||||
];
|
||||
|
||||
/// Param keys that name a file or a folder.
|
||||
const FILE_KEYS: &[&str] =
|
||||
&["path", "paths", "file", "files", "folder", "folders", "dir", "directory", "destinationFolder", "sourceFolder", "url", "diffPath"];
|
||||
/// Param keys that name a file or a folder, each by its whole name, the folder preferences
|
||||
/// `prefs.set {values}` takes included: a command that adds a key naming one adds it here. A key
|
||||
/// that only ends like one (`alignToPath`, `linksFolder`, `sortPaths`) names none, nor do `folders`
|
||||
/// (how an export groups its files) and `url` (a web link).
|
||||
const FILE_KEYS: &[&str] = &[
|
||||
"path",
|
||||
"paths",
|
||||
"file",
|
||||
"files",
|
||||
"folder",
|
||||
"dir",
|
||||
"directory",
|
||||
"destinationFolder",
|
||||
"sourceFolder",
|
||||
"diffPath",
|
||||
"fontsFolder",
|
||||
"pluginsFolder",
|
||||
"recoveryFolder",
|
||||
"templatesFolder",
|
||||
];
|
||||
|
||||
/// The keys in [`FILE_KEYS`] that name a folder.
|
||||
const FOLDER_KEYS: &[&str] = &["folder", "folders", "dir", "directory", "destinationFolder", "sourceFolder"];
|
||||
const FOLDER_KEYS: &[&str] =
|
||||
&["folder", "dir", "directory", "destinationFolder", "sourceFolder", "fontsFolder", "pluginsFolder", "recoveryFolder", "templatesFolder"];
|
||||
|
||||
/// What a param key that names a place on disk names there.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
@@ -132,7 +150,83 @@ pub fn key_location(key: &str) -> Option<Location> {
|
||||
/// What `key` names on disk in command `spec`: [`key_location`], or `None` when [`NOT_FILES`]
|
||||
/// names it for `spec` (it names part of the document there).
|
||||
pub fn location_in(spec: &CommandSpec, key: &str) -> Option<Location> {
|
||||
if NOT_FILES.contains(&(spec.id, key)) { None } else { key_location(key) }
|
||||
ParamsPlace::top(Some(spec)).member(key, None).1
|
||||
}
|
||||
|
||||
/// A place in the params of a command. What a key names on disk depends on the command and on the
|
||||
/// keys above it: [`key_location`], less a key [`NOT_FILES`] names for the command at the top of its
|
||||
/// params and one at the end of a [`NESTED_NOT_FILES`] key list. A walk of params starts at
|
||||
/// [`ParamsPlace::top`] and goes down with [`ParamsPlace::member`] and [`ParamsPlace::item`].
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct ParamsPlace {
|
||||
/// The command whose params these are; `None` for a command that isn't known.
|
||||
command: Option<&'static str>,
|
||||
/// Whether this is the top of the params.
|
||||
top: bool,
|
||||
/// The keys of a [`NESTED_NOT_FILES`] list still to follow below this place.
|
||||
trail: Option<&'static [&'static str]>,
|
||||
}
|
||||
|
||||
impl ParamsPlace {
|
||||
/// The top of the params of `spec`, or of a command that isn't known (`None`), where every key in
|
||||
/// [`FILE_KEYS`] names a file or a folder.
|
||||
pub fn top(spec: Option<&CommandSpec>) -> ParamsPlace {
|
||||
ParamsPlace { command: spec.map(|s| s.id), top: true, trail: None }
|
||||
}
|
||||
|
||||
/// The top of the params of the command with id `id` ([`ParamsPlace::top`]).
|
||||
pub fn of(id: &str) -> ParamsPlace {
|
||||
ParamsPlace::top(super::find_command(id))
|
||||
}
|
||||
|
||||
/// The top of the params of the command that object `fields` calls, when it is a call
|
||||
/// (`{command | id: <command id>, params}`, as a `command.batch` step or a control request is):
|
||||
/// the place of its `params` member ([`ParamsPlace::member`]).
|
||||
pub fn carried(fields: &serde_json::Map<String, Value>) -> Option<ParamsPlace> {
|
||||
if !fields.contains_key("params") {
|
||||
return None;
|
||||
}
|
||||
let id = fields.get("command").or_else(|| fields.get("id")).and_then(Value::as_str)?;
|
||||
super::find_command(id).map(|spec| ParamsPlace::top(Some(spec)))
|
||||
}
|
||||
|
||||
/// The top of the params of the command that array `items` records, when it is a recorded step
|
||||
/// (`[command id, params]`): the place of its item 1 ([`ParamsPlace::item`]).
|
||||
pub fn step(items: &[Value]) -> Option<ParamsPlace> {
|
||||
match items {
|
||||
[Value::String(id), Value::Object(_)] => super::find_command(id).map(|spec| ParamsPlace::top(Some(spec))),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// The place of member `key` of an object here, with what `key` names on disk there. `carried` is
|
||||
/// [`ParamsPlace::carried`] of that object: its `params` member is then the top of that command's
|
||||
/// params, and names no file.
|
||||
pub fn member(self, key: &str, carried: Option<ParamsPlace>) -> (ParamsPlace, Option<Location>) {
|
||||
if key == "params"
|
||||
&& let Some(inner) = carried
|
||||
{
|
||||
return (inner, None);
|
||||
}
|
||||
let rest = if self.top {
|
||||
let id = self.command;
|
||||
NESTED_NOT_FILES.iter().find(|(c, keys)| Some(*c) == id && keys.first() == Some(&key)).map(|(_, keys)| keys.get(1..).unwrap_or_default())
|
||||
} else {
|
||||
self.trail.filter(|keys| keys.first() == Some(&key)).map(|keys| keys.get(1..).unwrap_or_default())
|
||||
};
|
||||
let document = (self.top && self.command.is_some_and(|id| NOT_FILES.contains(&(id, key)))) || rest.is_some_and(<[&str]>::is_empty);
|
||||
let place = ParamsPlace { command: self.command, top: false, trail: rest.filter(|keys| !keys.is_empty()) };
|
||||
(place, if document { None } else { key_location(key) })
|
||||
}
|
||||
|
||||
/// The place of item `index` of an array here. `step` is [`ParamsPlace::step`] of that array: its
|
||||
/// item 1 is then the top of that command's params.
|
||||
pub fn item(self, index: usize, step: Option<ParamsPlace>) -> ParamsPlace {
|
||||
match step {
|
||||
Some(inner) if index == 1 => inner,
|
||||
_ => ParamsPlace { command: self.command, top: false, trail: None },
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The param keys of `spec` that name a file or a folder, with what they name: the keys in
|
||||
@@ -158,9 +252,6 @@ pub(crate) const NOT_FILES: &[(&str, &str)] = &[
|
||||
("symbol.instance.setAppearance", "path"),
|
||||
("symbol.instance.selectPart", "path"),
|
||||
("object.objectsOnPath.attach", "path"),
|
||||
("attributes.set", "url"),
|
||||
("object.slice.options", "url"),
|
||||
("document.exportForScreens", "folders"),
|
||||
];
|
||||
|
||||
/// Commands and the keys from the top of their params down to a key in [`FILE_KEYS`] that, there,
|
||||
@@ -251,34 +342,24 @@ pub(crate) fn names_key(text: &str, key: &str) -> bool {
|
||||
})
|
||||
}
|
||||
|
||||
/// Does `args`, the arguments of a call of command `id`, carry a key in [`FILE_KEYS`] at any depth
|
||||
/// (in objects and in arrays), such as an effect's `textureImage.path`? Only a key [`NOT_FILES`]
|
||||
/// names for `id`, at the top level, and one at the end of a [`NESTED_NOT_FILES`] key list for
|
||||
/// `id`, aren't counted. The walk keeps its own stack, so deep arguments can't overflow the
|
||||
/// thread's.
|
||||
/// Does `args`, the arguments of a call of command `id`, carry a key that names a file or a folder at
|
||||
/// any depth (in objects and in arrays, [`ParamsPlace`]), such as an effect's `textureImage.path`?
|
||||
/// Only a key [`NOT_FILES`] names for `id`, at the top level, and one at the end of a
|
||||
/// [`NESTED_NOT_FILES`] key list for `id`, aren't counted. A call or a recorded step inside `args`
|
||||
/// is read as part of `id`'s arguments, not as the command it names. The walk keeps its own stack,
|
||||
/// so deep arguments can't overflow the thread's.
|
||||
fn names_file(id: &str, args: &Value) -> bool {
|
||||
// Each value, whether it is the params themselves, and the keys of a NESTED_NOT_FILES list
|
||||
// still to follow below it.
|
||||
let mut stack: Vec<(&Value, bool, Option<&[&str]>)> = vec![(args, true, None)];
|
||||
while let Some((v, top, trail)) = stack.pop() {
|
||||
let mut stack: Vec<(&Value, ParamsPlace)> = vec![(args, ParamsPlace::of(id))];
|
||||
while let Some((v, place)) = stack.pop() {
|
||||
match v {
|
||||
Value::Array(a) => stack.extend(a.iter().map(|x| (x, false, None))),
|
||||
Value::Array(a) => stack.extend(a.iter().enumerate().map(|(i, x)| (x, place.item(i, None)))),
|
||||
Value::Object(o) => {
|
||||
for (k, x) in o {
|
||||
let k = k.as_str();
|
||||
let rest = if top {
|
||||
NESTED_NOT_FILES
|
||||
.iter()
|
||||
.find(|(c, keys)| *c == id && keys.first() == Some(&k))
|
||||
.map(|(_, keys)| keys.get(1..).unwrap_or_default())
|
||||
} else {
|
||||
trail.filter(|keys| keys.first() == Some(&k)).map(|keys| keys.get(1..).unwrap_or_default())
|
||||
};
|
||||
let document = (top && NOT_FILES.contains(&(id, k))) || rest.is_some_and(<[&str]>::is_empty);
|
||||
if FILE_KEYS.contains(&k) && !document {
|
||||
let (below, location) = place.member(k, None);
|
||||
if location.is_some() {
|
||||
return true;
|
||||
}
|
||||
stack.push((x, false, rest.filter(|keys| !keys.is_empty())));
|
||||
stack.push((x, below));
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
@@ -638,7 +719,13 @@ mod tests {
|
||||
assert!(names_file("effect.apply", &texture));
|
||||
assert!(names_file("effect.setParams", &texture));
|
||||
assert!(names_file("effect.apply", &json!({"params": {"layers": [{"name": "a"}, {"folder": "/tmp"}]}})));
|
||||
assert!(names_file("select.all", &json!([[[{"url": "file:///etc/hosts"}]]])));
|
||||
assert!(names_file("select.all", &json!([[[{"file": "file:///etc/hosts"}]]])));
|
||||
// A web link and an export's grouping name no file.
|
||||
assert!(!names_file("attributes.set", &json!({"url": "https://example.com/a"})));
|
||||
assert!(!names_file("object.move", &json!({"opts": {"folders": "rows", "alignToPath": "baseline"}})));
|
||||
// A call nested in the arguments doesn't vouch for its own keys.
|
||||
assert!(names_file("object.move", &json!({"opts": {"command": "object.setLiveShape", "params": {"path": "/tmp/x"}}})));
|
||||
assert!(names_file("object.move", &json!({"opts": ["object.setLiveShape", {"path": "/tmp/x"}]})));
|
||||
assert!(!names_file("effect.apply", &json!({"effect": "distort.glass", "params": {"distortion": 5, "textureImage": "frosted"}})));
|
||||
assert!(!names_file("object.move", &json!({"dx": 5, "dy": 0, "ids": [1, 2], "opts": {"copy": false}})));
|
||||
// `path` is the path text is set on in text.createInPath, but only as its own param.
|
||||
@@ -647,7 +734,13 @@ mod tests {
|
||||
assert!(names_file("object.move", &json!({"path": [[0, 0]]})));
|
||||
// object.setLiveShape takes no `path`; its description says "on any path:" in its prose.
|
||||
assert!(names_file("object.setLiveShape", &json!({"path": "/tmp/x"})));
|
||||
// Image Trace's path fidelity setting, only inside its tracing settings.
|
||||
}
|
||||
|
||||
/// Image Trace's path fidelity setting `paths` names no file, but only inside its tracing
|
||||
/// settings.
|
||||
#[test]
|
||||
fn image_trace_paths_name_no_file_only_in_its_settings() {
|
||||
use serde_json::json;
|
||||
for id in ["imageTrace.make", "imageTrace.makeAndExpand"] {
|
||||
assert!(!names_file(id, &json!({"preset": "Default", "params": {"mode": "color", "paths": 50}})));
|
||||
assert!(!names_file(id, &json!({"savedPreset": {"paths": 50, "corners": 75}})));
|
||||
@@ -658,7 +751,12 @@ mod tests {
|
||||
assert!(names_file(id, &json!({"options": {"paths": 50}})));
|
||||
}
|
||||
assert!(names_file("object.move", &json!({"params": {"paths": 50}})));
|
||||
// A custom arrowhead's outline in stroke.set, only where stroke.set takes one.
|
||||
}
|
||||
|
||||
/// A custom arrowhead's outline `path` names no file, but only where stroke.set takes one.
|
||||
#[test]
|
||||
fn a_custom_arrowhead_outline_names_no_file_only_in_stroke_set() {
|
||||
use serde_json::json;
|
||||
let outline = json!({"subpaths": []});
|
||||
assert!(!names_file("stroke.set", &json!({"endArrow": {"Custom": {"name": "A", "path": outline}}})));
|
||||
assert!(!names_file("stroke.set", &json!({"startArrow": {"Custom": {"name": "A", "path": outline}}, "endArrow": "Triangle"})));
|
||||
@@ -668,7 +766,12 @@ mod tests {
|
||||
assert!(names_file("stroke.set", &json!({"options": {"endArrow": {"Custom": {"path": "/tmp/x"}}}})));
|
||||
assert!(names_file("stroke.set", &json!({"endArrow": [{"Custom": {"path": "/tmp/x"}}]})));
|
||||
assert!(names_file("object.move", &json!({"endArrow": {"Custom": {"path": "/tmp/x"}}})));
|
||||
// Deep nesting is walked without recursion.
|
||||
}
|
||||
|
||||
/// A file key under deep nesting is found, and the walk doesn't recurse.
|
||||
#[test]
|
||||
fn a_file_key_is_found_under_deep_nesting() {
|
||||
use serde_json::json;
|
||||
let mut deep = json!({"file": "/tmp/x"});
|
||||
for _ in 0..10_000 {
|
||||
deep = Value::Array(vec![deep]);
|
||||
@@ -726,11 +829,48 @@ mod tests {
|
||||
assert!(found.iter().all(|(k, l)| (*l == Location::Folder) == FOLDER_KEYS.contains(k)), "{}: {found:?}", spec.id);
|
||||
assert!(denied(spec).is_some() || found.is_empty(), "{} names {found:?} but a plug-in may call it", spec.id);
|
||||
}
|
||||
assert_eq!(key_location("url"), Some(Location::File));
|
||||
assert_eq!(key_location("url"), None);
|
||||
assert_eq!(key_location("folders"), None);
|
||||
assert_eq!(key_location("linksFolder"), None);
|
||||
assert_eq!(key_location("sourceFolder"), Some(Location::Folder));
|
||||
assert_eq!(key_location("pathData"), None);
|
||||
}
|
||||
|
||||
/// A key keeps the meaning its command gives it at every depth: a call (`{command, params}`) and a
|
||||
/// recorded step (`[command id, params]`) carry their command's exceptions down, and a custom
|
||||
/// arrowhead's outline is part of the document only at its own place in `stroke.set`.
|
||||
#[test]
|
||||
fn a_params_place_follows_its_command() {
|
||||
use serde_json::json;
|
||||
let at = |place: ParamsPlace, keys: &[&str]| {
|
||||
let mut place = place;
|
||||
let mut location = None;
|
||||
for k in keys {
|
||||
(place, location) = place.member(k, None);
|
||||
}
|
||||
location
|
||||
};
|
||||
assert_eq!(at(ParamsPlace::of("text.createInPath"), &["path"]), None);
|
||||
assert_eq!(at(ParamsPlace::of("text.createInPath"), &["options", "path"]), Some(Location::File));
|
||||
assert_eq!(at(ParamsPlace::of("stroke.set"), &["endArrow", "Custom", "path"]), None);
|
||||
assert_eq!(at(ParamsPlace::of("stroke.set"), &["endArrow", "Custom", "file"]), Some(Location::File));
|
||||
assert_eq!(at(ParamsPlace::of("no.such.command"), &["path"]), Some(Location::File));
|
||||
assert_eq!(at(ParamsPlace::top(None), &["destinationFolder"]), Some(Location::Folder));
|
||||
let call = json!({"command": "text.createInPath", "params": {"path": [[0, 0]]}});
|
||||
let carried = call.as_object().and_then(ParamsPlace::carried);
|
||||
let (inner, location) = ParamsPlace::of("command.batch").member("params", carried);
|
||||
assert_eq!(location, None);
|
||||
assert_eq!(inner.member("path", None).1, None);
|
||||
assert_eq!(ParamsPlace::carried(&serde_json::Map::new()).map(|_| ()), None);
|
||||
let unknown = json!({"command": "no.such.command", "params": {}});
|
||||
assert!(unknown.as_object().and_then(ParamsPlace::carried).is_none());
|
||||
let step = [json!("text.createInPath"), json!({"path": [[0, 0]]})];
|
||||
let place = ParamsPlace::top(None).item(1, ParamsPlace::step(&step));
|
||||
assert_eq!(place.member("path", None).1, None);
|
||||
assert_eq!(ParamsPlace::top(None).item(0, ParamsPlace::step(&step)).member("path", None).1, Some(Location::File));
|
||||
assert!(ParamsPlace::step(&[json!("text.createInPath")]).is_none());
|
||||
}
|
||||
|
||||
/// A file key counts as a command's param only where its description takes it: not a word in
|
||||
/// the prose after the params, in a nested object or in the result. A description that doesn't
|
||||
/// say which keys it takes counts any `key:` in its text.
|
||||
|
||||
@@ -474,6 +474,7 @@ pub(super) const ALLOWED: &[&str] = &[
|
||||
"perspective.grid.snap",
|
||||
"perspective.move",
|
||||
"perspective.nudge",
|
||||
"perspective.plane.infer",
|
||||
"perspective.plane.matchObject",
|
||||
"perspective.plane.move",
|
||||
"perspective.plane.set",
|
||||
|
||||
@@ -3,9 +3,14 @@
|
||||
//! applied effect names the document's filter: editing the filter changes what every object that
|
||||
//! uses it draws, and deleting it leaves their effects in place, drawing nothing, until a filter of
|
||||
//! that name exists again. Each effect holds the definition it draws with, kept in step here.
|
||||
//!
|
||||
//! The default filters ([`svg_filter::defaults`]) are listed for every document. Applying or
|
||||
//! editing one adds a copy to the document under the default's name, and from then on that copy is
|
||||
//! the filter of that name. Deleting the copy lists the default again.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_doc::{Appearance, Document, SvgFilter};
|
||||
use vectorcraft_render::effects::svg_filter::defaults::{DEFAULT_FILTERS, default_filter};
|
||||
use vectorcraft_render::effects::{self, svg_filter};
|
||||
|
||||
use super::fileio::{absolute_path, read_file_head};
|
||||
@@ -21,7 +26,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"SVG Filters",
|
||||
[],
|
||||
None,
|
||||
"{} → {filters: [{name, xml}…]} the SVG filters the document holds, in the SVG Filters submenu's order",
|
||||
"{} → {filters: [{name, xml}…], defaults: [{name, xml, inDocument}…]} filters: the SVG filters the document holds, in the order they were added; defaults: the default filters every document lists (VectorCraft's own set), with inDocument true when the document holds a filter of that name, which then stands in the default's place. The SVG Filters submenu and Apply SVG Filter list the defaults first, then the document's other filters",
|
||||
has_doc,
|
||||
list
|
||||
),
|
||||
@@ -30,7 +35,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"New SVG Filter",
|
||||
[],
|
||||
None,
|
||||
"{xml: one SVG <filter> element (its id is its name; 1..64 primitives; at most 64 KB), replace?: the name of the filter it replaces and keeps (Edit SVG Filter)} add an SVG filter to the document, after the others, or replace one, as one undo step; every object whose svg.filter effect names it draws with the new definition; a name another filter has is refused and a document holds at most 64 filters → {name, filters}",
|
||||
"{xml: one SVG <filter> element (its id is its name; 1..64 primitives; at most 64 KB), replace?: the name of the filter it replaces and keeps (Edit SVG Filter)} add an SVG filter to the document, after the others, or replace one, as one undo step; every object whose svg.filter effect names it draws with the new definition; a name another filter of the document has is refused and a document holds at most 64 filters; replace with the name of a default filter the document does not hold adds the edited copy to the document under that name, and code equal to the default's adds nothing; a new filter may take a default's name, and then stands in its place → {name, filters}",
|
||||
has_doc,
|
||||
define
|
||||
),
|
||||
@@ -39,7 +44,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Delete SVG Filter",
|
||||
[],
|
||||
None,
|
||||
"{name} remove an SVG filter from the document, as one undo step; objects whose svg.filter effect names it keep the effect, which draws nothing until a filter of that name is defined or imported again → {filters}",
|
||||
"{name} remove an SVG filter from the document, as one undo step; objects whose svg.filter effect names it keep the effect, which draws nothing until a filter of that name is defined or imported again, or the default of that name is applied; a default filter the document holds no copy of is refused (the defaults are not deleted), and deleting the document's copy of one lists the default again → {filters}",
|
||||
has_doc,
|
||||
delete
|
||||
),
|
||||
@@ -57,7 +62,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Apply SVG Filter",
|
||||
[],
|
||||
None,
|
||||
"{name, ids?|id?, item?} apply the document's SVG filter `name` (svgFilter.list) to ids or the selection as a live svg.filter effect, as one undo step, like effect.apply → {ids, index, item}",
|
||||
"{name, ids?|id?, item?, index?} apply the document's SVG filter `name`, or the default filter of that name when the document holds none (svgFilter.list), to ids or the selection as a live svg.filter effect, as one undo step, like effect.apply → {ids, index, item}; with index, the filter takes the place of the applied svg.filter effect at index of item, like effect.setParams → {ids}; a default is copied into the document in the same undo step, which is refused when the document already holds 64 filters",
|
||||
has_doc,
|
||||
apply
|
||||
),
|
||||
@@ -69,7 +74,10 @@ fn filters_json(d: &Document) -> Value {
|
||||
}
|
||||
|
||||
fn list(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
Ok(json!({ "filters": filters_json(&s.doc()?.doc) }))
|
||||
let d = &s.doc()?.doc;
|
||||
let held = |name: &str| d.svg_filters.iter().any(|f| f.name == name);
|
||||
let defaults: Vec<Value> = DEFAULT_FILTERS.iter().map(|f| json!({ "name": f.name, "xml": f.xml, "inDocument": held(f.name) })).collect();
|
||||
Ok(json!({ "filters": filters_json(d), "defaults": defaults }))
|
||||
}
|
||||
|
||||
/// `p`'s `name`, trimmed and not empty.
|
||||
@@ -132,10 +140,12 @@ fn define(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
};
|
||||
svg_filter::check(&xml).map_err(|e| bad(C, e))?;
|
||||
let filters = &s.doc()?.doc.svg_filters;
|
||||
let at = match &replace {
|
||||
Some(r) => Some(filters.iter().position(|f| f.name == *r).ok_or_else(|| bad(C, format!("the document has no SVG filter named {r:?}")))?),
|
||||
None => None,
|
||||
};
|
||||
let at = replace.as_ref().and_then(|r| filters.iter().position(|f| f.name == *r));
|
||||
// A default the document does not hold: its edited copy is added under the default's name.
|
||||
let default = replace.as_ref().filter(|_| at.is_none()).and_then(|r| default_filter(r));
|
||||
if let Some(r) = replace.as_ref().filter(|_| at.is_none() && default.is_none()) {
|
||||
return Err(bad(C, format!("the document has no SVG filter named {r:?}")));
|
||||
}
|
||||
// An edited filter keeps its name, whatever id its new code gives it.
|
||||
let xml = match &replace {
|
||||
Some(r) => svg_filter::with_id(&xml, r).ok_or_else(|| bad(C, "give one <filter> element"))?,
|
||||
@@ -145,22 +155,28 @@ fn define(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
if filters.iter().enumerate().any(|(i, f)| f.name == name && Some(i) != at) {
|
||||
return Err(bad(C, format!("the document already has an SVG filter named {name:?}")));
|
||||
}
|
||||
let new = SvgFilter { name: name.clone(), xml };
|
||||
// Nothing to record when the filter, and every object that uses it, is already as given: a
|
||||
// default saved with its own code stays out of the document.
|
||||
let as_given = match default {
|
||||
Some(d) => d.to_filter() == new,
|
||||
None => at.and_then(|i| filters.get(i)) == Some(&new),
|
||||
};
|
||||
if as_given && !out_of_step(&s.doc()?.doc, &new.name, &new.xml) {
|
||||
return Ok(json!({ "name": name, "filters": filters_json(&s.doc()?.doc) }));
|
||||
}
|
||||
if at.is_none() && filters.len() >= SvgFilter::MAX {
|
||||
return Err(bad(C, format!("a document holds at most {} SVG filters", SvgFilter::MAX)));
|
||||
}
|
||||
let new = SvgFilter { name: name.clone(), xml };
|
||||
// Nothing to record when the filter, and every object that uses it, is already as given.
|
||||
if at.and_then(|i| filters.get(i)) != Some(&new) || out_of_step(&s.doc()?.doc, &new.name, &new.xml) {
|
||||
let label = if at.is_some() { "Edit SVG Filter" } else { "New SVG Filter" };
|
||||
s.edit(label, |d, _| {
|
||||
update_users(d, &new.name, &new.xml);
|
||||
match at.and_then(|i| d.svg_filters.get_mut(i)) {
|
||||
Some(f) => *f = new,
|
||||
None => d.svg_filters.push(new),
|
||||
}
|
||||
Ok(())
|
||||
})?;
|
||||
}
|
||||
let label = if replace.is_some() { "Edit SVG Filter" } else { "New SVG Filter" };
|
||||
s.edit(label, |d, _| {
|
||||
update_users(d, &new.name, &new.xml);
|
||||
match at.and_then(|i| d.svg_filters.get_mut(i)) {
|
||||
Some(f) => *f = new,
|
||||
None => d.svg_filters.push(new),
|
||||
}
|
||||
Ok(())
|
||||
})?;
|
||||
Ok(json!({ "name": name, "filters": filters_json(&s.doc()?.doc) }))
|
||||
}
|
||||
|
||||
@@ -168,6 +184,9 @@ fn delete(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "svgFilter.delete";
|
||||
let name = name_param(p, C)?;
|
||||
if !s.doc()?.doc.svg_filters.iter().any(|f| f.name == name) {
|
||||
if default_filter(&name).is_some() {
|
||||
return Err(bad(C, format!("{name:?} is a default SVG filter, and the document holds no copy of it to delete")));
|
||||
}
|
||||
return Err(bad(C, format!("the document has no SVG filter named {name:?}")));
|
||||
}
|
||||
s.edit("Delete SVG Filter", |d, _| {
|
||||
@@ -222,13 +241,79 @@ fn import(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
fn apply(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "svgFilter.apply";
|
||||
let name = name_param(p, C)?;
|
||||
let f = s.doc()?.doc.svg_filters.iter().find(|f| f.name == name).cloned();
|
||||
let f = f.ok_or_else(|| bad(C, format!("the document has no SVG filter named {name:?}")))?;
|
||||
let mut q = json!({ "effect": effects::SVG_FILTER, "params": { "name": f.name, "xml": f.xml } });
|
||||
let filters = &s.doc()?.doc.svg_filters;
|
||||
// The document's filter of that name, or the default of that name, which the document then takes.
|
||||
let (f, copied) = match (filters.iter().find(|f| f.name == name), default_filter(&name)) {
|
||||
(Some(f), _) => (f.clone(), false),
|
||||
(None, Some(_)) if filters.len() >= SvgFilter::MAX => {
|
||||
return Err(bad(C, format!("a document holds at most {} SVG filters, and applying a default filter adds it", SvgFilter::MAX)));
|
||||
}
|
||||
(None, Some(d)) => (d.to_filter(), true),
|
||||
(None, None) => return Err(bad(C, format!("the document has no SVG filter named {name:?}"))),
|
||||
};
|
||||
// A given `index`, null included, is checked as an index: only a missing one adds an effect.
|
||||
let replaces = p.get("index").is_some();
|
||||
let mut q = match replaces {
|
||||
true => json!({ "index": p["index"], "params": { "name": f.name, "xml": f.xml } }),
|
||||
false => json!({ "effect": effects::SVG_FILTER, "params": { "name": f.name, "xml": f.xml } }),
|
||||
};
|
||||
for key in ["ids", "id", "item"] {
|
||||
if let Some(v) = p.get(key) {
|
||||
q[key] = v.clone();
|
||||
}
|
||||
}
|
||||
super::effectcmd::apply(s, &q)
|
||||
if !copied {
|
||||
return apply_as_given(s, p, &q, replaces, None);
|
||||
}
|
||||
// The effect and the copy are two edits joined into one step. The history keeps room for both
|
||||
// until they are joined, so the application lets one old step go at most, as any edit does.
|
||||
let limit = s.doc()?.history.limit;
|
||||
if let Some(st) = s.active_mut() {
|
||||
st.history.limit = limit.saturating_add(2);
|
||||
}
|
||||
let out = apply_as_given(s, p, &q, replaces, Some(f));
|
||||
if let Some(st) = s.active_mut() {
|
||||
st.history.limit = limit;
|
||||
st.history.trim();
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// [`apply`] once the filter is known: the effect added (`q`) or put in the applied filter's place
|
||||
/// (`replaces`), and `copy`, a default's copy, added to the document in the same undo step.
|
||||
fn apply_as_given(s: &mut Session, p: &Value, q: &Value, replaces: bool, copy: Option<SvgFilter>) -> Result<Value> {
|
||||
const C: &str = "svgFilter.apply";
|
||||
let newest = s.doc()?.history.step().0;
|
||||
let out = if replaces {
|
||||
super::appearance::index_param(p, "index", C)?;
|
||||
// Only an applied SVG filter gives its place: another effect would take the filter's
|
||||
// parameters as its own.
|
||||
let edited = super::effectcmd::set_params_effects(s, q);
|
||||
if edited.is_empty() || edited.iter().any(|e| e != effects::SVG_FILTER) {
|
||||
return Err(bad(C, "`index` must be the index of an applied SVG filter"));
|
||||
}
|
||||
super::effectcmd::set_params(s, q)?
|
||||
} else {
|
||||
super::effectcmd::apply(s, q)?
|
||||
};
|
||||
if let Some(f) = copy {
|
||||
// The copy joins the step that applied it, under that step's name. That step is found by
|
||||
// its document, not its place: in an undo group both edits join the group's one step.
|
||||
let h = &s.doc()?.history;
|
||||
let applied = h.undo.last().filter(|_| h.step().0 != newest).map(|step| (step.label.clone(), step.doc.clone()));
|
||||
let label = applied.as_ref().map_or_else(|| "SVG Filter".to_string(), |(l, _)| l.clone());
|
||||
s.edit(&label, |d, _| {
|
||||
update_users(d, &f.name, &f.xml);
|
||||
d.svg_filters.push(f);
|
||||
Ok(())
|
||||
})?;
|
||||
let undo = &s.doc()?.history.undo;
|
||||
let below = undo.len().checked_sub(2);
|
||||
if let (Some(at), Some((_, doc))) = (below, &applied)
|
||||
&& undo.get(at).is_some_and(|e| std::sync::Arc::ptr_eq(&e.doc, doc))
|
||||
{
|
||||
super::menucmds::squash(s, at, &label);
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
@@ -40,7 +40,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Character",
|
||||
[],
|
||||
None,
|
||||
"{id? (default: the one selected type object), start?: byte, end?: byte (default: all text), story?: bool = false (all the text of every frame of the threaded story `id` is a frame of, in one undo step; no `start` or `end`), font?, style?, size?: pt 0.1..1296 (outside it: an error), leading?: pt|\"auto\", tracking?, kerning?: 1/1000 em|\"auto\"|\"optical\" (the space after each character), kerningBefore?: 1/1000 em -1000..10000 (the space before a character that starts a line by itself: the first character of the text, of a paragraph or after a forced line break; no effect elsewhere; 0 by default), baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg counter-clockwise (0: upright), fill?: colour|\"none\", stroke?: colour|\"none\" (#rrggbbaa and #rgba are refused in both), keepModel?: bool (fill and stroke, as paint.setFill), strokeWidth?: pt, strokeOptions?: {weight?, cap?, join?, miterLimit?, align?, dash?, dashOffset?, alignDashes?} (as stroke.set: the character stroke), underline?, strikethrough?, allCaps?: bool, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), features?: [\"dlig\", \"-liga\", \"salt=2\", …] (swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take the font's alternate number as `tag=N`, N 0–65535: \"salt=2\" draws the second alternate of each glyph that has one, \"salt\" is \"salt=1\", \"-salt\" and \"salt=0\" are off; the range is shaped with its word, so a letter's alternate keeps it joined to its neighbours), featureChanges?: [\"tnum\", \"-onum\", \"salt=2\", …] (OpenType features turned on, or with - off, on top of each character's own, a value replacing the feature's last one; its other features are kept), charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\"|\"icfTop\"|\"icfBottom\", proportionalMetrics?: bool (full-width glyphs on the font's proportional widths: `palt` in horizontal type, `vpal` in vertical type), tateChuYoko?: bool (Character panel menu › Tate-chu-yoko, with Show East Asian Options: in vertical type those characters stand side by side across one em of the column; kept on the characters and ignored in horizontal type), tcyUpDown?, tcyLeftRight?: pt -1296..1296 (Character panel menu › Tate-chu-yoko Settings: in vertical type a block of tate-chu-yoko characters moves up by a positive Up/Down and down by a negative one, right by a positive Left/Right and left by a negative one, as one piece with the values of its first character; on a vertical path a positive Up/Down moves it toward the path's start and a positive Left/Right to the path's left; 0 by default; automatic digit blocks and horizontal type do not move; neither turns tateChuYoko on), warichu?: bool (Character panel menu › Warichu, with Show East Asian Options: the characters are set at warichuScale percent of their size and stacked on warichuLines lines inside their line, one above the other in horizontal type and side by side in vertical type, the first line above or to the right; a stretch of them is one block with the settings of its first character that stays whole on one line and may run past its end; type on a path sets them at their own size), warichuLines?: 1..6 (default 2), warichuGap?: pt 0..100 (the space between the lines, default 0), warichuScale?: % 10..100 (default 50), warichuAlign?: \"auto\"|\"left\"|\"center\"|\"right\"|\"justifyLeft\"|\"justifyCenter\"|\"justifyRight\"|\"justifyAll\" (Warichu Settings: how the lines line up along the block, which is as long as its longest line; the justify values spread every line but the last, which is set left, centered or right, or spread with justifyAll; auto, the default, sets them as justifyLeft; left and right are top and bottom in vertical type; none of them turns warichu on), akiLeft?, akiRight?: 1/1000 em 0..1000 (Character panel › Insert Aki Left and Right, with Show East Asian Options: space before and after each character in reading order, on its left and right in left-to-right type, on its right and left in right-to-left type, above and below it in vertical type; a ligature or a letter with its marks takes the values of its first character; line wrapping counts it, alignment keeps it at a line's ends and justification does not stretch or narrow it; 0 by default; a value that is not a number or is outside the range is refused, naming the key), tsume?: % 0..100 (Character panel › Tsume, with Show East Asian Options: the share of the blank space on each side of each character's ink, inside its own width, that is taken away in horizontal type, the glyph keeping its shape; 100 sets the ink edge to edge; a character without ink, such as a space, keeps its width; a ligature or a letter with its marks takes the value of its first character; tracking, kerning and Insert Aki are added after it, and justification keeps it; vertical type keeps the characters' spacing; 0 by default; a value that is not a number or is outside t
Line truncated
|
||||
"{id? (default: the one selected type object), start?: byte, end?: byte (default: all text), story?: bool = false (all the text of every frame of the threaded story `id` is a frame of, in one undo step; no `start` or `end`), font?, style?, size?: pt 0.1..1296 (outside it: an error), leading?: pt|\"auto\", tracking?, kerning?: 1/1000 em|\"auto\"|\"optical\" (the space after each character), kerningBefore?: 1/1000 em -1000..10000 (the space before a character that starts a line by itself: the first character of the text, of a paragraph or after a forced line break; no effect elsewhere; 0 by default), baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg counter-clockwise (0: upright), fill?: colour|\"none\", stroke?: colour|\"none\" (#rrggbbaa and #rgba are refused in both), keepModel?: bool (fill and stroke, as paint.setFill), strokeWidth?: pt, strokeOptions?: {weight?, cap?, join?, miterLimit?, align?, dash?, dashOffset?, alignDashes?} (as stroke.set: the character stroke), underline?, strikethrough?, allCaps?: bool, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), features?: [\"dlig\", \"-liga\", \"salt=2\", …] (swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take the font's alternate number as `tag=N`, N 0–65535: \"salt=2\" draws the second alternate of each glyph that has one, \"salt\" is \"salt=1\", \"-salt\" and \"salt=0\" are off; the range is shaped with its word, so a letter's alternate keeps it joined to its neighbours), featureChanges?: [\"tnum\", \"-onum\", \"salt=2\", …] (OpenType features turned on, or with - off, on top of each character's own, a value replacing the feature's last one; its other features are kept), charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\"|\"icfTop\"|\"icfBottom\", proportionalMetrics?: bool (full-width glyphs on the font's proportional widths: `palt` in horizontal type, `vpal` in vertical type), tateChuYoko?: bool (Character panel menu › Tate-chu-yoko, with Show East Asian Options: in vertical type those characters stand side by side across one em of the column; kept on the characters and ignored in horizontal type), tcyUpDown?, tcyLeftRight?: pt -1296..1296 (Character panel menu › Tate-chu-yoko Settings: in vertical type a block of tate-chu-yoko characters moves up by a positive Up/Down and down by a negative one, right by a positive Left/Right and left by a negative one, as one piece with the values of its first character; on a vertical path a positive Up/Down moves it toward the path's start and a positive Left/Right to the path's left; 0 by default; automatic digit blocks and horizontal type do not move; neither turns tateChuYoko on), warichu?: bool (Character panel menu › Warichu, with Show East Asian Options: the characters are set at warichuScale percent of their size and stacked on warichuLines lines inside their line, one above the other in horizontal type and side by side in vertical type, the first line above or to the right; a stretch of them is one block with the settings of its first character that stays whole on one line and may run past its end; type on a path sets them at their own size), warichuLines?: 1..6 (default 2), warichuGap?: pt 0..100 (the space between the lines, default 0), warichuScale?: % 10..100 (default 50), warichuAlign?: \"auto\"|\"left\"|\"center\"|\"right\"|\"justifyLeft\"|\"justifyCenter\"|\"justifyRight\"|\"justifyAll\" (Warichu Settings: how the lines line up along the block, which is as long as its longest line; the justify values spread every line but the last, which is set left, centered or right, or spread with justifyAll; auto, the default, sets them as justifyLeft; left and right are top and bottom in vertical type; none of them turns warichu on), akiLeft?, akiRight?: 1/1000 em 0..1000 (Character panel › Insert Aki Left and Right, with Show East Asian Options: space before and after each character in reading order, on its left and right in left-to-right type, on its right and left in right-to-left type, above and below it in vertical type; a ligature or a letter with its marks takes the values of its first character; line wrapping counts it, alignment keeps it at a line's ends and justification does not stretch or narrow it; 0 by default; a value that is not a number or is outside the range is refused, naming the key), tsume?: % 0..100 (Character panel › Tsume, with Show East Asian Options: the share of the blank space on each side of each character's ink, inside its own width, that is taken away in horizontal type, the glyph keeping its shape; 100 sets the ink edge to edge; a character without ink, such as a space, keeps its width; a ligature or a letter with its marks takes the value of its first character; tracking, kerning and Insert Aki are added after it, and justification keeps it; vertical type keeps the characters' spacing; 0 by default; a value that is not a number or is outside t
Line truncated
|
||||
has_doc,
|
||||
set_range_style
|
||||
),
|
||||
@@ -473,6 +473,7 @@ pub(crate) struct CharChange {
|
||||
standard_vertical_roman: Option<bool>,
|
||||
no_break: Option<bool>,
|
||||
digits: Option<vectorcraft_doc::Digits>,
|
||||
glyph_form: Option<vectorcraft_doc::GlyphForm>,
|
||||
/// The language to set: a tag, or `None` for the default.
|
||||
language: Option<Option<String>>,
|
||||
font_axes: Option<AxisChange>,
|
||||
@@ -571,6 +572,20 @@ pub(crate) fn digits_param(p: &Value, cmd: &str) -> Result<Option<vectorcraft_do
|
||||
Ok(Some(d))
|
||||
}
|
||||
|
||||
/// `glyphForm: "traditional"|"expert"|"jis04"|…|"default"` ([`GlyphForm::id`]) → the East Asian
|
||||
/// glyph form the characters are drawn in.
|
||||
///
|
||||
/// [`GlyphForm::id`]: vectorcraft_doc::GlyphForm::id
|
||||
pub(crate) fn glyph_form_param(p: &Value, cmd: &str) -> Result<Option<vectorcraft_doc::GlyphForm>> {
|
||||
use vectorcraft_doc::GlyphForm;
|
||||
let Some(v) = p.get("glyphForm").filter(|v| !v.is_null()) else { return Ok(None) };
|
||||
let Some(f) = v.as_str().and_then(GlyphForm::from_id) else {
|
||||
let ids: Vec<String> = GlyphForm::ALL.iter().map(|f| format!("\"{}\"", f.id())).collect();
|
||||
return Err(bad(cmd, format!("`glyphForm` must be one of {}", ids.join(", "))));
|
||||
};
|
||||
Ok(Some(f))
|
||||
}
|
||||
|
||||
/// `language: name|tag` (one of Document Setup's languages, case-insensitive) → the language to
|
||||
/// set ([`vectorcraft_doc::CharStyle::language`]: `None` inside for the default).
|
||||
pub(crate) fn language_param(p: &Value, cmd: &str) -> Result<Option<Option<String>>> {
|
||||
@@ -840,6 +855,7 @@ impl CharChange {
|
||||
standard_vertical_roman: flag("standardVerticalRoman"),
|
||||
no_break: flag("noBreak"),
|
||||
digits: digits_param(p, cmd)?,
|
||||
glyph_form: glyph_form_param(p, cmd)?,
|
||||
language: language_param(p, cmd)?,
|
||||
font_axes: font_axes_param(p, cmd)?,
|
||||
font_height_reference: font_height_reference_param(p, cmd)?,
|
||||
@@ -905,6 +921,7 @@ impl CharChange {
|
||||
&& self.standard_vertical_roman.is_none()
|
||||
&& self.no_break.is_none()
|
||||
&& self.digits.is_none()
|
||||
&& self.glyph_form.is_none()
|
||||
&& self.language.is_none()
|
||||
&& self.font_axes.is_none()
|
||||
&& self.font_height_reference.is_none()
|
||||
@@ -1070,6 +1087,9 @@ impl CharChange {
|
||||
if let Some(v) = self.digits {
|
||||
st.digits = v;
|
||||
}
|
||||
if let Some(v) = self.glyph_form {
|
||||
st.glyph_form = v;
|
||||
}
|
||||
if let Some(v) = self.font_height_reference {
|
||||
st.font_height_reference = v;
|
||||
}
|
||||
|
||||
@@ -228,6 +228,7 @@ pub fn char_attrs(v: &CharStyle) -> Map<String, Value> {
|
||||
("digits", json!(v.digits)),
|
||||
("fontHeightReference", json!(v.font_height_reference)),
|
||||
("language", json!(v.language)),
|
||||
("glyphForm", json!(v.glyph_form)),
|
||||
] {
|
||||
m.insert(k.into(), x);
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ use serde_json::{Value, json};
|
||||
use vectorcraft_doc::{Document, NodeId, NodeKind, TextWrap};
|
||||
|
||||
use super::typecmd::refresh_bounds;
|
||||
use super::{CommandSpec, EngineError, Result, Session, bool_or, checked_ids_or_selection, cmd, f64_or, has_selection};
|
||||
use super::{CommandSpec, EngineError, Result, Session, bad, checked_ids_or_selection, cmd, has_selection, number_or, switch_or};
|
||||
|
||||
pub fn specs() -> Vec<CommandSpec> {
|
||||
vec![
|
||||
@@ -17,7 +17,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Make",
|
||||
["Object", "Text Wrap"],
|
||||
None,
|
||||
"{offset?: pt (6), invert?: bool, ids?} area type below the selected objects (same layer) wraps around them; a negative offset (to -1000) lets the text that far into them → {ids}",
|
||||
"{offset?: pt (6), invert?: bool, ids?} area type below the selected objects (same layer) wraps around them; offset -1000 to 1000 (a negative one lets the text that far into them); an offset outside that range or not a number, or an invert that is not true or false, is an error → {ids}",
|
||||
has_selection,
|
||||
make
|
||||
),
|
||||
@@ -27,7 +27,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Text Wrap Options…",
|
||||
["Object", "Text Wrap"],
|
||||
None,
|
||||
"{offset?: pt, invert?: bool, ids?} set the options of the selected wrap objects (offset -1000 to 1000; a negative one lets text into the objects); no options → the current {offset, invert}",
|
||||
"{offset?: pt, invert?: bool, ids?} set the options of the selected wrap objects (offset -1000 to 1000; a negative one lets text into the objects); an offset outside that range or not a number, or an invert that is not true or false, is an error; no options (or null ones) → the current {offset, invert}",
|
||||
has_selection,
|
||||
options
|
||||
),
|
||||
@@ -37,14 +37,23 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
/// The Offset a wrap object takes, in points.
|
||||
pub const TEXT_WRAP_OFFSET_RANGE: std::ops::RangeInclusive<f64> = -1000.0..=1000.0;
|
||||
|
||||
fn wrap_param(p: &Value, base: TextWrap) -> TextWrap {
|
||||
let (lo, hi) = (*TEXT_WRAP_OFFSET_RANGE.start(), *TEXT_WRAP_OFFSET_RANGE.end());
|
||||
TextWrap { offset: f64_or(p, "offset", base.offset).clamp(lo, hi), invert: bool_or(p, "invert", base.invert) }
|
||||
/// The options `p` gives, with `base` for an omitted or null `offset` or `invert`. An `offset` that is
|
||||
/// not a number or lies outside [`TEXT_WRAP_OFFSET_RANGE`], or an `invert` that is not true or false,
|
||||
/// is an error. `base`'s offset is kept as it is.
|
||||
fn wrap_param(p: &Value, base: TextWrap, cmd: &str) -> Result<TextWrap> {
|
||||
let key = "offset";
|
||||
let given = p.get(key).is_some_and(|v| !v.is_null());
|
||||
let offset = number_or(p, key, base.offset, cmd)?;
|
||||
if given && !TEXT_WRAP_OFFSET_RANGE.contains(&offset) {
|
||||
let (lo, hi) = (TEXT_WRAP_OFFSET_RANGE.start(), TEXT_WRAP_OFFSET_RANGE.end());
|
||||
return Err(bad(cmd, format!("`{key}` must be from {lo} to {hi}")));
|
||||
}
|
||||
Ok(TextWrap { offset, invert: switch_or(p, "invert", base.invert, cmd)? })
|
||||
}
|
||||
|
||||
fn make(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let ids = checked_ids_or_selection(s, p, "object.textWrap.make")?;
|
||||
let w = wrap_param(p, TextWrap::default());
|
||||
let w = wrap_param(p, TextWrap::default(), "object.textWrap.make")?;
|
||||
s.edit("Make Text Wrap", |d, _| {
|
||||
for id in &ids {
|
||||
let n = d.node_mut(*id).ok_or(EngineError::NoNode(*id))?;
|
||||
@@ -86,10 +95,10 @@ fn options(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let d = &s.doc()?.doc;
|
||||
ids.iter().find_map(|i| d.node(*i).and_then(|n| n.extras().wrap)).unwrap_or_default()
|
||||
};
|
||||
if p.get("offset").is_none() && p.get("invert").is_none() {
|
||||
if ["offset", "invert"].iter().all(|k| p.get(k).is_none_or(Value::is_null)) {
|
||||
return Ok(json!({ "offset": current.offset, "invert": current.invert }));
|
||||
}
|
||||
let w = wrap_param(p, current);
|
||||
let w = wrap_param(p, current, "object.textWrap.options")?;
|
||||
s.edit("Text Wrap Options", |d, _| {
|
||||
for id in &ids {
|
||||
if let Some(n) = d.node_mut(*id)
|
||||
@@ -212,11 +221,72 @@ mod tests {
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(s.execute("object.textWrap.options", &json!({})).unwrap()["offset"], json!(6.0));
|
||||
assert!(beside(&s).iter().all(|x| (x - 206.0).abs() < 1e-6), "{:?}", beside(&s));
|
||||
// An offset past -1000 is kept at -1000: the whole object lets text through.
|
||||
assert_eq!(s.execute("object.textWrap.options", &json!({"offset": -5000})).unwrap()["offset"], json!(-1000.0));
|
||||
// An offset of -1000 lets the text through the whole object.
|
||||
assert_eq!(s.execute("object.textWrap.options", &json!({"offset": -1000})).unwrap()["offset"], json!(-1000.0));
|
||||
assert!(lines(&s, t).iter().all(|l| l.0 < 1.0 && l.1 > 300.0));
|
||||
}
|
||||
|
||||
/// An offset that is not a number or lies outside -1000 to 1000 pt, or an invert that is not
|
||||
/// true or false, is an error for Make and Options, and leaves the options and the history as
|
||||
/// they were. Omitted and null values take the default, and the range's ends are accepted.
|
||||
#[test]
|
||||
fn text_wrap_commands_refuse_bad_offsets_and_inverts_without_editing() {
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 300, "height": 300})).unwrap();
|
||||
let id = s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 80, "height": 80})).unwrap()["id"].as_u64().unwrap();
|
||||
s.execute("select.set", &json!({"ids": [id]})).unwrap();
|
||||
let wrap = |s: &Session| s.doc().unwrap().doc.node(NodeId(id)).unwrap().extras().wrap;
|
||||
let undo = |s: &Session| s.doc().unwrap().history.undo.len();
|
||||
let refused = [
|
||||
(json!({"offset": "12"}), "`offset` must be a number"),
|
||||
(json!({"offset": true}), "`offset` must be a number"),
|
||||
(json!({"offset": [12]}), "`offset` must be a number"),
|
||||
(json!({"offset": {"pt": 12}}), "`offset` must be a number"),
|
||||
(json!({"offset": 1000.5}), "`offset` must be from -1000 to 1000"),
|
||||
(json!({"offset": -1000.5}), "`offset` must be from -1000 to 1000"),
|
||||
(json!({"offset": 5000}), "`offset` must be from -1000 to 1000"),
|
||||
(json!({"offset": 12, "invert": "true"}), "`invert` must be true or false"),
|
||||
(json!({"offset": 12, "invert": 1}), "`invert` must be true or false"),
|
||||
(json!({"invert": "false"}), "`invert` must be true or false"),
|
||||
];
|
||||
let start = undo(&s);
|
||||
for (p, msg) in &refused {
|
||||
let e = s.execute("object.textWrap.make", p).unwrap_err().to_string();
|
||||
assert!(e.contains(msg), "make {p}: {e}");
|
||||
assert!(wrap(&s).is_none(), "make {p} made a wrap");
|
||||
assert_eq!(undo(&s), start, "make {p} added history");
|
||||
}
|
||||
// Omitted and null values: Make's 6 pt default.
|
||||
s.execute("object.textWrap.make", &json!({"offset": null, "invert": null})).unwrap();
|
||||
assert_eq!(wrap(&s), Some(vectorcraft_doc::TextWrap { offset: 6.0, invert: false }));
|
||||
s.execute("object.textWrap.options", &json!({"offset": 40, "invert": true})).unwrap();
|
||||
let before = undo(&s);
|
||||
for (p, msg) in &refused {
|
||||
let e = s.execute("object.textWrap.options", p).unwrap_err().to_string();
|
||||
assert!(e.contains(msg), "options {p}: {e}");
|
||||
assert_eq!(wrap(&s), Some(vectorcraft_doc::TextWrap { offset: 40.0, invert: true }), "options {p}");
|
||||
assert_eq!(undo(&s), before, "options {p} added history");
|
||||
}
|
||||
// Null options read the current ones without an undo step; a null one keeps its value.
|
||||
assert_eq!(s.execute("object.textWrap.options", &json!({"offset": null, "invert": null})).unwrap(), json!({"offset": 40.0, "invert": true}));
|
||||
assert_eq!(undo(&s), before);
|
||||
assert_eq!(
|
||||
s.execute("object.textWrap.options", &json!({"offset": null, "invert": false})).unwrap(),
|
||||
json!({"offset": 40.0, "invert": false})
|
||||
);
|
||||
// The range's ends are accepted by both commands.
|
||||
for (command, offset) in
|
||||
[("object.textWrap.options", 1000), ("object.textWrap.options", -1000), ("object.textWrap.make", 1000), ("object.textWrap.make", -1000)]
|
||||
{
|
||||
s.execute(command, &json!({ "offset": offset })).unwrap();
|
||||
assert_eq!(wrap(&s).unwrap().offset, f64::from(offset), "{command} {offset}");
|
||||
}
|
||||
// A stored offset outside the range (from a file) is kept when only Invert Wrap changes.
|
||||
let d = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
|
||||
d.node_mut(NodeId(id)).unwrap().extras_mut().wrap = Some(vectorcraft_doc::TextWrap { offset: 5000.0, invert: false });
|
||||
assert_eq!(s.execute("object.textWrap.options", &json!({"invert": true})).unwrap(), json!({"offset": 5000.0, "invert": true}));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn text_flows_on_both_sides_of_a_centred_object() {
|
||||
let mut s = Session::new();
|
||||
|
||||
@@ -616,6 +616,21 @@ fn scale_text_attributes(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
Ok(json!({ "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>(), "changed": changed }))
|
||||
}
|
||||
|
||||
/// A path (or compound path) of `outline`, a piece of type `t`'s outline in text space, painted as
|
||||
/// run `run` and placed in the document as the canvas paints it ([`paint_type_piece`]: unplaced
|
||||
/// gradients fitted to `bounds`, the layout's bounds, stroke weights scaled by the type's
|
||||
/// transform); `None` when the piece has no path.
|
||||
fn type_piece(d: &mut Document, t: &TextObject, bounds: kurbo::Rect, run: usize, outline: &kurbo::BezPath) -> Option<Node> {
|
||||
let path = PathData::from_bezpath(outline);
|
||||
if path.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let st = t.runs.get(run).map(|r| r.style.clone()).unwrap_or_else(|| t.first_style());
|
||||
let mut node = shape_node(d, path, None);
|
||||
vectorcraft_render::effects::paint_type_piece(&mut node, &st, bounds, t.xf);
|
||||
Some(node)
|
||||
}
|
||||
|
||||
fn create_outlines(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
let roots = selected_roots(s)?;
|
||||
let ids = s.edit("Create Outlines", |d, sel| {
|
||||
@@ -660,14 +675,9 @@ fn create_outlines(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
children.push(Arc::new(d.reid(&art)));
|
||||
break 'glyph;
|
||||
}
|
||||
let path = PathData::from_bezpath(&g.outline).transformed(t.xf);
|
||||
if path.is_empty() {
|
||||
break 'glyph;
|
||||
if let Some(node) = type_piece(d, t, lay.bounds, g.run, &g.outline) {
|
||||
children.push(Arc::new(node));
|
||||
}
|
||||
let st = t.runs.get(g.run).map(|r| r.style.clone()).unwrap_or_else(|| t.first_style());
|
||||
let mut node = shape_node(d, path, None);
|
||||
node.appearance = st.appearance().into();
|
||||
children.push(Arc::new(node));
|
||||
}
|
||||
run_end.insert(g.run, children.len());
|
||||
}
|
||||
@@ -676,13 +686,7 @@ fn create_outlines(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
// nothing there either).
|
||||
let mut ruby: Vec<(usize, Arc<Node>)> = vec![];
|
||||
for g in &lay.ruby {
|
||||
let path = PathData::from_bezpath(&g.outline).transformed(t.xf);
|
||||
if path.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let st = t.runs.get(g.run).map(|r| r.style.clone()).unwrap_or_else(|| t.first_style());
|
||||
let mut node = shape_node(d, path, None);
|
||||
node.appearance = st.appearance().into();
|
||||
let Some(node) = type_piece(d, t, lay.bounds, g.run, &g.outline) else { continue };
|
||||
// After the glyphs of its run and of the runs before it.
|
||||
let at = run_end.range(..=g.run).map(|(_, end)| *end).max().unwrap_or(0);
|
||||
ruby.push((at, Arc::new(node)));
|
||||
@@ -707,10 +711,9 @@ fn create_outlines(s: &mut Session, _: &Value) -> Result<Value> {
|
||||
// Underline and strikethrough bars become paths of their run's paint too (#847).
|
||||
for (run, bar) in vectorcraft_text::decorations(&lay, vectorcraft_text::FontDb::global(), t) {
|
||||
all.extend(bar.iter());
|
||||
let st = t.runs.get(run).map(|r| r.style.clone()).unwrap_or_else(|| t.first_style());
|
||||
let mut node = shape_node(d, PathData::from_bezpath(&bar).transformed(t.xf), None);
|
||||
node.appearance = st.appearance().into();
|
||||
children.push(Arc::new(node));
|
||||
if let Some(node) = type_piece(d, t, lay.bounds, run, &bar) {
|
||||
children.push(Arc::new(node));
|
||||
}
|
||||
}
|
||||
// The object's own fills and strokes (not its characters') paint the whole outline:
|
||||
// those below the Characters row under the characters, the others over them, with
|
||||
|
||||
@@ -1925,6 +1925,55 @@ fn standard_vertical_roman_is_a_character_attribute_saved_only_when_on() {
|
||||
assert!(runs(&s).iter().all(|r| !r.style.standard_vertical_roman));
|
||||
}
|
||||
|
||||
/// The East Asian glyph form (Glyphs panel menu) is one character attribute, `glyphForm`: one
|
||||
/// form replaces another, "default" (Revert To Default Forms) takes it away, and it is saved
|
||||
/// only when set. A call that changes nothing records no undo step, an unknown form is refused,
|
||||
/// and character styles carry it.
|
||||
#[test]
|
||||
fn glyph_form_is_one_character_attribute_saved_only_when_set() {
|
||||
use vectorcraft_doc::GlyphForm;
|
||||
let mut s = Session::new();
|
||||
s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
|
||||
let id = s.execute("text.create", &json!({"x": 10, "y": 50, "text": "亜唖芦"})).unwrap()["id"].as_u64().unwrap();
|
||||
let runs = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
|
||||
NodeKind::Text(t) => t.runs.clone(),
|
||||
_ => panic!("text"),
|
||||
};
|
||||
let forms = |s: &Session| runs(s).iter().map(|r| (r.text.clone(), r.style.glyph_form)).collect::<Vec<_>>();
|
||||
assert!(serde_json::to_value(&runs(&s)[0].style).unwrap().get("glyphForm").is_none());
|
||||
s.execute("text.setRangeStyle", &json!({"id": id, "start": 3, "end": 6, "glyphForm": "jis78"})).unwrap();
|
||||
assert_eq!(forms(&s), [("亜".into(), GlyphForm::Default), ("唖".into(), GlyphForm::Jis78), ("芦".into(), GlyphForm::Default)]);
|
||||
assert_eq!(serde_json::to_value(&runs(&s)[1].style).unwrap()["glyphForm"], "jis78");
|
||||
// Saved and reopened as it was.
|
||||
let back = vectorcraft_format::load(&vectorcraft_format::save(&s.doc().unwrap().doc, false)).unwrap();
|
||||
let NodeKind::Text(t) = &back.node(NodeId(id)).unwrap().kind else { panic!("text") };
|
||||
assert_eq!(t.runs.iter().map(|r| (r.text.clone(), r.style.glyph_form)).collect::<Vec<_>>(), forms(&s));
|
||||
// Another form replaces it: one form at a time.
|
||||
s.execute("select.set", &json!({"ids": [id]})).unwrap();
|
||||
s.execute("text.setFormat", &json!({"glyphForm": "fullWidth"})).unwrap();
|
||||
assert!(runs(&s).iter().all(|r| r.style.glyph_form == GlyphForm::FullWidth));
|
||||
let n = s.doc().unwrap().history.undo.len();
|
||||
s.execute("text.setFormat", &json!({"glyphForm": "fullWidth"})).unwrap();
|
||||
assert_eq!(s.doc().unwrap().history.undo.len(), n, "nothing changed, no undo step");
|
||||
for bad in [json!("jis2004"), json!(78), json!(true), json!("Traditional")] {
|
||||
let e = s.execute("text.setFormat", &json!({"glyphForm": bad})).unwrap_err().to_string();
|
||||
assert!(e.contains("`glyphForm` must be one of \"traditional\""), "{bad}: {e}");
|
||||
assert!(s.execute("text.setRangeStyle", &json!({"id": id, "glyphForm": bad})).is_err(), "{bad}");
|
||||
}
|
||||
assert!(runs(&s).iter().all(|r| r.style.glyph_form == GlyphForm::FullWidth), "a refused call changes nothing");
|
||||
assert_eq!(super::super::textstyles::char_attrs(&runs(&s)[0].style)["glyphForm"], "fullWidth");
|
||||
s.execute("text.setFormat", &json!({"glyphForm": "default"})).unwrap();
|
||||
assert!(runs(&s).iter().all(|r| r.style.glyph_form == GlyphForm::Default));
|
||||
assert!(serde_json::to_value(&runs(&s)[0].style).unwrap().get("glyphForm").is_none());
|
||||
// A character style carries the form.
|
||||
s.execute("charStyle.new", &json!({"name": "Old forms", "attrs": {"glyphForm": "jis83"}})).unwrap();
|
||||
s.execute("charStyle.apply", &json!({"name": "Old forms", "id": id})).unwrap();
|
||||
assert!(runs(&s).iter().all(|r| r.style.glyph_form == GlyphForm::Jis83));
|
||||
assert!(s.execute("charStyle.new", &json!({"name": "Bad", "attrs": {"glyphForm": "jis2004"}})).is_err());
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!(runs(&s).iter().all(|r| r.style.glyph_form == GlyphForm::Default));
|
||||
}
|
||||
|
||||
/// No Break is a character attribute, saved only when on.
|
||||
#[test]
|
||||
fn no_break_is_a_character_attribute_saved_only_when_on() {
|
||||
|
||||
@@ -30,7 +30,7 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
"Smart Punctuation…",
|
||||
["Type"],
|
||||
None,
|
||||
"{quotes?: true (straight quotes become the Document Setup quotes), dashes?: true (-- → en dash, --- → em dash), ellipsis?: true (... → …), scope?: \"selection\"|\"document\"} → {changed}",
|
||||
"{fiLigatures?: false (ff, fi, ffi → the ligatures U+FB00, U+FB01, U+FB03), flLigatures?: false (ff, fl, ffl → U+FB00, U+FB02, U+FB04), quotes?: true (straight quotes become the Document Setup quotes), spaces?: false (two or more spaces after a period → one), dashes?: true (-- → en dash, --- → em dash), ellipsis?: true (... → …), fractions?: false (1/2, 1/4, 3/4 and the other fractions Unicode encodes as one character, with no digit, slash or decimal point next to them, → ½, ¼, ¾ …), scope?: \"selection\"|\"document\"} the selected type, or every text object with scope document or nothing selected; a ligature or a fraction is written only where the run's font has a glyph for it. Nothing to replace records no undo step → {changed: text objects changed, replaced: {fiLigatures, flLigatures, quotes, spaces, dashes, ellipses, fractions}: how many of each were replaced}",
|
||||
has_doc,
|
||||
smart_punctuation
|
||||
),
|
||||
@@ -268,24 +268,227 @@ fn change_case(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
|
||||
// ---------- Smart Punctuation ----------
|
||||
|
||||
#[derive(Default)]
|
||||
struct PunctState {
|
||||
prev: Option<char>,
|
||||
/// What Smart Punctuation replaces: each option of its dialog.
|
||||
struct Punct {
|
||||
/// ff, fi and ffi become the ligatures U+FB00, U+FB01 and U+FB03.
|
||||
fi_ligatures: bool,
|
||||
/// ff, fl and ffl become the ligatures U+FB00, U+FB02 and U+FB04.
|
||||
fl_ligatures: bool,
|
||||
/// Straight quotes become these quotes (the Document Setup quotes).
|
||||
quotes: Option<Quotes>,
|
||||
/// Two or more spaces after a period become one.
|
||||
spaces: bool,
|
||||
/// `--` becomes an en dash and `---` an em dash.
|
||||
dashes: bool,
|
||||
/// `...` becomes an ellipsis.
|
||||
ellipses: bool,
|
||||
/// `1/2` and the other fractions [`FRACTIONS`] lists become their one-character forms.
|
||||
fractions: bool,
|
||||
}
|
||||
|
||||
/// Dashes (`--` en, `---` em), ellipses and, with `quotes`, typographer's quotes.
|
||||
pub(crate) fn smarten(text: &str, prev: &mut Option<char>, quotes: Option<&Quotes>, dashes: bool, ellipsis: bool) -> String {
|
||||
let mut s = text.to_string();
|
||||
if dashes {
|
||||
s = s.replace("---", "—").replace("--", "–");
|
||||
/// How many of each replacement Smart Punctuation made.
|
||||
#[derive(Default)]
|
||||
struct PunctCounts {
|
||||
fi_ligatures: usize,
|
||||
fl_ligatures: usize,
|
||||
quotes: usize,
|
||||
spaces: usize,
|
||||
dashes: usize,
|
||||
ellipses: usize,
|
||||
fractions: usize,
|
||||
}
|
||||
|
||||
/// The text before the run being rewritten, across the runs of one text object.
|
||||
#[derive(Default)]
|
||||
struct PunctState {
|
||||
/// The character before the run.
|
||||
prev: Option<char>,
|
||||
/// The number of spaces since the last period, while only spaces follow it.
|
||||
after_period: Option<usize>,
|
||||
/// An inline graphic comes right before the run.
|
||||
after_graphic: bool,
|
||||
}
|
||||
|
||||
/// The fractions Expert Fractions writes as one character: every fraction Unicode encodes as a
|
||||
/// vulgar fraction with a numerator of 1 to 7 and a denominator of 2 to 10.
|
||||
const FRACTIONS: [(&str, char); 18] = [
|
||||
("1/2", '½'),
|
||||
("1/3", '⅓'),
|
||||
("2/3", '⅔'),
|
||||
("1/4", '¼'),
|
||||
("3/4", '¾'),
|
||||
("1/5", '⅕'),
|
||||
("2/5", '⅖'),
|
||||
("3/5", '⅗'),
|
||||
("4/5", '⅘'),
|
||||
("1/6", '⅙'),
|
||||
("5/6", '⅚'),
|
||||
("1/7", '⅐'),
|
||||
("1/8", '⅛'),
|
||||
("3/8", '⅜'),
|
||||
("5/8", '⅝'),
|
||||
("7/8", '⅞'),
|
||||
("1/9", '⅑'),
|
||||
("1/10", '⅒'),
|
||||
];
|
||||
|
||||
/// `s` with every `from` replaced by `to`, adding the number replaced to `n`.
|
||||
fn replace_counted(s: String, from: &str, to: &str, n: &mut usize) -> String {
|
||||
let found = s.matches(from).count();
|
||||
if found == 0 {
|
||||
return s;
|
||||
}
|
||||
if ellipsis {
|
||||
s = s.replace("...", "…");
|
||||
*n += found;
|
||||
s.replace(from, to)
|
||||
}
|
||||
|
||||
/// Smart Spaces: `text` without the second and later spaces after a period, adding the number of
|
||||
/// periods whose spaces it shortened to `n`. `after` carries the spaces after a period from one run
|
||||
/// to the next.
|
||||
fn smart_spaces(text: &str, after: &mut Option<usize>, n: &mut usize) -> String {
|
||||
let mut out = String::with_capacity(text.len());
|
||||
for c in text.chars() {
|
||||
match (c, *after) {
|
||||
(' ', Some(k)) => {
|
||||
*after = Some(k + 1);
|
||||
if k >= 1 {
|
||||
if k == 1 {
|
||||
*n += 1;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
('.', _) => *after = Some(0),
|
||||
_ => *after = None,
|
||||
}
|
||||
out.push(c);
|
||||
}
|
||||
match quotes {
|
||||
Some(q) => q.apply(&s, prev),
|
||||
out
|
||||
}
|
||||
|
||||
/// The fraction `cs` starts with, and its length in characters: one of [`FRACTIONS`] that no digit,
|
||||
/// slash or decimal part follows, so `1/25`, `1/2/2026` and `1/2.5` are left as they are. A digit
|
||||
/// counts in any script.
|
||||
fn fraction_at(cs: &[char]) -> Option<(usize, char)> {
|
||||
FRACTIONS.iter().find_map(|(text, f)| {
|
||||
let len = text.chars().count();
|
||||
if cs.len() < len || !cs[..len].iter().copied().eq(text.chars()) {
|
||||
return None;
|
||||
}
|
||||
let ends = match &cs[len..] {
|
||||
[c, ..] if c.is_numeric() || *c == '/' => false,
|
||||
['.' | ',', d, ..] if d.is_numeric() => false,
|
||||
_ => true,
|
||||
};
|
||||
ends.then_some((len, *f))
|
||||
})
|
||||
}
|
||||
|
||||
/// Expert Fractions: `text` with each fraction [`fraction_at`] finds, and no digit, slash or
|
||||
/// decimal point before, written as one character when `covers` it. `prev` is the character before
|
||||
/// `text`, and `next` the two characters after it (in the next runs), so a fraction at the end of
|
||||
/// a run is checked against what follows it.
|
||||
fn expert_fractions(text: &str, prev: Option<char>, next: [Option<char>; 2], covers: &mut impl FnMut(char) -> bool, n: &mut usize) -> String {
|
||||
let mut cs: Vec<char> = text.chars().collect();
|
||||
let len_text = cs.len();
|
||||
cs.extend(next.into_iter().flatten());
|
||||
let mut out = String::with_capacity(text.len());
|
||||
let mut i = 0;
|
||||
while i < len_text {
|
||||
let before = if i == 0 { prev } else { Some(cs[i - 1]) };
|
||||
let free = !before.is_some_and(|c| c.is_numeric() || matches!(c, '/' | '.' | ','));
|
||||
let found = fraction_at(&cs[i..]).filter(|(len, f)| i + len <= len_text && covers(*f));
|
||||
if free && let Some((len, f)) = found {
|
||||
out.push(f);
|
||||
*n += 1;
|
||||
i += len;
|
||||
continue;
|
||||
}
|
||||
out.push(cs[i]);
|
||||
i += 1;
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// The ligatures and their letters, longest first, with whether each comes with the ff, fi, ffi
|
||||
/// option (else with the ff, fl, ffl option). ff comes with both.
|
||||
const LIGATURES: [(&str, char, bool); 5] =
|
||||
[("ffi", '\u{FB03}', true), ("ffl", '\u{FB04}', false), ("ff", '\u{FB00}', true), ("fi", '\u{FB01}', true), ("fl", '\u{FB02}', false)];
|
||||
|
||||
/// The ligature options: `text` with the letters of each ligature an option `o` asks for written
|
||||
/// as the ligature, the longest first, when `covers` it.
|
||||
fn ligatures(text: &str, o: &Punct, covers: &mut impl FnMut(char) -> bool, n: &mut PunctCounts) -> String {
|
||||
let cs: Vec<char> = text.chars().collect();
|
||||
let mut out = String::with_capacity(text.len());
|
||||
let mut i = 0;
|
||||
while i < cs.len() {
|
||||
let found = (cs[i] == 'f').then(|| {
|
||||
LIGATURES.iter().find(|(letters, lig, fi)| {
|
||||
let on = if *letters == "ff" {
|
||||
o.fi_ligatures || o.fl_ligatures
|
||||
} else if *fi {
|
||||
o.fi_ligatures
|
||||
} else {
|
||||
o.fl_ligatures
|
||||
};
|
||||
let len = letters.chars().count();
|
||||
on && cs.len() - i >= len && cs[i..i + len].iter().copied().eq(letters.chars()) && covers(*lig)
|
||||
})
|
||||
});
|
||||
if let Some(&(letters, lig, fi)) = found.flatten() {
|
||||
out.push(lig);
|
||||
// ff counts with the ff, fi, ffi option when that option is on.
|
||||
if fi && (letters != "ff" || o.fi_ligatures) {
|
||||
n.fi_ligatures += 1;
|
||||
} else {
|
||||
n.fl_ligatures += 1;
|
||||
}
|
||||
i += letters.chars().count();
|
||||
continue;
|
||||
}
|
||||
out.push(cs[i]);
|
||||
i += 1;
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// One run's text with the replacements `o` asks for, counted in `n`. Ligatures and fractions are
|
||||
/// written only where the run's font has a glyph for them. `next` holds the two characters after
|
||||
/// the run.
|
||||
fn smarten(text: &str, style: &CharStyle, next: [Option<char>; 2], o: &Punct, st: &mut PunctState, n: &mut PunctCounts) -> String {
|
||||
let mut s = if o.spaces { smart_spaces(text, &mut st.after_period, &mut n.spaces) } else { text.to_string() };
|
||||
if o.dashes {
|
||||
s = replace_counted(s, "---", "—", &mut n.dashes);
|
||||
s = replace_counted(s, "--", "–", &mut n.dashes);
|
||||
}
|
||||
if o.ellipses {
|
||||
s = replace_counted(s, "...", "…", &mut n.ellipses);
|
||||
}
|
||||
// The run's font, looked up once and only for a ligature or a fraction.
|
||||
let mut face = None;
|
||||
let mut covers = |c: char| {
|
||||
face.get_or_insert_with(|| {
|
||||
vectorcraft_text::FontDb::global().face_version(&style.font_family, &style.font_style, style.font_version.as_deref())
|
||||
})
|
||||
.as_ref()
|
||||
.is_some_and(|f| f.covers(c))
|
||||
};
|
||||
if o.fractions && s.contains('/') {
|
||||
let before = if st.after_graphic { None } else { st.prev };
|
||||
s = expert_fractions(&s, before, next, &mut covers, &mut n.fractions);
|
||||
}
|
||||
st.after_graphic = false;
|
||||
if (o.fi_ligatures || o.fl_ligatures) && s.contains('f') {
|
||||
s = ligatures(&s, o, &mut covers, n);
|
||||
}
|
||||
match &o.quotes {
|
||||
Some(q) => {
|
||||
let out = q.apply(&s, &mut st.prev);
|
||||
n.quotes += s.chars().zip(out.chars()).filter(|(a, b)| a != b).count();
|
||||
out
|
||||
}
|
||||
None => {
|
||||
*prev = s.chars().last().or(*prev);
|
||||
st.prev = s.chars().last().or(st.prev);
|
||||
s
|
||||
}
|
||||
}
|
||||
@@ -293,12 +496,20 @@ pub(crate) fn smarten(text: &str, prev: &mut Option<char>, quotes: Option<&Quote
|
||||
|
||||
fn smart_punctuation(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
const C: &str = "type.smartPunctuation";
|
||||
let (d, e) = (switch_or(p, "dashes", true, C)?, switch_or(p, "ellipsis", true, C)?);
|
||||
let quotes = switch_or(p, "quotes", true, C)?;
|
||||
let mut o = Punct {
|
||||
fi_ligatures: switch_or(p, "fiLigatures", false, C)?,
|
||||
fl_ligatures: switch_or(p, "flLigatures", false, C)?,
|
||||
quotes: None,
|
||||
spaces: switch_or(p, "spaces", false, C)?,
|
||||
dashes: switch_or(p, "dashes", true, C)?,
|
||||
ellipses: switch_or(p, "ellipsis", true, C)?,
|
||||
fractions: switch_or(p, "fractions", false, C)?,
|
||||
};
|
||||
let document = choice(p, C, "scope", &["selection", "document"])? == Some("document");
|
||||
let st = s.doc()?;
|
||||
// Quotes in the document's style (Document Setup → Type).
|
||||
let q = quotes.then_some(st.doc.setup.quotes);
|
||||
o.quotes = quotes.then_some(st.doc.setup.quotes);
|
||||
let ids = if document || st.selection.is_empty() {
|
||||
let mut v = vec![];
|
||||
st.doc.walk(|n| {
|
||||
@@ -310,8 +521,93 @@ fn smart_punctuation(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
} else {
|
||||
text_ids(&st.doc, &st.selection.objects)
|
||||
};
|
||||
let n = edit_runs::<PunctState>(s, "Smart Punctuation", &ids, |text, st| smarten(text, &mut st.prev, q.as_ref(), d, e))?;
|
||||
Ok(json!({ "changed": n }))
|
||||
let mut n = PunctCounts::default();
|
||||
let changed = super::overprint::edit_counted(s, "Smart Punctuation", |d| {
|
||||
let mut changed = 0;
|
||||
for id in &ids {
|
||||
let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
|
||||
let mut st = PunctState::default();
|
||||
let mut any = false;
|
||||
// The ruby spans' ends, in the plain text as it was. Each run is rewritten in pieces
|
||||
// between them, so no replacement crosses one, and `moved` records where each end and
|
||||
// each run's start lands in the new text.
|
||||
let mut edges: Vec<usize> = t.ruby.iter().flat_map(|r| [r.start, r.end]).collect();
|
||||
edges.sort_unstable();
|
||||
edges.dedup();
|
||||
let mut moved = vec![];
|
||||
let (mut old_at, mut new_at) = (0, 0);
|
||||
// Inline graphics are art, not characters to rewrite. Each run sees the first two
|
||||
// characters of the runs after it, up to the next inline graphic, as they were.
|
||||
for i in 0..t.runs.len() {
|
||||
let len = t.runs[i].text.len();
|
||||
moved.push((old_at, new_at));
|
||||
if t.runs[i].inline.is_some() {
|
||||
// A graphic separates the characters on either side of it for Smart Spaces and
|
||||
// Expert Fractions; quotes still read the character before it.
|
||||
st.after_period = None;
|
||||
st.after_graphic = true;
|
||||
(old_at, new_at) = (old_at + len, new_at + len);
|
||||
continue;
|
||||
}
|
||||
let mut after = t.runs[i + 1..].iter().take_while(|r| r.inline.is_none()).flat_map(|r| r.text.chars());
|
||||
let following = [after.next(), after.next()];
|
||||
// Smart Spaces counts no space across a ruby span's end, so it removes no space on
|
||||
// the other side of one.
|
||||
if edges.binary_search(&old_at).is_ok() {
|
||||
st.after_period = None;
|
||||
}
|
||||
let r = &mut t.runs[i];
|
||||
let mut cuts: Vec<usize> =
|
||||
edges.iter().filter(|&&e| e > old_at && e < old_at + len && r.text.is_char_boundary(e - old_at)).map(|e| e - old_at).collect();
|
||||
cuts.push(len);
|
||||
let mut new = String::with_capacity(len);
|
||||
let mut from = 0;
|
||||
for cut in cuts {
|
||||
if from > 0 {
|
||||
moved.push((old_at + from, new_at + new.len()));
|
||||
st.after_period = None;
|
||||
}
|
||||
let mut after = r.text[cut..].chars().chain(following.into_iter().flatten());
|
||||
let next = [after.next(), after.next()];
|
||||
new.push_str(&smarten(&r.text[from..cut], &r.style, next, &o, &mut st, &mut n));
|
||||
from = cut;
|
||||
}
|
||||
(old_at, new_at) = (old_at + len, new_at + new.len());
|
||||
if new != r.text {
|
||||
r.text = new;
|
||||
any = true;
|
||||
}
|
||||
}
|
||||
moved.push((old_at, new_at));
|
||||
if any {
|
||||
changed += 1;
|
||||
// Each ruby end moves with the text before it; an end inside a character keeps its
|
||||
// distance from the last place recorded before it.
|
||||
let to_new = |v: usize| {
|
||||
let k = moved.partition_point(|&(old, _)| old <= v).saturating_sub(1);
|
||||
moved.get(k).map_or(v, |&(old, new)| new + (v - old.min(v)))
|
||||
};
|
||||
for span in &mut t.ruby {
|
||||
(span.start, span.end) = (to_new(span.start), to_new(span.end));
|
||||
}
|
||||
t.normalize_ruby();
|
||||
refresh_bounds(t);
|
||||
}
|
||||
}
|
||||
Ok(changed)
|
||||
})?;
|
||||
Ok(json!({
|
||||
"changed": changed,
|
||||
"replaced": {
|
||||
"fiLigatures": n.fi_ligatures,
|
||||
"flLigatures": n.fl_ligatures,
|
||||
"quotes": n.quotes,
|
||||
"spaces": n.spaces,
|
||||
"dashes": n.dashes,
|
||||
"ellipses": n.ellipses,
|
||||
"fractions": n.fractions,
|
||||
},
|
||||
}))
|
||||
}
|
||||
|
||||
// ---------- Area / Point conversion ----------
|
||||
|
||||
@@ -222,11 +222,11 @@ pub fn written_elsewhere(path: &str) -> bool {
|
||||
!cfg!(windows) && foreign && current().is_some()
|
||||
}
|
||||
|
||||
/// Does a command param named `key` hold a file or folder path: `path`, `paths`, `file`, `files`,
|
||||
/// `folder`, or a name ending in `Path`, `Paths`, `File`, `Files` or `Folder` (`diffPath`,
|
||||
/// `destinationFolder`)?
|
||||
/// Does a command param named `key` hold a file or folder path in a command that gives it no other
|
||||
/// meaning ([`crate::cmd::key_location`]: `path`, `file`, `diffPath`, `destinationFolder` and the
|
||||
/// like)? [`crate::cmd::ParamsPlace`] tells what it holds in a given command.
|
||||
pub fn is_path_key(key: &str) -> bool {
|
||||
matches!(key, "path" | "paths" | "file" | "files" | "folder") || ["Path", "Paths", "File", "Files", "Folder"].iter().any(|end| key.ends_with(end))
|
||||
crate::cmd::key_location(key).is_some()
|
||||
}
|
||||
|
||||
/// May `path` be written here? Always, without roots in force.
|
||||
|
||||
@@ -24,6 +24,9 @@ pub struct Interaction {
|
||||
/// The perspective transform the previews make (`perspective.transform` params): Transform
|
||||
/// Again repeats it once the drag is committed.
|
||||
pub perspective_again: Option<Value>,
|
||||
/// A preview drew an object on, or attached one to, a plane held by Automatic Plane
|
||||
/// Positioning: the plane goes back to its place once the drag is committed.
|
||||
pub(crate) plane_placed: bool,
|
||||
/// A transform or a perspective edit with `copy` keeps the copies it made of the snapshot here
|
||||
/// ([`PreviewCopies`]).
|
||||
pub(crate) copies: Option<Arc<PreviewCopies>>,
|
||||
|
||||
@@ -24,6 +24,8 @@ impl Session {
|
||||
});
|
||||
// Clicks find an image's own fills and strokes where their effects draw them.
|
||||
vectorcraft_doc::hit::set_image_paint(vectorcraft_render::effects::image_paint);
|
||||
// Clicks inside a clip group fall in the region its clipping path's effects give it.
|
||||
vectorcraft_doc::hit::set_clip_region(vectorcraft_render::effects::reshaped_clip_outline);
|
||||
// Clicks find a blend's steps and an envelope's distorted art where the canvas draws them,
|
||||
// evaluated again when the fonts, the hyphenation exceptions or the plug-ins change.
|
||||
vectorcraft_doc::hit::set_live_art(vectorcraft_render::effects::expand_live, || {
|
||||
@@ -329,6 +331,8 @@ impl Session {
|
||||
// Ruler guides a reader left in the saved list become nodes on their layers.
|
||||
doc.guides_into_nodes();
|
||||
cmd::dimension::conform(&mut doc);
|
||||
// A plane held by Automatic Plane Positioning when the file was saved is back in its place.
|
||||
vectorcraft_tools::distort::perspective::PerspectiveGrid::end_positioning(&mut doc);
|
||||
self.reset_tool_for_doc_switch();
|
||||
let mut st = DocState::new(doc, path);
|
||||
st.history.limit = self.prefs.history_states as usize;
|
||||
@@ -357,6 +361,7 @@ impl Session {
|
||||
doc.resolve_inline_art();
|
||||
doc.guides_into_nodes();
|
||||
cmd::dimension::conform(&mut doc);
|
||||
vectorcraft_tools::distort::perspective::PerspectiveGrid::end_positioning(&mut doc);
|
||||
// In the back, type set in a font named like a composite font is measured again below, in
|
||||
// the document's own composite fonts, not in the front document's.
|
||||
let back = self.active != Some(index);
|
||||
|
||||
@@ -289,6 +289,7 @@ impl Session {
|
||||
variables_highlight: st.variables_highlight.clone(),
|
||||
isolation: st.isolation,
|
||||
perspective_again: None,
|
||||
plane_placed: false,
|
||||
copies: None,
|
||||
move_box: std::sync::OnceLock::new(),
|
||||
});
|
||||
@@ -319,6 +320,7 @@ impl Session {
|
||||
it.preview_paint = None;
|
||||
it.color_mode_paints = None;
|
||||
it.deferred_color_mode = None;
|
||||
it.plane_placed = false;
|
||||
if selection_changed {
|
||||
st.selection.clone_from(&it.selection);
|
||||
}
|
||||
@@ -378,6 +380,7 @@ impl Session {
|
||||
after.clone_from(&paint);
|
||||
}
|
||||
let perspective_again = it.perspective_again.take();
|
||||
let plane_placed = it.plane_placed;
|
||||
let copy = preview.0 == "object.transform" && preview.1.get("copy").and_then(Value::as_bool).unwrap_or(false);
|
||||
// Alt pressed or released during a move drag turns it into a copy or back: name it for
|
||||
// what it did in the end.
|
||||
@@ -395,6 +398,12 @@ impl Session {
|
||||
preview.1.get("dy").and_then(Value::as_f64).unwrap_or(0.0),
|
||||
);
|
||||
st.keep_interaction(it);
|
||||
// The drag drew an object on, or attached one to, the plane Automatic Plane Positioning
|
||||
// held: the plane is back in its place now, as view state (undoing the drag holds it again).
|
||||
if plane_placed && changed && vectorcraft_tools::distort::perspective::PerspectiveGrid::positioning(&st.doc) {
|
||||
vectorcraft_tools::distort::perspective::PerspectiveGrid::end_positioning(Arc::make_mut(&mut st.doc));
|
||||
st.revision += 1;
|
||||
}
|
||||
if preview.0 == "object.transform" && changed {
|
||||
let m = cmd::matrix_param(&preview.1, "matrix");
|
||||
if let Some(m) = m {
|
||||
|
||||
@@ -128,6 +128,7 @@ mod pdffidelity;
|
||||
mod pdfmarks;
|
||||
mod pdfpresets;
|
||||
mod pdfraster;
|
||||
mod persp_infer;
|
||||
mod persp_planes;
|
||||
pub(super) mod persp_select;
|
||||
mod persp_text;
|
||||
|
||||
@@ -1490,6 +1490,93 @@ fn shape_builder_open_filled_paths_cut_without_open_filled_as_closed() {
|
||||
assert!((area(&s, NodeId(r["merged"].as_u64().unwrap())) - 5000.0).abs() < 1e-6);
|
||||
}
|
||||
|
||||
/// The fill rows of an open path's appearance (bottom first) for the open-path tests below, with
|
||||
/// a 1 pt black stroke on top: a painted fill under an unpainted top fill, a painted fill that is
|
||||
/// hidden, one with an opacity of 0, and a painted fill under a hidden painted top fill.
|
||||
fn open_path_fill_stacks() -> [(&'static str, Vec<AppearanceItem>, bool); 4] {
|
||||
use vectorcraft_doc::{FillLayer, StrokeLayer};
|
||||
let fill = |p: Paint, visible: bool, opacity: f32| {
|
||||
let mut f = FillLayer::new(p);
|
||||
f.visible = visible;
|
||||
f.opacity = opacity;
|
||||
AppearanceItem::Fill(f)
|
||||
};
|
||||
let red = || Paint::solid(Color::rgb(1.0, 0.0, 0.0));
|
||||
let blue = || Paint::solid(Color::rgb(0.0, 0.0, 1.0));
|
||||
let stroke = || AppearanceItem::Stroke(StrokeLayer::new(Paint::solid(Color::BLACK), 1.0));
|
||||
[
|
||||
("a painted fill under an unpainted top fill", vec![fill(red(), true, 1.0), fill(Paint::None, true, 1.0), stroke()], true),
|
||||
("a hidden painted fill", vec![fill(red(), false, 1.0), stroke()], false),
|
||||
("a painted fill with an opacity of 0", vec![fill(red(), true, 0.0), stroke()], false),
|
||||
("a painted fill under a hidden painted top fill", vec![fill(red(), true, 1.0), fill(blue(), false, 1.0), stroke()], true),
|
||||
]
|
||||
}
|
||||
|
||||
/// Consider Open Filled Paths as Closed: an open path counts as filled when any of its fill rows
|
||||
/// draws (shown, painted and above 0% opacity), whichever row is on top. The map, a merge inside
|
||||
/// the area and what a merge keeps of the path follow the rows that draw; with the option off, none
|
||||
/// of the paths closes.
|
||||
#[test]
|
||||
fn shape_builder_closes_open_paths_by_the_fill_rows_that_draw() {
|
||||
for (what, items, closes) in open_path_fill_stacks() {
|
||||
let mut s = session();
|
||||
let r = s.execute("path.create", &json!({"anchors": [{"x": 0, "y": 0}, {"x": 100, "y": 0}, {"x": 100, "y": 100}]})).unwrap();
|
||||
let p = NodeId(r["id"].as_u64().unwrap());
|
||||
s.edit("t", |d, _| {
|
||||
d.node_mut(p).unwrap().appearance.items = items;
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
s.execute("select.set", &json!({"ids": [p.0]})).unwrap();
|
||||
let r = s.execute("shapeBuilder.regions", &json!({})).unwrap();
|
||||
assert_eq!(
|
||||
(r["regions"].as_array().unwrap().len(), r["lines"].as_array().unwrap().len()),
|
||||
if closes { (1, 0) } else { (0, 1) },
|
||||
"{what}: {r}"
|
||||
);
|
||||
let r = s.execute("shapeBuilder.regions", &json!({"openFilledAsClosed": false})).unwrap();
|
||||
assert_eq!((r["regions"].as_array().unwrap().len(), r["lines"].as_array().unwrap().len()), (0, 1), "{what}, option off: {r}");
|
||||
let n = node(&s, p);
|
||||
for on in [true, false] {
|
||||
let inputs = vectorcraft_tools::builder::merge_inputs(&[&n], on);
|
||||
assert_eq!(inputs.iter().map(|i| i.fill_closes).collect::<Vec<_>>(), vec![closes && on], "{what}, option {on}");
|
||||
}
|
||||
let merged = s.execute("shapeBuilder.merge", &json!({"points": [[75, 25]]}));
|
||||
if closes {
|
||||
assert!((area(&s, NodeId(merged.unwrap()["merged"].as_u64().unwrap())) - 5000.0).abs() < 1e-6, "{what}");
|
||||
} else {
|
||||
assert!(merged.is_err(), "{what}: the open path encloses no region");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Clicking Stroke Splits the Path on the middle side of an open U cuts it along the outline its
|
||||
/// drawn fill closes: with a fill row that draws, what is left runs on from the cut round the
|
||||
/// implied closing edge (the top side, then the bottom side); without one, what is left is the
|
||||
/// open path's two ends in path order (the bottom side, then the top side).
|
||||
#[test]
|
||||
fn shape_builder_stroke_split_closes_open_paths_by_the_fill_rows_that_draw() {
|
||||
for (what, items, closes) in open_path_fill_stacks() {
|
||||
let mut s = session();
|
||||
let r =
|
||||
s.execute("path.create", &json!({"anchors": [{"x": 0, "y": 0}, {"x": 100, "y": 0}, {"x": 100, "y": 100}, {"x": 0, "y": 100}]})).unwrap();
|
||||
let p = NodeId(r["id"].as_u64().unwrap());
|
||||
s.edit("t", |d, _| {
|
||||
d.node_mut(p).unwrap().appearance.items = items;
|
||||
Ok(())
|
||||
})
|
||||
.unwrap();
|
||||
s.execute("select.set", &json!({"ids": [p.0]})).unwrap();
|
||||
let r = s.execute("shapeBuilder.merge", &json!({"points": [[101, 50]], "splitStroke": true})).unwrap();
|
||||
let out = ids(&r);
|
||||
assert_eq!(shapes_of(&s, &out), vec![(false, 4, 200.0), (false, 2, 100.0)], "{what}");
|
||||
let (rest, _) = outline(&node(&s, out[0]));
|
||||
let starts: Vec<(f64, f64)> = rest.subpaths.iter().map(|sp| (sp.anchors[0].p.x.round(), sp.anchors[0].p.y.round())).collect();
|
||||
let order = if closes { vec![(100.0, 100.0), (0.0, 0.0)] } else { vec![(0.0, 0.0), (100.0, 100.0)] };
|
||||
assert_eq!(starts, order, "{what}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Pick Color From Color Swatches: the merged shape takes the current fill, not the fill of the
|
||||
/// object under the first point; setting the current fill without `ids` leaves the selection's.
|
||||
#[test]
|
||||
@@ -4607,6 +4694,58 @@ fn shape_builder_uses_the_filled_faces_of_a_live_paint_group() {
|
||||
assert!((stroked_length(&s, &out) - 600.0).abs() < 1.0, "{}", stroked_length(&s, &out));
|
||||
}
|
||||
|
||||
/// The Shape Builder takes a Live Paint face or edge when any of its fill or stroke rows draws,
|
||||
/// whichever row is on top: a painted lower row under an unpainted top row counts, and a part
|
||||
/// whose only painted row is hidden, transparent or (for an edge) 0 pt wide, or whose own opacity
|
||||
/// is 0, does not.
|
||||
#[test]
|
||||
fn shape_builder_takes_the_live_paint_faces_and_edges_that_draw() {
|
||||
use vectorcraft_doc::{FillLayer, StrokeLayer};
|
||||
let fill = |p: Paint| AppearanceItem::Fill(FillLayer::new(p));
|
||||
let stroke = |p: Paint, w: f64| AppearanceItem::Stroke(StrokeLayer::new(p, w));
|
||||
let red = || Paint::solid(Color::rgb(1.0, 0.0, 0.0));
|
||||
let hidden = |mut i: AppearanceItem| {
|
||||
match &mut i {
|
||||
AppearanceItem::Fill(f) => f.visible = false,
|
||||
AppearanceItem::Stroke(st) => st.visible = false,
|
||||
}
|
||||
i
|
||||
};
|
||||
let clear = |mut i: AppearanceItem| {
|
||||
match &mut i {
|
||||
AppearanceItem::Fill(f) => f.opacity = 0.0,
|
||||
AppearanceItem::Stroke(st) => st.opacity = 0.0,
|
||||
}
|
||||
i
|
||||
};
|
||||
let mut s = session();
|
||||
let g = live(&mut s);
|
||||
let lower_fill = set_live_part(&mut s, g, Some((25.0, 50.0)), None, vec![fill(red()), fill(Paint::None)], 1.0);
|
||||
let hidden_fill = set_live_part(&mut s, g, Some((125.0, 50.0)), None, vec![hidden(fill(red()))], 1.0);
|
||||
let clear_fill = set_live_part(&mut s, g, Some((75.0, 50.0)), None, vec![clear(fill(red()))], 1.0);
|
||||
let lower_stroke = set_live_part(&mut s, g, None, Some((0.0, 50.0)), vec![stroke(red(), 2.0), stroke(Paint::None, 1.0)], 1.0);
|
||||
let hidden_stroke = set_live_part(&mut s, g, None, Some((150.0, 50.0)), vec![hidden(stroke(red(), 2.0))], 1.0);
|
||||
let thin_stroke = set_live_part(&mut s, g, None, Some((100.0, 50.0)), vec![stroke(red(), 0.0)], 1.0);
|
||||
let clear_stroke = set_live_part(&mut s, g, None, Some((50.0, 50.0)), vec![clear(stroke(red(), 2.0))], 1.0);
|
||||
let clear_edge = set_live_part(&mut s, g, None, Some((75.0, 0.0)), vec![stroke(red(), 2.0)], 0.0);
|
||||
let parts = [lower_fill, hidden_fill, clear_fill, lower_stroke, hidden_stroke, thin_stroke, clear_stroke, clear_edge];
|
||||
assert_eq!(parts.iter().collect::<std::collections::HashSet<_>>().len(), parts.len());
|
||||
let d = s.doc().unwrap();
|
||||
let (_, leaves) = vectorcraft_tools::builder::shape_builder_shapes(&d.doc, &[g], true);
|
||||
let taken: Vec<NodeId> = leaves.iter().map(|l| l.id).collect();
|
||||
assert!(taken.contains(&lower_fill) && taken.contains(&lower_stroke), "a painted lower row draws: {taken:?}");
|
||||
for id in [hidden_fill, clear_fill, hidden_stroke, thin_stroke, clear_stroke, clear_edge] {
|
||||
assert!(!taken.contains(&id), "{id:?} draws nothing: {taken:?}");
|
||||
}
|
||||
// A face with a painted fill whose own opacity is 0 is left out too.
|
||||
let mut s = session();
|
||||
let g = live(&mut s);
|
||||
let clear_face = set_live_part(&mut s, g, Some((75.0, 50.0)), None, vec![fill(red())], 0.0);
|
||||
let d = s.doc().unwrap();
|
||||
let (_, leaves) = vectorcraft_tools::builder::shape_builder_shapes(&d.doc, &[g], true);
|
||||
assert!(!leaves.iter().any(|l| l.id == clear_face), "a face with an opacity of 0 draws nothing");
|
||||
}
|
||||
|
||||
/// An edge that closes on itself is a line around its face, not a second shape over it.
|
||||
#[test]
|
||||
fn shape_builder_takes_a_closed_live_paint_edge_as_a_line() {
|
||||
|
||||
@@ -119,12 +119,80 @@ fn text_on_top_clips_by_its_glyphs() {
|
||||
assert_eq!(hit(&s, (b.x0 + b.x1) / 2.0, (b.y0 + b.y1) / 2.0), Some(art));
|
||||
assert!(b.x1 < 95.0, "{b:?}");
|
||||
assert_eq!(hit(&s, b.x1 + 3.0, (b.y0 + b.y1) / 2.0), None, "beside the text");
|
||||
// An effect that does not reshape it, such as a drop shadow, leaves clicks on its frame.
|
||||
s.execute("effect.apply", &json!({"effect": "stylize.dropShadow", "params": {}, "ids": [t.0], "item": null})).unwrap();
|
||||
assert_eq!(hit(&s, (b.x0 + b.x1) / 2.0, (b.y0 + b.y1) / 2.0), Some(art), "in the counter, with a drop shadow");
|
||||
// Release gives the text back.
|
||||
select(&mut s, &[g]);
|
||||
s.execute("object.clippingMask.release", &json!({})).unwrap();
|
||||
assert!(matches!(s.doc().unwrap().doc.node(t).unwrap().kind, NodeKind::Text(_)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_hidden_member_of_a_clipping_group_leaves_clicks_on_the_type_frame() {
|
||||
// The clipping path is a group of an "O" and a hidden rectangle with a Transform effect. The
|
||||
// hidden rectangle does not clip, so clicks inside the clip group still count the type by its
|
||||
// frame, the counter of the "O" included.
|
||||
let mut s = session();
|
||||
let art = id_of(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 100})).unwrap());
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 5, "y": 80, "text": "O", "size": 90})).unwrap());
|
||||
let b = s.doc().unwrap().doc.node(t).unwrap().geometric_bounds().unwrap();
|
||||
let r = id_of(&s.execute("shape.rectangle", &json!({"x": 40, "y": 40, "width": 10, "height": 10})).unwrap());
|
||||
s.execute("effect.apply", &json!({"effect": "distort.transform", "params": {"moveH": 20}, "ids": [r.0], "item": null})).unwrap();
|
||||
select(&mut s, &[art, t]);
|
||||
let g = id_of(&s.execute("object.clippingMask.make", &json!({})).unwrap());
|
||||
// Make Clipping Mask takes no group on top, so the group goes in place of the type.
|
||||
let mut d = (*s.doc().unwrap().doc).clone();
|
||||
let mut rect = (*d.remove(r).unwrap()).clone();
|
||||
rect.visible = false;
|
||||
let text = d.remove(t).unwrap();
|
||||
let group = vectorcraft_doc::Node::group(d.alloc_id(), vec![text, Arc::new(rect)]);
|
||||
d.insert(Some(g), 0, group).unwrap();
|
||||
let leaf = |x: f64, y: f64| vectorcraft_doc::hit::hit_test(&d, vectorcraft_geom::Point::new(x, y), Default::default()).map(|h| h.leaf);
|
||||
let middle = ((b.x0 + b.x1) / 2.0, (b.y0 + b.y1) / 2.0);
|
||||
assert_eq!(leaf(middle.0, middle.1), Some(art), "in the counter, inside the frame");
|
||||
assert_eq!(leaf(b.x1 + 3.0, middle.1), None, "beside the text");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clicks_follow_the_region_a_clipping_paths_effects_give_it() {
|
||||
// Art from 10 to 90 pt, clipped by the artboard's left half, which a Transform effect moves
|
||||
// 50 pt right: the art shows on the right half, as clicks find it.
|
||||
let mut s = session();
|
||||
let art = id_of(&s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 80, "height": 80})).unwrap());
|
||||
let clip = id_of(&s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 50, "height": 100})).unwrap());
|
||||
select(&mut s, &[art, clip]);
|
||||
let g = id_of(&s.execute("object.clippingMask.make", &json!({})).unwrap());
|
||||
s.execute("effect.apply", &json!({"effect": "distort.transform", "params": {"moveH": 50}, "ids": [clip.0], "item": null})).unwrap();
|
||||
let r = render(&s);
|
||||
assert!(opaque(&r, 75, 50) && !opaque(&r, 25, 50), "the canvas clips by the moved region");
|
||||
assert_eq!(hit(&s, 75.0, 50.0), Some(art), "where the effect moved the clipping path");
|
||||
assert_eq!(hit(&s, 25.0, 50.0), None, "the clipping path's own place");
|
||||
let d = &s.doc().unwrap().doc;
|
||||
let at = |x: f64| vectorcraft_doc::hit::objects_at(d, vectorcraft_geom::Point::new(x, 50.0), Default::default(), None);
|
||||
assert_eq!(at(75.0), [g]);
|
||||
assert!(at(25.0).is_empty());
|
||||
// A marquee across the art's edge reaches it within the moved region only.
|
||||
let marquee = |x0: f64, x1: f64| vectorcraft_doc::hit::marquee(d, vectorcraft_geom::Rect::new(x0, 40.0, x1, 60.0), None, true);
|
||||
assert_eq!(marquee(85.0, 95.0), [art], "the right edge, in the moved region");
|
||||
assert!(marquee(5.0, 15.0).is_empty(), "the left edge, in the clipping path's own place");
|
||||
|
||||
// The same with a sublayer that clips by its first object.
|
||||
let mut d = (**d).clone();
|
||||
let members: Vec<_> = d.node(g).unwrap().children().unwrap().to_vec();
|
||||
let top = d.layers[0].id;
|
||||
d.remove(g).unwrap();
|
||||
let mut sublayer = (*d.layers[0]).clone();
|
||||
sublayer.id = d.alloc_id();
|
||||
if let NodeKind::Layer { children, clip, .. } = &mut sublayer.kind {
|
||||
(*children, *clip) = (members, true);
|
||||
}
|
||||
d.insert(Some(top), 0, sublayer).unwrap();
|
||||
let leaf = |x: f64| vectorcraft_doc::hit::hit_test(&d, vectorcraft_geom::Point::new(x, 50.0), Default::default()).map(|h| h.leaf);
|
||||
assert_eq!(leaf(75.0), Some(art));
|
||||
assert_eq!(leaf(25.0), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn make_refuses_a_top_object_that_cannot_clip() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -248,7 +248,42 @@ fn the_list_shows_each_image_with_its_status() {
|
||||
assert_eq!(run(&mut s, "links.list", json!({"show": "missing"}))["links"][0]["id"], linked.0);
|
||||
assert_eq!(run(&mut s, "links.list", json!({"sort": "name"}))["links"][0]["name"], "a.png");
|
||||
assert!(s.execute("links.list", &json!({"show": "broken"})).is_err());
|
||||
assert!(s.execute("links.list", &json!({"sort": "size"})).is_err());
|
||||
assert!(s.execute("links.list", &json!({"sort": "date"})).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sort_by_size_lists_the_smallest_file_first() {
|
||||
let dir = Folder::new("list-size");
|
||||
let files = [("a.png", png(600, 300, RED)), ("b.png", png(10, 10, BLUE)), ("c.png", png(100, 100, RED)), ("d.png", png(10, 10, BLUE))];
|
||||
let mut s = session();
|
||||
for (name, bytes) in &files {
|
||||
let path = dir.file(name);
|
||||
write(&path, bytes);
|
||||
place(&mut s, &path);
|
||||
}
|
||||
let e = dir.file("e.png");
|
||||
write(&e, &png(1, 1, RED));
|
||||
place_embedded(&mut s, &e);
|
||||
let names = |s: &mut Session| -> Vec<String> {
|
||||
let l = run(s, "links.list", json!({"sort": "size"}));
|
||||
l["links"].as_array().unwrap().iter().map(|r| r["name"].as_str().unwrap_or_default().to_string()).collect()
|
||||
};
|
||||
// Smallest first, equal sizes by name, the embedded image (no file) last.
|
||||
let mut want: Vec<(usize, &str)> = files.iter().map(|(n, b)| (b.len(), *n)).collect();
|
||||
want.sort();
|
||||
assert!(want[0].0 < want[2].0 && want[2].0 < want[3].0, "{want:?}");
|
||||
let mut want: Vec<String> = want.iter().map(|(_, n)| n.to_string()).collect();
|
||||
want.push("e.png".into());
|
||||
assert_eq!(names(&mut s), want);
|
||||
// A missing file sorts by the size the document keeps of it.
|
||||
std::fs::remove_file(dir.file("a.png")).unwrap();
|
||||
assert_eq!(names(&mut s), want);
|
||||
// A modified file sorts by its size now.
|
||||
let bigger = png(900, 900, BLUE);
|
||||
assert!(bigger.len() > files[0].1.len());
|
||||
write(&dir.file("c.png"), &bigger);
|
||||
let got = names(&mut s);
|
||||
assert_eq!(got[got.len() - 2..], ["c.png".to_string(), "e.png".to_string()]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -2234,6 +2234,10 @@ fn type_menu_and_find_commands_refuse_a_param_of_the_wrong_type() {
|
||||
("type.smartPunctuation", json!({"dashes": "false"}), switch("dashes")),
|
||||
("type.smartPunctuation", json!({"ellipsis": 0}), switch("ellipsis")),
|
||||
("type.smartPunctuation", json!({"quotes": "no"}), switch("quotes")),
|
||||
("type.smartPunctuation", json!({"fiLigatures": 1}), switch("fiLigatures")),
|
||||
("type.smartPunctuation", json!({"flLigatures": "true"}), switch("flLigatures")),
|
||||
("type.smartPunctuation", json!({"spaces": "on"}), switch("spaces")),
|
||||
("type.smartPunctuation", json!({"fractions": [true]}), switch("fractions")),
|
||||
("type.smartPunctuation", json!({"scope": 5}), scope.clone()),
|
||||
("type.smartPunctuation", json!({"scope": "page"}), scope),
|
||||
("type.changeCase", json!({"case": 5}), string("case")),
|
||||
@@ -3563,12 +3567,154 @@ fn smart_punctuation_with_nothing_to_change_records_no_undo_step() {
|
||||
for id in [t, r] {
|
||||
select_with_a_step_to_redo(&mut s, &[id]);
|
||||
let before = history(&s);
|
||||
assert_eq!(s.execute("type.smartPunctuation", &json!({})).unwrap(), json!({"changed": 0}), "{id:?}");
|
||||
let r = s.execute("type.smartPunctuation", &json!({})).unwrap();
|
||||
assert_eq!(r["changed"], 0, "{id:?}");
|
||||
assert!(r["replaced"].as_object().unwrap().values().all(|n| n == 0), "{id:?}: {r}");
|
||||
assert_eq!(history(&s), before, "{id:?}");
|
||||
}
|
||||
assert_eq!(plain(&s, t), "“Hi” it’s 1–2 and 3—4…");
|
||||
}
|
||||
|
||||
/// Does the face text `font` draws with have a glyph for every character of `chars`?
|
||||
fn font_covers(font: &str, chars: &str) -> bool {
|
||||
let face = vectorcraft_text::FontDb::global().face(font, "Regular");
|
||||
face.is_some_and(|f| chars.chars().all(|c| f.covers(c)))
|
||||
}
|
||||
|
||||
/// Every option on: the ligatures, Smart Spaces and Expert Fractions, each counted on its own, in
|
||||
/// one undo step. Fractions next to a digit, a slash or a decimal part are left as they are.
|
||||
#[test]
|
||||
fn smart_punctuation_ligatures_spaces_and_fractions_are_counted() {
|
||||
let mut s = session();
|
||||
assert!(font_covers("Source Sans 3", "\u{FB00}\u{FB01}\u{FB02}\u{FB03}\u{FB04}½¾"), "Source Sans 3 draws the ligatures and fractions");
|
||||
let words = "An office's fluffy flow. Then 1/2 and 3/4, not 1/25, 1/2/26 or 1/2.5.";
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 50, "y": 50, "text": words, "font": "Source Sans 3"})).unwrap());
|
||||
sel(&mut s, &[t]);
|
||||
let undo = history(&s).0;
|
||||
let all = json!({"fiLigatures": true, "flLigatures": true, "quotes": true, "spaces": true, "dashes": true, "ellipsis": true, "fractions": true});
|
||||
let r = s.execute("type.smartPunctuation", &all).unwrap();
|
||||
assert_eq!(plain(&s, t), "An o\u{FB03}ce’s \u{FB02}u\u{FB00}y \u{FB02}ow. Then ½ and ¾, not 1/25, 1/2/26 or 1/2.5.");
|
||||
let replaced = json!({"fiLigatures": 2, "flLigatures": 2, "quotes": 1, "spaces": 1, "dashes": 0, "ellipses": 0, "fractions": 2});
|
||||
assert_eq!(r, json!({"changed": 1, "replaced": replaced}));
|
||||
assert_eq!(history(&s).0, undo + 1);
|
||||
}
|
||||
|
||||
/// The ff, fl, ffl option alone leaves fi and ffi as letters (ffi keeps its ff ligature, counted
|
||||
/// with this option), and the other options are off unless asked for.
|
||||
#[test]
|
||||
fn smart_punctuation_fl_ligatures_alone() {
|
||||
let mut s = session();
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 50, "y": 50, "text": "office fit baffle. 1/2", "font": "Source Sans 3"})).unwrap());
|
||||
sel(&mut s, &[t]);
|
||||
let r = s.execute("type.smartPunctuation", &json!({"flLigatures": true})).unwrap();
|
||||
assert_eq!(plain(&s, t), "o\u{FB00}ice fit ba\u{FB04}e. 1/2");
|
||||
assert_eq!(r["replaced"], json!({"fiLigatures": 0, "flLigatures": 2, "quotes": 0, "spaces": 0, "dashes": 0, "ellipses": 0, "fractions": 0}));
|
||||
}
|
||||
|
||||
/// A ligature or a fraction the run's font has no glyph for stays as its letters, while the run's
|
||||
/// other replacements still happen.
|
||||
#[test]
|
||||
fn smart_punctuation_skips_ligatures_and_fractions_the_font_lacks() {
|
||||
let mut s = session();
|
||||
let mono = "JetBrains Mono";
|
||||
assert!(!font_covers(mono, "\u{FB01}") && !font_covers(mono, "⅐"), "{mono} has no fi ligature or one-seventh");
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 50, "y": 50, "text": "fit 1/7 a--b", "font": mono})).unwrap());
|
||||
sel(&mut s, &[t]);
|
||||
let r = s.execute("type.smartPunctuation", &json!({"fiLigatures": true, "fractions": true})).unwrap();
|
||||
assert_eq!(plain(&s, t), "fit 1/7 a–b");
|
||||
let counts = (&r["replaced"]["fiLigatures"], &r["replaced"]["fractions"], &r["replaced"]["dashes"]);
|
||||
assert_eq!(counts, (&json!(0), &json!(0), &json!(1)));
|
||||
}
|
||||
|
||||
/// A fraction at the end of a run is checked against the start of the next run: 1/25 and 1/2.5
|
||||
/// split after their 1/2 stay as they are, and a 1/2 the next run's space ends is replaced.
|
||||
#[test]
|
||||
fn expert_fractions_look_past_the_end_of_a_run() {
|
||||
let mut s = session();
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 50, "y": 50, "text": "1/25 1/2.5 1/2 x", "font": "Source Sans 3"})).unwrap());
|
||||
for (start, end) in [(0, 3), (5, 8), (11, 14)] {
|
||||
s.execute("text.setRangeStyle", &json!({"id": t.0, "start": start, "end": end, "size": 30})).unwrap();
|
||||
}
|
||||
sel(&mut s, &[t]);
|
||||
let r = s.execute("type.smartPunctuation", &json!({"fractions": true})).unwrap();
|
||||
assert_eq!(plain(&s, t), "1/25 1/2.5 ½ x");
|
||||
assert_eq!(r["replaced"]["fractions"], 1);
|
||||
}
|
||||
|
||||
/// An inline graphic separates the text on either side of it: the space after it is not a second
|
||||
/// space after the period before it, and the digit before it does not stop a fraction after it.
|
||||
#[test]
|
||||
fn an_inline_graphic_separates_smart_spaces_and_fractions() {
|
||||
let mut s = session();
|
||||
let r = rect(&mut s, 600.0, 500.0, 10.0, 10.0);
|
||||
sel(&mut s, &[r]);
|
||||
s.execute("symbol.new", &json!({"name": "Mark"})).unwrap();
|
||||
s.execute("edit.clear", &json!({})).unwrap();
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 50, "y": 50, "text": "A. B 71/2", "font": "Source Sans 3"})).unwrap());
|
||||
s.execute("text.insertInline", &json!({"id": t.0, "at": 7, "symbol": "Mark"})).unwrap();
|
||||
s.execute("text.insertInline", &json!({"id": t.0, "at": 3, "symbol": "Mark"})).unwrap();
|
||||
let texts = |s: &Session| match node(s, t).kind {
|
||||
NodeKind::Text(o) => o.runs.iter().map(|r| if r.inline.is_some() { "[g]".to_string() } else { r.text.clone() }).collect::<String>(),
|
||||
_ => String::new(),
|
||||
};
|
||||
assert_eq!(texts(&s), "A. [g] B 7[g]1/2");
|
||||
sel(&mut s, &[t]);
|
||||
let r = s.execute("type.smartPunctuation", &json!({"spaces": true, "fractions": true})).unwrap();
|
||||
assert_eq!(texts(&s), "A. [g] B 7[g]½");
|
||||
assert_eq!((&r["replaced"]["spaces"], &r["replaced"]["fractions"]), (&json!(0), &json!(1)));
|
||||
}
|
||||
|
||||
/// Smart Spaces keeps one space after each period, also when the spaces start in the next run,
|
||||
/// and leaves single spaces and spaces after other characters alone.
|
||||
#[test]
|
||||
fn smart_spaces_keeps_one_space_after_a_period() {
|
||||
let mut s = session();
|
||||
let t = text(&mut s, "A. B. C. D E");
|
||||
// "C." is in a run of its own, and the spaces after it start the next one.
|
||||
s.execute("text.setRangeStyle", &json!({"id": t.0, "start": 8, "end": 10, "size": 30})).unwrap();
|
||||
assert!(matches!(node(&s, t).kind, NodeKind::Text(ref o) if o.runs.len() > 1));
|
||||
sel(&mut s, &[t]);
|
||||
let r = s.execute("type.smartPunctuation", &json!({"spaces": true, "quotes": false, "dashes": false, "ellipsis": false})).unwrap();
|
||||
assert_eq!(plain(&s, t), "A. B. C. D E");
|
||||
assert_eq!(r["replaced"]["spaces"], 2);
|
||||
}
|
||||
|
||||
/// Ruby stays on the characters it was set on when Smart Punctuation makes the text before them
|
||||
/// longer (curly quotes) or shorter (Smart Spaces), and no replacement takes in characters on both
|
||||
/// sides of a ruby span's end: the fi with ruby on its i stays as letters, and a second space after
|
||||
/// a period with ruby of its own stays.
|
||||
#[test]
|
||||
fn smart_punctuation_keeps_ruby_on_its_characters() {
|
||||
let mut s = session();
|
||||
let spans = |s: &Session, t| match node(s, t).kind {
|
||||
NodeKind::Text(o) => o.ruby.iter().map(|r| (r.start, r.end)).collect::<Vec<_>>(),
|
||||
_ => vec![],
|
||||
};
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 50, "y": 50, "text": "'A'. base fit X. Y", "font": "Source Sans 3"})).unwrap());
|
||||
sel(&mut s, &[t]);
|
||||
for (start, end) in [(1, 2), (6, 10), (12, 13), (18, 19)] {
|
||||
s.execute("type.ruby", &json!({"text": "r", "start": start, "end": end})).unwrap();
|
||||
}
|
||||
let r = s.execute("type.smartPunctuation", &json!({"spaces": true, "fiLigatures": true})).unwrap();
|
||||
assert_eq!(plain(&s, t), "‘A’. base fit X. Y");
|
||||
assert_eq!((&r["replaced"]["spaces"], &r["replaced"]["fiLigatures"]), (&json!(1), &json!(0)));
|
||||
let text = plain(&s, t);
|
||||
let on: Vec<&str> = spans(&s, t).into_iter().map(|(a, b)| &text[a..b]).collect();
|
||||
assert_eq!(on, ["A", "base", "i", " "]);
|
||||
}
|
||||
|
||||
/// Expert Fractions leaves a fraction next to a digit of another script as it is.
|
||||
#[test]
|
||||
fn expert_fractions_skip_fractions_next_to_digits_of_any_script() {
|
||||
let mut s = session();
|
||||
let words = "\u{662}1/2 1/2\u{662} 1/2.\u{662} 1/2";
|
||||
let t = id_of(&s.execute("text.create", &json!({"x": 50, "y": 50, "text": words, "font": "Source Sans 3"})).unwrap());
|
||||
sel(&mut s, &[t]);
|
||||
let r = s.execute("type.smartPunctuation", &json!({"fractions": true})).unwrap();
|
||||
assert_eq!(plain(&s, t), "\u{662}1/2 1/2\u{662} 1/2.\u{662} ½");
|
||||
assert_eq!(r["replaced"]["fractions"], 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn convert_point_area_roundtrip() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -775,6 +775,78 @@ fn create_outlines_draws_the_type_objects_own_paint() {
|
||||
assert!(differing(&before, &render(&session()), 24) > 1000, "the type paints something");
|
||||
}
|
||||
|
||||
/// Selected type "HIH" at 40 pt with ruby, underlined and struck through, its characters filled
|
||||
/// with `fill` (a `paint.setFill` param) and stroked 2 pt wide, then scaled to 150% and rotated 20
|
||||
/// degrees (the stroke keeps its 2 pt, which is 4/3 pt in text space).
|
||||
fn transformed_gradient_type(s: &mut Session, fill: Value) -> NodeId {
|
||||
let t = run(s, "text.create", json!({"x": 30, "y": 110, "text": "HIH", "size": 40}))["id"].as_u64().unwrap();
|
||||
run(s, "select.set", json!({"ids": [t]}));
|
||||
run(s, "type.ruby", json!({"text": "ab"}));
|
||||
run(s, "text.setFormat", json!({"ids": [t], "underline": true, "strikethrough": true}));
|
||||
run(s, "paint.setFill", fill);
|
||||
run(s, "paint.setStroke", json!({"color": "#008000"}));
|
||||
run(s, "stroke.set", json!({"weight": 2}));
|
||||
run(s, "object.scale", json!({"ids": [t], "sx": 150, "sy": 150}));
|
||||
run(s, "object.rotate", json!({"ids": [t], "angle": 20}));
|
||||
NodeId(t)
|
||||
}
|
||||
|
||||
/// Create Outlines draws what the type drew: a gradient on the characters that has no vector of
|
||||
/// its own keeps one gradient across every glyph, ruby glyph and bar, fitted to the layout's box,
|
||||
/// and one with a vector keeps it where it was, both with the type's scale and rotation. The
|
||||
/// characters' stroke keeps the weight it was drawn at.
|
||||
#[test]
|
||||
fn create_outlines_keeps_a_character_gradient_across_the_type() {
|
||||
let placed = json!({"gradient": {"kind": "linear", "start": [40, 100], "end": [110, 100],
|
||||
"stops": [{"offset": 0, "color": "#ff0000"}, {"offset": 1, "color": "#0000ff"}]}});
|
||||
for fill in [red_blue(), placed] {
|
||||
let mut s = session();
|
||||
let t = transformed_gradient_type(&mut s, fill.clone());
|
||||
let NodeKind::Text(text) = &node(&s, t).kind else { panic!("not type") };
|
||||
assert!(!text.ruby.is_empty() && text.runs.iter().all(|r| r.style.underline && r.style.strikethrough), "{fill}");
|
||||
// The characters' stroke is kept in text space and drawn scaled by the type's transform.
|
||||
let weight = text.runs[0].style.stroke_layer().width;
|
||||
let drawn = weight * vectorcraft_doc::Scaling::factor(text.xf).unwrap_or(1.0);
|
||||
assert!((drawn - weight).abs() > 0.1, "the type's transform scales: {weight} {drawn}");
|
||||
let before = render(&s);
|
||||
let g = run(&mut s, "type.createOutlines", json!({}))["ids"][0].as_u64().unwrap();
|
||||
let after = render(&s);
|
||||
let n = differing(&before, &after, 24);
|
||||
assert!(n < 60, "{fill}: {n} pixels differ");
|
||||
assert!(differing(&before, &render(&session()), 24) > 1000, "the type paints something");
|
||||
// Every glyph, ruby glyph and bar takes the same gradient, placed, and the stroke at the
|
||||
// weight it was drawn at.
|
||||
let mut gradients = vec![];
|
||||
let mut widths = vec![];
|
||||
node(&s, NodeId(g)).walk(&mut |c: &Node| {
|
||||
if let Paint::Gradient(gr) = c.appearance.fill_paint() {
|
||||
gradients.push(gr.clone());
|
||||
}
|
||||
widths.extend(c.appearance.stroke().map(|st| st.width));
|
||||
});
|
||||
assert!(gradients.len() >= 6, "{fill}: three glyphs, ruby and two bars: {}", gradients.len());
|
||||
assert!(gradients.iter().all(|gr| gr.is_placed() && *gr == gradients[0]), "{fill}: {gradients:?}");
|
||||
assert!(widths.len() == gradients.len() && widths.iter().all(|w| (w - drawn).abs() < 1e-9), "{fill}: {drawn} {widths:?}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Expand outlines the type before its fills expand, so a gradient on its characters that has no
|
||||
/// vector of its own expands across the whole type, as the canvas draws it, and the query reports
|
||||
/// it.
|
||||
#[test]
|
||||
fn expand_keeps_a_character_gradient_across_the_type() {
|
||||
let mut s = session();
|
||||
transformed_gradient_type(&mut s, red_blue());
|
||||
let info = run(&mut s, "object.expand.info", json!({}));
|
||||
assert_eq!((info["gradient"].clone(), info["fill"].clone(), info["object"].clone()), (json!(true), json!(true), json!(true)), "{info}");
|
||||
let before = render(&s);
|
||||
run(&mut s, "object.expand", json!({}));
|
||||
let after = render(&s);
|
||||
assert_eq!(gradients_and_type(&s), (0, 0), "outlined and expanded");
|
||||
let d = mean_diff(&before, &after);
|
||||
assert!(d < 0.5, "{d}");
|
||||
}
|
||||
|
||||
/// `object.expand.info` reports the type object's own stroke, pattern fill and gradient fill, which
|
||||
/// Object turns into paths of its whole outline: a gradient only when that outline's box needs no
|
||||
/// more runs than are written.
|
||||
|
||||
@@ -0,0 +1,273 @@
|
||||
//! Automatic Plane Positioning: Shift held over an anchor point of art in perspective or over a
|
||||
//! gridline intersection moves the active plane through it for now (`perspective.plane.infer`),
|
||||
//! the two Perspective Grid Options that turn the targets on and off, and what ends it.
|
||||
|
||||
use serde_json::json;
|
||||
use vectorcraft_geom::{Point, Vec2};
|
||||
use vectorcraft_tools::distort::perspective::{PerspectiveGrid, Plane};
|
||||
use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};
|
||||
|
||||
use crate::tests_persp_select::{attached, bounds_of, drag, grid, persp_session, plane_pts, undo_len};
|
||||
use crate::*;
|
||||
|
||||
fn shift() -> Mods {
|
||||
Mods { shift: true, ..Default::default() }
|
||||
}
|
||||
|
||||
/// The top anchor of path `id` (on the right wall at depth 0): its page point and its height.
|
||||
fn top_anchor(s: &Session, id: NodeId) -> (Point, f64) {
|
||||
let page: Vec<Point> = s.doc().unwrap().doc.node(id).unwrap().path_data().unwrap().anchors().map(|(_, _, a)| a.p).collect();
|
||||
let plane = plane_pts(s, id, Plane::Right, 0.0);
|
||||
page.into_iter().zip(plane).map(|(p, q)| (p, q.y)).max_by(|a, b| a.1.total_cmp(&b.1)).unwrap()
|
||||
}
|
||||
|
||||
fn hover(s: &mut Session, p: Point, mods: Mods) {
|
||||
s.pointer(&PointerEvent::new(PointerKind::Move, p.x, p.y).with_mods(mods), ViewInfo::default()).unwrap();
|
||||
}
|
||||
|
||||
fn revision(s: &Session) -> u64 {
|
||||
s.doc().unwrap().revision
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shift_over_an_anchor_holds_the_active_plane_at_its_height_until_an_object_is_drawn() {
|
||||
let (mut s, id) = persp_session();
|
||||
let v = ViewInfo::default();
|
||||
let (anchor, height) = top_anchor(&s, id);
|
||||
assert!(height > 10.0, "{height}");
|
||||
s.execute("perspective.plane.set", &json!({"plane": "ground"})).unwrap();
|
||||
s.select_tool("perspectiveSelection", v).unwrap();
|
||||
let steps = undo_len(&s);
|
||||
// Without Shift the pointer only hovers.
|
||||
hover(&mut s, anchor, Mods::default());
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
hover(&mut s, anchor, shift());
|
||||
let g = grid(&s);
|
||||
assert!(g.inferred.is_some());
|
||||
assert!((g.offset(Plane::Ground) - height).abs() < 1e-6, "{} {height}", g.offset(Plane::Ground));
|
||||
assert_eq!((g.ground_offset, g.shown_planes(), undo_len(&s)), (0.0, vec![Plane::Ground], steps));
|
||||
// Held there already, another hover over the anchor changes nothing.
|
||||
let rev = revision(&s);
|
||||
hover(&mut s, anchor, shift());
|
||||
assert_eq!(revision(&s), rev);
|
||||
// The Rectangle tool draws on the plane where it is held, and the plane stays put for the drag.
|
||||
s.select_tool("rectangle", v).unwrap();
|
||||
s.pointer(&PointerEvent::new(PointerKind::Down, 420.0, 400.0), v).unwrap();
|
||||
s.pointer(&PointerEvent::new(PointerKind::Drag, 470.0, 430.0), v).unwrap();
|
||||
assert!(grid(&s).inferred.is_some(), "held while the object is drawn");
|
||||
s.pointer(&PointerEvent::new(PointerKind::Up, 470.0, 430.0), v).unwrap();
|
||||
let drawn = s.doc().unwrap().selection.objects[0];
|
||||
assert_ne!(drawn, id);
|
||||
let (plane, depth) = attached(&s, drawn).unwrap();
|
||||
assert!(plane == Plane::Ground && (depth - height).abs() < 1e-6, "{plane:?} {depth}");
|
||||
// Drawn, the plane is back in its place and the other planes show: one undo step for the drag.
|
||||
let g = grid(&s);
|
||||
assert_eq!((g.inferred, g.offset(Plane::Ground), g.shown_planes().len(), undo_len(&s)), (None, 0.0, 3, steps + 1));
|
||||
// Undoing the drag holds the plane again; Escape with the Perspective Selection tool ends that.
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!(grid(&s).inferred.is_some());
|
||||
s.select_tool("perspectiveSelection", v).unwrap();
|
||||
s.tool_key(ToolKey::Escape, Mods::default(), v).unwrap();
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shift_during_a_drag_still_constrains_the_move() {
|
||||
let (mut s, id) = persp_session();
|
||||
let v = ViewInfo::default();
|
||||
s.select_tool("perspectiveSelection", v).unwrap();
|
||||
let before = plane_pts(&s, id, Plane::Right, 0.0);
|
||||
let h = grid(&s).homography(Plane::Right).unwrap();
|
||||
// From the middle of the object, along the wall and a little up.
|
||||
let start = bounds_of(&before).center();
|
||||
let (from, to) = (h.apply(start).unwrap(), h.apply(start + Vec2::new(80.0, 20.0)).unwrap());
|
||||
drag(&mut s, &[from, to, to], shift());
|
||||
assert_eq!(grid(&s).inferred, None, "with a button down Shift constrains the move");
|
||||
for (a, b) in before.iter().zip(plane_pts(&s, id, Plane::Right, 0.0)) {
|
||||
assert!((b - *a - Vec2::new(80.0, 0.0)).hypot() < 1e-6, "{a:?} → {b:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_gridline_intersection_brings_each_plane_made_active_through_it() {
|
||||
let (mut s, _) = persp_session();
|
||||
let (g, steps) = (grid(&s), undo_len(&s));
|
||||
s.execute("perspective.plane.set", &json!({"plane": "left"})).unwrap();
|
||||
let at = g.to_page(Plane::Left, Point::new(3.0 * g.cell, 2.0 * g.cell)).unwrap();
|
||||
let r = s.execute("perspective.plane.infer", &json!({"at": [at.x, at.y], "tolerance": 1})).unwrap();
|
||||
assert_eq!((r["active"].as_bool(), r["source"].as_str(), r["plane"].as_str()), (Some(true), Some("gridline"), Some("left")));
|
||||
for (got, want) in r["point"].as_array().unwrap().iter().zip([0.0, 2.0 * g.cell, 3.0 * g.cell]) {
|
||||
assert!((got.as_f64().unwrap() - want).abs() < 1e-6, "{r}");
|
||||
}
|
||||
for (plane, want) in [("ground", 2.0 * g.cell), ("right", 3.0 * g.cell), ("left", 0.0)] {
|
||||
s.execute("perspective.plane.set", &json!({"plane": plane})).unwrap();
|
||||
let r = s.execute("perspective.plane.infer", &json!({})).unwrap();
|
||||
assert!((r["offset"].as_f64().unwrap() - want).abs() < 1e-6 && r["active"] == json!(true) && r.get("source").is_none(), "{plane}: {r}");
|
||||
}
|
||||
let held = grid(&s);
|
||||
assert_eq!((held.left_offset, held.right_offset, held.ground_offset, undo_len(&s)), (0.0, 0.0, 0.0, steps));
|
||||
// Nothing within reach leaves the plane where it is held.
|
||||
let rev = revision(&s);
|
||||
let mid = held.to_page(Plane::Left, Point::new(3.5 * g.cell, 2.5 * g.cell)).unwrap();
|
||||
let r = s.execute("perspective.plane.infer", &json!({"at": [mid.x, mid.y], "tolerance": 0.5})).unwrap();
|
||||
assert!(r["active"] == json!(true) && r.get("source").is_none() && revision(&s) == rev, "{r}");
|
||||
// With no active plane nothing is held.
|
||||
s.execute("perspective.plane.set", &json!({"plane": "none"})).unwrap();
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
assert!(s.execute("perspective.plane.infer", &json!({"at": [at.x, at.y]})).is_err(), "no active plane");
|
||||
assert_eq!(s.execute("perspective.plane.infer", &json!({})).unwrap()["active"], json!(false));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_two_options_turn_the_targets_on_and_off_and_are_kept() {
|
||||
let (mut s, id) = persp_session();
|
||||
assert!(s.prefs.perspective_widget.anchor_point && s.prefs.perspective_widget.gridline_intersection, "both on by default");
|
||||
let (anchor, _) = top_anchor(&s, id);
|
||||
let infer = |s: &mut Session| s.execute("perspective.plane.infer", &json!({"at": [anchor.x, anchor.y], "tolerance": 0.01}));
|
||||
assert_eq!(infer(&mut s).unwrap()["source"], json!("anchor"));
|
||||
s.execute("perspective.plane.infer", &json!({"clear": true})).unwrap();
|
||||
let r = s.execute("perspective.widget.options", &json!({"anchorPoint": false})).unwrap();
|
||||
assert_eq!((r["anchorPoint"].as_bool(), r["gridlineIntersection"].as_bool(), r["show"].as_bool()), (Some(false), Some(true), Some(true)));
|
||||
assert!(infer(&mut s).unwrap().get("source").is_none(), "the anchor is no target now");
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
let back: Prefs = serde_json::from_value(serde_json::to_value(&s.prefs).unwrap()).unwrap();
|
||||
assert!(!back.perspective_widget.anchor_point && back.perspective_widget.gridline_intersection);
|
||||
s.execute("perspective.widget.options", &json!({"gridlineIntersection": false})).unwrap();
|
||||
assert!(infer(&mut s).is_err(), "both off");
|
||||
for bad in [json!({"anchorPoint": "yes"}), json!({"gridlineIntersection": 1})] {
|
||||
assert!(s.execute("perspective.widget.options", &bad).is_err(), "{bad}");
|
||||
}
|
||||
assert!(!s.prefs.perspective_widget.anchor_point, "a refused value changes nothing");
|
||||
s.execute("prefs.set", &json!({"key": "perspectiveWidget", "value": {"anchorPoint": true}})).unwrap();
|
||||
assert!(s.prefs.perspective_widget.anchor_point && !s.prefs.perspective_widget.gridline_intersection);
|
||||
// Preferences saved before the options existed read as both on.
|
||||
let old: vectorcraft_tools::distort::perspective::widget::WidgetOptions = serde_json::from_value(json!({"show": false})).unwrap();
|
||||
assert!(old.anchor_point && old.gridline_intersection && !old.show);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bad_params_are_refused_and_leave_the_grid_as_it_is() {
|
||||
let (mut s, id) = persp_session();
|
||||
let (anchor, _) = top_anchor(&s, id);
|
||||
let rev = revision(&s);
|
||||
for bad in [
|
||||
json!({"at": "here"}),
|
||||
json!({"at": [1]}),
|
||||
json!({"at": [anchor.x, anchor.y], "tolerance": -1}),
|
||||
json!({"at": [anchor.x, anchor.y], "tolerance": "wide"}),
|
||||
json!({"at": [anchor.x, anchor.y], "clear": true}),
|
||||
json!({"clear": "yes"}),
|
||||
] {
|
||||
assert!(s.execute("perspective.plane.infer", &bad).is_err(), "{bad}");
|
||||
}
|
||||
assert_eq!((grid(&s).inferred, revision(&s)), (None, rev));
|
||||
// Clearing when nothing is held changes nothing.
|
||||
assert_eq!(s.execute("perspective.plane.infer", &json!({"clear": true})).unwrap()["active"], json!(false));
|
||||
assert_eq!(revision(&s), rev);
|
||||
s.execute("perspective.grid.show", &json!({"visible": false})).unwrap();
|
||||
assert!(s.execute("perspective.plane.infer", &json!({"at": [anchor.x, anchor.y]})).is_err(), "hidden grid");
|
||||
}
|
||||
|
||||
/// A session whose ground plane is held at the height of the attached rectangle's top anchor.
|
||||
fn held_session() -> (Session, NodeId, f64) {
|
||||
let (mut s, id) = persp_session();
|
||||
let (anchor, height) = top_anchor(&s, id);
|
||||
s.execute("perspective.plane.set", &json!({"plane": "ground"})).unwrap();
|
||||
let r = s.execute("perspective.plane.infer", &json!({"at": [anchor.x, anchor.y], "tolerance": 0.01})).unwrap();
|
||||
assert_eq!(r["source"], json!("anchor"));
|
||||
(s, id, height)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn attaching_an_object_ends_it_and_the_object_sits_where_the_plane_was_held() {
|
||||
let (mut s, _, height) = held_session();
|
||||
let r = s.execute("shape.rectangle", &json!({"x": 420, "y": 400, "width": 40, "height": 30})).unwrap();
|
||||
let flat = NodeId(r["id"].as_u64().unwrap());
|
||||
s.execute("perspective.attach", &json!({"ids": [flat.0]})).unwrap();
|
||||
let (plane, depth) = attached(&s, flat).unwrap();
|
||||
assert!(plane == Plane::Ground && (depth - height).abs() < 1e-6, "{plane:?} {depth}");
|
||||
assert_eq!((grid(&s).inferred, grid(&s).ground_offset), (None, 0.0));
|
||||
// An attach of nothing, or to a plane it doesn't hold, leaves it held.
|
||||
let (mut s, ..) = held_session();
|
||||
s.execute("perspective.attach", &json!({"ids": []})).unwrap();
|
||||
assert!(grid(&s).inferred.is_some());
|
||||
let r = s.execute("shape.rectangle", &json!({"x": 420, "y": 400, "width": 40, "height": 30})).unwrap();
|
||||
let other = NodeId(r["id"].as_u64().unwrap());
|
||||
s.execute("perspective.attach", &json!({"ids": [other.0], "plane": "right"})).unwrap();
|
||||
assert_eq!(attached(&s, other).map(|a| a.0), Some(Plane::Right));
|
||||
assert!(grid(&s).inferred.is_some());
|
||||
// A move of an object already in perspective leaves it held; one brought into perspective ends it.
|
||||
let (mut s, id, height) = held_session();
|
||||
s.execute("perspective.move", &json!({"ids": [id.0], "from": [460, 400], "to": [470, 400]})).unwrap();
|
||||
assert!(grid(&s).inferred.is_some());
|
||||
let r = s.execute("shape.rectangle", &json!({"x": 420, "y": 400, "width": 40, "height": 30})).unwrap();
|
||||
let flat = NodeId(r["id"].as_u64().unwrap());
|
||||
s.execute("perspective.move", &json!({"ids": [flat.0], "from": [430, 410], "to": [440, 410]})).unwrap();
|
||||
let (plane, depth) = attached(&s, flat).unwrap();
|
||||
assert!(plane == Plane::Ground && (depth - height).abs() < 1e-6, "{plane:?} {depth}");
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn moving_a_plane_hiding_the_grid_and_reopening_the_file_end_it() {
|
||||
// A moved plane moves from where it is held and is placed there for good, in one undo step;
|
||||
// undoing the move holds it again.
|
||||
let (mut s, _, height) = held_session();
|
||||
let steps = undo_len(&s);
|
||||
s.execute("perspective.plane.move", &json!({"plane": "ground", "by": 10})).unwrap();
|
||||
let g = grid(&s);
|
||||
assert_eq!((g.inferred, undo_len(&s)), (None, steps + 1));
|
||||
assert!((g.ground_offset - (height + 10.0)).abs() < 1e-6, "{}", g.ground_offset);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!((grid(&s).inferred.is_some(), grid(&s).ground_offset), (true, 0.0));
|
||||
// A refused move leaves it held.
|
||||
let (mut s, ..) = held_session();
|
||||
assert!(s.execute("perspective.plane.move", &json!({"plane": "ground", "offset": 1, "objects": "all"})).is_err());
|
||||
assert!(grid(&s).inferred.is_some());
|
||||
// A plane dragged while it is held, then the drag canceled, is held again.
|
||||
let (mut s, ..) = held_session();
|
||||
s.begin_interaction("Move Plane").unwrap();
|
||||
s.preview("perspective.plane.move", &json!({"plane": "ground", "by": 20})).unwrap();
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
s.cancel_interaction().unwrap();
|
||||
assert!(grid(&s).inferred.is_some());
|
||||
// Move Plane to Match Object.
|
||||
let (mut s, id, _) = held_session();
|
||||
s.execute("perspective.plane.matchObject", &json!({"id": id.0})).unwrap();
|
||||
assert_eq!((grid(&s).inferred, grid(&s).plane), (None, Plane::Right));
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!((grid(&s).inferred.is_some(), grid(&s).plane), (true, Plane::Ground), "undo holds it again");
|
||||
// With the plane placed at the object already, matching only puts the held plane back there.
|
||||
s.execute("perspective.plane.set", &json!({"plane": "right"})).unwrap();
|
||||
assert!(grid(&s).inferred.is_some());
|
||||
let steps = undo_len(&s);
|
||||
s.execute("perspective.plane.matchObject", &json!({"id": id.0})).unwrap();
|
||||
assert_eq!((grid(&s).inferred, grid(&s).offset(Plane::Right), undo_len(&s)), (None, 0.0, steps));
|
||||
// Hide Grid.
|
||||
let (mut s, ..) = held_session();
|
||||
s.execute("perspective.grid.show", &json!({"visible": false})).unwrap();
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
// The grid's definition changing leaves it held, and it is not `perspective.grid.set`'s to set.
|
||||
let (mut s, ..) = held_session();
|
||||
let held = grid(&s).inferred;
|
||||
s.execute("perspective.grid.set", &json!({"cell": 31, "inferred": [1, 2, 3]})).unwrap();
|
||||
assert_eq!(grid(&s).inferred, held);
|
||||
// `perspective.grid.set` hiding the grid or choosing no plane ends it.
|
||||
for patch in [json!({"visible": false}), json!({"plane": "none"})] {
|
||||
let (mut s, ..) = held_session();
|
||||
s.execute("perspective.grid.set", &patch).unwrap();
|
||||
assert_eq!(grid(&s).inferred, None, "{patch}");
|
||||
}
|
||||
// Another preset leaves it held, as other changes to the grid's definition do.
|
||||
let (mut preset, ..) = held_session();
|
||||
let before = grid(&preset).inferred;
|
||||
preset.execute("perspective.grid.preset", &json!({"kind": 3})).unwrap();
|
||||
assert_eq!((grid(&preset).kind, grid(&preset).inferred), (3, before));
|
||||
// A file saved while a plane is held opens with the plane in its place.
|
||||
let saved = vectorcraft_format::save(&s.doc().unwrap().doc, false);
|
||||
let back = vectorcraft_format::load(&saved).unwrap();
|
||||
assert!(PerspectiveGrid::positioning(&back), "the saved file still holds the point");
|
||||
s.add_document(back, None);
|
||||
assert_eq!(grid(&s).inferred, None);
|
||||
assert_eq!(grid(&s).cell, 31.0);
|
||||
}
|
||||
@@ -520,7 +520,10 @@ fn the_plane_widget_stays_on_screen_and_takes_clicks_with_any_tool() {
|
||||
click(&mut s, q, view);
|
||||
assert_eq!(grid(&s).plane, Plane::Ground);
|
||||
// Perspective Grid Options move it to another corner or hide it.
|
||||
assert_eq!(run(&mut s, "perspective.widget.options", json!({"position": "bottomRight"})), json!({"show": true, "position": "bottomRight"}));
|
||||
assert_eq!(
|
||||
run(&mut s, "perspective.widget.options", json!({"position": "bottomRight"})),
|
||||
json!({"show": true, "position": "bottomRight", "anchorPoint": true, "gridlineIntersection": true})
|
||||
);
|
||||
let r = face(&s, view, WidgetCorner::BottomRight, Plane::Left);
|
||||
assert!(r.x > 100.0 + 450.0 && r.y > 50.0 + 300.0, "{r:?}");
|
||||
click(&mut s, r, view);
|
||||
|
||||
@@ -599,6 +599,100 @@ fn with_link_a_pdf_page_places_linked() {
|
||||
assert!(near(centre_colour(&s.doc().unwrap().doc), RED));
|
||||
}
|
||||
|
||||
/// The colour at the centre of `r` in `doc`.
|
||||
fn colour_at(doc: &Document, r: Rect) -> [u8; 3] {
|
||||
let img = vectorcraft_render::Renderer::new().render_region(doc, r, 1.0, true);
|
||||
let [red, g, b, _] = img.pixel((r.width() / 2.0) as u32, (r.height() / 2.0) as u32);
|
||||
[red, g, b]
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn link_pages_opens_each_picked_pdf_page_as_a_linked_placed_document() {
|
||||
let dir = Folder::new("open-pdf-link-pages");
|
||||
let src = dir.file("flyer.pdf");
|
||||
pdf_source(&src, "pdf", &[RED, BLUE, RED], 0);
|
||||
let mut s = Session::new();
|
||||
let r = s.execute("document.open", &json!({"path": src, "linkPages": true, "pages": "2-3"})).unwrap();
|
||||
assert_eq!((r["format"].as_str(), r["restored"].as_bool()), (Some("pdf"), Some(false)), "{r}");
|
||||
let st = s.doc().unwrap();
|
||||
assert_eq!(st.path, None, "Save asks for a name instead of writing over the PDF");
|
||||
let d = &st.doc;
|
||||
let boards: Vec<Rect> = d.artboards.iter().map(|a| a.rect).collect();
|
||||
assert_eq!(boards, [Rect::new(0.0, 0.0, 100.0, 50.0), Rect::new(136.0, 0.0, 236.0, 50.0)]);
|
||||
let layers: Vec<_> = d.layers.iter().map(|l| l.name.clone().unwrap_or_default()).collect();
|
||||
assert_eq!(layers, ["Page 2", "Page 3"]);
|
||||
let mut ids = vec![];
|
||||
for (layer, (page, board)) in d.layers.iter().zip([(2, boards[0]), (3, boards[1])]) {
|
||||
let kids = layer.children().unwrap();
|
||||
assert_eq!(kids.len(), 1);
|
||||
let p = placed(&s, kids[0].id);
|
||||
assert_eq!((p.link.path.as_str(), p.link.page, p.bounding), (src.as_str(), Some(page), false), "{p:?}");
|
||||
assert_eq!(bounds(&s, kids[0].id), board);
|
||||
ids.push(kids[0].id);
|
||||
}
|
||||
assert!(near(colour_at(d, boards[0]), BLUE));
|
||||
assert!(near(colour_at(d, boards[1]), RED));
|
||||
let links = s.execute("links.list", &json!({})).unwrap()["links"].clone();
|
||||
assert_eq!(links.as_array().map(Vec::len), Some(2), "{links}");
|
||||
assert!(links.as_array().unwrap().iter().all(|row| row["document"] == true && row["status"] == "ok"), "{links}");
|
||||
// Embed makes a page editable art.
|
||||
s.execute("links.embed", &json!({"ids": [ids[0].0]})).unwrap();
|
||||
let d = &s.doc().unwrap().doc;
|
||||
assert_eq!(d.node(ids[0]).unwrap().kind_label(), "Clip Group");
|
||||
assert_eq!(bounds(&s, ids[0]), boards[0]);
|
||||
assert!(near(colour_at(d, boards[0]), BLUE));
|
||||
// Every page, with the art's bounds as the artboard.
|
||||
s.execute("document.open", &json!({"path": src, "linkPages": true, "cropTo": "bounding"})).unwrap();
|
||||
let d = &s.doc().unwrap().doc;
|
||||
assert_eq!(d.artboards.len(), 3);
|
||||
assert!(d.layers.iter().flat_map(|l| l.children().unwrap()).all(|n| matches!(&n.kind, NodeKind::PlacedDocument(p) if p.bounding)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn linked_pages_share_one_copy_of_the_file_and_open_in_the_pages_color_mode() {
|
||||
use vectorcraft_testkit::pdf::{PdfPage, pdf};
|
||||
let dir = Folder::new("open-pdf-link-pages-cmyk");
|
||||
let src = dir.file("cmyk.pdf");
|
||||
let page = || PdfPage::new(100.0, 50.0, "0 0.5 1 0 k 0 0 100 50 re f");
|
||||
write(&src, &pdf(&[page(), page(), page()], None));
|
||||
let mut s = Session::new();
|
||||
s.execute("document.open", &json!({"path": src, "linkPages": true})).unwrap();
|
||||
let d = &s.doc().unwrap().doc;
|
||||
assert_eq!(d.color_mode, vectorcraft_doc::ColorMode::Cmyk, "pages painted in CMYK open as a CMYK document");
|
||||
let blobs: Vec<_> = d.images.values().map(|b| b.bytes.clone()).collect();
|
||||
assert_eq!(blobs.len(), 3);
|
||||
assert!(blobs.iter().all(|b| std::sync::Arc::ptr_eq(b, &blobs[0])), "one copy of the file for every page");
|
||||
s.execute("document.open", &json!({"path": src, "linkPages": true, "colorMode": "rgb"})).unwrap();
|
||||
assert_eq!(s.doc().unwrap().doc.color_mode, vectorcraft_doc::ColorMode::Rgb, "colorMode wins");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn link_pages_is_refused_without_a_path_for_other_files_and_with_a_password_or_outlines() {
|
||||
let dir = Folder::new("open-pdf-link-pages-refused");
|
||||
let src = dir.file("flyer.pdf");
|
||||
pdf_source(&src, "pdf", &[RED, BLUE], 0);
|
||||
let bytes = std::fs::read(&src).unwrap();
|
||||
let logo = dir.file("logo.vectorcraft");
|
||||
source(&logo, 100.0, 50.0, RED, 0);
|
||||
let mut s = Session::new();
|
||||
let cases = [
|
||||
(json!({"name": "flyer.pdf", "dataBase64": vectorcraft_format::base64_encode(&bytes), "linkPages": true}), "needs the file's path"),
|
||||
(json!({"path": logo, "linkPages": true}), "isn't a PDF"),
|
||||
(json!({"path": src, "linkPages": true, "password": "secret"}), "password"),
|
||||
(json!({"path": src, "linkPages": true, "textAs": "outlines"}), "textAs: outlines"),
|
||||
(json!({"path": src, "linkPages": "yes"}), "linkPages must be true or false"),
|
||||
(json!({"path": src, "linkPages": true, "pages": "3"}), "pages:"),
|
||||
];
|
||||
for (p, says) in cases {
|
||||
let e = s.execute("document.open", &p).unwrap_err().to_string();
|
||||
assert!(e.contains(says), "{p}: {e}");
|
||||
}
|
||||
assert!(s.documents().is_empty(), "nothing opened");
|
||||
// Off, the pages open as editable art.
|
||||
s.execute("document.open", &json!({"path": src, "linkPages": false})).unwrap();
|
||||
assert!(!s.doc().unwrap().doc.has_placed());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_changed_pdf_is_modified_and_update_links_reads_it_again() {
|
||||
let dir = Folder::new("placed-pdf-update");
|
||||
|
||||
@@ -715,3 +715,179 @@ fn svg_export_draws_a_filter_svg_1_1_lacks_as_an_image() {
|
||||
assert_eq!((out.contains("<image"), out.contains("<feBlend")), (image, !image), "{mode}: {out}");
|
||||
}
|
||||
}
|
||||
|
||||
/// The `defaults` of `svgFilter.list`: each one's name and whether the document holds it.
|
||||
fn defaults(s: &mut Session) -> Vec<(String, bool)> {
|
||||
let listed = run(s, "svgFilter.list", json!({}))["defaults"].as_array().cloned().unwrap_or_default();
|
||||
listed.iter().map(|f| (f["name"].as_str().unwrap().to_string(), f["inDocument"].as_bool().unwrap())).collect()
|
||||
}
|
||||
|
||||
/// Every document lists the default filters without holding them; applying one adds the effect and
|
||||
/// the document's copy in one undo step.
|
||||
#[test]
|
||||
fn a_default_filter_is_listed_and_copied_into_the_document_when_applied() {
|
||||
use vectorcraft_render::effects::svg_filter::defaults::DEFAULT_FILTERS;
|
||||
let mut s = session();
|
||||
let listed = defaults(&mut s);
|
||||
assert_eq!(listed.len(), DEFAULT_FILTERS.len());
|
||||
assert!(listed.iter().all(|(_, held)| !held), "a new document holds none of them");
|
||||
assert!(names(&mut s).is_empty());
|
||||
let soft = DEFAULT_FILTERS.iter().find(|f| f.name == "Soft Shadow").unwrap();
|
||||
assert_eq!(run(&mut s, "svgFilter.list", json!({}))["defaults"][2], json!({"name": "Soft Shadow", "xml": soft.xml, "inDocument": false}));
|
||||
let (a, b) = (rect(&mut s, 10.0), rect(&mut s, 50.0));
|
||||
run(&mut s, "select.set", json!({"ids": [a.0, b.0]}));
|
||||
let before = steps(&s);
|
||||
let r = run(&mut s, "svgFilter.apply", json!({"name": "Soft Shadow"}));
|
||||
assert_eq!((r["ids"].as_array().unwrap().len(), &r["index"]), (2, &json!(0)));
|
||||
assert_eq!(steps(&s), before + 1, "the effect and the copy are one step");
|
||||
assert_eq!(s.doc().unwrap().history.undo.last().unwrap().label, "SVG Filter");
|
||||
assert_eq!(names(&mut s), ["Soft Shadow"]);
|
||||
assert_eq!(drawn(&s, a), json!(soft.xml));
|
||||
assert!(defaults(&mut s).contains(&("Soft Shadow".to_string(), true)));
|
||||
// Applied again, the document's copy is the filter: nothing more is added.
|
||||
run(&mut s, "svgFilter.apply", json!({"name": "Soft Shadow", "ids": [a.0]}));
|
||||
assert_eq!(names(&mut s), ["Soft Shadow"]);
|
||||
run(&mut s, "edit.undo", json!({}));
|
||||
run(&mut s, "edit.undo", json!({}));
|
||||
assert!(names(&mut s).is_empty(), "undo takes the copy back with the effect");
|
||||
assert!(s.doc().unwrap().doc.node(a).unwrap().appearance.effects.is_empty());
|
||||
run(&mut s, "edit.redo", json!({}));
|
||||
assert_eq!((names(&mut s), drawn(&s, b)), (vec!["Soft Shadow".to_string()], json!(soft.xml)));
|
||||
// Nothing to apply it to: no copy and no step.
|
||||
let mut s = session();
|
||||
assert!(s.execute("svgFilter.apply", &json!({"name": "Glow"})).is_err(), "nothing selected");
|
||||
assert!(names(&mut s).is_empty());
|
||||
assert_eq!(steps(&s), 0);
|
||||
assert!(err(&mut s, "svgFilter.apply", json!({"name": "glow", "ids": []})).contains("no SVG filter named \"glow\""), "names match exactly");
|
||||
}
|
||||
|
||||
/// With a full history, applying a default lets one old step go, as any edit does: the copy joins
|
||||
/// the step that applied it, and one Undo takes both back.
|
||||
#[test]
|
||||
fn a_default_applied_with_a_full_history_is_still_one_step() {
|
||||
let mut s = session();
|
||||
s.active_mut().unwrap().history.limit = 3;
|
||||
let a = rect(&mut s, 10.0);
|
||||
rect(&mut s, 30.0);
|
||||
rect(&mut s, 50.0);
|
||||
assert_eq!(steps(&s), 3);
|
||||
run(&mut s, "svgFilter.apply", json!({"name": "Invert", "ids": [a.0]}));
|
||||
// The application takes one place in the history: only the oldest step went.
|
||||
assert_eq!(steps(&s), 3);
|
||||
assert_eq!(s.doc().unwrap().history.undo.last().unwrap().label, "SVG Filter");
|
||||
run(&mut s, "edit.undo", json!({}));
|
||||
assert!(names(&mut s).is_empty(), "the copy is undone with the effect");
|
||||
assert!(s.doc().unwrap().doc.node(a).unwrap().appearance.effects.is_empty());
|
||||
}
|
||||
|
||||
/// Edit SVG Filter on a default saves the edited copy in the document under the default's name;
|
||||
/// the document's filter then stands in the default's place, and deleting it lists the default again.
|
||||
#[test]
|
||||
fn an_edited_default_is_saved_in_the_document_and_delete_restores_the_default() {
|
||||
use vectorcraft_render::effects::svg_filter::defaults::default_filter;
|
||||
let mut s = session();
|
||||
let glow = default_filter("Glow").unwrap();
|
||||
// Saved with its own code: nothing to keep, and no undo step.
|
||||
run(&mut s, "svgFilter.define", json!({"xml": glow.xml, "replace": "Glow"}));
|
||||
assert_eq!((names(&mut s).len(), steps(&s)), (0, 0));
|
||||
let edited = r#"<filter id="Renamed"><feGaussianBlur stdDeviation="9"/></filter>"#;
|
||||
assert_eq!(run(&mut s, "svgFilter.define", json!({"xml": edited, "replace": "Glow"}))["name"], "Glow");
|
||||
assert_eq!((names(&mut s), steps(&s)), (vec!["Glow".to_string()], 1));
|
||||
assert_eq!(s.doc().unwrap().history.undo[0].label, "Edit SVG Filter");
|
||||
let kept = r#"<filter id="Glow"><feGaussianBlur stdDeviation="9"/></filter>"#;
|
||||
assert_eq!(run(&mut s, "svgFilter.list", json!({}))["filters"][0]["xml"], kept, "it keeps the default's name");
|
||||
// Applying the name now applies the document's filter.
|
||||
let a = rect(&mut s, 10.0);
|
||||
run(&mut s, "svgFilter.apply", json!({"name": "Glow", "ids": [a.0]}));
|
||||
assert_eq!(drawn(&s, a), json!(kept));
|
||||
// Deleting the copy leaves the effect drawing nothing, as for any filter, and lists the default.
|
||||
run(&mut s, "svgFilter.delete", json!({"name": "Glow"}));
|
||||
assert_eq!(drawn(&s, a), json!(""));
|
||||
assert!(defaults(&mut s).contains(&("Glow".to_string(), false)));
|
||||
// The default itself is not deleted.
|
||||
let before = steps(&s);
|
||||
assert!(err(&mut s, "svgFilter.delete", json!({"name": "Glow"})).contains("is a default SVG filter"));
|
||||
assert!(err(&mut s, "svgFilter.delete", json!({"name": "Nope"})).contains("no SVG filter named"));
|
||||
assert_eq!(steps(&s), before);
|
||||
// Applied again, the default is copied back, and the object that named it draws with it.
|
||||
let b = rect(&mut s, 50.0);
|
||||
run(&mut s, "svgFilter.apply", json!({"name": "Glow", "ids": [b.0]}));
|
||||
assert_eq!((drawn(&s, a), drawn(&s, b)), (json!(glow.xml), json!(glow.xml)));
|
||||
assert_eq!(steps(&s), before + 2, "the rectangle and one step for the application");
|
||||
// A new filter may take a default's name the document does not hold.
|
||||
let mut s = session();
|
||||
run(&mut s, "svgFilter.define", json!({"xml": r#"<filter id="Invert"><feOffset dx="1"/></filter>"#}));
|
||||
assert!(defaults(&mut s).contains(&("Invert".to_string(), true)));
|
||||
// An unknown name is still refused.
|
||||
assert!(err(&mut s, "svgFilter.define", json!({"xml": SHIFT, "replace": "Nope"})).contains("no SVG filter named \"Nope\""));
|
||||
}
|
||||
|
||||
/// With `index`, the filter takes the place of an applied SVG filter, a default with its copy in
|
||||
/// the same undo step; any other effect keeps its place.
|
||||
#[test]
|
||||
fn apply_with_an_index_replaces_an_applied_filter() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 10.0);
|
||||
run(&mut s, "svgFilter.define", json!({"xml": SHIFT}));
|
||||
run(&mut s, "svgFilter.apply", json!({"name": "Shift", "ids": [a.0]}));
|
||||
run(&mut s, "effect.apply", json!({"effect": "stylize.feather", "ids": [a.0]}));
|
||||
let before = steps(&s);
|
||||
let r = run(&mut s, "svgFilter.apply", json!({"name": "Invert", "ids": [a.0], "index": 0, "item": null}));
|
||||
assert_eq!(r["ids"], json!([a.0]));
|
||||
assert_eq!(steps(&s), before + 1, "one step");
|
||||
let fx = s.doc().unwrap().doc.node(a).unwrap().appearance.effects.clone();
|
||||
assert_eq!((fx.len(), fx[0].params["name"].as_str(), fx[1].id.as_str()), (2, Some("Invert"), "stylize.feather"));
|
||||
assert_eq!(names(&mut s), ["Shift", "Invert"]);
|
||||
run(&mut s, "edit.undo", json!({}));
|
||||
assert_eq!(names(&mut s), ["Shift"]);
|
||||
assert_eq!(s.doc().unwrap().doc.node(a).unwrap().appearance.effects[0].params["name"], "Shift");
|
||||
// Not an SVG filter, no effect there, or not an index: refused, and the default is not copied.
|
||||
let before = steps(&s);
|
||||
for (index, why) in [
|
||||
(json!(1), "applied SVG filter"),
|
||||
(json!(7), "applied SVG filter"),
|
||||
(json!("x"), "`index`"),
|
||||
(json!(-1), "`index`"),
|
||||
(json!(null), "`index`"),
|
||||
] {
|
||||
let e = err(&mut s, "svgFilter.apply", json!({"name": "Invert", "ids": [a.0], "index": index, "item": null}));
|
||||
assert!(e.contains(why), "{index}: {e}");
|
||||
}
|
||||
assert_eq!((names(&mut s), steps(&s)), (vec!["Shift".to_string()], before));
|
||||
}
|
||||
|
||||
/// A default needs room in the document: at 64 filters applying one is refused, and a filter the
|
||||
/// document holds still applies.
|
||||
#[test]
|
||||
fn a_full_document_refuses_a_default_it_does_not_hold() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 10.0);
|
||||
for i in 0..64 {
|
||||
run(&mut s, "svgFilter.define", json!({"xml": format!("<filter id=\"f{i}\"><feOffset/></filter>")}));
|
||||
}
|
||||
let before = steps(&s);
|
||||
assert!(err(&mut s, "svgFilter.apply", json!({"name": "Glow", "ids": [a.0]})).contains("at most 64 SVG filters"));
|
||||
let edited = r#"<filter id="Glow"><feOffset dx="2"/></filter>"#;
|
||||
assert!(err(&mut s, "svgFilter.define", json!({"xml": edited, "replace": "Glow"})).contains("at most 64 SVG filters"));
|
||||
assert_eq!(steps(&s), before);
|
||||
assert!(s.doc().unwrap().doc.node(a).unwrap().appearance.effects.is_empty());
|
||||
run(&mut s, "svgFilter.apply", json!({"name": "f3", "ids": [a.0]}));
|
||||
}
|
||||
|
||||
/// A default applied in one document is written to SVG as a filter and read back from the native
|
||||
/// format with the document's copy.
|
||||
#[test]
|
||||
fn an_applied_default_survives_svg_export_and_a_native_round_trip() {
|
||||
let mut s = session();
|
||||
let a = rect(&mut s, 10.0);
|
||||
run(&mut s, "svgFilter.apply", json!({"name": "Grayscale", "ids": [a.0]}));
|
||||
let out = svg(&mut s);
|
||||
assert!(out.contains("<feColorMatrix") && out.contains("saturate"), "{out}");
|
||||
let (back, warnings) = vectorcraft_svg::import_with_report(&out).unwrap();
|
||||
assert!(warnings.is_empty(), "{warnings:?}");
|
||||
assert!(back.any_node(|n| n.appearance.effects.iter().any(|e| e.id == "svg.filter")), "SVG import reads the filter back");
|
||||
let doc = s.doc().unwrap().doc.clone();
|
||||
let again = vectorcraft_format::load(&vectorcraft_format::save(&doc, false)).unwrap();
|
||||
assert_eq!(again.svg_filters, doc.svg_filters);
|
||||
assert_eq!(again.svg_filters[0].name, "Grayscale");
|
||||
}
|
||||
@@ -2265,6 +2265,36 @@ fn remove_breaks_takes_the_whole_story_that_select_all_selected() {
|
||||
assert!(obj(&s, a).plain_text().contains('\n') && obj(&s, b).plain_text().contains('\n'));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn remove_breaks_of_the_whole_story_takes_locked_and_hidden_frames() {
|
||||
for command in ["object.lock", "object.hide"] {
|
||||
for held_first in [false, true] {
|
||||
let (mut s, a, b, story) = threaded_list_edited_in_its_second_frame();
|
||||
let (held, other) = if held_first { (a, b) } else { (b, a) };
|
||||
let unrelated = s.execute("text.create", &json!({"x": 10, "y": 500, "text": "One\nTwo", "size": 12})).unwrap()["id"].as_u64().unwrap();
|
||||
let unrelated = NodeId(unrelated);
|
||||
s.execute(command, &json!({"ids": [held.0]})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [other.0]})).unwrap();
|
||||
s.select_tool("type", ViewInfo::default()).unwrap();
|
||||
s.set_tool_option("textSelection", &json!({"editing": other.0, "anchor": 0, "caret": 0}));
|
||||
assert_eq!(s.execute("select.all", &json!({})).unwrap()["story"], json!([a.0, b.0]));
|
||||
let case = format!("{command}, held first: {held_first}");
|
||||
let steps = undo_labels(&s).len();
|
||||
let r = s.execute("addon.cleanup.removeBreaks", &json!({"kind": "paragraph"})).unwrap();
|
||||
assert_eq!(undo_labels(&s).len(), steps + 1, "{case}: one undo step");
|
||||
assert!(r["ids"].as_array().unwrap().contains(&json!(held.0)), "{case}: the held frame is changed");
|
||||
let joined = format!("{}{}", obj(&s, a).plain_text(), obj(&s, b).plain_text());
|
||||
assert_eq!(joined, story.trim_end_matches('\n').replace('\n', " "), "{case}: every frame's returns go");
|
||||
assert_eq!(obj(&s, unrelated).plain_text(), "One\nTwo", "{case}: other type is as it was");
|
||||
// No return is left: another call fails and adds no undo step.
|
||||
assert!(s.execute("addon.cleanup.removeBreaks", &json!({"kind": "paragraph"})).is_err());
|
||||
assert_eq!(undo_labels(&s).len(), steps + 1, "{case}: no undo step when nothing changes");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(format!("{}{}", obj(&s, a).plain_text(), obj(&s, b).plain_text()), story, "{case}: undo restores the text");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn remove_breaks_on_a_selected_threaded_story_puts_a_space_between_its_frames() {
|
||||
let (mut s, a, b, story) = threaded_list_edited_in_its_second_frame();
|
||||
@@ -2306,41 +2336,72 @@ fn convert_to_text_takes_the_whole_story_that_select_all_selected() {
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether no paragraph of type `id` is a list.
|
||||
fn no_list(s: &Session, id: NodeId) -> bool {
|
||||
let t = obj(s, id);
|
||||
(0..t.paragraph_count()).all(|k| t.para_at(k).list.is_none())
|
||||
}
|
||||
|
||||
/// The bullets held as characters in the frames `ids`.
|
||||
fn bullet_chars(s: &Session, ids: &[NodeId]) -> usize {
|
||||
ids.iter().map(|id| obj(s, *id).plain_text().matches("\u{2022}\t").count()).sum()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn convert_to_text_of_the_whole_story_leaves_a_locked_frame() {
|
||||
// Over MCP without ids, and as the Paragraph panel sends it, with every frame of the story.
|
||||
for named in [false, true] {
|
||||
let (mut s, a, b, _) = threaded_list_edited_in_its_second_frame();
|
||||
s.execute("object.lock", &json!({"ids": [b.0]})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [a.0]})).unwrap();
|
||||
s.set_tool_option("textSelection", &json!({"editing": a.0, "anchor": 0, "caret": 0}));
|
||||
assert_eq!(s.execute("select.all", &json!({})).unwrap()["story"], json!([a.0, b.0]));
|
||||
// The first frame ends with a paragraph return, so the paragraph that starts the locked
|
||||
// frame takes in the first frame's empty last part and starts its text there.
|
||||
let in_a = obj(&s, a).plain_text();
|
||||
assert!(in_a.ends_with('\n'));
|
||||
let own = in_a.split('\n').filter(|piece| !piece.is_empty()).count();
|
||||
let p = if named { json!({"ids": [a.0, b.0]}) } else { json!({}) };
|
||||
let r = s.execute("text.convertListToText", &p).unwrap();
|
||||
assert_eq!(r["ids"], json!([a.0]), "only the editable frame is changed (ids named: {named})");
|
||||
assert_eq!(r["converted"], json!(own), "only the paragraphs whose text starts in the editable frame convert");
|
||||
assert!(r["inserted"].as_array().unwrap().iter().all(|i| i["id"] == json!(a.0)));
|
||||
let (ta, tb) = (obj(&s, a), obj(&s, b));
|
||||
assert!(ta.plain_text().contains("\u{2022}\t"), "the editable frame is converted");
|
||||
let markers = ta.plain_text().matches("\u{2022}\t").count() + tb.plain_text().matches("\u{2022}\t").count();
|
||||
assert_eq!(markers, own, "the locked frame's first paragraph keeps its list");
|
||||
// The converted text is longer, so the story flows on into the locked frame; its own
|
||||
// paragraphs stay a list.
|
||||
let last = tb.paragraph_count() - 2;
|
||||
assert!(tb.para_at(last).list.is_some(), "the locked frame's paragraphs stay a list (ids named: {named})");
|
||||
assert!(!tb.plain_text().ends_with("\u{2022}\tAlpha beta.\n"));
|
||||
assert!(s.tool_options().get("story").is_some(), "the whole story stays selected");
|
||||
fn convert_to_text_of_the_whole_story_converts_locked_and_hidden_frames() {
|
||||
// Over MCP without ids, as the Paragraph panel sends it with every frame of the story, and with
|
||||
// ids naming only the held frame.
|
||||
for command in ["object.lock", "object.hide"] {
|
||||
for held_first in [false, true] {
|
||||
for call in ["none", "story", "held"] {
|
||||
let (mut s, a, b, story) = threaded_list_edited_in_its_second_frame();
|
||||
let (held, other) = if held_first { (a, b) } else { (b, a) };
|
||||
let unrelated =
|
||||
s.execute("text.create", &json!({"x": 10, "y": 500, "text": "One\nTwo", "size": 12})).unwrap()["id"].as_u64().unwrap();
|
||||
let unrelated = NodeId(unrelated);
|
||||
s.execute("text.setFormat", &json!({"ids": [unrelated.0], "list": "bullet"})).unwrap();
|
||||
let unrelated_before = obj(&s, unrelated);
|
||||
s.execute(command, &json!({"ids": [held.0]})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [other.0]})).unwrap();
|
||||
s.select_tool("type", ViewInfo::default()).unwrap();
|
||||
s.set_tool_option("textSelection", &json!({"editing": other.0, "anchor": 0, "caret": 0}));
|
||||
assert_eq!(s.execute("select.all", &json!({})).unwrap()["story"], json!([a.0, b.0]));
|
||||
let case = format!("{command}, held first: {held_first}, ids: {call}");
|
||||
let p = match call {
|
||||
"none" => json!({}),
|
||||
"story" => json!({"ids": [a.0, b.0]}),
|
||||
_ => json!({"ids": [held.0]}),
|
||||
};
|
||||
let steps = undo_labels(&s).len();
|
||||
let r = s.execute("text.convertListToText", &p).unwrap();
|
||||
assert_eq!(undo_labels(&s).len(), steps + 1, "{case}: one undo step");
|
||||
assert!(r["ids"].as_array().unwrap().contains(&json!(held.0)), "{case}: the held frame is changed");
|
||||
assert!(no_list(&s, held), "{case}: the held frame leaves its list");
|
||||
assert_eq!(obj(&s, unrelated), unrelated_before, "{case}: other type is as it was");
|
||||
if call == "held" {
|
||||
// The other frame's paragraphs whose text starts there keep their list.
|
||||
assert!(!no_list(&s, other), "{case}: the frame not named keeps its list");
|
||||
continue;
|
||||
}
|
||||
assert!(no_list(&s, other), "{case}: the other frame leaves its list");
|
||||
assert_eq!(bullet_chars(&s, &[a, b]), 12, "{case}: each paragraph's bullet is held once as characters");
|
||||
assert!(s.tool_options().get("story").is_some(), "{case}: the whole story stays selected");
|
||||
// Nothing is a list any more: another call changes nothing and adds no undo step.
|
||||
s.execute("text.convertListToText", &p).unwrap();
|
||||
assert_eq!(undo_labels(&s).len(), steps + 1, "{case}: no undo step when nothing changes");
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(format!("{}{}", obj(&s, a).plain_text(), obj(&s, b).plain_text()), story, "{case}: undo restores the text");
|
||||
assert!(!no_list(&s, a) && !no_list(&s, b), "{case}: undo restores the lists");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn convert_to_text_of_the_whole_story_leaves_a_paragraph_that_starts_in_a_locked_frame() {
|
||||
for named in [false, true] {
|
||||
fn convert_to_text_of_the_whole_story_converts_a_paragraph_that_runs_across_a_locked_frame() {
|
||||
// The paragraph that runs from the first frame into the second starts in the locked frame, or
|
||||
// ends in it.
|
||||
for (named, lock_first) in [(false, true), (true, true), (false, false), (true, false)] {
|
||||
let mut s = session();
|
||||
let story = format!("Alpha beta.\nAlpha beta.\n{}end.\nAlpha beta.\nAlpha beta.\n", "Gamma delta ".repeat(40));
|
||||
let a = NodeId(
|
||||
@@ -2354,22 +2415,23 @@ fn convert_to_text_of_the_whole_story_leaves_a_paragraph_that_starts_in_a_locked
|
||||
s.execute("text.setFormat", &json!({"ids": [a.0, b.0], "list": "bullet"})).unwrap();
|
||||
let in_a = obj(&s, a).plain_text();
|
||||
assert!(!in_a.ends_with('\n') && !obj(&s, b).plain_text().starts_with('\n'), "a paragraph runs on from the first frame into the second");
|
||||
s.execute("object.lock", &json!({"ids": [a.0]})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [b.0]})).unwrap();
|
||||
let (locked, other) = if lock_first { (a, b) } else { (b, a) };
|
||||
s.execute("object.lock", &json!({"ids": [locked.0]})).unwrap();
|
||||
s.execute("select.set", &json!({"ids": [other.0]})).unwrap();
|
||||
s.select_tool("type", ViewInfo::default()).unwrap();
|
||||
s.set_tool_option("textSelection", &json!({"editing": b.0, "anchor": 0, "caret": 0}));
|
||||
s.set_tool_option("textSelection", &json!({"editing": other.0, "anchor": 0, "caret": 0}));
|
||||
assert_eq!(s.execute("select.all", &json!({})).unwrap()["story"], json!([a.0, b.0]));
|
||||
let case = format!("ids named: {named}, first frame locked: {lock_first}");
|
||||
let p = if named { json!({"ids": [a.0, b.0]}) } else { json!({}) };
|
||||
let r = s.execute("text.convertListToText", &p).unwrap();
|
||||
assert_eq!(r["ids"], json!([b.0]), "only the editable frame is changed (ids named: {named})");
|
||||
// The two paragraphs that start in the editable frame, and the empty one that ends the story.
|
||||
assert_eq!(r["converted"], json!(3), "only the paragraphs that start in the editable frame convert");
|
||||
assert_eq!(r["ids"], json!([a.0, b.0]), "{case}: both frames are changed");
|
||||
// The five paragraphs with text, and the empty one that ends the story.
|
||||
assert_eq!(r["converted"], json!(6), "{case}: every paragraph of the story converts");
|
||||
let (ta, tb) = (obj(&s, a), obj(&s, b));
|
||||
assert_eq!(ta.plain_text(), in_a, "the locked frame's text is as it was");
|
||||
assert!((0..ta.paragraph_count()).all(|k| ta.para_at(k).list.is_some()), "the locked frame stays a list");
|
||||
assert!(tb.para_at(0).list.is_some(), "the paragraph the locked frame starts stays a list");
|
||||
assert!(!tb.plain_text().starts_with('\u{2022}'));
|
||||
assert_eq!(tb.plain_text().matches("\u{2022}\t").count(), 2);
|
||||
assert!(no_list(&s, a) && no_list(&s, b), "{case}: the story leaves its list");
|
||||
assert_eq!(bullet_chars(&s, &[a, b]), 5, "{case}: each paragraph's bullet is held once as characters");
|
||||
assert!(ta.plain_text().contains("\u{2022}\tGamma"), "{case}: the paragraph across the frames takes its bullet where its text starts");
|
||||
assert!(!tb.plain_text().starts_with('\u{2022}'), "{case}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -429,6 +429,7 @@ impl Session {
|
||||
},
|
||||
screen: view.screen,
|
||||
plane_widget: self.prefs.perspective_widget.show.then_some(self.prefs.perspective_widget.position),
|
||||
plane_targets: self.prefs.perspective_widget.targets(),
|
||||
precise_cursors: self.precise_cursors(),
|
||||
global_edit: st.global_edit.as_ref().map_or(&[], |g| g.members.as_slice()),
|
||||
};
|
||||
@@ -1543,7 +1544,7 @@ impl Session {
|
||||
if !std::sync::Arc::ptr_eq(&it.doc, &st.doc) {
|
||||
return None;
|
||||
}
|
||||
let interaction_fields = (it.preview.clone(), it.copies.clone(), it.perspective_again.clone());
|
||||
let interaction_fields = (it.preview.clone(), it.copies.clone(), it.perspective_again.clone(), it.plane_placed);
|
||||
(st.doc.clone(), st.selection.clone(), st.revision, self.pending_paint.clone(), interaction_fields)
|
||||
};
|
||||
let (overlays, transform_box) = if self.preview(cmd, p).is_ok() {
|
||||
@@ -1565,6 +1566,7 @@ impl Session {
|
||||
it.preview = interaction_fields.0;
|
||||
it.copies = interaction_fields.1;
|
||||
it.perspective_again = interaction_fields.2;
|
||||
it.plane_placed = interaction_fields.3;
|
||||
}
|
||||
}
|
||||
self.pending_paint = paint;
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use vectorcraft_engine::cmd::{Location, ParamsPlace};
|
||||
use vectorcraft_engine::{Session, command_specs};
|
||||
use vectorcraft_testkit::catch_quiet;
|
||||
use vectorcraft_testkit::fixtures::Fixture;
|
||||
@@ -272,44 +273,46 @@ fn tool_edit_cases(c: &vectorcraft_engine::CommandSpec, path: &str) -> Vec<Value
|
||||
cases
|
||||
}
|
||||
|
||||
/// The strings in `v`, the value at `at` in a case of command `id`, that name a place on disk
|
||||
/// outside `dir`, as `id at: value`: `v` itself and the members of arrays in it when `named` (it is
|
||||
/// under a key that names a file or folder), and in objects at any depth, the values under such
|
||||
/// keys ([`names_location`]).
|
||||
fn outside_locations(id: &str, at: &str, v: &Value, named: bool, dir: &std::path::Path, out: &mut std::collections::BTreeSet<String>) {
|
||||
/// The strings in `v`, the value at `at` (found at `place`) in a case of command `id`, that name a
|
||||
/// place on disk outside `dir`, as `id at: value`: `v` itself and the members of arrays in it when
|
||||
/// `named` (it is under a key that names a file or folder), and in objects at any depth, the values
|
||||
/// under such keys as the command reads them (`vectorcraft_engine::cmd::ParamsPlace`).
|
||||
fn outside_locations(
|
||||
id: &str,
|
||||
at: &str,
|
||||
v: &Value,
|
||||
place: ParamsPlace,
|
||||
named: bool,
|
||||
dir: &std::path::Path,
|
||||
out: &mut std::collections::BTreeSet<String>,
|
||||
) {
|
||||
match v {
|
||||
Value::String(s) if named && !std::path::Path::new(s).starts_with(dir) => {
|
||||
out.insert(format!("{id} {at}: {v}"));
|
||||
}
|
||||
Value::Array(a) => {
|
||||
let step = ParamsPlace::step(a);
|
||||
for (i, x) in a.iter().enumerate() {
|
||||
outside_locations(id, &format!("{at}[{i}]"), x, named, dir, out);
|
||||
outside_locations(id, &format!("{at}[{i}]"), x, place.item(i, step), named, dir, out);
|
||||
}
|
||||
}
|
||||
Value::Object(o) => {
|
||||
let carried = ParamsPlace::carried(o);
|
||||
for (k, x) in o {
|
||||
outside_locations(id, &format!("{at}.{k}"), x, names_location(None, k), dir, out);
|
||||
let (below, location) = place.member(k, carried);
|
||||
outside_locations(id, &format!("{at}.{k}"), x, below, location.is_some(), dir, out);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
/// Does `key` name a file or folder, in command `spec` when given: a key in
|
||||
/// `vectorcraft_engine::cmd::key_location`'s list that `vectorcraft_engine::cmd::location_in` keeps
|
||||
/// for `spec`.
|
||||
fn names_location(spec: Option<&vectorcraft_engine::CommandSpec>, key: &str) -> bool {
|
||||
match spec {
|
||||
Some(spec) => vectorcraft_engine::cmd::location_in(spec, key).is_some(),
|
||||
None => vectorcraft_engine::cmd::key_location(key).is_some(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Every string the sweeps send under a key that names a file or folder, in the command catalog
|
||||
/// (`vectorcraft_engine::cmd::location_keys`, so a command added later is checked too) or inside
|
||||
/// an object or an array at any depth, is inside the sweep's temp folder, so no run reads or
|
||||
/// writes in the working directory. `every_command_with_junk_params` sends every such key of every
|
||||
/// command alone in at least one case ([`junk_cases`]).
|
||||
/// command alone in at least one case ([`junk_cases`]). Which catalog keys name a file or folder is
|
||||
/// checked on its own by [`catalog_path_keys_match_location_policy`].
|
||||
#[test]
|
||||
fn sweep_cases_name_files_only_inside_the_temp_folder() {
|
||||
let dir = vectorcraft_testkit::TempDir::new("sweep");
|
||||
@@ -330,7 +333,8 @@ fn sweep_cases_name_files_only_inside_the_temp_folder() {
|
||||
for p in &cases {
|
||||
let Some(o) = p.as_object() else { continue };
|
||||
for (k, v) in o {
|
||||
outside_locations(c.id, k, v, names_location(Some(c), k), &dir, &mut outside);
|
||||
let (below, location) = ParamsPlace::top(Some(c)).member(k, None);
|
||||
outside_locations(c.id, k, v, below, location.is_some(), &dir, &mut outside);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -339,6 +343,104 @@ fn sweep_cases_name_files_only_inside_the_temp_folder() {
|
||||
assert!(outside.is_empty(), "{} cases name a location outside {}:\n{}", outside.len(), dir.display(), outside.join("\n"));
|
||||
}
|
||||
|
||||
/// The param keys that name a file or a folder, and which.
|
||||
const LOCATION_KEYS: &[(&str, Location)] = &[
|
||||
("path", Location::File),
|
||||
("paths", Location::File),
|
||||
("file", Location::File),
|
||||
("files", Location::File),
|
||||
("diffPath", Location::File),
|
||||
("folder", Location::Folder),
|
||||
("dir", Location::Folder),
|
||||
("directory", Location::Folder),
|
||||
("destinationFolder", Location::Folder),
|
||||
("sourceFolder", Location::Folder),
|
||||
("fontsFolder", Location::Folder),
|
||||
("pluginsFolder", Location::Folder),
|
||||
("recoveryFolder", Location::Folder),
|
||||
("templatesFolder", Location::Folder),
|
||||
];
|
||||
|
||||
/// Param keys that read like a file or folder key ([`reads_like_a_location`]) and name neither:
|
||||
/// web links, an export's grouping of its files, and choices and switches.
|
||||
const NOT_LOCATIONS: &[&str] = &[
|
||||
"url",
|
||||
"copyrightUrl",
|
||||
"folders",
|
||||
"alignToPath",
|
||||
"wholePaths",
|
||||
"emptyTextPaths",
|
||||
"sortPaths",
|
||||
"alterPaths",
|
||||
"includeLinkedFiles",
|
||||
"linksFolder",
|
||||
];
|
||||
|
||||
/// Commands and the key in [`LOCATION_KEYS`] that, at the top of their params, names part of the
|
||||
/// document (a path of its art, a result field), not a file.
|
||||
const DOCUMENT_PARTS: &[(&str, &str)] = &[
|
||||
("object.setLiveShape", "path"),
|
||||
("path.reverse", "paths"),
|
||||
("object.pathfinder.options", "paths"),
|
||||
("object.maskImage", "path"),
|
||||
("text.createInPath", "path"),
|
||||
("symbol.instance.setAppearance", "path"),
|
||||
("symbol.instance.selectPart", "path"),
|
||||
("object.objectsOnPath.attach", "path"),
|
||||
("svgInteractivity.info", "files"),
|
||||
("addon.cleanup.rejoin", "paths"),
|
||||
];
|
||||
|
||||
/// Does param key `k` read like one that names a file, a folder or a link: a bare name for one, or a
|
||||
/// name that ends like one?
|
||||
fn reads_like_a_location(k: &str) -> bool {
|
||||
const ENDS: &[&str] = &["Path", "Paths", "File", "Files", "Folder", "Folders", "Dir", "Directory", "Url", "URL"];
|
||||
matches!(k, "path" | "paths" | "file" | "files" | "folder" | "folders" | "dir" | "directory" | "url") || ENDS.iter().any(|end| k.ends_with(end))
|
||||
}
|
||||
|
||||
/// Every key of every command that reads like a file or folder key (in its params description, the
|
||||
/// commands its `…` entries name and its schema) is in [`LOCATION_KEYS`] or [`NOT_LOCATIONS`], so a
|
||||
/// command that adds one fails here until it is sorted. The generic classifications
|
||||
/// (`vectorcraft_engine::cmd::key_location`, `vectorcraft_engine::file_access::is_path_key`) agree
|
||||
/// with those lists, and each command reads such a key as they say (`location_in`), less
|
||||
/// [`DOCUMENT_PARTS`].
|
||||
#[test]
|
||||
fn catalog_path_keys_match_location_policy() {
|
||||
use vectorcraft_engine::cmd::{key_location, location_in, params::takes_key};
|
||||
let catalog: Vec<(&vectorcraft_engine::CommandSpec, Vec<String>)> = command_specs().iter().map(|c| (c, command_param_keys(c))).collect();
|
||||
let mut keys: std::collections::BTreeSet<String> =
|
||||
catalog.iter().flat_map(|(_, keys)| keys.iter().filter(|k| reads_like_a_location(k)).cloned()).collect();
|
||||
keys.extend(LOCATION_KEYS.iter().map(|(k, _)| k.to_string()).chain(NOT_LOCATIONS.iter().map(|k| k.to_string())));
|
||||
let mut wrong = vec![];
|
||||
for k in &keys {
|
||||
let want = LOCATION_KEYS.iter().find(|(l, _)| l == k).map(|(_, l)| *l);
|
||||
if want.is_none() && !NOT_LOCATIONS.contains(&k.as_str()) {
|
||||
wrong.push(format!("`{k}` is in neither LOCATION_KEYS nor NOT_LOCATIONS"));
|
||||
continue;
|
||||
}
|
||||
if key_location(k) != want {
|
||||
wrong.push(format!("key_location(`{k}`) is {:?}, not {want:?}", key_location(k)));
|
||||
}
|
||||
if vectorcraft_engine::file_access::is_path_key(k) != want.is_some() {
|
||||
wrong.push(format!("is_path_key(`{k}`) is {}", want.is_none()));
|
||||
}
|
||||
for (c, named) in &catalog {
|
||||
if !named.contains(k) && !(c.params.contains('…') && takes_key(c.params, k)) {
|
||||
continue;
|
||||
}
|
||||
let here = if DOCUMENT_PARTS.contains(&(c.id, k.as_str())) { None } else { want };
|
||||
if location_in(c, k) != here {
|
||||
wrong.push(format!("{}: location_in(`{k}`) is {:?}, not {here:?}", c.id, location_in(c, k)));
|
||||
}
|
||||
}
|
||||
}
|
||||
for (id, key) in DOCUMENT_PARTS {
|
||||
let named = catalog.iter().any(|(c, _)| c.id == *id && c.params.contains(key));
|
||||
assert!(named, "{id} doesn't name `{key}`");
|
||||
}
|
||||
assert!(wrong.is_empty(), "{} keys are classified unlike the reviewed lists:\n{}", wrong.len(), wrong.join("\n"));
|
||||
}
|
||||
|
||||
/// The cases sweep keys the command catalog names as files and folders: `document.open`'s
|
||||
/// `{path | name …}`, `addon.document.saveTimestampedCopy`'s `{folder? (…)}`, `document.compare`'s
|
||||
/// `diffPath`, `file.saveAs`'s `path` after `{…as document.save}` and `links.relink`'s
|
||||
@@ -650,6 +752,10 @@ fn structured_junk() {
|
||||
)}),
|
||||
),
|
||||
("svgFilter.apply", json!({"name": "\u{0}", "ids": [u64::MAX]})),
|
||||
("svgFilter.apply", json!({"name": "Glow", "index": u64::MAX, "item": -1})),
|
||||
("svgFilter.apply", json!({"name": "Rough Edges", "index": [0], "ids": "x"})),
|
||||
("svgFilter.define", json!({"xml": "<filter id=\"x\"/>", "replace": "Glow"})),
|
||||
("svgFilter.delete", json!({"name": "Glow"})),
|
||||
("svgFilter.delete", json!({"name": ["a"]})),
|
||||
(
|
||||
"effect.apply",
|
||||
|
||||
@@ -2904,9 +2904,9 @@ fn arb_body() -> impl Strategy<Value = Vec<u8>> {
|
||||
}
|
||||
|
||||
/// WMF record functions VectorCraft reads, and one it doesn't.
|
||||
const WMF_FUNCTIONS: [u16; 33] = [
|
||||
const WMF_FUNCTIONS: [u16; 35] = [
|
||||
0x0324, 0x0325, 0x0538, 0x041B, 0x0418, 0x061C, 0x0817, 0x081A, 0x0830, 0x0416, 0x0415, 0x02FA, 0x02FC, 0x02FB, 0x012D, 0x01F0, 0x0521, 0x0A32,
|
||||
0x0F43, 0x0B41, 0x0940, 0x061D, 0x0213, 0x0214, 0x001E, 0x0127, 0x0106, 0x0209, 0x012E, 0x00F7, 0x01F9, 0x0142, 0x0999,
|
||||
0x0F43, 0x0B41, 0x0940, 0x061D, 0x0213, 0x0214, 0x001E, 0x0127, 0x0106, 0x0209, 0x012E, 0x00F7, 0x01F9, 0x0142, 0x0103, 0x0104, 0x0999,
|
||||
];
|
||||
|
||||
proptest! {
|
||||
@@ -2933,6 +2933,30 @@ proptest! {
|
||||
survive_metafile("WMF records", "x.wmf", &wmf_of(&records))?;
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn random_headerless_wmf_records_never_panic(records in prop::collection::vec((prop::sample::select(WMF_FUNCTIONS.to_vec()), arb_body()), 0..32)) {
|
||||
// Without the placeable header, the map and mix modes the records set decide the scale.
|
||||
survive_metafile("headerless WMF records", "x.wmf", &wmf_of(&records)[22..])?;
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn random_emf_plus_records_never_panic(records in prop::collection::vec((0x4001u16..0x403B, any::<u16>(), arb_body()), 0..32)) {
|
||||
// One comment of EMF+ records (type, flags, data) after an EmfPlusHeader.
|
||||
let mut plus = vec![];
|
||||
let header = (0x4001u16, 0u16, [0xDBC0_1002u32, 0, 96, 96].iter().flat_map(|v| v.to_le_bytes()).collect::<Vec<u8>>());
|
||||
for (kind, flags, data) in std::iter::once(&header).chain(&records) {
|
||||
plus.extend(kind.to_le_bytes());
|
||||
plus.extend(flags.to_le_bytes());
|
||||
plus.extend((12 + data.len() as u32).to_le_bytes());
|
||||
plus.extend((data.len() as u32).to_le_bytes());
|
||||
plus.extend(data);
|
||||
}
|
||||
let mut comment = (4 + plus.len() as u32).to_le_bytes().to_vec();
|
||||
comment.extend(b"EMF+");
|
||||
comment.extend(plus);
|
||||
survive_metafile("EMF+ records", "x.emf", &emf_of(&[(70, comment)]))?;
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn pasted_metafiles_never_panic(which in 0usize..2, cut in 0usize..200_000, edits in prop::collection::vec((0usize..200_000, any::<u8>()), 0..12)) {
|
||||
paste_from_elsewhere("clipboard.importEmf", json!({"dataBase64": mutated_b64(metafile_samples()[which].clone(), cut, &edits)}))?;
|
||||
|
||||
@@ -4191,6 +4191,57 @@ fn standard_vertical_roman_alignment_comes_back() {
|
||||
assert_eq!(flags(&texts(&read_back(&both))[0])[2], (false, true));
|
||||
}
|
||||
|
||||
/// Insert Aki Left and Right come back on each run, in vertical and horizontal type: a run with
|
||||
/// either writes it as key 49 or 50 in 1/1000 em, a run without writes neither, and nothing is
|
||||
/// reported. Each object lays out as it did. A run that also has an attribute the text document
|
||||
/// leaves out is still reported.
|
||||
#[test]
|
||||
fn insert_aki_comes_back() {
|
||||
use vectorcraft_doc::{CharStyle, TextObject, TextRun};
|
||||
let plain = style(14.0, Color::BLACK);
|
||||
let left = CharStyle { aki_left: 250.0, ..plain.clone() };
|
||||
let both = CharStyle { aki_left: 125.5, aki_right: 500.0, ..plain.clone() };
|
||||
let mut doc = Document::new(200.0, 200.0);
|
||||
let layer = doc.layers[0].id;
|
||||
let mut down = TextObject::point(vectorcraft_geom::Point::new(150.0, 20.0), "", plain.clone());
|
||||
down.runs = vec![TextRun::new("AB", left.clone()), TextRun::new("CD", plain.clone()), TextRun::new("EF", both.clone())];
|
||||
down.vertical = true;
|
||||
let mut across = TextObject::point(vectorcraft_geom::Point::new(20.0, 40.0), "", plain.clone());
|
||||
across.runs = vec![TextRun::new("GH", both.clone()), TextRun::new("IJ", plain.clone())];
|
||||
for t in [down, across] {
|
||||
let n = text_node(&mut doc, t);
|
||||
doc.insert(Some(layer), usize::MAX, n).unwrap();
|
||||
}
|
||||
let out = export_ai_editing(&doc, &opts()).unwrap();
|
||||
assert!(out.warnings.is_empty(), "{:?}", out.warnings);
|
||||
let back = read_back(&doc);
|
||||
same_lines(&type_lines(&back), &type_lines(&doc));
|
||||
let texts = |d: &Document| -> Vec<TextObject> {
|
||||
d.layers[0].children().unwrap().iter().filter_map(|n| if let NodeKind::Text(t) = &n.kind { Some((**t).clone()) } else { None }).collect()
|
||||
};
|
||||
let aki = |t: &TextObject| t.runs.iter().map(|r| (r.style.aki_left, r.style.aki_right)).collect::<Vec<_>>();
|
||||
let (written, read) = (texts(&doc), texts(&back));
|
||||
assert_eq!(read.iter().map(aki).collect::<Vec<_>>(), [vec![(250.0, 0.0), (0.0, 0.0), (125.5, 500.0)], vec![(125.5, 500.0), (0.0, 0.0)]]);
|
||||
let origins = |t: &TextObject| {
|
||||
vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t).glyphs.iter().map(|g| (r3(g.origin.x), r3(g.origin.y))).collect::<Vec<_>>()
|
||||
};
|
||||
for (w, r) in written.iter().zip(&read) {
|
||||
assert_eq!(origins(r), origins(w), "vertical={}", w.vertical);
|
||||
}
|
||||
let decoded = text_document(&program(&doc));
|
||||
for (key, count) in [("/49 250.0", 1), ("/49 125.5", 2), ("/50 500.0", 2)] {
|
||||
assert_eq!(decoded.matches(key).count(), count, "{key}: {decoded}");
|
||||
}
|
||||
assert_eq!(decoded.matches("/49 ").count() + decoded.matches("/50 ").count(), 5, "{decoded}");
|
||||
// Underline is still left out, and reported.
|
||||
let mut lossy = doc.clone();
|
||||
let id = lossy.layers[0].children().unwrap()[0].id;
|
||||
if let Some(NodeKind::Text(t)) = lossy.node_mut(id).map(|n| &mut n.kind) {
|
||||
t.runs[0].style.underline = true;
|
||||
}
|
||||
assert_eq!(export_ai_editing(&lossy, &opts()).unwrap().warnings, [writer::TYPE_ATTRIBUTES]);
|
||||
}
|
||||
|
||||
/// The text document of program `text` (LF line ends), decoded, with its UTF-16 strings' zero
|
||||
/// bytes left out.
|
||||
fn text_document(text: &str) -> String {
|
||||
@@ -10194,6 +10245,119 @@ fn envelopes_past_the_readers_checks_are_written_as_their_art() {
|
||||
assert!(!notes.iter().any(|n| n == crate::import::ENVELOPE_DRAWN), "{notes:?}");
|
||||
}
|
||||
|
||||
/// A document of `envelopes` envelopes and `images` embedded images with one Warp, the images first
|
||||
/// when `images_first`, saved and opened again: the live envelopes, the images with their Warp live
|
||||
/// and all the objects it opens with, the save's warnings and the open's notes.
|
||||
fn envelopes_and_warped_images(envelopes: usize, images: usize, images_first: bool) -> (usize, usize, usize, Vec<String>, Vec<String>) {
|
||||
use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
|
||||
let mut doc = Document::new(200.0, 100.0);
|
||||
let layer = doc.layers[0].id;
|
||||
let add_images = |doc: &mut Document| {
|
||||
for _ in 0..images {
|
||||
let photo = warped_photo(doc, vec![fx("warp.arc", serde_json::json!({"bend": 40.0}))]);
|
||||
doc.insert(Some(layer), usize::MAX, photo).unwrap();
|
||||
}
|
||||
};
|
||||
if images_first {
|
||||
add_images(&mut doc);
|
||||
}
|
||||
for _ in 0..envelopes {
|
||||
let points = [(30.0, 10.0), (170.0, 0.0), (30.0, 90.0), (170.0, 90.0)].map(kurbo::Point::from).to_vec();
|
||||
let kind = EnvelopeKind::Mesh { rows: 1, cols: 1, points, handles: vec![] };
|
||||
let envelope = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW);
|
||||
doc.insert(Some(layer), usize::MAX, envelope).unwrap();
|
||||
}
|
||||
if !images_first {
|
||||
add_images(&mut doc);
|
||||
}
|
||||
let (p, warnings) = private_data(&doc, &opts()).unwrap();
|
||||
let (back, notes) = crate::ai_alone(&p.data).unwrap();
|
||||
let a = back.layers[0].children().unwrap();
|
||||
let live = a.iter().filter(|n| matches!(n.kind, NodeKind::Envelope { .. })).count();
|
||||
let warped = a.iter().filter(|n| matches!(n.kind, NodeKind::Image(_)) && n.appearance.effects.iter().any(|e| e.id == "warp.arc")).count();
|
||||
(live, warped, a.len(), warnings, notes)
|
||||
}
|
||||
|
||||
/// Images with a Warp take the reader's checks as envelopes do: past them, an image is written as
|
||||
/// its drawn look, with a warning, and the file opens with every object written live still live.
|
||||
#[test]
|
||||
fn warped_images_past_the_readers_checks_are_written_as_their_drawn_look() {
|
||||
// GUARDS: images with a Warp were written live past the checks the envelopes left, and the
|
||||
// file opened with the last one as its drawn look and no warning on saving.
|
||||
let limit = crate::import::ENVELOPE_CHECKS;
|
||||
let (live, warped, all, warnings, notes) = envelopes_and_warped_images(limit - 1, 2, false);
|
||||
assert_eq!((live, warped, all), (limit - 1, 1, limit + 1), "{warnings:?} {notes:?}");
|
||||
assert!(warnings.iter().any(|w| w == writer::WARPED_IMAGES), "{warnings:?}");
|
||||
assert!(!warnings.iter().any(|w| w == writer::ENVELOPES), "{warnings:?}");
|
||||
assert!(!notes.iter().any(|n| n.contains("drawn look") || n == crate::import::ENVELOPE_DRAWN), "{notes:?}");
|
||||
}
|
||||
|
||||
/// An image with a Warp whose pixels can't be read is written as its gray outline, which the reader
|
||||
/// doesn't check: it leaves its check to the objects after it.
|
||||
#[test]
|
||||
fn a_warped_image_written_as_its_outline_takes_no_check() {
|
||||
// GUARDS: an image written as its gray outline took a check, and the image after it lost its Warp.
|
||||
use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
|
||||
let limit = crate::import::ENVELOPE_CHECKS;
|
||||
let mut doc = Document::new(200.0, 100.0);
|
||||
let layer = doc.layers[0].id;
|
||||
for _ in 0..limit - 1 {
|
||||
let points = [(30.0, 10.0), (170.0, 0.0), (30.0, 90.0), (170.0, 90.0)].map(kurbo::Point::from).to_vec();
|
||||
let kind = EnvelopeKind::Mesh { rows: 1, cols: 1, points, handles: vec![] };
|
||||
let envelope = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW);
|
||||
doc.insert(Some(layer), usize::MAX, envelope).unwrap();
|
||||
}
|
||||
let arc = || fx("warp.arc", serde_json::json!({"bend": 40.0}));
|
||||
let mut broken = image_node(&mut doc, ImageBlob::png(b"not a png".to_vec()), (8, 8), Affine::new([10.0, 0.0, 0.0, 10.0, 20.0, 10.0]), None);
|
||||
broken.appearance = Appearance { effects: vec![arc()], ..Appearance::default() }.into();
|
||||
doc.insert(Some(layer), usize::MAX, broken).unwrap();
|
||||
let photo = warped_photo(&mut doc, vec![arc()]);
|
||||
doc.insert(Some(layer), usize::MAX, photo).unwrap();
|
||||
let (p, warnings) = private_data(&doc, &opts()).unwrap();
|
||||
assert!(warnings.iter().any(|w| w == writer::IMAGES), "{warnings:?}");
|
||||
assert!(!warnings.iter().any(|w| w == writer::WARPED_IMAGES), "{warnings:?}");
|
||||
let (back, notes) = crate::ai_alone(&p.data).unwrap();
|
||||
let a = back.layers[0].children().unwrap();
|
||||
let warped = a.iter().filter(|n| matches!(n.kind, NodeKind::Image(_)) && n.appearance.effects.iter().any(|e| e.id == "warp.arc")).count();
|
||||
assert_eq!(warped, 1, "{notes:?}");
|
||||
}
|
||||
|
||||
/// Past the reader's checks, an image with a Warp whose pixels can't be read is still written as its
|
||||
/// gray outline, with the warning for its pixels and not the one for the checks.
|
||||
#[test]
|
||||
fn an_unreadable_warped_image_past_the_checks_is_warned_about_its_pixels() {
|
||||
// GUARDS: an image whose pixels can't be read was warned about as past the checks.
|
||||
use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
|
||||
let limit = crate::import::ENVELOPE_CHECKS;
|
||||
let mut doc = Document::new(200.0, 100.0);
|
||||
let layer = doc.layers[0].id;
|
||||
for _ in 0..limit {
|
||||
let points = [(30.0, 10.0), (170.0, 0.0), (30.0, 90.0), (170.0, 90.0)].map(kurbo::Point::from).to_vec();
|
||||
let kind = EnvelopeKind::Mesh { rows: 1, cols: 1, points, handles: vec![] };
|
||||
let envelope = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW);
|
||||
doc.insert(Some(layer), usize::MAX, envelope).unwrap();
|
||||
}
|
||||
let mut broken = image_node(&mut doc, ImageBlob::png(b"not a png".to_vec()), (8, 8), Affine::new([10.0, 0.0, 0.0, 10.0, 20.0, 10.0]), None);
|
||||
broken.appearance = Appearance { effects: vec![fx("warp.arc", serde_json::json!({"bend": 40.0}))], ..Appearance::default() }.into();
|
||||
doc.insert(Some(layer), usize::MAX, broken).unwrap();
|
||||
let (_, warnings) = private_data(&doc, &opts()).unwrap();
|
||||
assert!(warnings.iter().any(|w| w == writer::IMAGES), "{warnings:?}");
|
||||
assert!(!warnings.iter().any(|w| w == writer::WARPED_IMAGES), "{warnings:?}");
|
||||
}
|
||||
|
||||
/// Envelopes after images with a Warp get the checks the images left: past them, an envelope is
|
||||
/// written as its art, with a warning.
|
||||
#[test]
|
||||
fn envelopes_get_the_checks_warped_images_left() {
|
||||
// GUARDS: envelopes were written live past the checks the images with a Warp before them left.
|
||||
let limit = crate::import::ENVELOPE_CHECKS;
|
||||
let (live, warped, all, warnings, notes) = envelopes_and_warped_images(limit - 1, 2, true);
|
||||
assert_eq!((live, warped, all), (limit - 2, 2, limit + 1), "{warnings:?} {notes:?}");
|
||||
assert!(warnings.iter().any(|w| w == writer::ENVELOPES), "{warnings:?}");
|
||||
assert!(!warnings.iter().any(|w| w == writer::WARPED_IMAGES), "{warnings:?}");
|
||||
assert!(!notes.iter().any(|n| n.contains("drawn look") || n == crate::import::ENVELOPE_DRAWN), "{notes:?}");
|
||||
}
|
||||
|
||||
/// Every Envelope Options switch and the ends of Fidelity come back as saved.
|
||||
#[test]
|
||||
fn envelope_options_and_fidelity_are_read_back() {
|
||||
|
||||
@@ -30,7 +30,7 @@ pub(super) use brushes::BRUSHES;
|
||||
pub(super) use envelopes::ENVELOPES;
|
||||
pub(super) use styles::{LARGE_CANVAS_STYLES, style_links, styled_objects};
|
||||
#[cfg(test)]
|
||||
pub(super) use styles::{PANEL_EMPTY, PANEL_STYLES, STYLE_LINKS, same_appearance};
|
||||
pub(super) use styles::{PANEL_EMPTY, PANEL_STYLES, STYLE_LINKS, WARPED_IMAGES, same_appearance};
|
||||
|
||||
pub(super) use images::PAYLOAD;
|
||||
#[cfg(test)]
|
||||
@@ -281,9 +281,9 @@ pub(super) struct Writer<'a> {
|
||||
/// The object just written is an envelope's distorted art, which the plugin's `XP` follows
|
||||
/// ([`Self::envelope`]).
|
||||
deform: bool,
|
||||
/// How many more envelopes may be written live: as many as the reader checks in one file
|
||||
/// ([`crate::import::ENVELOPE_CHECKS`]).
|
||||
envelopes_left: usize,
|
||||
/// How many more envelopes and images with a Warp may be written live: as many as the reader
|
||||
/// checks in one file ([`crate::import::ENVELOPE_CHECKS`]), which it spends on both.
|
||||
checks_left: usize,
|
||||
/// The image read last and its pixels ([`images::Samples::of`], `None` when they can't be
|
||||
/// read): the pieces of a warped image, which follow one another, read them once.
|
||||
last_samples: Option<(vectorcraft_doc::ImageBlob, Option<images::Read>)>,
|
||||
@@ -357,7 +357,7 @@ impl<'a> Writer<'a> {
|
||||
brush_set: brushes::Brushes::default(),
|
||||
brushes_live: true,
|
||||
deform: false,
|
||||
envelopes_left: crate::import::ENVELOPE_CHECKS,
|
||||
checks_left: crate::import::ENVELOPE_CHECKS,
|
||||
objects: 0,
|
||||
left_out: 0,
|
||||
definition_objects: 0,
|
||||
@@ -662,6 +662,7 @@ impl<'a> Writer<'a> {
|
||||
&& self.clip.is_none()
|
||||
&& !self.in_symbol
|
||||
&& let Some(orig) = self.styled.get(&n.id).cloned()
|
||||
&& self.check_left(&orig)
|
||||
&& let Some(name) = self.object_style(n, &orig)
|
||||
{
|
||||
return self.styled_object(n, &orig, &name);
|
||||
|
||||
@@ -26,7 +26,7 @@ use super::{MAX_NEST, Writer, Xy, hide};
|
||||
use crate::import::{DEFORM_PLUGIN, EnvelopeGridPoint as GridPoint, envelope_outline, envelope_upright, warp_number};
|
||||
use crate::ps;
|
||||
|
||||
pub(in crate::ai_editing) const ENVELOPES: &str = "envelopes of type, envelopes without contents, envelopes in opacity masks, pattern tiles, art cut to a clipping object or other envelopes' contents, envelopes on the layers of a large canvas or in a turned or mirrored frame, warps drawn without their style's net, meshes and top objects that the data would open in another shape, envelopes with a Fidelity that isn't a whole number, envelopes that map from a box other than their contents' bounds with or without strokes or keep bounds margins with Distort Appearance off, envelopes after the first 256, and envelopes nested more than 8 deep are written as their art in the editing data for other apps";
|
||||
pub(in crate::ai_editing) const ENVELOPES: &str = "envelopes of type, envelopes without contents, envelopes in opacity masks, pattern tiles, art cut to a clipping object or other envelopes' contents, envelopes on the layers of a large canvas or in a turned or mirrored frame, warps drawn without their style's net, meshes and top objects that the data would open in another shape, envelopes with a Fidelity that isn't a whole number, envelopes that map from a box other than their contents' bounds with or without strokes or keep bounds margins with Distort Appearance off, envelopes after the first 256 envelopes and images with a Warp, and envelopes nested more than 8 deep are written as their art in the editing data for other apps";
|
||||
|
||||
/// The most rows or columns of an envelope's grid written (Make with Mesh's own limit, and the
|
||||
/// reader's).
|
||||
@@ -287,7 +287,7 @@ impl Writer<'_> {
|
||||
/// another shape, or some of it is left out for the object limit ([`Self::take_objects`]).
|
||||
pub(super) fn envelope(&mut self, n: &Node, xy: Xy) -> bool {
|
||||
let NodeKind::Envelope { content, kind, fidelity, editing, options, frame } = &n.kind else { return false };
|
||||
if self.hidden > 0 || self.clip.is_some() || self.nest >= MAX_NEST || !self.symbols_live || self.envelopes_left == 0 {
|
||||
if self.hidden > 0 || self.clip.is_some() || self.nest >= MAX_NEST || !self.symbols_live || self.checks_left == 0 {
|
||||
return false;
|
||||
}
|
||||
let Some(record) = record(n, content, kind, *fidelity, *editing, options, **frame) else { return false };
|
||||
@@ -339,7 +339,7 @@ impl Writer<'_> {
|
||||
return false;
|
||||
}
|
||||
self.deform = true;
|
||||
self.envelopes_left -= 1;
|
||||
self.checks_left -= 1;
|
||||
true
|
||||
}
|
||||
|
||||
|
||||
@@ -121,29 +121,37 @@ impl Samples {
|
||||
}
|
||||
|
||||
impl Writer<'_> {
|
||||
/// Whether [`Self::image`] can read `im`'s pixels, rather than write its gray outline.
|
||||
pub(super) fn image_readable(&mut self, im: &ImageObject) -> bool {
|
||||
let doc = self.doc;
|
||||
doc.image_blob(im).and_then(|b| self.samples(b)).is_some()
|
||||
}
|
||||
|
||||
/// Image object `im` of transparency `xy`: embedded, a raster ([`Self::raster`]); linked, a
|
||||
/// placed file with a preview ([`Self::placed_file`]), except in a part of the data written on
|
||||
/// `%_` lines (other than a styled object's copy on the layers, [`Self::styled_object`]) and in
|
||||
/// a symbol's art. One whose pixels can't be read is its outline filled mid gray. Where the art is
|
||||
/// cut to a clipping path, the image is in a clipping group of that path; a raster of pixels
|
||||
/// written whole already is then the part of them that the path shows ([`ai_ops::image_window`]).
|
||||
pub(super) fn image(&mut self, im: &ImageObject, xy: Xy) {
|
||||
/// True when the image is written as an image.
|
||||
pub(super) fn image(&mut self, im: &ImageObject, xy: Xy) -> bool {
|
||||
let doc = self.doc;
|
||||
let blob = doc.image_blob(im);
|
||||
let read = blob.and_then(|b| self.samples(b));
|
||||
let Some((samples, deep)) = read.as_deref() else {
|
||||
let bounds = PathData::from_bezpath(&(im.xf * Rect::new(0.0, 0.0, f64::from(im.width), f64::from(im.height)).to_path(0.1)));
|
||||
self.warn(IMAGES);
|
||||
return self.fill_object(&bounds, FillRule::NonZero, &FillLayer::new(Paint::solid(Color::gray(0.5))), xy);
|
||||
self.fill_object(&bounds, FillRule::NonZero, &FillLayer::new(Paint::solid(Color::gray(0.5))), xy);
|
||||
return false;
|
||||
};
|
||||
// A region that has nothing left hides the image.
|
||||
if self.clip.as_ref().is_some_and(|c| c.subpaths.iter().all(|sp| sp.anchors.is_empty())) {
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
// The image, and where it is cut, the clipping group and its clipping path.
|
||||
let clipping = self.clip.as_ref().map_or(0, |c| 1 + super::object_count(c.subpaths.iter().filter(|sp| !sp.anchors.is_empty()).count()));
|
||||
if !self.take_objects(1 + clipping) {
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
if *deep {
|
||||
self.warn(IMAGE_DEPTH);
|
||||
@@ -217,6 +225,7 @@ impl Writer<'_> {
|
||||
self.end_group("Q", Xy::PLAIN);
|
||||
}
|
||||
self.clip = cut;
|
||||
true
|
||||
}
|
||||
|
||||
/// An embedded image whose pixels `xf` places in the document: `%AI5_File:`,
|
||||
|
||||
@@ -23,6 +23,7 @@ pub(in crate::ai_editing) const LARGE_CANVAS_STYLES: &str = "on a large canvas,
|
||||
pub(in crate::ai_editing) const PANEL_STYLES: &str = "graphic styles with gradient or pattern fills, with fills, strokes or effects the editing data can't hold as a graphic style, with a name another style has, with names over 1,024 bytes, or past 4,096 styles, are left out of the editing data for other apps";
|
||||
pub(in crate::ai_editing) const PANEL_EMPTY: &str =
|
||||
"a Graphic Styles panel with no style written opens from the editing data with a new document's styles";
|
||||
pub(in crate::ai_editing) const WARPED_IMAGES: &str = "images with a Warp after the first 256 envelopes and images with a Warp are written as their drawn look, without their Warp, in the editing data for other apps";
|
||||
pub(in crate::ai_editing) const STYLE_LINKS: &str = "links to graphic styles are left out of the editing data for other apps on type, images, symbol instances, knockout shapes and other objects that aren't written with their graphic style";
|
||||
|
||||
/// How many objects of `doc`'s layers, opacity masks and symbols are linked to a graphic style.
|
||||
@@ -719,6 +720,24 @@ impl Writer<'_> {
|
||||
items_keep && m.children().is_none_or(|c| c.iter().all(|c| self.member_keeps_outline(c)))
|
||||
}
|
||||
|
||||
/// Whether `orig` may be written with its art style as far as the reader's checks go: an image
|
||||
/// with a Warp takes one of them, as an envelope does ([`Self::envelope`]); with none left, it is
|
||||
/// written as its drawn look, with a warning. One whose pixels can't be read takes none: it is
|
||||
/// written as its gray outline ([`Self::image`]).
|
||||
pub(super) fn check_left(&mut self, orig: &Node) -> bool {
|
||||
if !warped_image(orig) || self.checks_left > 0 {
|
||||
return true;
|
||||
}
|
||||
let doc = self.doc;
|
||||
if let NodeKind::Image(im) = &orig.kind
|
||||
&& !self.image_readable(&doc.shown_image(orig, im))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
self.warn(WARPED_IMAGES);
|
||||
false
|
||||
}
|
||||
|
||||
/// Object `n` (as baking left it; `orig` before baking) with the style `name`: its lock and
|
||||
/// hidden state; its drawn look (a group of its vector art as baking left it, without shadows,
|
||||
/// glows or feathers, the object's transparency
|
||||
@@ -729,7 +748,8 @@ impl Writer<'_> {
|
||||
/// `1 (name) XW`.
|
||||
/// The look's group and the object itself are counted first ([`Self::take_objects`]): without
|
||||
/// room for them, nothing is written, and the object counts neither as written with its graphic
|
||||
/// style nor as written with a brush on its stroke.
|
||||
/// style nor as written with a brush on its stroke. An image written as an image takes one of
|
||||
/// the reader's checks ([`Self::check_left`]).
|
||||
pub(super) fn styled_object(&mut self, n: &Node, orig: &Node, name: &str) {
|
||||
let own = match &orig.kind {
|
||||
NodeKind::Path { path, .. } => super::object_count(path.subpaths.iter().filter(|sp| !sp.anchors.is_empty()).count()),
|
||||
@@ -787,9 +807,12 @@ impl Writer<'_> {
|
||||
match &orig.kind {
|
||||
NodeKind::Path { path, rule, .. } => self.styled_outline(orig, path, *rule, fit, xy),
|
||||
NodeKind::Compound { rule, .. } => self.styled_outline(orig, &compound_path(orig), *rule, fit, xy),
|
||||
// The reader checks the object only when it is an image, not its gray outline.
|
||||
NodeKind::Image(im) => {
|
||||
let was = std::mem::replace(&mut self.styled_copy, on_layers);
|
||||
self.image(&self.doc.shown_image(orig, im), xy);
|
||||
if self.image(&self.doc.shown_image(orig, im), xy) {
|
||||
self.checks_left = self.checks_left.saturating_sub(1);
|
||||
}
|
||||
self.styled_copy = was;
|
||||
}
|
||||
NodeKind::Group { children, .. } => {
|
||||
|
||||
@@ -20,6 +20,7 @@ use std::fmt::Write;
|
||||
|
||||
use kurbo::{ParamCurveArclen, PathSeg};
|
||||
use vectorcraft_color::{Color, Paint};
|
||||
use vectorcraft_doc::text::MAX_AKI;
|
||||
use vectorcraft_doc::{
|
||||
AreaOptions, Burasagari, CharStyle, Document, FirstBaseline, Justify, LineCap, LineJoin, Mojikumi, Node, NodeId, NodeKind, ParaDirection,
|
||||
ParaStyle, PathAlign, PathEffect, TextKind, TextObject, VerticalAlign,
|
||||
@@ -29,7 +30,7 @@ use vectorcraft_geom::{Affine, PathData, Point};
|
||||
use crate::ps;
|
||||
|
||||
/// What the text document holds of type, and what it leaves out.
|
||||
pub(in crate::ai_editing) const TYPE_ATTRIBUTES: &str = "attributes of type other than its font, size, leading, tracking, baseline shift, horizontal and vertical scale, solid fill, solid stroke and its weight, cap, join and miter limit, capitals, small capitals at the document's size, Tate-chu-yoko, Standard Vertical Roman Alignment, paragraph alignment, indents, space before and after, hyphenation on or off and right-to-left direction (for example underline, kerning, OpenType features, swatch links of its colors, character and paragraph styles, tabs, lists, optical margin alignment, area type's inset spacing, vertical alignment and flow, a minimum first baseline with the Ascent first baseline, and type on a path's effect, alignment and spacing and an end bracket at the very end of an open path) are left out of the editing data for other apps";
|
||||
pub(in crate::ai_editing) const TYPE_ATTRIBUTES: &str = "attributes of type other than its font, size, leading, tracking, baseline shift, horizontal and vertical scale, solid fill, solid stroke and its weight, cap, join and miter limit, capitals, small capitals at the document's size, Tate-chu-yoko, Standard Vertical Roman Alignment, Insert Aki, paragraph alignment, indents, space before and after, hyphenation on or off and right-to-left direction (for example underline, kerning, OpenType features, swatch links of its colors, character and paragraph styles, tabs, lists, optical margin alignment, area type's inset spacing, vertical alignment and flow, a minimum first baseline with the Ascent first baseline, and type on a path's effect, alignment and spacing and an end bracket at the very end of an open path) are left out of the editing data for other apps";
|
||||
|
||||
/// The version of the text document's form (`/98 << /0 n >>`), as the newest files users sent have it.
|
||||
const STREAM_VERSION: u32 = 14;
|
||||
@@ -326,6 +327,12 @@ fn end_read_as_none(t: &TextObject) -> bool {
|
||||
!closed(&segs) && end < 1.0 - 1e-9 && place_on(&segs, end) >= segs.len() as f64 - 0.02
|
||||
}
|
||||
|
||||
/// Insert Aki Left or Right `v` as the text document holds it: 0 to [`MAX_AKI`] in 1/1000 em, and 0
|
||||
/// for a value that is not a number.
|
||||
fn held_aki(v: f64) -> f64 {
|
||||
if v.is_nan() { 0.0 } else { v.clamp(0.0, MAX_AKI) }
|
||||
}
|
||||
|
||||
/// Has type `t` attributes the text document leaves out ([`TYPE_ATTRIBUTES`])?
|
||||
pub(in crate::ai_editing) fn loses(t: &TextObject) -> bool {
|
||||
// Small capitals are read back at Document Setup's default size.
|
||||
@@ -360,6 +367,8 @@ pub(in crate::ai_editing) fn loses(t: &TextObject) -> bool {
|
||||
tate_chu_yoko: s.tate_chu_yoko,
|
||||
// Key 35 holds one of the two: a Tate-chu-yoko run is read back without the other.
|
||||
standard_vertical_roman: s.standard_vertical_roman && !s.tate_chu_yoko,
|
||||
aki_left: held_aki(s.aki_left),
|
||||
aki_right: held_aki(s.aki_right),
|
||||
..CharStyle::default()
|
||||
}
|
||||
};
|
||||
@@ -677,6 +686,14 @@ impl TextDoc {
|
||||
};
|
||||
d.push((12, V::Int(caps)));
|
||||
d.push((35, V::Int(baseline_direction(st))));
|
||||
// Insert Aki Left and Right in 1/1000 em, as the reader reads keys 49 and 50. No key is no
|
||||
// space added: neither the stories' character attributes nor `[Normal Character Style]` set one.
|
||||
for (key, v) in [(49, st.aki_left), (50, st.aki_right)] {
|
||||
let v = held_aki(v);
|
||||
if v > 0.0 {
|
||||
d.push((key, real(v)));
|
||||
}
|
||||
}
|
||||
let fill = solid(&st.fill).flatten();
|
||||
// A stroke of no width keeps its paint.
|
||||
let stroke = solid(&st.stroke).flatten();
|
||||
|
||||
@@ -631,7 +631,7 @@ impl<'a> Reader<'a> {
|
||||
let Some(paints) = series_paints(art, &tags, spec.kind == GraphKind::Line) else { return false };
|
||||
spec.series_paints = paints;
|
||||
spec.placed = Some(placed);
|
||||
spec.placed_art = art.children().and_then(|c| vectorcraft_doc::graph::art_bounds(c));
|
||||
spec.placed_art = art.children().and_then(|c| vectorcraft_doc::graph::graph_art_without_type(c));
|
||||
tag_series(art, &tags);
|
||||
art.extras_mut().graph = Some(Box::new(spec));
|
||||
true
|
||||
|
||||
@@ -25,6 +25,7 @@ use std::collections::{BTreeMap, HashMap};
|
||||
|
||||
use kurbo::{BezPath, CubicBez, ParamCurve, ParamCurveArclen};
|
||||
use vectorcraft_color::{Color, Paint};
|
||||
use vectorcraft_doc::text::MAX_AKI;
|
||||
use vectorcraft_doc::{
|
||||
Burasagari, CharStyle, HyphenationOptions, JustificationOptions, Justify, Kinsoku, KinsokuShoriType, LineCap, LineJoin, Node, NodeId, NodeKind,
|
||||
ParaDirection, ParaStyle, PathAlign, PathEffect, TabAlign, TabStop, TextKind, TextObject, TextRun,
|
||||
@@ -525,6 +526,17 @@ struct Style {
|
||||
/// Key 35 at 1 (Standard): Standard Vertical Roman Alignment, half-width characters upright in
|
||||
/// a column. Any other value, or no key in the run, its character style or the defaults, is off.
|
||||
standard_vertical_roman: bool,
|
||||
/// Keys 49 and 50, Insert Aki Left and Right ([`CharStyle::aki_left`]), in 1/1000 em.
|
||||
aki_left: f64,
|
||||
aki_right: f64,
|
||||
}
|
||||
|
||||
/// Insert Aki Left or Right as key `v` of a character style gives it, in 1/1000 em (the unit the
|
||||
/// scripting reference gives `aki left` and `aki right`), 0 to [`MAX_AKI`]. A negative value, one
|
||||
/// that is not a finite number, or no key is 0: no space added. A key the run itself carries wins
|
||||
/// over its styles' even when it is not a number, so a bad value never shows a style's.
|
||||
fn aki(v: Option<&Val>) -> f64 {
|
||||
v.and_then(Val::num).filter(|v| v.is_finite() && *v > 0.0).map_or(0.0, |v| v.min(MAX_AKI))
|
||||
}
|
||||
|
||||
/// The longest font version string read from a font record: name ID 5 strings are short (`Version
|
||||
@@ -922,6 +934,8 @@ impl Texts {
|
||||
caps: num("12").filter(|v| *v == 1.0 || *v == 2.0).map_or(0, |v| v as u8),
|
||||
tate_chu_yoko: num("35") == Some(3.0),
|
||||
standard_vertical_roman: num("35") == Some(1.0),
|
||||
aki_left: aki(pick("49")),
|
||||
aki_right: aki(pick("50")),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1549,6 +1563,9 @@ fn char_style(s: &Style, scale: f64, to_text: Affine) -> CharStyle {
|
||||
small_caps: (s.caps == 1).then(|| vectorcraft_doc::DocSetup::default().small_caps_size),
|
||||
tate_chu_yoko: s.tate_chu_yoko,
|
||||
standard_vertical_roman: s.standard_vertical_roman,
|
||||
// In ems of the type's own size, so the art's scale does not apply.
|
||||
aki_left: s.aki_left,
|
||||
aki_right: s.aki_right,
|
||||
..CharStyle::default()
|
||||
}
|
||||
}
|
||||
@@ -1922,6 +1939,48 @@ mod tests {
|
||||
assert!(texts(b"/35 3").style(None).tate_chu_yoko && !texts(b"/35 3").style(None).standard_vertical_roman);
|
||||
}
|
||||
|
||||
/// Keys 49 and 50 of a character style are Insert Aki Left and Right in 1/1000 em, each from the
|
||||
/// run, its character style and the styles that is based on, `[Normal Character Style]`, then the
|
||||
/// document's defaults. A run's own 0 wins over a style's value, a value past 1000 is 1000, and a
|
||||
/// negative value, one that is not a number or no key at all is 0.
|
||||
#[test]
|
||||
fn a_run_keeps_its_insert_aki() {
|
||||
let texts = |defaults: &[u8], normal: &[u8]| Texts {
|
||||
stories: vec![],
|
||||
fonts: vec![],
|
||||
defaults: read(defaults).unwrap(),
|
||||
para_defaults: Val::Dict(BTreeMap::new()),
|
||||
char_sheets: vec![
|
||||
read(&[&b"/0 ([Normal Character Style]) /6 << "[..], normal, b" >>"].concat()).unwrap(),
|
||||
read(b"/0 (Base) /6 << /49 125.0 >>").unwrap(),
|
||||
read(b"/0 (Spaced) /5 1 /6 << /50 500.0 >>").unwrap(),
|
||||
],
|
||||
para_sheets: vec![],
|
||||
frames: vec![],
|
||||
patterns: HashMap::new(),
|
||||
kinsoku_sets: vec![],
|
||||
};
|
||||
let aki = |defaults: &[u8], normal: &[u8], run: &[u8]| {
|
||||
let s = texts(defaults, normal).style(Some(&read(run).unwrap()));
|
||||
(s.aki_left, s.aki_right)
|
||||
};
|
||||
assert_eq!(aki(b"/0 0", b"", b"/6 << /49 250.0 /50 750.0 >>"), (250.0, 750.0), "the run's own");
|
||||
assert_eq!(aki(b"/0 0", b"", b"/5 2 /6 << >>"), (125.0, 500.0), "its style's, and the style that is based on");
|
||||
assert_eq!(aki(b"/0 0", b"", b"/5 2 /6 << /49 0.0 /50 0 >>"), (0.0, 0.0), "the run's own zero wins");
|
||||
assert_eq!(aki(b"/49 10.0 /50 20.0", b"/49 30.0", b"/6 << >>"), (30.0, 20.0), "Normal, then the document's");
|
||||
assert_eq!(aki(b"/49 10.0 /50 20.0", b"", b"/6 << >>"), (10.0, 20.0), "the document's");
|
||||
assert_eq!(aki(b"/0 0", b"", b"/6 << >>"), (0.0, 0.0), "no key");
|
||||
assert_eq!(aki(b"/0 0", b"", b"/6 << /49 1000.5 /50 1e300 >>"), (MAX_AKI, MAX_AKI), "clamped");
|
||||
for bad in [&b"-1.0"[..], b"-250", b"(125)", b"true", b"[ 125 ]", b"1e400", b"-1e400"] {
|
||||
let run = [&b"/5 2 /6 << /49 "[..], bad, b" /50 ", bad, b" >>"].concat();
|
||||
assert_eq!(aki(b"/0 0", b"", &run), (0.0, 0.0), "{}", String::from_utf8_lossy(bad));
|
||||
}
|
||||
// In ems of the type's size: the art's scale leaves it as it is.
|
||||
let s = texts(b"/0 0", b"").style(Some(&read(b"/6 << /49 250.0 /50 125.0 >>").unwrap()));
|
||||
let c = char_style(&s, 10.0, Affine::IDENTITY);
|
||||
assert_eq!((c.aki_left, c.aki_right), (250.0, 125.0));
|
||||
}
|
||||
|
||||
/// Keys 61, 62 and 64 of a character style are its stroke's cap (0 butt, 1 round, 2
|
||||
/// projecting), join (0 miter, 1 round, 2 bevel) and miter limit, from the run, its character
|
||||
/// style or the document's defaults. A value that isn't one of theirs keeps the default, a miter
|
||||
@@ -2397,6 +2456,8 @@ mod tests {
|
||||
caps: 0,
|
||||
tate_chu_yoko: false,
|
||||
standard_vertical_roman: false,
|
||||
aki_left: 0.0,
|
||||
aki_right: 0.0,
|
||||
},
|
||||
)],
|
||||
kerns: vec![],
|
||||
|
||||
@@ -101,7 +101,7 @@ const HEX_LINE: usize = 60;
|
||||
pub const SUBLAYERS: &str = "sublayers are written as groups in their top-level layer (legacy .ai files have no sublayers)";
|
||||
pub const TYPE: &str = "type a legacy .ai can't hold as text (characters outside Windows Latin-1, vertical type, ruby, inline graphics, gradient or pattern fills) is written as outlines";
|
||||
pub const ROTATED_TYPE: &str = "type with rotated characters is written as outlines, which keep the rotation, and is no longer editable text (legacy .ai text can't rotate characters)";
|
||||
pub const TYPE_ATTRIBUTES: &str = "type attributes legacy .ai files don't have (underline, strikethrough, optical kerning, small caps, superscript and subscript, OpenType features, Variable Font settings, optical margin alignment, System Layout, fractional widths off, area type options, type on a path's effect, alignment and spacing, an end bracket short of the path's end, subpaths after the first in an area type frame or a type path, space after paragraphs, tabs, bulleted and numbered lists) are left out";
|
||||
pub const TYPE_ATTRIBUTES: &str = "type attributes legacy .ai files don't have (underline, strikethrough, optical kerning, small caps, superscript and subscript, Insert Aki, OpenType features, Variable Font settings, optical margin alignment, System Layout, fractional widths off, area type options, type on a path's effect, alignment and spacing, an end bracket short of the path's end, subpaths after the first in an area type frame or a type path, space after paragraphs, tabs, bulleted and numbered lists) are left out";
|
||||
pub const DYNAMIC_TEXT: &str = "Dynamic Text is written as the sizes the type is drawn at (legacy .ai files don't have it)";
|
||||
pub const HIDDEN: &str = "hidden objects are left out (hidden layers are kept, hidden)";
|
||||
pub const HIDDEN_LAYER: &str = "hidden objects are moved to a hidden layer above their own (legacy .ai files can hide only layers)";
|
||||
|
||||
@@ -123,6 +123,9 @@ pub(super) fn lost_attributes(t: &TextObject) -> bool {
|
||||
|| s.optical_kerning
|
||||
|| s.small_caps.is_some()
|
||||
|| s.position != CharPosition::Normal
|
||||
// Its text operators (§15.4) have no Insert Aki.
|
||||
|| s.aki_left != 0.0
|
||||
|| s.aki_right != 0.0
|
||||
|| !s.features.is_empty()
|
||||
|| !s.font_axes.is_empty()
|
||||
};
|
||||
|
||||
@@ -1435,6 +1435,41 @@ fn variable_font_settings_are_warned_as_left_out() {
|
||||
assert!(String::from_utf8(out.bytes).unwrap().contains("(H\\351llo \\2005\\r) Tx\n"), "still written as text");
|
||||
}
|
||||
|
||||
/// A legacy `.ai` text object has no Insert Aki (§15.4): type with Insert Aki Left or Right is
|
||||
/// written as text with the warning that it is left out. Written as outlines, the glyphs keep the
|
||||
/// space it adds, and nothing is reported.
|
||||
#[test]
|
||||
fn insert_aki_is_warned_as_left_out_of_text() {
|
||||
for (left, right) in [(250.0, 0.0), (0.0, 125.0)] {
|
||||
let mut doc = typed();
|
||||
let id = texts(&doc)[0].0.id;
|
||||
if let Some(NodeKind::Text(t)) = doc.node_mut(id).map(|n| &mut n.kind) {
|
||||
t.runs[0].style.aki_left = left;
|
||||
t.runs[0].style.aki_right = right;
|
||||
}
|
||||
let out = write(&doc);
|
||||
assert!(out.warnings.iter().any(|w| w == TYPE_ATTRIBUTES), "{left} {right}: {:?}", out.warnings);
|
||||
assert!(String::from_utf8(out.bytes).unwrap().contains("(H\\351llo \\2005\\r) Tx\n"), "still written as text");
|
||||
}
|
||||
let width = |aki: f64| {
|
||||
let mut st = style(20.0, red());
|
||||
st.aki_left = aki;
|
||||
st.aki_right = aki;
|
||||
let t = vectorcraft_doc::TextObject::point(vectorcraft_geom::Point::new(20.0, 40.0), "HH", st);
|
||||
let mut doc = Document::new(300.0, 200.0);
|
||||
let layer = doc.layers[0].id;
|
||||
let n = Node::new(doc.alloc_id(), NodeKind::Text(Box::new(t)));
|
||||
doc.insert(Some(layer), usize::MAX, n).unwrap();
|
||||
let out = write_with(&doc, LegacyAiOptions { outline_text: true, ..LegacyAiOptions::default() });
|
||||
assert!(!out.warnings.iter().any(|w| w == TYPE_ATTRIBUTES), "{:?}", out.warnings);
|
||||
let back = crate::import(&out.bytes).unwrap().document;
|
||||
children(&children(&back.layers[0])[0])[0].visual_bounds().unwrap().width()
|
||||
};
|
||||
// Between the two H's: 0.5 em after the first and 0.5 em before the second, 20 pt.
|
||||
let (plain, spaced) = (width(0.0), width(500.0));
|
||||
assert!((spaced - plain - 20.0).abs() < 0.05, "{plain} {spaced}");
|
||||
}
|
||||
|
||||
/// Standard Vertical Roman Alignment is written as `Tv` and Tate-chu-yoko in horizontal type as a
|
||||
/// Kumi block recorded for later use, `TY` (§15.3.4), each where it changes: the marks read back
|
||||
/// on the same characters, a block is closed before its text object ends, and type with neither
|
||||
|
||||
@@ -489,8 +489,11 @@ impl<'a> Scene<'a> {
|
||||
self.warn(TOO_LARGE);
|
||||
return;
|
||||
}
|
||||
// Off the region, an object is still written when brush art painted along its brushed
|
||||
// strokes, or those of the objects in it, can reach the region.
|
||||
let off = |b: Rect, reach: f64| !overlaps(b.inflate(1.0 + reach, 1.0 + reach), self.o.region);
|
||||
match n.visual_bounds_with(&self.symbols) {
|
||||
Some(b) if !force && !overlaps(b.inflate(1.0, 1.0), self.o.region) => return,
|
||||
Some(b) if !force && off(b, 0.0) && off(b, vectorcraft_brush::reach_within(n)) => return,
|
||||
None if !n.is_container() => return,
|
||||
_ => {}
|
||||
}
|
||||
|
||||
@@ -1654,6 +1654,59 @@ fn an_instance_whose_brush_art_reaches_the_region_is_written() {
|
||||
assert!(page.contains("1 0 0 rg"), "{page}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_path_whose_brush_art_reaches_the_region_is_written() {
|
||||
// A line from (-5, 40) to (-5, 60) with a 1 pt red stroke painted by a 20 pt round nib lies
|
||||
// left of the artboard, and the nib paints 10 pt either side of it, onto the artboard: alone, in
|
||||
// a group and as a compound path. Without its brush, or 100 pt left of the artboard, where the
|
||||
// nib does not reach it, the line is left out.
|
||||
let red = |x: f64, brushed: bool| {
|
||||
let mut n = Node::path(
|
||||
vectorcraft_doc::NodeId(0),
|
||||
shapes::line((x, 40.0).into(), (x, 60.0).into()),
|
||||
Appearance::basic(Paint::None, Paint::solid(Color::rgb(1.0, 0.0, 0.0)), 1.0),
|
||||
);
|
||||
if brushed {
|
||||
n.appearance.stroke_mut().unwrap().brush = Some("3 pt. Round".into());
|
||||
}
|
||||
n
|
||||
};
|
||||
let cases: [(&str, f64, bool, bool); 5] = [
|
||||
("path", -5.0, true, true),
|
||||
("group", -5.0, true, true),
|
||||
("compound path", -5.0, true, true),
|
||||
("unbrushed path", -5.0, false, false),
|
||||
("far path", -100.0, true, false),
|
||||
];
|
||||
for (what, x, brushed, written) in cases {
|
||||
let mut d = Document::new(200.0, 200.0);
|
||||
let mut lib = vectorcraft_brush::library(&d);
|
||||
let Some(vectorcraft_brush::BrushKind::Calligraphic(c)) = lib.iter_mut().find(|b| b.name == "3 pt. Round").map(|b| &mut b.kind) else {
|
||||
panic!("the 3 pt. Round brush")
|
||||
};
|
||||
c.size = 20.0;
|
||||
vectorcraft_brush::store(&mut d, &lib);
|
||||
let line = red(x, brushed);
|
||||
let mut n = match what {
|
||||
"group" => Node::group(vectorcraft_doc::NodeId(0), vec![Arc::new(line)]),
|
||||
"compound path" => {
|
||||
let mut c = Node::new(
|
||||
vectorcraft_doc::NodeId(0),
|
||||
NodeKind::Compound { children: vec![Arc::new(red(x, false))], rule: vectorcraft_geom::FillRule::NonZero },
|
||||
);
|
||||
c.appearance = line.appearance;
|
||||
c
|
||||
}
|
||||
_ => line,
|
||||
};
|
||||
n.id = d.alloc_id();
|
||||
let layer = d.layers[0].id;
|
||||
d.insert(Some(layer), usize::MAX, n).unwrap();
|
||||
let page = page_of(&d, &opts(&d));
|
||||
assert_eq!(page.contains("1 0 0 rg") || page.contains("1 0 0 RG"), written, "{what}: {page}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn symbol_art_effects_are_written_where_they_draw() {
|
||||
// The symbol's square at (10, 40), which a Transform effect moves 100 pt right, is drawn from
|
||||
|
||||
@@ -166,10 +166,11 @@ fn create(interp: &mut Interp, _: Value, args: &[Value], _: bool) -> JsResult<Va
|
||||
/// `Object.defineProperty` (section 15.2.3.6).
|
||||
fn define_property(interp: &mut Interp, _: Value, args: &[Value], _: bool) -> JsResult<Value> {
|
||||
let o = require_object(interp, &arg(args, 0), "defineProperty")?;
|
||||
let k = interp.to_key(&arg(args, 1))?;
|
||||
let desc = to_desc(interp, &arg(args, 2))?;
|
||||
let roots = desc_values(&desc);
|
||||
interp.rooted(&roots, |interp| interp.define_own_property(o, k, &desc, true))?;
|
||||
interp.with_key(&arg(args, 1), |interp, k| {
|
||||
let desc = to_desc(interp, &arg(args, 2))?;
|
||||
let roots = desc_values(&desc);
|
||||
interp.rooted(&roots, |interp| interp.define_own_property(o, k, &desc, true))
|
||||
})?;
|
||||
Ok(Value::Object(o))
|
||||
}
|
||||
|
||||
|
||||
+14
-4
@@ -1779,8 +1779,7 @@ impl Interp {
|
||||
return self.replace(2, v);
|
||||
}
|
||||
self.check_coercible(&base, &[])?;
|
||||
let name = self.to_key(&k)?;
|
||||
let v = self.get_value(&base, &name)?;
|
||||
let v = self.with_key(&k, |i, name| i.get_value(&base, &name))?;
|
||||
self.replace(2, v)?;
|
||||
if with_this { self.push(base) } else { Ok(()) }
|
||||
}
|
||||
@@ -1852,8 +1851,7 @@ impl Interp {
|
||||
return self.replace(2, Value::Number(if prefix { new } else { old }));
|
||||
}
|
||||
self.check_coercible(&base, &[])?;
|
||||
let name = self.to_key(&k)?;
|
||||
let r = self.inc_property(&base, name, prefix, dec)?;
|
||||
let r = self.with_key(&k, |i, name| i.inc_property(&base, name, prefix, dec))?;
|
||||
self.replace(2, r)
|
||||
}
|
||||
|
||||
@@ -2670,6 +2668,18 @@ impl Interp {
|
||||
}
|
||||
}
|
||||
|
||||
/// Runs `f` with the property name [`Self::to_key`] makes from `v`. A name converted from a
|
||||
/// value that is not a string is kept reachable while `f` runs, so a collection that a getter
|
||||
/// or setter starts still counts its units.
|
||||
pub(crate) fn with_key<T>(&mut self, v: &Value, f: impl FnOnce(&mut Self, Key) -> JsResult<T>) -> JsResult<T> {
|
||||
let name = self.to_key(v)?;
|
||||
if matches!(v, Value::String(_)) {
|
||||
return f(self, name);
|
||||
}
|
||||
let root = Value::String(Str::from_rc(name.clone()));
|
||||
self.rooted(&[root], |i| f(i, name))
|
||||
}
|
||||
|
||||
/// The code units of `s`. Flattening a rope makes a copy of its units, so for a rope that
|
||||
/// copy's bytes are reserved and added to the heap first, without taking fuel. The rope stays
|
||||
/// rooted while the copy is reserved; everything else the caller still needs must be
|
||||
|
||||
@@ -434,6 +434,32 @@ fn a_call_keeps_its_operands_while_a_string_receiver_is_boxed() {
|
||||
assert_eq!(realm.run(src), Ok(JsValue::Number(1.0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_computed_key_stays_counted_while_its_getter_or_setter_runs() {
|
||||
// `o` has an accessor named by a flat string of 131,073 units. `key`'s toString returns a new
|
||||
// rope with the same units, so using `key` as a name makes a second flat copy, which must stay
|
||||
// counted while an accessor makes a third. The heap has room for one more copy, not two.
|
||||
let build = "var s = 'x'; for (var i = 0; i < 17; i++) s = s + s; function f(c) { return s + c; } \
|
||||
function copy() { var g = f('g'); g[0]; return 1; } var o = {}, name = f('k'); name[0]; \
|
||||
Object.defineProperty(o, name, { get: copy, set: copy }); \
|
||||
var key = { toString: function () { return f('k'); } }; 0";
|
||||
let realm = || {
|
||||
let mut realm = Realm::with_options(Options::default(), Limits::default());
|
||||
assert_eq!(realm.run(build), Ok(JsValue::Number(0.0)));
|
||||
let interp = realm.interp();
|
||||
interp.collect_garbage();
|
||||
let copy = crate::heap::string_bytes(131_073);
|
||||
interp.limits.heap_bytes = interp.heap.bytes + copy + copy / 2;
|
||||
interp.reset_gc_threshold();
|
||||
realm
|
||||
};
|
||||
assert_eq!(realm().run("o[name]"), Ok(JsValue::Number(1.0)), "the accessor's own copy fits");
|
||||
for read in ["o[key]", "o[key] = 1", "o[key]++", "Object.defineProperty({}, key, { get value() { return copy(); } })"] {
|
||||
let result = realm().run(read);
|
||||
assert!(matches!(result, Err(ref e) if e.kind == RunErrorKind::Limit(LimitKind::Heap)), "{read}: {result:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn compiling_a_pattern_counts_against_the_heap() {
|
||||
let src = "var s = '[\\\\s\\\\S]a*'; for (var i = 0; i < 14; i++) s = s + s; new RegExp(s).source.length";
|
||||
|
||||
@@ -1635,6 +1635,27 @@ fn text_effect_pathfinder_transform_graph_and_wrap_tools() {
|
||||
let ds = d.to_string();
|
||||
// The wrap object carries the options and the area type resolved its shape.
|
||||
assert!(ds.contains("\"wrap\":{\"invert\":false,\"offset\":8.0}") && ds.contains("\"wrap\":[{\"invert\":false,\"offset\":8.0"), "{area}");
|
||||
// An offset outside -1000 to 1000 pt, an invert or a release that is not true or false is an
|
||||
// error, with release too, and the wrap and the selection stay as they were.
|
||||
let r = call(&mut s, 20, "run_command", json!({"command": "select.set", "params": {"ids": [g]}}));
|
||||
assert_eq!(r["isError"], false, "{r}");
|
||||
for (id, args) in [
|
||||
(21, json!({"ids": [c], "offset": 5000})),
|
||||
(22, json!({"ids": [c], "offset": "8"})),
|
||||
(23, json!({"ids": [c], "invert": "true"})),
|
||||
(24, json!({"ids": [c], "release": "true"})),
|
||||
(25, json!({"ids": [c], "release": true, "offset": -5000})),
|
||||
] {
|
||||
let r = call(&mut s, id, "text_wrap", args.clone());
|
||||
assert_eq!(r["isError"], true, "{args}: {r}");
|
||||
assert!(doc_json(&mut s).to_string().contains("\"wrap\":{\"invert\":false,\"offset\":8.0}"), "{args}");
|
||||
}
|
||||
// The graph is still the selection: a wrap made without ids goes on it, not on the circle.
|
||||
let r = call(&mut s, 26, "text_wrap", json!({"offset": 9}));
|
||||
assert_eq!(r["isError"], false, "{r}");
|
||||
let made: Value = serde_json::from_str(&text_of(&r)).unwrap();
|
||||
assert_eq!(made["ids"], json!([g]), "{r}");
|
||||
call(&mut s, 27, "text_wrap", json!({"release": true}));
|
||||
call(&mut s, 15, "text_wrap", json!({"ids": [c], "release": true}));
|
||||
assert!(!doc_json(&mut s).to_string().contains("\"offset\":8.0"));
|
||||
}
|
||||
|
||||
@@ -507,7 +507,7 @@ pub fn tool_definitions() -> Vec<Value> {
|
||||
tool(
|
||||
"text_wrap",
|
||||
"Text wrap",
|
||||
"Make the selected (or `ids`) objects wrap objects: area type below them in the same layer flows around them (offset in pt, invert = flow inside). `release: true` removes the wrap.",
|
||||
"Make the selected (or `ids`) objects wrap objects: area type below them in the same layer flows around them (offset in pt, invert = flow inside). `release: true` removes the wrap. An offset outside -1000 to 1000 or not a number, or an invert or release that is not true or false, is an error and changes nothing.",
|
||||
obj(
|
||||
json!({
|
||||
"ids": {"type": "array", "items": {"type": "integer"}},
|
||||
|
||||
@@ -20,6 +20,29 @@ pub(super) const MAX_SIDE_WINDOW: &str =
|
||||
/// The `traceViews` argument of the artboard renders.
|
||||
pub(super) const TRACE_VIEWS: &str = "Draw Image Trace objects in the view set with imageTrace.setView (outlines, the source image…), as the app's window does; by default they draw their tracing result, as exports do";
|
||||
|
||||
/// The `text_wrap` tool's `release` and its `offset` and `invert` for `object.textWrap.make`, checked
|
||||
/// before the tool changes the selection: an omitted or null value is left out, an `offset` that is
|
||||
/// not a number or lies outside [`vectorcraft_engine::TEXT_WRAP_OFFSET_RANGE`] is an error, and so is
|
||||
/// an `invert` or `release` that is not true or false.
|
||||
fn text_wrap_args(a: &Args) -> Result<(bool, Value), String> {
|
||||
let mut p = json!({});
|
||||
for k in ["offset", "invert", "release"] {
|
||||
let Some(v) = a.get(k).filter(|v| !v.is_null()) else { continue };
|
||||
if k == "offset" {
|
||||
let range = vectorcraft_engine::TEXT_WRAP_OFFSET_RANGE;
|
||||
let n = v.as_f64().ok_or_else(|| format!("`{k}` must be a number, not {v}"))?;
|
||||
if !range.contains(&n) {
|
||||
return Err(format!("`{k}` must be from {} to {}", range.start(), range.end()));
|
||||
}
|
||||
} else if !v.is_boolean() {
|
||||
return Err(format!("`{k}` must be true or false"));
|
||||
}
|
||||
p[k] = v.clone();
|
||||
}
|
||||
let release = p.as_object_mut().and_then(|m| m.remove("release")).is_some_and(|v| v == true);
|
||||
Ok((release, p))
|
||||
}
|
||||
|
||||
/// `traceViews`: false when absent.
|
||||
pub(super) fn trace_views(a: &Args) -> Result<bool, String> {
|
||||
match a.get("traceViews") {
|
||||
@@ -261,16 +284,11 @@ fn dispatch(b: &mut dyn Backend, name: &str, a: &Args) -> Result<ToolResult, Str
|
||||
j(exec(b, "graph.create", p)?)
|
||||
}
|
||||
"text_wrap" => {
|
||||
let (release, p) = text_wrap_args(a)?;
|
||||
select_ids(b, a)?;
|
||||
if a.get("release").and_then(Value::as_bool) == Some(true) {
|
||||
if release {
|
||||
return j(exec(b, "object.textWrap.release", json!({}))?);
|
||||
}
|
||||
let mut p = json!({});
|
||||
for k in ["offset", "invert"] {
|
||||
if let Some(v) = a.get(k) {
|
||||
p[k] = v.clone();
|
||||
}
|
||||
}
|
||||
j(exec(b, "object.textWrap.make", p)?)
|
||||
}
|
||||
"undo" => j(exec(b, "edit.undo", json!({}))?),
|
||||
|
||||
@@ -1252,7 +1252,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
|
||||
"ui.svgFilterDialog",
|
||||
"Apply SVG Filter…",
|
||||
"",
|
||||
"{index?, item?} open Apply SVG Filter for the active document (dialog `svgFilter`, fields `selected`: a filter's name, `code`: the code being edited, `editing`: \"\", \"new\" or the name of the filter being edited; with index, for the applied svg.filter effect at index of item, as effect.dialog opens it): its list shows svgFilter.list's filters; OK runs svgFilter.apply with selected, or effect.setParams on the applied effect; New and Edit open the code, Save runs svgFilter.define, Delete runs svgFilter.delete and Import… svgFilter.import with a picked SVG file",
|
||||
"{index?, item?} open Apply SVG Filter for the active document (dialog `svgFilter`, fields `selected`: a filter's name, `code`: the code being edited, `editing`: \"\", \"new\" or the name of the filter being edited; with index, for the applied svg.filter effect at index of item, as effect.dialog opens it): its list shows svgFilter.list's defaults (the document's filter of a default's name in its place) and then the document's other filters; OK runs svgFilter.apply with selected, and with index and item for the applied effect; New and Edit open the code, Save runs svgFilter.define (replace: the filter edited, a default included), Delete runs svgFilter.delete (off for a default the document holds no copy of) and Import… svgFilter.import with a picked SVG file",
|
||||
),
|
||||
(
|
||||
"ui.importSvgFilter",
|
||||
|
||||
Loaded 100 of 223 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user