pantograph2d 0.9.1 → 0.10.0

package/dist/{models-zEMLdtLw.js → models-DCkOI0hV.js}

@@ -1,31 +1,31 @@
-var tn = Object.defineProperty;
-var nn = (t, n, e) => n in t ? tn(t, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[n] = e;
-var C = (t, n, e) => nn(t, typeof n != "symbol" ? n + "" : n, e);
-import { b as k, d as en, e as Ot, a as q, s as V, n as sn, p as Tt, r as U, A as S, g, u as Lt, E as M, T as on, v as rn, Q as A, w as $, C as I, c as ln, x as cn, L as y, y as zt, F as lt, z as N, G as un, l as an, o as fn, H as dt, B as hn } from "./QuadraticBezier-DxieHk9z.js";
-function pn(t, n) {
-  const e = k(n, t.firstPoint), s = en(e, t.V) / t.squareLength;
+var nn = Object.defineProperty;
+var en = (t, n, e) => n in t ? nn(t, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[n] = e;
+var C = (t, n, e) => en(t, typeof n != "symbol" ? n + "" : n, e);
+import { b as k, d as sn, e as Tt, a as z, s as V, n as on, p as Lt, r as U, A as S, g as P, u as qt, E as M, T as rn, v as ln, Q as I, w as $, C as A, c as un, x as cn, L as b, y as zt, F as ut, z as N, G as an, l as fn, o as hn, H as mt, B as pn } from "./QuadraticBezier-DxieHk9z.js";
+function dn(t, n) {
+  const e = k(n, t.firstPoint), s = sn(e, t.V) / t.squareLength;
   return t.paramPoint(s);
 }
-function J(t, n, e) {
-  const s = e || t.precision, i = pn(t, n.center), o = Ot(i, n.center);
+function K(t, n, e) {
+  const s = e || t.precision, i = dn(t, n.center), o = Tt(i, n.center);
   if (o > n.radius + s) return [];
   if (Math.abs(o - n.radius) < s) {
-    const u = i;
-    return t.isOnSegment(u) && n.isOnSegment(u) ? [u] : [];
+    const c = i;
+    return t.isOnSegment(c) && n.isOnSegment(c) ? [c] : [];
   }
-  const r = [], l = Math.sqrt(
+  const l = [], r = Math.sqrt(
     n.radius * n.radius - o * o
-  ), c = t.tangentAtFirstPoint, a = q(i, V(c, l));
-  t.isOnSegment(a) && n.isOnSegment(a) && r.push(a);
-  const f = q(i, V(c, -l));
-  return t.isOnSegment(f) && n.isOnSegment(f) && r.push(f), r;
+  ), u = t.tangentAtFirstPoint, a = z(i, V(u, r));
+  t.isOnSegment(a) && n.isOnSegment(a) && l.push(a);
+  const f = z(i, V(u, -r));
+  return t.isOnSegment(f) && n.isOnSegment(f) && l.push(f), l;
 }
-const dn = (t) => {
+const mn = (t) => {
   const { firstPoint: n, lastPoint: e, center: s, clockwise: i } = t;
   return new S(e, n, s, i, {
     ignoreChecks: !0
   });
-}, mn = (t, n) => {
+}, gn = (t, n) => {
   if (t.isSame(n))
     return [t];
   const e = U(
@@ -41,9 +41,9 @@ const dn = (t) => {
   if (e.length === 0) return [];
   if (e.length === 1) return [];
   if (e.length === 2)
-    return t.isSame(dn(n)) ? [] : [new S(e[0], e[1], t.center, t.clockwise)];
+    return t.isSame(mn(n)) ? [] : [new S(e[0], e[1], t.center, t.clockwise)];
   if (e.length === 3) {
-    const s = g(e[0], n.lastPoint) || g(e[0], n.firstPoint) ? 1 : 0;
+    const s = P(e[0], n.lastPoint) || P(e[0], n.firstPoint) ? 1 : 0;
     return [
       new S(
         e[0 + s],
@@ -59,101 +59,101 @@ const dn = (t) => {
     ];
   throw new Error("Bug in the arc arc overlap algorithm");
 };
-function qt(t, n, e = !1, s) {
-  const i = s || t.precision, o = Ot(t.center, n.center), r = t.radius + n.radius;
-  if (o > r + i)
+function Dt(t, n, e = !1, s) {
+  const i = s || t.precision, o = Tt(t.center, n.center), l = t.radius + n.radius;
+  if (o > l + i)
     return [];
-  const l = Math.abs(t.radius - n.radius);
-  if (o < l - i)
+  const r = Math.abs(t.radius - n.radius);
+  if (o < r - i)
     return [];
   if (o < i)
-    return l > i ? [] : e ? mn(t, n) : [];
-  const c = sn(k(n.center, t.center)), a = o > r - i;
+    return r > i ? [] : e ? gn(t, n) : [];
+  const u = on(k(n.center, t.center)), a = o > l - i;
   if (
     // circles are outside each other
     a || // circles are inside each other
-    Math.abs(o - l) < i
+    Math.abs(o - r) < i
   ) {
-    const w = a || t.radius > n.radius ? 1 : -1, x = q(
+    const g = a || t.radius > n.radius ? 1 : -1, w = z(
       t.center,
-      V(c, w * t.radius)
+      V(u, g * t.radius)
     );
-    return t.isOnSegment(x) && n.isOnSegment(x) ? [x] : [];
+    return t.isOnSegment(w) && n.isOnSegment(w) ? [w] : [];
   }
-  const f = t.radius * t.radius / (2 * o) - n.radius * n.radius / (2 * o) + o / 2, u = q(
+  const f = t.radius * t.radius / (2 * o) - n.radius * n.radius / (2 * o) + o / 2, c = z(
     t.center,
-    V(c, f)
+    V(u, f)
   ), h = Math.sqrt(
     t.radius * t.radius - f * f
-  ), p = Tt(c), d = q(u, V(p, h)), m = q(u, V(p, -h)), P = [];
-  return t.isOnSegment(d) && n.isOnSegment(d) && P.push(d), t.isOnSegment(m) && n.isOnSegment(m) && P.push(m), P;
+  ), p = Lt(u), d = z(c, V(p, h)), m = z(c, V(p, -h)), x = [];
+  return t.isOnSegment(d) && n.isOnSegment(d) && x.push(d), t.isOnSegment(m) && n.isOnSegment(m) && x.push(m), x;
 }
-function et(t, n, e = 1e-9) {
-  const s = t.transform(n.ellipseReferenceFrameTransform), i = s.slope, o = s.yIntercept, r = n.majorRadius * n.majorRadius, l = n.minorRadius * n.minorRadius, c = n.majorRadius * n.minorRadius, a = s.slope * s.slope, f = s.yIntercept * s.yIntercept, u = (w) => w.map(
-    (x) => n.reverseEllipseReferenceFrameTransform.transform(x)
-  ).filter((x) => t.isOnSegment(x) && n.isOnSegment(x));
+function st(t, n, e = 1e-9) {
+  const s = t.transform(n.ellipseReferenceFrameTransform), i = s.slope, o = s.yIntercept, l = n.majorRadius * n.majorRadius, r = n.minorRadius * n.minorRadius, u = n.majorRadius * n.minorRadius, a = s.slope * s.slope, f = s.yIntercept * s.yIntercept, c = (g) => g.map(
+    (w) => n.reverseEllipseReferenceFrameTransform.transform(w)
+  ).filter((w) => t.isOnSegment(w) && n.isOnSegment(w));
   if (!Number.isFinite(i)) {
-    const w = s.firstPoint[0];
-    if (Math.abs(w) - n.majorRadius > e) return [];
-    if (Math.abs(Math.abs(w) - n.majorRadius) < e)
-      return u([[w, 0]]);
-    const x = n.minorRadius * Math.sqrt(1 - w * w / r), F = [w, x], b = [w, -x];
-    return u([F, b]);
-  }
-  const h = r * a + l - f;
+    const g = s.firstPoint[0];
+    if (Math.abs(g) - n.majorRadius > e) return [];
+    if (Math.abs(Math.abs(g) - n.majorRadius) < e)
+      return c([[g, 0]]);
+    const w = n.minorRadius * Math.sqrt(1 - g * g / l), F = [g, w], y = [g, -w];
+    return c([F, y]);
+  }
+  const h = l * a + r - f;
   if (h < -e)
     return [];
-  const p = r * a + l;
+  const p = l * a + r;
   if (Math.abs(h) < e) {
-    const w = -(r * i * o) / p, x = l * o / p;
-    return u([[w, x]]);
+    const g = -(l * i * o) / p, w = r * o / p;
+    return c([[g, w]]);
   }
   const d = Math.sqrt(h), m = [
-    -(r * i * o + c * d) / p,
-    (l * o - c * i * d) / p
-  ], P = [
-    -(r * i * o - c * d) / p,
-    (l * o + c * i * d) / p
+    -(l * i * o + u * d) / p,
+    (r * o - u * i * d) / p
+  ], x = [
+    -(l * i * o - u * d) / p,
+    (r * o + u * i * d) / p
   ];
-  return u([m, P]);
-}
-function Dt(t, n) {
-  const e = Math.max(t.precision, n.precision), s = t.coefficients, i = s.x2, o = s.xy, r = s.y2, l = s.x, c = s.y, a = s.c, f = n.coefficients, u = f.x2, h = f.xy, p = f.y2, d = f.x, m = f.y, P = f.c, w = {
-    z0: a * i * d * d + i * i * P * P - l * i * d * P + u * u * a * a - 2 * i * P * u * a - l * d * u * a + u * l * l * P,
-    z1: m * l * l * u - P * d * i * o - 2 * i * P * u * c - a * u * h * l + 2 * d * h * i * a + 2 * m * P * i * i + d * d * i * c - m * d * i * l - 2 * i * m * u * a - a * u * d * o + 2 * a * c * u * u - P * h * i * l - c * u * d * l + 2 * P * o * u * l,
-    z2: m * m * i * i + 2 * p * P * i * i - c * u * d * o + P * u * o * o - c * u * h * l - P * h * i * o - 2 * i * m * u * c + 2 * d * h * i * c - p * d * i * l - 2 * i * p * u * a + h * h * i * a + 2 * m * o * u * l + c * c * u * u - r * u * d * l - m * h * i * l + 2 * a * r * u * u - a * u * h * o + p * l * l * u + d * d * i * r - m * d * i * o - 2 * i * P * u * r,
-    z3: -2 * i * u * r * m + m * u * o * o + 2 * p * o * u * l - r * u * h * l + h * h * i * c - m * h * i * o - 2 * i * p * u * c - c * u * h * o - p * h * i * l + 2 * m * p * i * i + 2 * c * r * u * u - r * u * d * o + 2 * d * h * i * r - p * d * i * o,
-    z4: i * i * p * p - 2 * i * p * u * r + u * u * r * r - o * i * h * p - o * h * u * r + o * o * u * p + r * i * h * h
-  }, F = Lt(
-    [w.z0, w.z1, w.z2, w.z3, w.z4],
+  return c([m, x]);
+}
+function Rt(t, n) {
+  const e = Math.max(t.precision, n.precision), s = t.coefficients, i = s.x2, o = s.xy, l = s.y2, r = s.x, u = s.y, a = s.c, f = n.coefficients, c = f.x2, h = f.xy, p = f.y2, d = f.x, m = f.y, x = f.c, g = {
+    z0: a * i * d * d + i * i * x * x - r * i * d * x + c * c * a * a - 2 * i * x * c * a - r * d * c * a + c * r * r * x,
+    z1: m * r * r * c - x * d * i * o - 2 * i * x * c * u - a * c * h * r + 2 * d * h * i * a + 2 * m * x * i * i + d * d * i * u - m * d * i * r - 2 * i * m * c * a - a * c * d * o + 2 * a * u * c * c - x * h * i * r - u * c * d * r + 2 * x * o * c * r,
+    z2: m * m * i * i + 2 * p * x * i * i - u * c * d * o + x * c * o * o - u * c * h * r - x * h * i * o - 2 * i * m * c * u + 2 * d * h * i * u - p * d * i * r - 2 * i * p * c * a + h * h * i * a + 2 * m * o * c * r + u * u * c * c - l * c * d * r - m * h * i * r + 2 * a * l * c * c - a * c * h * o + p * r * r * c + d * d * i * l - m * d * i * o - 2 * i * x * c * l,
+    z3: -2 * i * c * l * m + m * c * o * o + 2 * p * o * c * r - l * c * h * r + h * h * i * u - m * h * i * o - 2 * i * p * c * u - u * c * h * o - p * h * i * r + 2 * m * p * i * i + 2 * u * l * c * c - l * c * d * o + 2 * d * h * i * l - p * d * i * o,
+    z4: i * i * p * p - 2 * i * p * c * l + c * c * l * l - o * i * h * p - o * h * c * l + o * o * c * p + l * i * h * h
+  }, F = qt(
+    [g.z0, g.z1, g.z2, g.z3, g.z4],
     e
-  ).flatMap((b) => {
-    const R = i * h * b + i * d - u * o * b - u * l;
+  ).flatMap((y) => {
+    const R = i * h * y + i * d - c * o * y - c * r;
     if (R)
-      return [[-(i * P + i * p * b * b - u * r * b * b + i * m * b - u * c * b - u * a) / R, b]];
-    const T = o * b + l, L = -T / (2 * i), j = r * b * b + c * b + a, z = T * T / (4 * i * i) - j / i;
-    if (Math.abs(z) < e)
-      return [[L, b]];
-    if (z > 0) {
-      const H = Math.sqrt(z);
-      return [[L + H, b], [L - H, b]];
+      return [[-(i * x + i * p * y * y - c * l * y * y + i * m * y - c * u * y - c * a) / R, y]];
+    const T = o * y + r, L = -T / (2 * i), j = l * y * y + u * y + a, q = T * T / (4 * i * i) - j / i;
+    if (Math.abs(q) < e)
+      return [[L, y]];
+    if (q > 0) {
+      const H = Math.sqrt(q);
+      return [[L + H, y], [L - H, y]];
     }
     return [];
   });
   return U(F, e);
 }
-function mt(t, n) {
-  return Dt(t, n).filter((s) => t.isOnSegment(s) && n.isOnSegment(s));
+function gt(t, n) {
+  return Rt(t, n).filter((s) => t.isOnSegment(s) && n.isOnSegment(s));
 }
-const gn = (t) => {
+const Pn = (t) => {
   const {
     firstPoint: n,
     lastPoint: e,
     center: s,
     majorRadius: i,
     minorRadius: o,
-    tiltAngle: r,
-    clockwise: l
+    tiltAngle: l,
+    clockwise: r
   } = t;
   return new M(
     e,
@@ -161,14 +161,14 @@ const gn = (t) => {
     s,
     i,
     o,
-    r,
     l,
+    r,
     {
       ignoreChecks: !0,
       angleUnits: "rad"
     }
   );
-}, Pn = (t, n) => {
+}, wn = (t, n) => {
   if (t.isSame(n))
     return [t];
   const e = (i, o) => new M(
@@ -193,50 +193,50 @@ const gn = (t) => {
   if (s.length === 0) return [];
   if (s.length === 1) return [];
   if (s.length === 2)
-    return t.isSame(gn(n)) ? [] : [e(s[0], s[1])];
+    return t.isSame(Pn(n)) ? [] : [e(s[0], s[1])];
   if (s.length === 3) {
-    const i = g(s[0], n.lastPoint) || g(s[0], n.firstPoint) ? 1 : 0;
+    const i = P(s[0], n.lastPoint) || P(s[0], n.firstPoint) ? 1 : 0;
     return [e(s[0 + i], s[1 + i])];
   } else if (s.length === 4)
     return [e(s[0], s[1]), e(s[2], s[3])];
   throw new Error("Bug in the ellipse arc ellipse arc overlap algorithm");
 };
-function wn(t, n, e = !1) {
+function xn(t, n, e = !1) {
   const s = Math.max(t.precision, n.precision);
-  return g(t.center, n.center) && Math.abs(t.majorRadius - n.majorRadius) < s && Math.abs(t.minorRadius - n.minorRadius) < s && (Math.abs(t.tiltAngle - n.tiltAngle) < s || Math.abs(Math.abs(t.tiltAngle - n.tiltAngle) - Math.PI) < s) ? e ? Pn(t, n) : [] : Dt(t, n).filter((r) => t.isOnSegment(r) && n.isOnSegment(r));
+  return P(t.center, n.center) && Math.abs(t.majorRadius - n.majorRadius) < s && Math.abs(t.minorRadius - n.minorRadius) < s && (Math.abs(t.tiltAngle - n.tiltAngle) < s || Math.abs(Math.abs(t.tiltAngle - n.tiltAngle) - Math.PI) < s) ? e ? wn(t, n) : [] : Rt(t, n).filter((l) => t.isOnSegment(l) && n.isOnSegment(l));
 }
-function gt(t, n) {
-  const [e, s] = t.firstPoint, [i, o] = t.lastPoint, r = new on().translate(-e, -s).rotate(-Math.atan2(o - s, i - e)), l = r.clone().inverse(), c = n.transform(r);
-  return c.paramsAtY(0).map((a) => c.paramPoint(a)).map((a) => l.transform(a)).filter((a) => t.isOnSegment(a));
+function Pt(t, n) {
+  const [e, s] = t.firstPoint, [i, o] = t.lastPoint, l = new rn().translate(-e, -s).rotate(-Math.atan2(o - s, i - e)), r = l.clone().inverse(), u = n.transform(l);
+  return u.paramsAtY(0).map((a) => u.paramPoint(a)).map((a) => r.transform(a)).filter((a) => t.isOnSegment(a));
 }
-const xn = (t, n = 1e-9) => {
+const Sn = (t, n = 1e-9) => {
   let e = t;
   return Math.abs(t) < n && (e = 0), e.toFixed(-Math.log10(n));
 };
-function Rt(t, n = 1e-9) {
+function Vt(t, n = 1e-9) {
   return Array.from(
-    new Map(t.map((e) => [xn(e, n), e])).values()
+    new Map(t.map((e) => [Sn(e, n), e])).values()
   );
 }
-const Sn = (t, n) => {
-  const [[e, s, i, o], [r, l, c, a]] = n.polynomialCoefficients, f = t.coefficients, u = f.x2, h = f.xy, p = f.y2, d = f.x, m = f.y, P = f.c, w = e * e, x = s * s, F = i * i, b = o * o, R = r * r, T = l * l, L = c * c, j = a * a, z = P + d * e + u * w + m * r + h * e * r + p * R, H = d * s + 2 * u * e * s + h * s * r + m * l + h * e * l + 2 * p * r * l, Qt = u * x + d * i + 2 * u * e * i + h * i * r + h * s * l + p * T + m * c + h * e * c + 2 * p * r * c, Wt = 2 * u * s * i + d * o + 2 * u * e * o + h * o * r + h * i * l + h * s * c + 2 * p * l * c + m * a + h * e * a + 2 * p * r * a, Jt = u * F + 2 * u * s * o + h * o * l + h * i * c + p * L + h * s * a + 2 * p * l * a, Kt = 2 * u * i * o + h * o * c + h * i * a + 2 * p * c * a, Zt = u * b + h * o * a + p * j;
-  return [z, H, Qt, Wt, Jt, Kt, Zt];
-};
-function Pt(t, n) {
-  const e = Math.max(t.precision, n.precision), s = Sn(t, n), i = Lt(s, e).filter((o) => o >= -n.precision && o <= 1 + n.precision);
-  return Rt(i, e).map((o) => n.paramPoint(o)).filter((o) => t.isOnSegment(o));
-}
 const yn = (t, n) => {
-  const [[e, s, i], [o, r, l]] = n.polynomialCoefficients, c = t.coefficients, a = c.x2, f = c.xy, u = c.y2, h = c.x, p = c.y, d = c.c, m = e * e, P = s * s, w = i * i, x = o * o, F = r * r, b = l * l, R = a * m + f * e * o + u * x + h * e + p * o + d, T = 2 * a * e * s + f * e * r + f * s * o + 2 * u * o * r + h * s + p * r, L = 2 * a * e * i + a * P + f * e * l + f * s * r + f * i * o + 2 * u * o * l + u * F + h * i + p * l, j = 2 * a * s * i + f * s * l + f * i * r + 2 * u * r * l, z = a * w + f * i * l + u * b;
-  return [R, T, L, j, z];
+  const [[e, s, i, o], [l, r, u, a]] = n.polynomialCoefficients, f = t.coefficients, c = f.x2, h = f.xy, p = f.y2, d = f.x, m = f.y, x = f.c, g = e * e, w = s * s, F = i * i, y = o * o, R = l * l, T = r * r, L = u * u, j = a * a, q = x + d * e + c * g + m * l + h * e * l + p * R, H = d * s + 2 * c * e * s + h * s * l + m * r + h * e * r + 2 * p * l * r, Wt = c * w + d * i + 2 * c * e * i + h * i * l + h * s * r + p * T + m * u + h * e * u + 2 * p * l * u, Jt = 2 * c * s * i + d * o + 2 * c * e * o + h * o * l + h * i * r + h * s * u + 2 * p * r * u + m * a + h * e * a + 2 * p * l * a, Kt = c * F + 2 * c * s * o + h * o * r + h * i * u + p * L + h * s * a + 2 * p * r * a, Zt = 2 * c * i * o + h * o * u + h * i * a + 2 * p * u * a, tn = c * y + h * o * a + p * j;
+  return [q, H, Wt, Jt, Kt, Zt, tn];
 };
 function wt(t, n) {
-  const e = Math.max(t.precision, n.precision), s = yn(t, n), i = rn(...s).filter((o) => o >= -n.precision && o <= 1 + n.precision);
-  return Rt(i, e).map((o) => n.paramPoint(o)).filter((o) => t.isOnSegment(o));
+  const e = Math.max(t.precision, n.precision), s = yn(t, n), i = qt(s, e).filter((o) => o >= -n.precision && o <= 1 + n.precision);
+  return Vt(i, e).map((o) => n.paramPoint(o)).filter((o) => t.isOnSegment(o));
+}
+const bn = (t, n) => {
+  const [[e, s, i], [o, l, r]] = n.polynomialCoefficients, u = t.coefficients, a = u.x2, f = u.xy, c = u.y2, h = u.x, p = u.y, d = u.c, m = e * e, x = s * s, g = i * i, w = o * o, F = l * l, y = r * r, R = a * m + f * e * o + c * w + h * e + p * o + d, T = 2 * a * e * s + f * e * l + f * s * o + 2 * c * o * l + h * s + p * l, L = 2 * a * e * i + a * x + f * e * r + f * s * l + f * i * o + 2 * c * o * r + c * F + h * i + p * r, j = 2 * a * s * i + f * s * r + f * i * l + 2 * c * l * r, q = a * g + f * i * r + c * y;
+  return [R, T, L, j, q];
+};
+function xt(t, n) {
+  const e = Math.max(t.precision, n.precision), s = bn(t, n), i = ln(...s).filter((o) => o >= -n.precision && o <= 1 + n.precision);
+  return Vt(i, e).map((o) => n.paramPoint(o)).filter((o) => t.isOnSegment(o));
 }
 function E(t, { firstPoint: n, lastPoint: e }, s = 1e-9) {
   const i = k(e, n);
-  return Math.abs(i[0]) < s ? i[1] > 0 ? n[0] - t[0] : t[0] - n[0] : Math.abs(i[1]) < s ? i[0] > 0 ? t[1] - n[1] : n[1] - t[1] : ln(i, k(t, n)) / cn(i);
+  return Math.abs(i[0]) < s ? i[1] > 0 ? n[0] - t[0] : t[0] - n[0] : Math.abs(i[1]) < s ? i[0] > 0 ? t[1] - n[1] : n[1] - t[1] : un(i, k(t, n)) / cn(i);
 }
 class ct {
   constructor(n, e, s, i) {
@@ -246,9 +246,9 @@ class ct {
     return this.positiveThickness - this.negativeThickness;
   }
 }
-const bn = 3 / 4, Cn = 4 / 9;
-function Mn(t) {
-  const n = E(t.firstControlPoint, t), e = E(t.lastControlPoint, t), s = n * e > 0 ? bn : Cn;
+const Cn = 3 / 4, Mn = 4 / 9;
+function In(t) {
+  const n = E(t.firstControlPoint, t), e = E(t.lastControlPoint, t), s = n * e > 0 ? Cn : Mn;
   return new ct(
     t.firstPoint,
     t.lastPoint,
@@ -265,32 +265,32 @@ function An(t) {
     Math.max(0, n / 2)
   );
 }
-function In(t) {
-  if (t instanceof I)
-    return Mn(t);
+function En(t) {
   if (t instanceof A)
+    return In(t);
+  if (t instanceof I)
     return An(t);
   throw new Error("Not implemented");
 }
-function En(t) {
-  const n = t.paramPoint(0.5), e = Tt(k(n, t.firstPoint)), s = q(n, e), i = {
+function Fn(t) {
+  const n = t.paramPoint(0.5), e = Lt(k(n, t.firstPoint)), s = z(n, e), i = {
     firstPoint: n,
     lastPoint: s
   }, o = [
     E(t.firstPoint, i),
     E(t.lastPoint, i)
   ];
-  return t instanceof I ? o.push(
+  return t instanceof A ? o.push(
     E(t.firstControlPoint, i),
     E(t.lastControlPoint, i)
-  ) : t instanceof A && o.push(E(t.controlPoint, i)), new ct(
+  ) : t instanceof I && o.push(E(t.controlPoint, i)), new ct(
     n,
     s,
     Math.min(...o),
     Math.max(...o)
   );
 }
-function xt(t, n) {
+function St(t, n) {
   const e = [];
   for (let s = 1; s < t.length; s++) {
     const i = t[s];
@@ -298,8 +298,8 @@ function xt(t, n) {
       e.push(i[0]);
       continue;
     }
-    const o = t[s - 1], r = n - o[1], l = n - i[1];
-    if (r * l < 0) {
+    const o = t[s - 1], l = n - o[1], r = n - i[1];
+    if (l * r < 0) {
       e.push(
         o[0] + (n - o[1]) * (i[0] - o[0]) / (i[1] - o[1])
       );
@@ -319,29 +319,29 @@ class Y {
     return this.from === "start" ? this.to === "end" ? n : n.splitAtParameters([this.to])[0] : this.to === "end" ? n.splitAtParameters([this.from])[1] : n.splitAtParameters([this.from, this.to])[1];
   }
 }
-function Fn(t, n) {
-  if (t instanceof I)
-    return new Bn([
+function vn(t, n) {
+  if (t instanceof A)
+    return new kn([
       E(t.firstPoint, n),
       E(t.firstControlPoint, n),
       E(t.lastControlPoint, n),
       E(t.lastPoint, n)
     ]);
-  if (t instanceof A)
-    return new vn([
+  if (t instanceof I)
+    return new Bn([
       E(t.firstPoint, n),
       E(t.controlPoint, n),
       E(t.lastPoint, n)
     ]);
   throw new Error("Not implemented");
 }
-class vn {
+class Bn {
   constructor(n) {
     C(this, "topHull", []);
     C(this, "bottomHull", []);
     this.distances = n;
-    const [e, s, i] = n, o = [0, e], r = [1 / 2, s], l = [1, i], c = i - e, a = e;
-    s - (c * (1 / 2) + a) > 0 ? (this.topHull = [o, r, l], this.bottomHull = [o, l]) : (this.topHull = [o, l], this.bottomHull = [o, r, l]);
+    const [e, s, i] = n, o = [0, e], l = [1 / 2, s], r = [1, i], u = i - e, a = e;
+    s - (u * (1 / 2) + a) > 0 ? (this.topHull = [o, l, r], this.bottomHull = [o, r]) : (this.topHull = [o, r], this.bottomHull = [o, l, r]);
   }
   get startDistance() {
     return this.distances[0];
@@ -350,18 +350,18 @@ class vn {
     return this.distances[2];
   }
 }
-class Bn {
+class kn {
   constructor(n) {
     C(this, "topHull", []);
     C(this, "bottomHull", []);
     this.distances = n;
-    const [e, s, i, o] = n, r = [0, e], l = [1 / 3, s], c = [2 / 3, i], a = [1, o], f = o - e, u = e, h = s - (f * (1 / 3) + u), p = i - (f * (2 / 3) + u);
+    const [e, s, i, o] = n, l = [0, e], r = [1 / 3, s], u = [2 / 3, i], a = [1, o], f = o - e, c = e, h = s - (f * (1 / 3) + c), p = i - (f * (2 / 3) + c);
     let d = null, m = null;
     if (h * p < 0)
-      d = [r, l, a], m = [r, c, a];
+      d = [l, r, a], m = [l, u, a];
     else {
-      const w = h / p;
-      w >= 2 ? (d = [r, l, a], m = [r, a]) : w <= 0.5 ? (d = [r, c, a], m = [r, a]) : (d = [r, l, c, a], m = [r, a]);
+      const g = h / p;
+      g >= 2 ? (d = [l, r, a], m = [l, a]) : g <= 0.5 ? (d = [l, u, a], m = [l, a]) : (d = [l, r, u, a], m = [l, a]);
     }
     h < 0 && ([d, m] = [m, d]), this.topHull = d, this.bottomHull = m;
   }
@@ -372,11 +372,11 @@ class Bn {
     return this.distances[3];
   }
 }
-function St(t, n) {
-  const e = Fn(n, t), s = xt(
+function yt(t, n) {
+  const e = vn(n, t), s = St(
     e.topHull,
     t.negativeThickness
-  ), i = xt(
+  ), i = St(
     e.bottomHull,
     t.positiveThickness
   ), o = e.endDistance >= t.negativeThickness && e.endDistance <= t.positiveThickness;
@@ -388,39 +388,39 @@ function St(t, n) {
     throw new Error(
       "Bug in the clipping algorithm, unexpected number of crossing points"
     );
-  const r = s.length ? s : i;
-  return r.length === 2 ? new Y(r[0], r[1]) : o ? new Y(r[0], "end") : new Y("start", r[0]);
+  const l = s.length ? s : i;
+  return l.length === 2 ? new Y(l[0], l[1]) : o ? new Y(l[0], "end") : new Y("start", l[0]);
 }
-function yt(t, n) {
-  const e = In(t), s = St(e, n);
+function bt(t, n) {
+  const e = En(t), s = yt(e, n);
   if (!s)
     return null;
-  const i = En(t), o = St(
+  const i = Fn(t), o = yt(
     i,
     n
   );
   return o ? s.size > o.size ? o.clipCurve(n) : s.clipCurve(n) : null;
 }
-const W = (t) => t instanceof A ? $(k(t.controlPoint, t.firstPoint)) + $(k(t.controlPoint, t.lastPoint)) : $(k(t.firstControlPoint, t.firstPoint)) + $(k(t.lastControlPoint, t.firstControlPoint)) + $(k(t.lastControlPoint, t.lastPoint));
+const W = (t) => t instanceof I ? $(k(t.controlPoint, t.firstPoint)) + $(k(t.controlPoint, t.lastPoint)) : $(k(t.firstControlPoint, t.firstPoint)) + $(k(t.lastControlPoint, t.firstControlPoint)) + $(k(t.lastControlPoint, t.lastPoint));
 function D(t, n, e = 1e-9, { maxIterations: s = 100 } = {}) {
   const i = Math.max(e * e, Number.EPSILON * 10);
-  let o = t, r = n, l = W(o), c = W(r);
+  let o = t, l = n, r = W(o), u = W(l);
   for (let a = 0; a < s; a++) {
-    const f = l > i ? yt(r, o) : o;
+    const f = r > i ? bt(l, o) : o;
     if (!f) return [];
-    const u = W(f), h = c > i ? yt(f, r) : r;
+    const c = W(f), h = u > i ? bt(f, l) : l;
     if (!h) return [];
     const p = W(h);
-    if (u <= i && p <= i)
+    if (c <= i && p <= i)
       return [
         f.boundingBox.intersection(h.boundingBox).center
       ];
-    if (g(f.firstPoint, f.lastPoint) && h.isOnSegment(f.firstPoint))
+    if (P(f.firstPoint, f.lastPoint) && h.isOnSegment(f.firstPoint))
       return [f.firstPoint];
-    if (g(h.firstPoint, h.lastPoint) && f.isOnSegment(h.firstPoint))
+    if (P(h.firstPoint, h.lastPoint) && f.isOnSegment(h.firstPoint))
       return [h.firstPoint];
-    if (u > 0.8 * l && p > 0.8 * c)
-      if (u / l > p / c) {
+    if (c > 0.8 * r && p > 0.8 * u)
+      if (c / r > p / u) {
         const [d, m] = f.splitAtParameters([
           0.5
         ]);
@@ -451,11 +451,11 @@ function D(t, n, e = 1e-9, { maxIterations: s = 100 } = {}) {
           e
         );
       }
-    o = f, r = h, l = u, c = p;
+    o = f, l = h, r = c, u = p;
   }
   throw new Error("Bézier clip: Maximum number of iterations reached");
 }
-function kn(t, n) {
+function On(t, n) {
   const e = [];
   if ([
     [t.firstPoint, n],
@@ -469,20 +469,20 @@ function kn(t, n) {
   if (e.length === 2)
     return [t.splitAt(e)[1]];
   if (e.length === 3)
-    return g(e[0], t.firstPoint) && g(e[1], t.lastPoint) ? [t] : [n];
+    return P(e[0], t.firstPoint) && P(e[1], t.lastPoint) ? [t] : [n];
   if (e.length === 4)
     return [t];
 }
 function _n(t, n, e = !1) {
   const s = Math.max(t.precision, n.precision);
   if (e) {
-    const i = kn(t, n);
+    const i = On(t, n);
     if (i)
       return i;
   }
   return D(t, n, s);
 }
-function On(t, n) {
+function Tn(t, n) {
   const e = [];
   if ([
     [t.firstPoint, n],
@@ -496,21 +496,21 @@ function On(t, n) {
   if (e.length === 2)
     return [t.splitAt(e)[1]];
   if (e.length === 3)
-    return g(e[0], t.firstPoint) && g(e[1], t.lastPoint) ? [t] : [n];
+    return P(e[0], t.firstPoint) && P(e[1], t.lastPoint) ? [t] : [n];
   if (e.length === 4)
     return [t];
 }
-function Tn(t, n, e = !1) {
+function Ln(t, n, e = !1) {
   const s = Math.max(t.precision, n.precision);
   if (e) {
-    const i = On(t, n);
+    const i = Tn(t, n);
     if (i)
       return i;
   }
   return D(t, n, s);
 }
-function ae(t, n, e) {
-  if (t instanceof y && n instanceof y) {
+function de(t, n, e) {
+  if (t instanceof b && n instanceof b) {
     const s = zt(
       t,
       n,
@@ -519,36 +519,36 @@ function ae(t, n, e) {
     );
     return s === null ? [] : [s];
   }
-  if (t instanceof y && n instanceof S)
-    return J(t, n, e);
-  if (t instanceof S && n instanceof y)
-    return J(n, t, e);
+  if (t instanceof b && n instanceof S)
+    return K(t, n, e);
+  if (t instanceof S && n instanceof b)
+    return K(n, t, e);
   if (t instanceof S && n instanceof S)
-    return qt(t, n, !1, e);
+    return Dt(t, n, !1, e);
   throw new Error("Not implemented");
 }
-function K(t, n, e) {
-  if (t instanceof y && n instanceof y) {
+function Z(t, n, e) {
+  if (t instanceof b && n instanceof b) {
     const s = zt(
       t,
       n,
       !0,
       e
     );
-    return s === null ? { intersections: [], overlaps: [], count: 0 } : s instanceof y ? { intersections: [], overlaps: [s], count: 1 } : { intersections: [s], overlaps: [], count: 1 };
+    return s === null ? { intersections: [], overlaps: [], count: 0 } : s instanceof b ? { intersections: [], overlaps: [s], count: 1 } : { intersections: [s], overlaps: [], count: 1 };
   }
   if (!t.boundingBox.overlaps(n.boundingBox))
     return { intersections: [], overlaps: [], count: 0 };
-  if (t instanceof y && n instanceof S) {
-    const s = J(t, n, e);
+  if (t instanceof b && n instanceof S) {
+    const s = K(t, n, e);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if (t instanceof S && n instanceof y) {
-    const s = J(n, t, e);
+  if (t instanceof S && n instanceof b) {
+    const s = K(n, t, e);
     return { intersections: s, overlaps: [], count: s.length };
   }
   if (t instanceof S && n instanceof S) {
-    const s = qt(
+    const s = Dt(
       t,
       n,
       !0,
@@ -564,16 +564,16 @@ function K(t, n, e) {
       count: s.length
     } : { intersections: [], overlaps: [], count: 0 };
   }
-  if (t instanceof y && n instanceof M) {
-    const s = et(
+  if (t instanceof b && n instanceof M) {
+    const s = st(
       t,
       n,
       e
     );
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if (n instanceof y && t instanceof M) {
-    const s = et(
+  if (n instanceof b && t instanceof M) {
+    const s = st(
       n,
       t,
       e
@@ -581,15 +581,15 @@ function K(t, n, e) {
     return { intersections: s, overlaps: [], count: s.length };
   }
   if (t instanceof S && n instanceof M) {
-    const s = mt(t, n);
+    const s = gt(t, n);
     return { intersections: s, overlaps: [], count: s.length };
   }
   if (n instanceof S && t instanceof M) {
-    const s = mt(n, t);
+    const s = gt(n, t);
     return { intersections: s, overlaps: [], count: s.length };
   }
   if (t instanceof M && n instanceof M) {
-    const s = wn(
+    const s = xn(
       t,
       n,
       !0
@@ -604,36 +604,36 @@ function K(t, n, e) {
       count: s.length
     } : { intersections: [], overlaps: [], count: 0 };
   }
-  if (t instanceof y && (n instanceof I || n instanceof A)) {
-    const s = gt(t, n);
+  if (t instanceof b && (n instanceof A || n instanceof I)) {
+    const s = Pt(t, n);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if (n instanceof y && (t instanceof I || t instanceof A)) {
-    const s = gt(n, t);
+  if (n instanceof b && (t instanceof A || t instanceof I)) {
+    const s = Pt(n, t);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if ((t instanceof S || t instanceof M) && n instanceof A) {
-    const s = wt(t, n);
+  if ((t instanceof S || t instanceof M) && n instanceof I) {
+    const s = xt(t, n);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if ((n instanceof S || n instanceof M) && t instanceof A) {
-    const s = wt(n, t);
+  if ((n instanceof S || n instanceof M) && t instanceof I) {
+    const s = xt(n, t);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if ((t instanceof S || t instanceof M) && n instanceof I) {
-    const s = Pt(t, n);
+  if ((t instanceof S || t instanceof M) && n instanceof A) {
+    const s = wt(t, n);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if ((n instanceof S || n instanceof M) && t instanceof I) {
-    const s = Pt(n, t);
+  if ((n instanceof S || n instanceof M) && t instanceof A) {
+    const s = wt(n, t);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if (t instanceof A && n instanceof A) {
-    const s = Tn(
+  if (t instanceof I && n instanceof I) {
+    const s = Ln(
       t,
       n
     );
-    return s.length ? s[0] instanceof A ? {
+    return s.length ? s[0] instanceof I ? {
       intersections: [],
       overlaps: s,
       count: s.length
@@ -643,16 +643,16 @@ function K(t, n, e) {
       count: s.length
     } : { intersections: [], overlaps: [], count: 0 };
   }
-  if (t instanceof A && n instanceof I || n instanceof A && t instanceof I) {
+  if (t instanceof I && n instanceof A || n instanceof I && t instanceof A) {
     const s = D(t, n);
     return { intersections: s, overlaps: [], count: s.length };
   }
-  if (t instanceof I && n instanceof I) {
+  if (t instanceof A && n instanceof A) {
     const s = _n(
       t,
       n
     );
-    return s.length ? s[0] instanceof I ? {
+    return s.length ? s[0] instanceof A ? {
       intersections: [],
       overlaps: s,
       count: s.length
@@ -664,23 +664,23 @@ function K(t, n, e) {
   }
   throw new Error("Not implemented");
 }
-function Vt(t) {
+function Nt(t) {
   const n = [];
   for (let e = 0; e < t; e++)
     for (let s = 0; s <= e; s++)
       n.push([e, s]);
   return n;
 }
-function* st(t) {
-  for (const [n, e] of Vt(t.length))
+function* it(t) {
+  for (const [n, e] of Nt(t.length))
     n !== e && (yield [t[n], t[e]]);
 }
-class Nt extends lt {
+class Ut extends ut {
   constructor(e, { ignoreChecks: s = !1 } = {}) {
     super();
     C(this, "segments");
     C(this, "_boundingBox", null);
-    s || Ut(e), this.segments = e;
+    s || jt(e), this.segments = e;
   }
   get repr() {
     return this.segments.map((e) => e.repr).join(`
@@ -705,12 +705,12 @@ class Nt extends lt {
   intersects(e) {
     return this.boundingBox.overlaps(e.boundingBox) ? this.segments.some(
       (s) => e.segments.some(
-        (i) => K(s, i).count > 0
+        (i) => Z(s, i).count > 0
       )
     ) : !1;
   }
   overlappingSegments(e) {
-    return this.segments.flatMap((s) => e.segments.flatMap((i) => s.boundingBox.overlaps(i.boundingBox) ? K(s, i).overlaps : []));
+    return this.segments.flatMap((s) => e.segments.flatMap((i) => s.boundingBox.overlaps(i.boundingBox) ? Z(s, i).overlaps : []));
   }
   get boundingBox() {
     if (this._boundingBox === null) {
@@ -725,61 +725,61 @@ class Nt extends lt {
     return this.repr;
   }
 }
-function Ln(t, n = "Stroke") {
-  Vt(t.length).forEach(
+function qn(t, n = "Stroke") {
+  Nt(t.length).forEach(
     ([e, s]) => {
       if (e === s) return;
-      const i = t[e], o = t[s], r = K(i, o), l = Math.max(i.precision, o.precision);
-      if (r.count !== 0) {
-        if (r.count === 1 && !r.overlaps.length) {
-          const c = e - s, a = r.intersections[0];
-          if (c === 1 && g(i.firstPoint, a, l) || c === -1 && g(i.lastPoint, a, l) || c === t.length - 1 && g(i.lastPoint, a, l) && g(o.firstPoint, a, l) || -c === t.length - 1 && g(i.firstPoint, a, l) && g(o.lastPoint, a, l))
+      const i = t[e], o = t[s], l = Z(i, o), r = Math.max(i.precision, o.precision);
+      if (l.count !== 0) {
+        if (l.count === 1 && !l.overlaps.length) {
+          const u = e - s, a = l.intersections[0];
+          if (u === 1 && P(i.firstPoint, a, r) || u === -1 && P(i.lastPoint, a, r) || u === t.length - 1 && P(i.lastPoint, a, r) && P(o.firstPoint, a, r) || -u === t.length - 1 && P(i.firstPoint, a, r) && P(o.lastPoint, a, r))
             return;
         }
-        if (!(r.count === 2 && t.length === 2 && (g(
+        if (!(l.count === 2 && t.length === 2 && (P(
           i.firstPoint,
-          r.intersections[0],
-          l
-        ) && g(
+          l.intersections[0],
+          r
+        ) && P(
           i.lastPoint,
-          r.intersections[1],
-          l
-        ) || g(
+          l.intersections[1],
+          r
+        ) || P(
           i.firstPoint,
-          r.intersections[1],
-          l
-        ) && g(
+          l.intersections[1],
+          r
+        ) && P(
           i.lastPoint,
-          r.intersections[0],
-          l
+          l.intersections[0],
+          r
         ))))
           throw new Error(
             `${n} segments must not intersect, but segments ${i.info} and ${o.info} do at ${JSON.stringify(
-              r.intersections
+              l.intersections
             )}`
           );
       }
     }
   );
 }
-function Ut(t, n = "Stroke") {
+function jt(t, n = "Stroke") {
   if (t.length === 0)
     throw new Error(`${n} must have at least one segment`);
   N([t.slice(0, -1), t.slice(1)]).forEach(
     ([e, s]) => {
-      if (!g(e.lastPoint, s.firstPoint))
+      if (!P(e.lastPoint, s.firstPoint))
         throw new Error(
           `${n} segments must be connected, but ${e.info} and ${s.info} are not`
         );
     }
-  ), Ln(t, n);
-}
-function bt(t, n) {
-  return !!(t instanceof y && n instanceof y && un(t.V, n.V) || t instanceof S && n instanceof S && g(t.center, n.center) && t.radius - n.radius < t.precision);
+  ), qn(t, n);
 }
 function Ct(t, n) {
-  if (t instanceof y && n instanceof y)
-    return new y(t.firstPoint, n.lastPoint);
+  return !!(t instanceof b && n instanceof b && an(t.V, n.V) || t instanceof S && n instanceof S && P(t.center, n.center) && t.radius - n.radius < t.precision);
+}
+function Mt(t, n) {
+  if (t instanceof b && n instanceof b)
+    return new b(t.firstPoint, n.lastPoint);
   if (t instanceof S && n instanceof S)
     return new S(
       t.firstPoint,
@@ -789,7 +789,7 @@ function Ct(t, n) {
     );
   throw new Error("Not implemented");
 }
-function jt(t) {
+function Ht(t) {
   let n = !1;
   const e = [];
   for (const s of t.segments) {
@@ -798,19 +798,19 @@ function jt(t) {
       continue;
     }
     const i = e[e.length - 1];
-    bt(i, s) ? (n = !0, e.pop(), e.push(Ct(i, s))) : e.push(s);
+    Ct(i, s) ? (n = !0, e.pop(), e.push(Mt(i, s))) : e.push(s);
   }
-  if (g(t.firstPoint, t.lastPoint) && bt(
+  if (P(t.firstPoint, t.lastPoint) && Ct(
     e[0],
     e[e.length - 1]
   )) {
     n = !0;
     const s = e.pop();
-    e[0] = Ct(s, e[0]);
+    e[0] = Mt(s, e[0]);
   }
   return n ? e : null;
 }
-class B extends Nt {
+class B extends Ut {
   constructor() {
     super(...arguments);
     C(this, "strokeType", "STRAND");
@@ -826,12 +826,12 @@ class B extends Nt {
     );
   }
   extend(e) {
-    if (!g(this.lastPoint, e.firstPoint))
+    if (!P(this.lastPoint, e.firstPoint))
       throw console.error(this.repr, e.repr), new Error("Cannot extend strand: connection point is not the same");
     return new B([...this.segments, ...e.segments]);
   }
   simplify() {
-    const e = jt(this);
+    const e = Ht(this);
     return e ? new B(e, { ignoreChecks: !0 }) : this;
   }
   transform(e) {
@@ -842,7 +842,7 @@ class B extends Nt {
   }
 }
 const zn = (t, n) => {
-  const e = an(n, {
+  const e = fn(n, {
     V: [1, 0],
     firstPoint: t,
     precision: n.precision
@@ -857,38 +857,38 @@ const zn = (t, n) => {
   }
   return 1;
 };
-class ut {
+class at {
   constructor(n) {
     C(this, "_count", 0);
     C(this, "segment");
     this.segment = n;
   }
   update(n, e = !1) {
-    !e && !this.segment.isOnSegment(n) || (g(n, this.segment.firstPoint) ? this._count += this.segment.tangentAtFirstPoint[1] > 0 ? 1 : 0 : g(n, this.segment.lastPoint) ? this._count += this.segment.tangentAtLastPoint[1] > 0 ? 0 : 1 : this._count += 1);
+    !e && !this.segment.isOnSegment(n) || (P(n, this.segment.firstPoint) ? this._count += this.segment.tangentAtFirstPoint[1] > 0 ? 1 : 0 : P(n, this.segment.lastPoint) ? this._count += this.segment.tangentAtLastPoint[1] > 0 ? 0 : 1 : this._count += 1);
   }
   get count() {
     return this._count;
   }
 }
-const qn = (t, n) => {
+const Dn = (t, n) => {
   const e = n.precision, s = Math.abs(t[1] - n.center[1]);
   if (s > n.radius + e) return 0;
-  const i = fn(t, n.center), o = n.radius * n.radius, r = e * e;
-  if (Math.abs(i - o) < r && n.isOnSegment(t))
+  const i = hn(t, n.center), o = n.radius * n.radius, l = e * e;
+  if (Math.abs(i - o) < l && n.isOnSegment(t))
     return 0;
-  const l = i - o > r;
-  if (l && n.center[0] < t[0]) return 0;
-  const c = Math.sqrt(
+  const r = i - o > l;
+  if (r && n.center[0] < t[0]) return 0;
+  const u = Math.sqrt(
     n.radius * n.radius - s * s
-  ), a = new ut(n);
-  return a.update([n.center[0] + c, t[1]]), l && a.update([n.center[0] - c, t[1]]), a.count;
-}, Dn = (t, n) => {
-  const e = n.boundingBox.xMax + n.boundingBox.width / 2, s = new y(t, [e, t[1]]), i = new ut(n);
-  return et(s, n).forEach((o) => {
+  ), a = new at(n);
+  return a.update([n.center[0] + u, t[1]]), r && a.update([n.center[0] - u, t[1]]), a.count;
+}, Rn = (t, n) => {
+  const e = n.boundingBox.xMax + n.boundingBox.width / 2, s = new b(t, [e, t[1]]), i = new at(n);
+  return st(s, n).forEach((o) => {
     i.update(o, !0);
   }), i.count;
-}, Rn = (t, n) => {
-  const e = new ut(n);
+}, Vn = (t, n) => {
+  const e = new at(n);
   return n.paramsAtY(t[1]).map((s) => {
     try {
       return n.paramPoint(s);
@@ -902,74 +902,74 @@ const qn = (t, n) => {
     e.update(s, !0);
   }), e.count;
 };
-function Vn(t, n) {
-  if (n instanceof y)
+function Nn(t, n) {
+  if (n instanceof b)
     return zn(t, n);
   if (n instanceof S)
-    return qn(t, n);
-  if (n instanceof M)
     return Dn(t, n);
-  if (n instanceof I || n instanceof A)
+  if (n instanceof M)
     return Rn(t, n);
+  if (n instanceof A || n instanceof I)
+    return Vn(t, n);
   throw new Error("Not implemented");
 }
-class O extends Nt {
+class _ extends Ut {
   constructor(e, { ignoreChecks: s = !1 } = {}) {
     super(e, { ignoreChecks: !0 });
     C(this, "strokeType", "LOOP");
     C(this, "_clockwise", null);
-    s || Nn(e);
+    s || Un(e);
   }
   get clockwise() {
     if (this._clockwise === null) {
-      const e = this.segments.flatMap((i) => i instanceof y ? [i.firstPoint] : [i.firstPoint, i.paramPoint(0.5)]), s = e.map((i, o) => {
-        const r = e[(o + 1) % e.length];
-        return (r[0] - i[0]) * (r[1] + i[1]);
+      const e = this.segments.flatMap((i) => i instanceof b ? [i.firstPoint] : [i.firstPoint, i.paramPoint(0.5)]), s = e.map((i, o) => {
+        const l = e[(o + 1) % e.length];
+        return (l[0] - i[0]) * (l[1] + i[1]);
       }).reduce((i, o) => i + o, 0);
       this._clockwise = s > 0;
     }
     return this._clockwise;
   }
   clone() {
-    return new O(
+    return new _(
       this.segments.map((e) => e.clone()),
       { ignoreChecks: !0 }
     );
   }
   reverse() {
     const e = this.segments.map((s) => s.reverse());
-    return e.reverse(), new O(e, { ignoreChecks: !0 });
+    return e.reverse(), new _(e, { ignoreChecks: !0 });
   }
   transform(e) {
-    return new O(
+    return new _(
       this.segments.map((s) => s.transform(e)),
       { ignoreChecks: !0 }
     );
   }
-  contains(e) {
-    return this.onStroke(e) || !this.boundingBox.contains(e) ? !1 : this.segments.reduce((i, o) => i + Vn(e, o), 0) % 2 === 1;
+  contains(e, { strokeIsInside: s = !1 } = {}) {
+    return this.onStroke(e) ? s : this.boundingBox.contains(e) ? this.segments.reduce((o, l) => o + Nn(e, l), 0) % 2 === 1 : !1;
   }
   simplify() {
-    const e = jt(this);
-    return e ? new O(e, { ignoreChecks: !0 }) : this;
+    const e = Ht(this);
+    return e ? new _(e, { ignoreChecks: !0 }) : this;
   }
 }
-function Nn(t) {
-  if (Ut(t, "Loop"), !g(t[0].firstPoint, t[t.length - 1].lastPoint))
+function Un(t) {
+  if (jt(t, "Loop"), !P(t[0].firstPoint, t[t.length - 1].lastPoint))
     throw new Error("Loop segment must be closed");
 }
-const Un = [
-  y,
+const jn = [
+  b,
   S,
   M,
-  A,
-  I
+  I,
+  A
 ];
-function jn(t) {
-  return Un.some((n) => t instanceof n);
+function Hn(t) {
+  return jn.some((n) => t instanceof n);
 }
-function Ht(t) {
-  if (t instanceof y)
+function $t(t) {
+  if (t instanceof b)
     return {
       type: t.segmentType,
       firstPoint: t.firstPoint,
@@ -994,14 +994,14 @@ function Ht(t) {
       minorRadius: t.minorRadius,
       tiltAngle: t.tiltAngle
     };
-  if (t instanceof A)
+  if (t instanceof I)
     return {
       type: t.segmentType,
       firstPoint: t.firstPoint,
       lastPoint: t.lastPoint,
       controlPoint: t.controlPoint
     };
-  if (t instanceof I)
+  if (t instanceof A)
     return {
       type: t.segmentType,
       firstPoint: t.firstPoint,
@@ -1011,37 +1011,37 @@ function Ht(t) {
     };
   throw new Error("Unknown segment type");
 }
-function it(t) {
+function ot(t) {
   return {
     type: "LOOP",
-    segments: t.segments.map(Ht)
+    segments: t.segments.map($t)
   };
 }
-function $t(t) {
+function Yt(t) {
   return {
     type: "FIGURE",
-    contour: it(t.contour),
-    holes: t.holes.map(it)
+    contour: ot(t.contour),
+    holes: t.holes.map(ot)
   };
 }
-function Hn(t) {
+function $n(t) {
   return {
     type: "DIAGRAM",
-    figures: t.figures.map($t)
+    figures: t.figures.map(Yt)
   };
 }
-function Mt(t) {
-  if (t instanceof _)
-    return Hn(t);
+function It(t) {
+  if (t instanceof O)
+    return $n(t);
   if (t instanceof v)
+    return Yt(t);
+  if (t instanceof _)
+    return ot(t);
+  if (Hn(t))
     return $t(t);
-  if (t instanceof O)
-    return it(t);
-  if (jn(t))
-    return Ht(t);
   throw new Error("Unknown shape type");
 }
-class $n {
+class Yn {
   constructor() {
     this.ids = [], this.values = [], this.length = 0;
   }
@@ -1064,12 +1064,12 @@ class $n {
       const e = this.ids[0] = this.ids[this.length], s = this.values[0] = this.values[this.length], i = this.length >> 1;
       let o = 0;
       for (; o < i; ) {
-        let r = (o << 1) + 1;
-        const l = r + 1;
-        let c = this.ids[r], a = this.values[r];
-        const f = this.values[l];
-        if (l < this.length && f < a && (r = l, c = this.ids[l], a = f), a >= s) break;
-        this.ids[o] = c, this.values[o] = a, o = r;
+        let l = (o << 1) + 1;
+        const r = l + 1;
+        let u = this.ids[l], a = this.values[l];
+        const f = this.values[r];
+        if (r < this.length && f < a && (l = r, u = this.ids[r], a = f), a >= s) break;
+        this.ids[o] = u, this.values[o] = a, o = l;
       }
       this.ids[o] = e, this.values[o] = s;
     }
@@ -1087,8 +1087,8 @@ class $n {
     this.ids.length = this.values.length = this.length;
   }
 }
-const At = [Int8Array, Uint8Array, Uint8ClampedArray, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array], nt = 3;
-class at {
+const At = [Int8Array, Uint8Array, Uint8ClampedArray, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array], et = 3;
+class ft {
   /**
    * Recreate a Flatbush index from raw `ArrayBuffer` or `SharedArrayBuffer` data.
    * @param {ArrayBuffer | SharedArrayBuffer} data
@@ -1104,13 +1104,13 @@ class at {
     if (s !== 251)
       throw new Error("Data does not appear to be in a Flatbush format.");
     const o = i >> 4;
-    if (o !== nt)
-      throw new Error(`Got v${o} data when expected v${nt}.`);
-    const r = At[i & 15];
-    if (!r)
+    if (o !== et)
+      throw new Error(`Got v${o} data when expected v${et}.`);
+    const l = At[i & 15];
+    if (!l)
       throw new Error("Unrecognized array type.");
-    const [l] = new Uint16Array(n, e + 2, 1), [c] = new Uint32Array(n, e + 4, 1);
-    return new at(c, l, r, void 0, n, e);
+    const [r] = new Uint16Array(n, e + 2, 1), [u] = new Uint32Array(n, e + 4, 1);
+    return new ft(u, r, l, void 0, n, e);
   }
   /**
    * Create a Flatbush index that will hold a given number of items.
@@ -1121,20 +1121,20 @@ class at {
    * @param {ArrayBuffer | SharedArrayBuffer} [data] (Only used internally)
    * @param {number} [byteOffset=0] (Only used internally)
    */
-  constructor(n, e = 16, s = Float64Array, i = ArrayBuffer, o, r = 0) {
+  constructor(n, e = 16, s = Float64Array, i = ArrayBuffer, o, l = 0) {
     if (n === void 0) throw new Error("Missing required argument: numItems.");
     if (isNaN(n) || n <= 0) throw new Error(`Unexpected numItems value: ${n}.`);
-    this.numItems = +n, this.nodeSize = Math.min(Math.max(+e, 2), 65535), this.byteOffset = r;
-    let l = n, c = l;
-    this._levelBounds = [l * 4];
+    this.numItems = +n, this.nodeSize = Math.min(Math.max(+e, 2), 65535), this.byteOffset = l;
+    let r = n, u = r;
+    this._levelBounds = [r * 4];
     do
-      l = Math.ceil(l / this.nodeSize), c += l, this._levelBounds.push(c * 4);
-    while (l !== 1);
-    this.ArrayType = s, this.IndexArrayType = c < 16384 ? Uint16Array : Uint32Array;
-    const a = At.indexOf(this.ArrayType), f = c * 4 * this.ArrayType.BYTES_PER_ELEMENT;
+      r = Math.ceil(r / this.nodeSize), u += r, this._levelBounds.push(u * 4);
+    while (r !== 1);
+    this.ArrayType = s, this.IndexArrayType = u < 16384 ? Uint16Array : Uint32Array;
+    const a = At.indexOf(this.ArrayType), f = u * 4 * this.ArrayType.BYTES_PER_ELEMENT;
     if (a < 0)
       throw new Error(`Unexpected typed array class: ${s}.`);
-    o && o.byteLength !== void 0 && !o.buffer ? (this.data = o, this._boxes = new this.ArrayType(this.data, r + 8, c * 4), this._indices = new this.IndexArrayType(this.data, r + 8 + f, c), this._pos = c * 4, this.minX = this._boxes[this._pos - 4], this.minY = this._boxes[this._pos - 3], this.maxX = this._boxes[this._pos - 2], this.maxY = this._boxes[this._pos - 1]) : (this.data = new i(8 + f + c * this.IndexArrayType.BYTES_PER_ELEMENT), this._boxes = new this.ArrayType(this.data, 8, c * 4), this._indices = new this.IndexArrayType(this.data, 8 + f, c), this._pos = 0, this.minX = 1 / 0, this.minY = 1 / 0, this.maxX = -1 / 0, this.maxY = -1 / 0, new Uint8Array(this.data, 0, 2).set([251, (nt << 4) + a]), new Uint16Array(this.data, 2, 1)[0] = e, new Uint32Array(this.data, 4, 1)[0] = n), this._queue = new $n();
+    o && o.byteLength !== void 0 && !o.buffer ? (this.data = o, this._boxes = new this.ArrayType(this.data, l + 8, u * 4), this._indices = new this.IndexArrayType(this.data, l + 8 + f, u), this._pos = u * 4, this.minX = this._boxes[this._pos - 4], this.minY = this._boxes[this._pos - 3], this.maxX = this._boxes[this._pos - 2], this.maxY = this._boxes[this._pos - 1]) : (this.data = new i(8 + f + u * this.IndexArrayType.BYTES_PER_ELEMENT), this._boxes = new this.ArrayType(this.data, 8, u * 4), this._indices = new this.IndexArrayType(this.data, 8 + f, u), this._pos = 0, this.minX = 1 / 0, this.minY = 1 / 0, this.maxX = -1 / 0, this.maxY = -1 / 0, new Uint8Array(this.data, 0, 2).set([251, (et << 4) + a]), new Uint16Array(this.data, 2, 1)[0] = e, new Uint32Array(this.data, 4, 1)[0] = n), this._queue = new Yn();
   }
   /**
    * Add a given rectangle to the index.
@@ -1145,8 +1145,8 @@ class at {
    * @returns {number} A zero-based, incremental number that represents the newly added rectangle.
    */
   add(n, e, s = n, i = e) {
-    const o = this._pos >> 2, r = this._boxes;
-    return this._indices[o] = o, r[this._pos++] = n, r[this._pos++] = e, r[this._pos++] = s, r[this._pos++] = i, n < this.minX && (this.minX = n), e < this.minY && (this.minY = e), s > this.maxX && (this.maxX = s), i > this.maxY && (this.maxY = i), o;
+    const o = this._pos >> 2, l = this._boxes;
+    return this._indices[o] = o, l[this._pos++] = n, l[this._pos++] = e, l[this._pos++] = s, l[this._pos++] = i, n < this.minX && (this.minX = n), e < this.minY && (this.minY = e), s > this.maxX && (this.maxX = s), i > this.maxY && (this.maxY = i), o;
   }
   /** Perform indexing of the added rectangles. */
   finish() {
@@ -1158,19 +1158,19 @@ class at {
       return;
     }
     const e = this.maxX - this.minX || 1, s = this.maxY - this.minY || 1, i = new Uint32Array(this.numItems), o = 65535;
-    for (let r = 0, l = 0; r < this.numItems; r++) {
-      const c = n[l++], a = n[l++], f = n[l++], u = n[l++], h = Math.floor(o * ((c + f) / 2 - this.minX) / e), p = Math.floor(o * ((a + u) / 2 - this.minY) / s);
-      i[r] = Xn(h, p);
+    for (let l = 0, r = 0; l < this.numItems; l++) {
+      const u = n[r++], a = n[r++], f = n[r++], c = n[r++], h = Math.floor(o * ((u + f) / 2 - this.minX) / e), p = Math.floor(o * ((a + c) / 2 - this.minY) / s);
+      i[l] = Gn(h, p);
     }
-    ot(i, n, this._indices, 0, this.numItems - 1, this.nodeSize);
-    for (let r = 0, l = 0; r < this._levelBounds.length - 1; r++) {
-      const c = this._levelBounds[r];
-      for (; l < c; ) {
-        const a = l;
-        let f = n[l++], u = n[l++], h = n[l++], p = n[l++];
-        for (let d = 1; d < this.nodeSize && l < c; d++)
-          f = Math.min(f, n[l++]), u = Math.min(u, n[l++]), h = Math.max(h, n[l++]), p = Math.max(p, n[l++]);
-        this._indices[this._pos >> 2] = a, n[this._pos++] = f, n[this._pos++] = u, n[this._pos++] = h, n[this._pos++] = p;
+    rt(i, n, this._indices, 0, this.numItems - 1, this.nodeSize);
+    for (let l = 0, r = 0; l < this._levelBounds.length - 1; l++) {
+      const u = this._levelBounds[l];
+      for (; r < u; ) {
+        const a = r;
+        let f = n[r++], c = n[r++], h = n[r++], p = n[r++];
+        for (let d = 1; d < this.nodeSize && r < u; d++)
+          f = Math.min(f, n[r++]), c = Math.min(c, n[r++]), h = Math.max(h, n[r++]), p = Math.max(p, n[r++]);
+        this._indices[this._pos >> 2] = a, n[this._pos++] = f, n[this._pos++] = c, n[this._pos++] = h, n[this._pos++] = p;
       }
     }
   }
@@ -1186,18 +1186,18 @@ class at {
   search(n, e, s, i, o) {
     if (this._pos !== this._boxes.length)
       throw new Error("Data not yet indexed - call index.finish().");
-    let r = this._boxes.length - 4;
-    const l = [], c = [];
-    for (; r !== void 0; ) {
-      const a = Math.min(r + this.nodeSize * 4, Et(r, this._levelBounds));
-      for (let f = r; f < a; f += 4) {
+    let l = this._boxes.length - 4;
+    const r = [], u = [];
+    for (; l !== void 0; ) {
+      const a = Math.min(l + this.nodeSize * 4, Ft(l, this._levelBounds));
+      for (let f = l; f < a; f += 4) {
         if (s < this._boxes[f] || i < this._boxes[f + 1] || n > this._boxes[f + 2] || e > this._boxes[f + 3]) continue;
-        const u = this._indices[f >> 2] | 0;
-        r >= this.numItems * 4 ? l.push(u) : (o === void 0 || o(u)) && c.push(u);
+        const c = this._indices[f >> 2] | 0;
+        l >= this.numItems * 4 ? r.push(c) : (o === void 0 || o(c)) && u.push(c);
       }
-      r = l.pop();
+      l = r.pop();
     }
-    return c;
+    return u;
   }
   /**
    * Search items in order of distance from the given point.
@@ -1211,25 +1211,25 @@ class at {
   neighbors(n, e, s = 1 / 0, i = 1 / 0, o) {
     if (this._pos !== this._boxes.length)
       throw new Error("Data not yet indexed - call index.finish().");
-    let r = this._boxes.length - 4;
-    const l = this._queue, c = [], a = i * i;
-    t: for (; r !== void 0; ) {
-      const f = Math.min(r + this.nodeSize * 4, Et(r, this._levelBounds));
-      for (let u = r; u < f; u += 4) {
-        const h = this._indices[u >> 2] | 0, p = It(n, this._boxes[u], this._boxes[u + 2]), d = It(e, this._boxes[u + 1], this._boxes[u + 3]), m = p * p + d * d;
-        m > a || (r >= this.numItems * 4 ? l.push(h << 1, m) : (o === void 0 || o(h)) && l.push((h << 1) + 1, m));
+    let l = this._boxes.length - 4;
+    const r = this._queue, u = [], a = i * i;
+    t: for (; l !== void 0; ) {
+      const f = Math.min(l + this.nodeSize * 4, Ft(l, this._levelBounds));
+      for (let c = l; c < f; c += 4) {
+        const h = this._indices[c >> 2] | 0, p = Et(n, this._boxes[c], this._boxes[c + 2]), d = Et(e, this._boxes[c + 1], this._boxes[c + 3]), m = p * p + d * d;
+        m > a || (l >= this.numItems * 4 ? r.push(h << 1, m) : (o === void 0 || o(h)) && r.push((h << 1) + 1, m));
       }
-      for (; l.length && l.peek() & 1; )
-        if (l.peekValue() > a || (c.push(l.pop() >> 1), c.length === s)) break t;
-      r = l.length ? l.pop() >> 1 : void 0;
+      for (; r.length && r.peek() & 1; )
+        if (r.peekValue() > a || (u.push(r.pop() >> 1), u.length === s)) break t;
+      l = r.length ? r.pop() >> 1 : void 0;
     }
-    return l.clear(), c;
+    return r.clear(), u;
   }
 }
-function It(t, n, e) {
+function Et(t, n, e) {
   return t < n ? n - t : t <= e ? 0 : t - e;
 }
-function Et(t, n) {
+function Ft(t, n) {
   let e = 0, s = n.length - 1;
   for (; e < s; ) {
     const i = e + s >> 1;
@@ -1237,79 +1237,79 @@ function Et(t, n) {
   }
   return n[e];
 }
-function ot(t, n, e, s, i, o) {
+function rt(t, n, e, s, i, o) {
   if (Math.floor(s / o) >= Math.floor(i / o)) return;
-  const r = t[s + i >> 1];
-  let l = s - 1, c = i + 1;
+  const l = t[s + i >> 1];
+  let r = s - 1, u = i + 1;
   for (; ; ) {
     do
-      l++;
-    while (t[l] < r);
+      r++;
+    while (t[r] < l);
     do
-      c--;
-    while (t[c] > r);
-    if (l >= c) break;
-    Yn(t, n, e, l, c);
+      u--;
+    while (t[u] > l);
+    if (r >= u) break;
+    Xn(t, n, e, r, u);
   }
-  ot(t, n, e, s, c, o), ot(t, n, e, c + 1, i, o);
+  rt(t, n, e, s, u, o), rt(t, n, e, u + 1, i, o);
 }
-function Yn(t, n, e, s, i) {
+function Xn(t, n, e, s, i) {
   const o = t[s];
   t[s] = t[i], t[i] = o;
-  const r = 4 * s, l = 4 * i, c = n[r], a = n[r + 1], f = n[r + 2], u = n[r + 3];
-  n[r] = n[l], n[r + 1] = n[l + 1], n[r + 2] = n[l + 2], n[r + 3] = n[l + 3], n[l] = c, n[l + 1] = a, n[l + 2] = f, n[l + 3] = u;
+  const l = 4 * s, r = 4 * i, u = n[l], a = n[l + 1], f = n[l + 2], c = n[l + 3];
+  n[l] = n[r], n[l + 1] = n[r + 1], n[l + 2] = n[r + 2], n[l + 3] = n[r + 3], n[r] = u, n[r + 1] = a, n[r + 2] = f, n[r + 3] = c;
   const h = e[s];
   e[s] = e[i], e[i] = h;
 }
-function Xn(t, n) {
-  let e = t ^ n, s = 65535 ^ e, i = 65535 ^ (t | n), o = t & (n ^ 65535), r = e | s >> 1, l = e >> 1 ^ e, c = i >> 1 ^ s & o >> 1 ^ i, a = e & i >> 1 ^ o >> 1 ^ o;
-  e = r, s = l, i = c, o = a, r = e & e >> 2 ^ s & s >> 2, l = e & s >> 2 ^ s & (e ^ s) >> 2, c ^= e & i >> 2 ^ s & o >> 2, a ^= s & i >> 2 ^ (e ^ s) & o >> 2, e = r, s = l, i = c, o = a, r = e & e >> 4 ^ s & s >> 4, l = e & s >> 4 ^ s & (e ^ s) >> 4, c ^= e & i >> 4 ^ s & o >> 4, a ^= s & i >> 4 ^ (e ^ s) & o >> 4, e = r, s = l, i = c, o = a, c ^= e & i >> 8 ^ s & o >> 8, a ^= s & i >> 8 ^ (e ^ s) & o >> 8, e = c ^ c >> 1, s = a ^ a >> 1;
-  let f = t ^ n, u = s | 65535 ^ (f | e);
-  return f = (f | f << 8) & 16711935, f = (f | f << 4) & 252645135, f = (f | f << 2) & 858993459, f = (f | f << 1) & 1431655765, u = (u | u << 8) & 16711935, u = (u | u << 4) & 252645135, u = (u | u << 2) & 858993459, u = (u | u << 1) & 1431655765, (u << 1 | f) >>> 0;
+function Gn(t, n) {
+  let e = t ^ n, s = 65535 ^ e, i = 65535 ^ (t | n), o = t & (n ^ 65535), l = e | s >> 1, r = e >> 1 ^ e, u = i >> 1 ^ s & o >> 1 ^ i, a = e & i >> 1 ^ o >> 1 ^ o;
+  e = l, s = r, i = u, o = a, l = e & e >> 2 ^ s & s >> 2, r = e & s >> 2 ^ s & (e ^ s) >> 2, u ^= e & i >> 2 ^ s & o >> 2, a ^= s & i >> 2 ^ (e ^ s) & o >> 2, e = l, s = r, i = u, o = a, l = e & e >> 4 ^ s & s >> 4, r = e & s >> 4 ^ s & (e ^ s) >> 4, u ^= e & i >> 4 ^ s & o >> 4, a ^= s & i >> 4 ^ (e ^ s) & o >> 4, e = l, s = r, i = u, o = a, u ^= e & i >> 8 ^ s & o >> 8, a ^= s & i >> 8 ^ (e ^ s) & o >> 8, e = u ^ u >> 1, s = a ^ a >> 1;
+  let f = t ^ n, c = s | 65535 ^ (f | e);
+  return f = (f | f << 8) & 16711935, f = (f | f << 4) & 252645135, f = (f | f << 2) & 858993459, f = (f | f << 1) & 1431655765, c = (c | c << 8) & 16711935, c = (c | c << 4) & 252645135, c = (c | c << 2) & 858993459, c = (c | c << 1) & 1431655765, (c << 1 | f) >>> 0;
 }
-function Yt(t, n = 1e-7) {
+function Xt(t, n = 1e-7) {
   if (t.length === 0) return [];
   if (t.length === 1) return [t];
-  const e = new at(t.length);
+  const e = new ft(t.length);
   t.forEach((o) => {
-    const [r, l] = o.firstPoint;
-    e.add(r - n, l - n, r + n, l + n);
+    const [l, r] = o.firstPoint;
+    e.add(l - n, r - n, l + n, r + n);
   }), e.finish();
   const s = [], i = /* @__PURE__ */ new Set();
-  return t.forEach((o, r) => {
-    if (i.has(r)) return;
-    const l = [o];
-    let c = r;
-    i.add(r);
+  return t.forEach((o, l) => {
+    if (i.has(l)) return;
+    const r = [o];
+    let u = l;
+    i.add(l);
     let a = t.length;
     for (; ; ) {
       if (a-- < 0)
         throw new Error("Infinite loop detected");
-      const f = l[l.length - 1].lastPoint, [u, h] = f, p = e.search(
-        u - n,
+      const f = r[r.length - 1].lastPoint, [c, h] = f, p = e.search(
+        c - n,
         h - n,
-        u + n,
+        c + n,
         h + n
-      ), d = (x) => Math.abs((c - x) % t.length), m = p.filter((x) => !i.has(x)).map((x) => [
-        t[x],
-        x,
-        d(x)
-      ]).sort(([, , x], [, , F]) => d(x) - d(F));
+      ), d = (w) => Math.abs((u - w) % t.length), m = p.filter((w) => !i.has(w)).map((w) => [
+        t[w],
+        w,
+        d(w)
+      ]).sort(([, , w], [, , F]) => d(w) - d(F));
       if (m.length === 0) {
-        s.push(l);
+        s.push(r);
         break;
       }
-      const [P, w] = m[0];
-      l.push(P), i.add(w), c = w;
+      const [x, g] = m[0];
+      r.push(x), i.add(g), u = g;
     }
   }), s;
 }
-class v extends lt {
+class v extends ut {
   constructor(e, s = [], { ignoreChecks: i = !1 } = {}) {
     super();
     C(this, "contour");
     C(this, "holes");
-    i || Gn(e, s), this.contour = e, this.holes = s;
+    i || Qn(e, s), this.contour = e, this.holes = s;
   }
   get boundingBox() {
     return this.contour.boundingBox;
@@ -1332,8 +1332,8 @@ class v extends lt {
       this.holes.map((s) => s.transform(e))
     );
   }
-  contains(e) {
-    return this.contour.contains(e) && !this.holes.some((s) => s.contains(e));
+  contains(e, { strokeIsInside: s = !1 } = {}) {
+    return this.contour.contains(e, { strokeIsInside: s }) && !this.holes.some((i) => i.contains(e, { strokeIsInside: s }));
   }
   intersects(e) {
     return this.allLoops.some(
@@ -1341,266 +1341,326 @@ class v extends lt {
     );
   }
   overlappingStrands(e) {
-    const s = e instanceof v ? e.allLoops : [e], i = this.allLoops.flatMap((o) => s.flatMap((r) => o.overlappingSegments(r)));
-    return Yt(i).map((o) => new B(o));
+    const s = e instanceof v ? e.allLoops : [e], i = this.allLoops.flatMap((o) => s.flatMap((l) => o.overlappingSegments(l)));
+    return Xt(i).map((o) => new B(o));
   }
 }
-function Gn(t, n = []) {
+function Qn(t, n = []) {
   if (!t) throw new Error("Figure must have a contour");
-  for (const [e, s] of st([t, ...n]))
+  for (const [e, s] of it([t, ...n]))
     if (e.intersects(s))
       throw new Error("Loops in a figure must not intersect");
   if (n.some(
     (e) => !t.contains(e.firstPoint) && !t.onStroke(e.firstPoint)
   ))
     throw new Error("Holes must be inside the contour");
-  for (const [e, s] of st(n))
+  for (const [e, s] of it(n))
     if (e.contains(s.firstPoint))
-      throw console.error(Mt(e), Mt(s)), new Error("Holes must not be inside other holes");
-}
-const Qn = (t) => {
-  const n = t.map((i, o) => t.slice(o + 1).map((r, l) => [l + o + 1, r]).filter(([, r]) => i.boundingBox.overlaps(r.boundingBox)).map(([r]) => r)), e = [], s = Array(n.length);
+      throw console.error(It(e), It(s)), new Error("Holes must not be inside other holes");
+}
+const J = (t, n, e = 1e-7) => Math.abs(t - n) <= e, Wn = (t, n) => {
+  const e = t.boundingBox, s = n.boundingBox;
+  return J(e.xMin, s.xMin) && J(e.yMin, s.yMin) && J(e.xMax, s.xMax) && J(e.yMax, s.yMax);
+}, Jn = (t, n) => {
+  if (t.segmentsCount !== n.segmentsCount || !Wn(t, n)) return !1;
+  const e = t.segments, s = n.segments, i = e.length, o = (l, r) => {
+    for (let u = 0; u < i; u += 1) {
+      const a = (l + r * u + i) % i;
+      if (!e[u].isSame(s[a])) return !1;
+    }
+    return !0;
+  };
+  for (let l = 0; l < i; l += 1)
+    if (e[0].isSame(s[l]) && (o(l, 1) || o(l, -1)))
+      return !0;
+  return !1;
+}, Kn = (t) => {
+  const n = [];
+  return t.forEach((e) => {
+    n.some((s) => Jn(e, s)) || n.push(e);
+  }), n;
+}, Zn = (t) => {
+  const n = t.map((i, o) => t.slice(o + 1).map((l, r) => [r + o + 1, l]).filter(([, l]) => i.boundingBox.overlaps(l.boundingBox)).map(([l]) => l)), e = [], s = Array(n.length);
   return n.forEach((i, o) => {
-    let r = s[o];
-    r || (r = [], e.push(r)), r.push(t[o]), i.length && i.forEach((l) => {
-      s[l] = r;
+    let l = s[o];
+    l || (l = [], e.push(l)), l.push(t[o]), i.length && i.forEach((r) => {
+      s[r] = l;
     });
   }), e;
-}, Xt = (t) => t.map((n, e) => {
-  const i = n.segments[0].midPoint, o = t.filter((r, l) => e === l ? !1 : r.contains(i));
+}, Gt = (t) => t.map((n, e) => {
+  const i = n.segments[0].midPoint, o = t.filter((l, r) => e === r ? !1 : l.contains(i));
   return {
     loop: n,
     isIn: o
   };
-}), Wn = (t, n) => t.flatMap(({ loop: e }) => ft(
+}), te = (t, n) => t.flatMap(({ loop: e }) => ht(
   n.filter(
     ({ loop: s, isIn: i }) => s === e || i.indexOf(e) !== -1
   )
-)), Jn = (t, n) => {
-  const e = n.filter(({ isIn: i }) => i.length <= 1), s = ft(
-    Xt(t.map(({ loop: i }) => i))
+)), ne = (t, n) => {
+  const e = n.filter(({ isIn: i }) => i.length <= 1), s = ht(
+    Gt(t.map(({ loop: i }) => i))
   );
   return [e, ...s];
-}, ft = (t) => {
+}, ht = (t) => {
   if (!t.length) return [];
   const n = t.filter(({ isIn: s }) => !s.length), e = t.filter(({ isIn: s }) => s.length > 1);
-  return n.length === 1 && e.length === 0 ? [t] : n.length > 1 ? Wn(n, t) : Jn(e, t);
+  return n.length === 1 && e.length === 0 ? [t] : n.length > 1 ? te(n, t) : ne(e, t);
 };
 function X(t) {
-  return Qn(t).map(Xt).flatMap(ft).map((e) => {
-    if (e.length === 1) return new v(e[0].loop);
-    e.sort((o, r) => o.isIn.length - r.isIn.length);
-    const [s, ...i] = e.map(({ loop: o }) => o);
-    return new v(s, i);
+  const n = Kn(t);
+  return Zn(n).map(Gt).flatMap(ht).map((s) => {
+    if (s.length === 1) return new v(s[0].loop);
+    s.sort((l, r) => l.isIn.length - r.isIn.length);
+    const [i, ...o] = s.map(({ loop: l }) => l);
+    return new v(i, o);
   });
 }
-function Kn(t, n) {
+function ee(t, n) {
   const e = [];
   for (const s of t)
     for (const i of n)
       e.push([s, i]);
   return e;
 }
-function* Ft(t, n, e) {
-  const s = (r) => n.some((l) => g(l, r.lastPoint)), i = (r) => e.some((l) => r.isSame(l));
-  let o = [];
+function* vt(t, n, e) {
+  const s = (r) => n.some((u) => P(u, r.lastPoint)), i = (r, u) => r.segmentType !== u.segmentType || !u.isOnSegment(r.firstPoint) || !u.isOnSegment(r.lastPoint) ? !1 : r.segmentType !== "LINE" ? u.isOnSegment(r.midPoint) : !0, o = (r) => e.some((u) => r.isSame(u) || i(r, u));
+  let l = [];
   for (const r of t)
-    s(r) ? (o.push(r), yield new B(o, { ignoreChecks: !0 }), o = []) : i(r) ? (o.length && (yield new B(o, { ignoreChecks: !0 }), o = []), yield new B([r], { ignoreChecks: !0 })) : o.push(r);
-  o.length && (yield new B(o, { ignoreChecks: !0 }));
+    s(r) ? (l.push(r), yield new B(l, { ignoreChecks: !0 }), l = []) : o(r) ? (l.length && (yield new B(l, { ignoreChecks: !0 }), l = []), yield new B([r], { ignoreChecks: !0 })) : l.push(r);
+  l.length && (yield new B(l, { ignoreChecks: !0 }));
 }
-const vt = (t, n) => {
-  const e = t.findIndex((o) => g(n, o.firstPoint)), s = t.slice(0, e);
+const Bt = (t, n) => {
+  const e = t.findIndex((o) => P(n, o.firstPoint)), s = t.slice(0, e);
   return t.slice(e).concat(s);
-}, Bt = (t, n) => {
+}, kt = (t, n) => {
   let e = t;
-  const s = (l) => g(l.firstPoint, n.firstPoint) && g(l.lastPoint, n.lastPoint);
+  const s = (r) => P(r.firstPoint, n.firstPoint) && P(r.lastPoint, n.lastPoint);
   let i = t.findIndex(s);
   if (i === -1) {
-    const l = t.map((c) => c.reverse());
-    if (l.reverse(), i = l.findIndex(s), i === -1)
+    const r = t.map((u) => u.reverse());
+    if (r.reverse(), i = r.findIndex(s), i === -1)
       throw console.error(
-        l.map((c) => c.repr),
+        r.map((u) => u.repr),
         n.repr
       ), new Error("Failed to rotate to segment start");
-    e = l;
+    e = r;
   }
   const o = e.slice(0, i);
   return e.slice(i).concat(o);
 };
-function Zn(t, n, e) {
+function se(t, n, e) {
   return t.filter((s) => {
-    const i = n.filter((l) => g(l.firstPoint, s) || g(l.lastPoint, s));
+    const i = n.filter((r) => P(r.firstPoint, s) || P(r.lastPoint, s));
     if (i.length % 2)
       throw new Error("Bug in the intersection algo on non crossing point");
-    const o = i.map((l) => e.contains(l.midPoint));
-    return !(o.every((l) => l) || !o.some((l) => l));
+    const o = i.map((r) => e.contains(r.midPoint));
+    return !(o.every((r) => r) || !o.some((r) => r));
   });
 }
-function te(t, n, e) {
-  let s = [];
-  const i = [], o = new Array(t.segments.length).fill(0).map(() => []), r = new Array(n.segments.length).fill(0).map(() => []);
-  if (t.segments.forEach((h, p) => {
-    n.segments.forEach((d, m) => {
-      const { intersections: P, overlaps: w } = K(
-        h,
-        d,
+function ie(t, n, e, s = !1) {
+  let i = [];
+  const o = [], l = new Array(t.segments.length).fill(0).map(() => []), r = new Array(n.segments.length).fill(0).map(() => []);
+  if (t.segments.forEach((p, d) => {
+    n.segments.forEach((m, x) => {
+      const { intersections: g, overlaps: w } = Z(
+        p,
+        m,
         e
       );
-      s.push(...P), o[p].push(...P), r[m].push(...P), i.push(...w);
-      const x = w.flatMap((F) => [
-        F.firstPoint,
-        F.lastPoint
+      i.push(...g), l[d].push(...g), r[x].push(...g), o.push(...w);
+      const F = w.flatMap((y) => [
+        y.firstPoint,
+        y.lastPoint
       ]);
-      s.push(...x), o[p].push(...x), r[m].push(...x);
+      i.push(...F), l[d].push(...F), r[x].push(...F);
     });
-  }), s = U(s, e), !s.length || s.length === 1) return null;
-  const l = ([h, p]) => p.length ? h.splitAt(p) : [h];
-  let c = N([t.segments, o]).flatMap(l), a = N([n.segments, r]).flatMap(l);
-  if (s = Zn(
-    s,
-    c,
+  }), i = U(i, e), !i.length || i.length === 1) return null;
+  const u = ([p, d]) => d.length ? p.splitAt(d) : [p];
+  let a = N([t.segments, l]).flatMap(u), f = N([n.segments, r]).flatMap(u);
+  if (i = se(
+    i,
+    a,
     n
-  ), !s.length && !i.length) return null;
-  if (i.length) {
-    const h = i[0];
-    c = Bt(
-      c,
-      h
-    ), a = Bt(
+  ), !i.length && !o.length) return null;
+  if (o.length) {
+    const p = o[0];
+    a = kt(
       a,
-      h
+      p
+    ), f = kt(
+      f,
+      p
     );
   } else {
-    const h = s[0];
-    c = vt(c, h), a = vt(a, h);
-  }
-  let f = Array.from(
-    Ft(
-      c,
-      s,
-      i
-    )
-  ), u = Array.from(
-    Ft(
+    const p = i[0];
+    a = Bt(a, p), f = Bt(f, p);
+  }
+  let c = Array.from(
+    vt(
       a,
-      s,
-      i
+      i,
+      o
+    )
+  ), h = Array.from(
+    vt(
+      f,
+      i,
+      o
     )
   );
-  return (!g(
-    u[0].lastPoint,
-    f[0].lastPoint
-  ) || i.length > 0 && u[0].segmentsCount !== 1) && (u = u.map((h) => h.reverse()).reverse(), g(u[0].lastPoint, f[0].lastPoint) || (f = f.map((h) => h.reverse()).reverse())), N([f, u]).map(([h, p]) => h.segmentsCount === 1 && i.some((d) => h.segments[0].isSame(d)) ? [h, "same"] : [h, p]);
+  return (!P(
+    h[0].lastPoint,
+    c[0].lastPoint
+  ) || o.length > 0 && h[0].segmentsCount !== 1) && (h = h.map((p) => p.reverse()).reverse(), P(h[0].lastPoint, c[0].lastPoint) || (c = c.map((p) => p.reverse()).reverse())), N([c, h]).map(([p, d]) => {
+    if (s) {
+      if (((x) => x.segments.every(
+        (g) => o.some(
+          (w) => g.isSame(w) || g.segmentType === w.segmentType && w.isOnSegment(g.firstPoint) && w.isOnSegment(g.lastPoint) && (g.segmentType === "LINE" || w.isOnSegment(g.midPoint))
+        )
+      ))(p))
+        return [p, "same"];
+    } else if (p.segmentsCount === 1 && o.some((m) => p.segments[0].isSame(m)))
+      return [p, "same"];
+    return [p, d];
+  });
 }
-function kt(t) {
+function Ot(t) {
   let n = t[0];
   for (const e of t.slice(1))
     n = n.extend(e);
-  if (!g(n.firstPoint, n.lastPoint))
+  if (!P(n.firstPoint, n.lastPoint))
     throw console.error(
-      dt(n.firstPoint),
-      dt(n.lastPoint)
+      mt(n.firstPoint),
+      mt(n.lastPoint)
     ), new Error("Bug in the intersection algo on non closing strand");
-  return new O(n.segments);
+  return new _(n.segments);
 }
-function ne(t, n) {
+function oe(t, n) {
   const e = N([
     n.slice(0, -1),
     n.slice(1)
-  ]).map(([i, o]) => kt(t.slice(i, o)));
+  ]).map(([i, o]) => Ot(t.slice(i, o)));
   let s = t.slice(
     n[n.length - 1]
   );
-  return n[0] !== 0 && (s = s.concat(t.slice(0, n[0]))), e.push(kt(s)), e;
+  return n[0] !== 0 && (s = s.concat(t.slice(0, n[0]))), e.push(Ot(s)), e;
 }
-function ee(t) {
+function re(t) {
   if (!t.length) return [];
   const n = t.map((i) => i.firstPoint);
   let e = t.map((i) => i.lastPoint);
   e = e.slice(-1).concat(e.slice(0, -1));
   const s = N([n, e]).flatMap(
-    ([i, o], r) => g(i, o) ? [] : r
+    ([i, o], l) => P(i, o) ? [] : l
   );
   try {
-    return ne(t, s);
+    return oe(t, s);
   } catch {
-    return Yt(t.flatMap((o) => o.segments)).filter((o) => o.length > 1).filter((o) => g(o[0].firstPoint, o.at(-1).lastPoint)).map((o) => new O(o));
+    return Xt(t.flatMap((o) => o.segments)).filter((o) => o.length > 1).filter((o) => P(o[0].firstPoint, o.at(-1).lastPoint)).map((o) => new _(o));
   }
 }
 const _t = (t, n) => {
   if (t.length === 0) return [n];
   const e = t.at(-1);
-  return g(e.lastPoint, n.firstPoint) ? t.slice(0, -1).concat([e.extend(n)]) : g(e.lastPoint, n.lastPoint) ? t.slice(0, -1).concat([e.extend(n.reverse())]) : t.concat([n]);
-}, se = (t, n) => t.length === 0 ? [n] : g(t[0].firstPoint, n.lastPoint) ? [n.extend(t[0])].concat(t.slice(1)) : [n].concat(t);
-function ht(t, n, {
+  return P(e.lastPoint, n.firstPoint) ? t.slice(0, -1).concat([e.extend(n)]) : P(e.lastPoint, n.lastPoint) ? t.slice(0, -1).concat([e.extend(n.reverse())]) : t.concat([n]);
+}, le = (t, n) => t.length === 0 ? [n] : P(t[0].firstPoint, n.lastPoint) ? [n.extend(t[0])].concat(t.slice(1)) : [n].concat(t);
+function pt(t, n, {
   firstInside: e,
-  secondInside: s
+  secondInside: s,
+  firstBoundaryInside: i = !1,
+  secondBoundaryInside: o = !1
 }) {
-  const i = te(t, n);
-  if (!i) {
-    const c = t.segments[0].midPoint, a = n.contains(c), f = n.segments[0].midPoint, u = t.contains(f);
+  const l = ie(
+    t,
+    n,
+    void 0,
+    i || o
+  );
+  if (!l) {
+    const f = t.segments[0].midPoint, c = n.contains(f, {
+      strokeIsInside: o
+    }), h = n.segments[0].midPoint, p = t.contains(h, {
+      strokeIsInside: i
+    });
     return {
       identical: !1,
-      firstCurveInSecond: a,
-      secondCurveInFirst: u
+      firstCurveInSecond: c,
+      secondCurveInFirst: p
     };
   }
-  if (i.every(([, c]) => c === "same"))
+  if (l.every(([, f]) => f === "same"))
     return { identical: !0 };
-  let o = null, r = null;
-  const l = i.flatMap(([c, a]) => {
-    let f = [], u = 0;
-    if (a === "same")
-      return r === 1 ? (r = 1, c) : r === 2 || r === 0 ? (r = null, []) : r === null ? (o ? o = o.extend(c) : o = c, []) : (console.error("weird situation"), []);
-    const h = c.segments[0].midPoint, p = n.contains(h);
-    (e === "keep" && p || e === "remove" && !p) && (u += 1, f = _t(f, c));
-    const d = a.segments[0].midPoint, m = t.contains(d);
-    if (s === "keep" && m || s === "remove" && !m) {
-      const P = a;
-      u += 1, u === 2 && f.length ? (f = _t(f, P), o = null) : f = [P];
+  let r = null, u = null;
+  const a = l.flatMap(([f, c]) => {
+    let h = [], p = 0;
+    if (c === "same")
+      return u === 1 ? (u = 1, f) : u === 2 || u === 0 ? (u = null, []) : u === null ? (r ? r = r.extend(f) : r = f, []) : (console.error("weird situation"), []);
+    const d = f.segments[0].midPoint, m = n.contains(d, {
+      strokeIsInside: o
+    });
+    (e === "keep" && m || e === "remove" && !m) && (p += 1, h = _t(h, f));
+    const x = c.segments[0].midPoint, g = t.contains(x, {
+      strokeIsInside: i
+    });
+    if (s === "keep" && g || s === "remove" && !g) {
+      const w = c;
+      p += 1, p === 2 && h.length ? (h = _t(h, w), r = null) : h = [w];
     }
-    return r === null && u === 1 && o && (f = se(f, o)), u === 1 && (r = u, o = null), f.length ? f : (o = null, []);
+    return u === null && p === 1 && r && (h = le(h, r)), p === 1 && (u = p, r = null), h.length ? h : (r = null, []);
   });
-  return ee(l);
+  return re(a);
 }
-const ie = (t, n) => {
-  const e = ht(t, n, {
+const ue = (t, n, e) => {
+  const s = pt(t, n, {
     firstInside: "remove",
-    secondInside: "remove"
+    secondInside: "remove",
+    ...e
   });
-  return Array.isArray(e) ? e : e.identical ? [t] : e.firstCurveInSecond ? [n] : e.secondCurveInFirst ? [t] : [t, n];
-}, Z = (t, n) => {
-  const e = ht(t, n, {
+  return Array.isArray(s) ? s : s.identical ? [t] : s.firstCurveInSecond ? [n] : s.secondCurveInFirst ? [t] : [t, n];
+}, tt = (t, n, e) => {
+  const s = pt(t, n, {
     firstInside: "remove",
-    secondInside: "keep"
+    secondInside: "keep",
+    ...e
   });
-  return Array.isArray(e) ? e : e.identical ? [] : e.firstCurveInSecond ? [] : e.secondCurveInFirst ? [t, n] : [t];
-}, pt = (t, n) => {
-  const e = ht(t, n, {
+  return Array.isArray(s) ? s : s.identical ? [] : s.firstCurveInSecond ? [] : s.secondCurveInFirst ? [t, n] : [t];
+}, dt = (t, n, e) => {
+  const s = (e == null ? void 0 : e.firstBoundaryInside) ?? !1, i = (e == null ? void 0 : e.secondBoundaryInside) ?? !1, o = s || i, l = (u, a, f) => u.segments.every(
+    (c) => a.contains(c.midPoint, { strokeIsInside: f })
+  );
+  if (o) {
+    if (l(t, n, i))
+      return [t];
+    if (l(n, t, s))
+      return [n];
+  }
+  const r = pt(t, n, {
     firstInside: "keep",
-    secondInside: "keep"
+    secondInside: "keep",
+    ...e
   });
-  return Array.isArray(e) ? e : e.identical ? [t] : e.firstCurveInSecond ? [t] : e.secondCurveInFirst ? [n] : [];
+  return Array.isArray(r) ? r : r.identical ? [t] : r.firstCurveInSecond ? [t] : r.secondCurveInFirst ? [n] : [];
 };
-function oe(t) {
+function ce(t) {
   const n = /* @__PURE__ */ new Map(), e = [];
   return t.forEach((s, i) => {
     let o;
-    n.has(i) ? o = n.get(i) : (o = { current: [s], fusedWith: /* @__PURE__ */ new Set([i]) }, e.push(o)), t.slice(i + 1).forEach((r, l) => {
-      const c = o.current, a = i + l + 1;
+    n.has(i) ? o = n.get(i) : (o = { current: [s], fusedWith: /* @__PURE__ */ new Set([i]) }, e.push(o)), t.slice(i + 1).forEach((l, r) => {
+      const u = o.current, a = i + r + 1;
       if (o.fusedWith.has(a)) return;
-      let f = [r], u = !1;
-      if (n.has(a) && (f = n.get(a).current, u = !0), !c.some(
+      let f = [l], c = !1;
+      if (n.has(a) && (f = n.get(a).current, c = !0), !u.some(
         (d) => f.some((m) => d.intersects(m))
       )) return;
       let p;
-      c.length > 1 || f.length > 1 ? p = G(c, f) : p = Gt(c[0], f[0]), o.fusedWith.add(a), o.current = p, u || n.set(a, o);
+      u.length > 1 || f.length > 1 ? p = G(u, f) : p = Qt(u[0], f[0]), o.fusedWith.add(a), o.current = p, c || n.set(a, o);
     });
   }), e.flatMap(({ current: s }) => s);
 }
-function Gt(t, n) {
-  const e = ie(t.contour, n.contour), s = n.holes.flatMap((r) => Z(r, t.contour)), i = t.holes.flatMap((r) => Z(r, n.contour)), o = Kn(t.holes, n.holes).flatMap(
-    ([r, l]) => pt(r, l)
+function Qt(t, n) {
+  const e = ue(t.contour, n.contour), s = n.holes.flatMap((l) => tt(l, t.contour)), i = t.holes.flatMap((l) => tt(l, n.contour)), o = ee(t.holes, n.holes).flatMap(
+    ([l, r]) => dt(l, r)
   );
   return X([
     ...e,
@@ -1609,12 +1669,12 @@ function Gt(t, n) {
     ...o
   ]);
 }
-function tt(t, n) {
+function nt(t, n) {
   if (t.isFull && n.isFull)
-    return X(Z(t.contour, n.contour));
+    return X(tt(t.contour, n.contour));
   if (t.isFull) {
-    const s = Z(t.contour, n.contour), i = n.holes.flatMap(
-      (o) => pt(o, t.contour)
+    const s = tt(t.contour, n.contour), i = n.holes.flatMap(
+      (o) => dt(o, t.contour, { firstBoundaryInside: !0 })
     );
     return X([...s, ...i]);
   } else if (n.isFull && !t.contour.intersects(n.contour))
@@ -1629,13 +1689,13 @@ function tt(t, n) {
       ]);
     } else
       return [t];
-  let e = tt(new v(t.contour), n);
+  let e = nt(new v(t.contour), n);
   return t.holes.forEach((s) => {
-    e = e.flatMap((i) => tt(i, new v(s)));
+    e = e.flatMap((i) => nt(i, new v(s)));
   }), e;
 }
-function re(t, n) {
-  const e = pt(t.contour, n.contour);
+function ae(t, n) {
+  const e = dt(t.contour, n.contour);
   if (!e.length) return [];
   let s = X(e);
   return s = Q(
@@ -1650,42 +1710,42 @@ function G(t, n) {
   if (!t.length) return n;
   if (!n.length) return t;
   if (t.length === 1 && n.length > 1 || n.length === 1 && t.length > 1)
-    return oe([...t, ...n]);
+    return ce([...t, ...n]);
   if (t.length > 1 && n.length > 1) {
     let e = G([t[0]], n);
     return t.slice(1).forEach((s) => {
       e = G([s], e);
     }), e;
   }
-  return t.length === 1 && n.length === 1 ? Gt(t[0], n[0]) : [];
+  return t.length === 1 && n.length === 1 ? Qt(t[0], n[0]) : [];
 }
 function Q(t, n) {
   if (!t.length) return [];
   if (!n.length) return t;
   if (t.length === 1 && n.length === 1)
-    return tt(t[0], n[0]);
+    return nt(t[0], n[0]);
   if (t.length > 1)
     return t.flatMap((s) => Q([s], n));
-  let e = tt(t[0], n[0]);
+  let e = nt(t[0], n[0]);
   return n.slice(1).forEach((s) => {
     e = Q(e, [s]);
   }), e;
 }
-function rt(t, n) {
-  return !t.length || !n.length ? [] : t.length === 1 && n.length === 1 ? re(t[0], n[0]) : t.length > 1 ? t.flatMap((e) => rt([e], n)) : n.flatMap((e) => rt(t, [e]));
+function lt(t, n) {
+  return !t.length || !n.length ? [] : t.length === 1 && n.length === 1 ? ae(t[0], n[0]) : t.length > 1 ? t.flatMap((e) => lt([e], n)) : n.flatMap((e) => lt(t, [e]));
 }
-class _ extends lt {
+class O extends ut {
   constructor(e = [], { ignoreChecks: s = !1 } = {}) {
     super();
     C(this, "figures");
     C(this, "_boundingBox", null);
-    s || le(e), this.figures = e;
+    s || fe(e), this.figures = e;
   }
   get isEmpty() {
     return this.figures.length === 0;
   }
   get boundingBox() {
-    if (this.isEmpty) return new hn();
+    if (this.isEmpty) return new pn();
     if (this._boundingBox === null) {
       let e = this.figures[0].boundingBox;
       for (const s of this.figures.slice(1))
@@ -1695,13 +1755,15 @@ class _ extends lt {
     return this._boundingBox;
   }
   clone() {
-    return new _(this.figures.map((e) => e.clone()));
+    return new O(this.figures.map((e) => e.clone()));
   }
   transform(e) {
-    return new _(this.figures.map((s) => s.transform(e)));
+    return new O(this.figures.map((s) => s.transform(e)));
   }
-  contains(e) {
-    return this.figures.some((s) => s.contains(e));
+  contains(e, { strokeIsInside: s = !1 } = {}) {
+    return this.figures.some(
+      (i) => i.contains(e, { strokeIsInside: s })
+    );
   }
   intersects(e) {
     return this.figures.some(
@@ -1709,41 +1771,41 @@ class _ extends lt {
     );
   }
   overlappingStrands(e) {
-    return this.figures.flatMap((s) => e instanceof _ ? e.figures.flatMap(
+    return this.figures.flatMap((s) => e instanceof O ? e.figures.flatMap(
       (i) => s.overlappingStrands(i)
     ) : s.overlappingStrands(e));
   }
   fuse(e) {
-    return new _(G(this.figures, e.figures));
+    return new O(G(this.figures, e.figures));
   }
   cut(e) {
-    return new _(Q(this.figures, e.figures));
+    return new O(Q(this.figures, e.figures));
   }
   intersect(e) {
-    return new _(rt(this.figures, e.figures));
+    return new O(lt(this.figures, e.figures));
   }
 }
-function le(t) {
-  for (const [n, e] of st(t))
+function fe(t) {
+  for (const [n, e] of it(t))
     if (n.intersects(e))
       throw new Error("Diagram figures must not intersect");
 }
 export {
-  _ as D,
+  O as D,
   v as F,
-  O as L,
+  _ as L,
   B as S,
-  K as a,
+  Z as a,
   G as b,
   Q as c,
-  qt as d,
-  Yt as e,
-  ae as f,
-  jn as g,
-  Mt as h,
-  rt as i,
-  J as l,
-  pn as p,
-  Ft as s
+  Dt as d,
+  Xt as e,
+  de as f,
+  Hn as g,
+  It as h,
+  lt as i,
+  K as l,
+  dn as p,
+  vt as s
 };
-//# sourceMappingURL=models-zEMLdtLw.js.map
+//# sourceMappingURL=models-DCkOI0hV.js.map