@visactor/vrender 1.0.25 → 1.0.26-alpha.0

package/dist/index.js

@@ -21679,41 +21679,42 @@
 
     function t(t, e, s) {
       if (t && t.length) {
-        const [n, o] = e,
-          a = Math.PI / 180 * s,
-          h = Math.cos(a),
-          r = Math.sin(a);
-        for (const e of t) {
-          const [t, s] = e;
-          e[0] = (t - n) * h - (s - o) * r + n, e[1] = (t - n) * r + (s - o) * h + o;
-        }
+        const [n, a] = e,
+          o = Math.PI / 180 * s,
+          h = Math.cos(o),
+          r = Math.sin(o);
+        t.forEach(t => {
+          const [e, s] = t;
+          t[0] = (e - n) * h - (s - a) * r + n, t[1] = (e - n) * r + (s - a) * h + a;
+        });
       }
     }
-    function e(t, e) {
-      return t[0] === e[0] && t[1] === e[1];
+    function e(t) {
+      const e = t[0],
+        s = t[1];
+      return Math.sqrt(Math.pow(e[0] - s[0], 2) + Math.pow(e[1] - s[1], 2));
     }
-    function s(s, n, o) {
-      let a = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
-      const h = o,
-        r = Math.max(n, .1),
-        i = s[0] && s[0][0] && "number" == typeof s[0][0] ? [s] : s,
-        c = [0, 0];
-      if (h) for (const e of i) t(e, c, h);
-      const l = function (t, s, n) {
-        const o = [];
-        for (const s of t) {
-          const t = [...s];
-          e(t[0], t[t.length - 1]) || t.push([t[0][0], t[0][1]]), t.length > 2 && o.push(t);
+    function s(e, s) {
+      const n = s.hachureAngle + 90;
+      let a = s.hachureGap;
+      a < 0 && (a = 4 * s.strokeWidth), a = Math.max(a, .1);
+      const o = [0, 0];
+      if (n) for (const s of e) t(s, o, n);
+      const h = function (t, e) {
+        const s = [];
+        for (const e of t) {
+          const t = [...e];
+          t[0].join(",") !== t[t.length - 1].join(",") && t.push([t[0][0], t[0][1]]), t.length > 2 && s.push(t);
         }
+        const n = [];
+        e = Math.max(e, .1);
         const a = [];
-        s = Math.max(s, .1);
-        const h = [];
-        for (const t of o) for (let e = 0; e < t.length - 1; e++) {
+        for (const t of s) for (let e = 0; e < t.length - 1; e++) {
           const s = t[e],
             n = t[e + 1];
           if (s[1] !== n[1]) {
             const t = Math.min(s[1], n[1]);
-            h.push({
+            a.push({
               ymin: t,
               ymax: Math.max(s[1], n[1]),
               x: t === s[1] ? s[0] : n[0],
@@ -21721,52 +21722,43 @@
             });
           }
         }
-        if (h.sort((t, e) => t.ymin < e.ymin ? -1 : t.ymin > e.ymin ? 1 : t.x < e.x ? -1 : t.x > e.x ? 1 : t.ymax === e.ymax ? 0 : (t.ymax - e.ymax) / Math.abs(t.ymax - e.ymax)), !h.length) return a;
-        let r = [],
-          i = h[0].ymin,
-          c = 0;
-        for (; r.length || h.length;) {
-          if (h.length) {
+        if (a.sort((t, e) => t.ymin < e.ymin ? -1 : t.ymin > e.ymin ? 1 : t.x < e.x ? -1 : t.x > e.x ? 1 : t.ymax === e.ymax ? 0 : (t.ymax - e.ymax) / Math.abs(t.ymax - e.ymax)), !a.length) return n;
+        let o = [],
+          h = a[0].ymin;
+        for (; o.length || a.length;) {
+          if (a.length) {
             let t = -1;
-            for (let e = 0; e < h.length && !(h[e].ymin > i); e++) t = e;
-            h.splice(0, t + 1).forEach(t => {
-              r.push({
-                s: i,
+            for (let e = 0; e < a.length && !(a[e].ymin > h); e++) t = e;
+            a.splice(0, t + 1).forEach(t => {
+              o.push({
+                s: h,
                 edge: t
               });
             });
           }
-          if (r = r.filter(t => !(t.edge.ymax <= i)), r.sort((t, e) => t.edge.x === e.edge.x ? 0 : (t.edge.x - e.edge.x) / Math.abs(t.edge.x - e.edge.x)), (1 !== n || c % s == 0) && r.length > 1) for (let t = 0; t < r.length; t += 2) {
+          if (o = o.filter(t => !(t.edge.ymax <= h)), o.sort((t, e) => t.edge.x === e.edge.x ? 0 : (t.edge.x - e.edge.x) / Math.abs(t.edge.x - e.edge.x)), o.length > 1) for (let t = 0; t < o.length; t += 2) {
             const e = t + 1;
-            if (e >= r.length) break;
-            const s = r[t].edge,
-              n = r[e].edge;
-            a.push([[Math.round(s.x), i], [Math.round(n.x), i]]);
+            if (e >= o.length) break;
+            const s = o[t].edge,
+              a = o[e].edge;
+            n.push([[Math.round(s.x), h], [Math.round(a.x), h]]);
           }
-          i += n, r.forEach(t => {
-            t.edge.x = t.edge.x + n * t.edge.islope;
-          }), c++;
+          h += e, o.forEach(t => {
+            t.edge.x = t.edge.x + e * t.edge.islope;
+          });
         }
-        return a;
-      }(i, r, a);
-      if (h) {
-        for (const e of i) t(e, c, -h);
+        return n;
+      }(e, a);
+      if (n) {
+        for (const s of e) t(s, o, -n);
         !function (e, s, n) {
-          const o = [];
-          e.forEach(t => o.push(...t)), t(o, s, n);
-        }(l, c, -h);
+          const a = [];
+          e.forEach(t => a.push(...t)), t(a, s, n);
+        }(h, o, -n);
       }
-      return l;
+      return h;
     }
-    function n(t, e) {
-      var n;
-      const o = e.hachureAngle + 90;
-      let a = e.hachureGap;
-      a < 0 && (a = 4 * e.strokeWidth), a = Math.round(Math.max(a, .1));
-      let h = 1;
-      return e.roughness >= 1 && ((null === (n = e.randomizer) || void 0 === n ? void 0 : n.next()) || Math.random()) > .7 && (h = a), s(t, a, o, h || 1);
-    }
-    class o {
+    class n {
       constructor(t) {
         this.helper = t;
       }
@@ -21774,10 +21766,10 @@
         return this._fillPolygons(t, e);
       }
       _fillPolygons(t, e) {
-        const s = n(t, e);
+        const n = s(t, e);
         return {
           type: "fillSketch",
-          ops: this.renderLines(s, e)
+          ops: this.renderLines(n, e)
         };
       }
       renderLines(t, e) {
@@ -21786,148 +21778,143 @@
         return s;
       }
     }
-    function a(t) {
-      const e = t[0],
-        s = t[1];
-      return Math.sqrt(Math.pow(e[0] - s[0], 2) + Math.pow(e[1] - s[1], 2));
-    }
-    class h extends o {
-      fillPolygons(t, e) {
-        let s = e.hachureGap;
-        s < 0 && (s = 4 * e.strokeWidth), s = Math.max(s, .1);
-        const o = n(t, Object.assign({}, e, {
-            hachureGap: s
+    class a extends n {
+      fillPolygons(t, n) {
+        let a = n.hachureGap;
+        a < 0 && (a = 4 * n.strokeWidth), a = Math.max(a, .1);
+        const o = s(t, Object.assign({}, n, {
+            hachureGap: a
           })),
-          h = Math.PI / 180 * e.hachureAngle,
+          h = Math.PI / 180 * n.hachureAngle,
           r = [],
-          i = .5 * s * Math.cos(h),
-          c = .5 * s * Math.sin(h);
-        for (const [t, e] of o) a([t, e]) && r.push([[t[0] - i, t[1] + c], [...e]], [[t[0] + i, t[1] - c], [...e]]);
+          i = .5 * a * Math.cos(h),
+          c = .5 * a * Math.sin(h);
+        for (const [t, s] of o) e([t, s]) && r.push([[t[0] - i, t[1] + c], [...s]], [[t[0] + i, t[1] - c], [...s]]);
         return {
           type: "fillSketch",
-          ops: this.renderLines(r, e)
+          ops: this.renderLines(r, n)
         };
       }
     }
-    class r extends o {
+    class o extends n {
       fillPolygons(t, e) {
         const s = this._fillPolygons(t, e),
           n = Object.assign({}, e, {
             hachureAngle: e.hachureAngle + 90
           }),
-          o = this._fillPolygons(t, n);
-        return s.ops = s.ops.concat(o.ops), s;
+          a = this._fillPolygons(t, n);
+        return s.ops = s.ops.concat(a.ops), s;
       }
     }
-    class i {
+    class h {
       constructor(t) {
         this.helper = t;
       }
       fillPolygons(t, e) {
-        const s = n(t, e = Object.assign({}, e, {
+        const n = s(t, e = Object.assign({}, e, {
           hachureAngle: 0
         }));
-        return this.dotsOnLines(s, e);
+        return this.dotsOnLines(n, e);
       }
-      dotsOnLines(t, e) {
-        const s = [];
-        let n = e.hachureGap;
-        n < 0 && (n = 4 * e.strokeWidth), n = Math.max(n, .1);
-        let o = e.fillWeight;
-        o < 0 && (o = e.strokeWidth / 2);
-        const h = n / 4;
+      dotsOnLines(t, s) {
+        const n = [];
+        let a = s.hachureGap;
+        a < 0 && (a = 4 * s.strokeWidth), a = Math.max(a, .1);
+        let o = s.fillWeight;
+        o < 0 && (o = s.strokeWidth / 2);
+        const h = a / 4;
         for (const r of t) {
-          const t = a(r),
-            i = t / n,
+          const t = e(r),
+            i = t / a,
             c = Math.ceil(i) - 1,
-            l = t - c * n,
-            u = (r[0][0] + r[1][0]) / 2 - n / 4,
+            l = t - c * a,
+            u = (r[0][0] + r[1][0]) / 2 - a / 4,
             p = Math.min(r[0][1], r[1][1]);
           for (let t = 0; t < c; t++) {
-            const a = p + l + t * n,
+            const e = p + l + t * a,
               r = u - h + 2 * Math.random() * h,
-              i = a - h + 2 * Math.random() * h,
-              c = this.helper.ellipse(r, i, o, o, e);
-            s.push(...c.ops);
+              i = e - h + 2 * Math.random() * h,
+              c = this.helper.ellipse(r, i, o, o, s);
+            n.push(...c.ops);
           }
         }
         return {
           type: "fillSketch",
-          ops: s
+          ops: n
         };
       }
     }
-    class c {
+    class r {
       constructor(t) {
         this.helper = t;
       }
       fillPolygons(t, e) {
-        const s = n(t, e);
+        const n = s(t, e);
         return {
           type: "fillSketch",
-          ops: this.dashedLine(s, e)
+          ops: this.dashedLine(n, e)
         };
       }
-      dashedLine(t, e) {
-        const s = e.dashOffset < 0 ? e.hachureGap < 0 ? 4 * e.strokeWidth : e.hachureGap : e.dashOffset,
-          n = e.dashGap < 0 ? e.hachureGap < 0 ? 4 * e.strokeWidth : e.hachureGap : e.dashGap,
+      dashedLine(t, s) {
+        const n = s.dashOffset < 0 ? s.hachureGap < 0 ? 4 * s.strokeWidth : s.hachureGap : s.dashOffset,
+          a = s.dashGap < 0 ? s.hachureGap < 0 ? 4 * s.strokeWidth : s.hachureGap : s.dashGap,
           o = [];
         return t.forEach(t => {
-          const h = a(t),
-            r = Math.floor(h / (s + n)),
-            i = (h + n - r * (s + n)) / 2;
+          const h = e(t),
+            r = Math.floor(h / (n + a)),
+            i = (h + a - r * (n + a)) / 2;
           let c = t[0],
             l = t[1];
           c[0] > l[0] && (c = t[1], l = t[0]);
           const u = Math.atan((l[1] - c[1]) / (l[0] - c[0]));
           for (let t = 0; t < r; t++) {
-            const a = t * (s + n),
-              h = a + s,
-              r = [c[0] + a * Math.cos(u) + i * Math.cos(u), c[1] + a * Math.sin(u) + i * Math.sin(u)],
+            const e = t * (n + a),
+              h = e + n,
+              r = [c[0] + e * Math.cos(u) + i * Math.cos(u), c[1] + e * Math.sin(u) + i * Math.sin(u)],
               l = [c[0] + h * Math.cos(u) + i * Math.cos(u), c[1] + h * Math.sin(u) + i * Math.sin(u)];
-            o.push(...this.helper.doubleLineOps(r[0], r[1], l[0], l[1], e));
+            o.push(...this.helper.doubleLineOps(r[0], r[1], l[0], l[1], s));
           }
         }), o;
       }
     }
-    class l {
+    class i {
       constructor(t) {
         this.helper = t;
       }
       fillPolygons(t, e) {
-        const s = e.hachureGap < 0 ? 4 * e.strokeWidth : e.hachureGap,
-          o = e.zigzagOffset < 0 ? s : e.zigzagOffset,
-          a = n(t, e = Object.assign({}, e, {
-            hachureGap: s + o
+        const n = e.hachureGap < 0 ? 4 * e.strokeWidth : e.hachureGap,
+          a = e.zigzagOffset < 0 ? n : e.zigzagOffset,
+          o = s(t, e = Object.assign({}, e, {
+            hachureGap: n + a
           }));
         return {
           type: "fillSketch",
-          ops: this.zigzagLines(a, o, e)
+          ops: this.zigzagLines(o, a, e)
         };
       }
-      zigzagLines(t, e, s) {
-        const n = [];
+      zigzagLines(t, s, n) {
+        const a = [];
         return t.forEach(t => {
-          const o = a(t),
-            h = Math.round(o / (2 * e));
+          const o = e(t),
+            h = Math.round(o / (2 * s));
           let r = t[0],
             i = t[1];
           r[0] > i[0] && (r = t[1], i = t[0]);
           const c = Math.atan((i[1] - r[1]) / (i[0] - r[0]));
           for (let t = 0; t < h; t++) {
-            const o = 2 * t * e,
-              a = 2 * (t + 1) * e,
-              h = Math.sqrt(2 * Math.pow(e, 2)),
-              i = [r[0] + o * Math.cos(c), r[1] + o * Math.sin(c)],
-              l = [r[0] + a * Math.cos(c), r[1] + a * Math.sin(c)],
+            const e = 2 * t * s,
+              o = 2 * (t + 1) * s,
+              h = Math.sqrt(2 * Math.pow(s, 2)),
+              i = [r[0] + e * Math.cos(c), r[1] + e * Math.sin(c)],
+              l = [r[0] + o * Math.cos(c), r[1] + o * Math.sin(c)],
               u = [i[0] + h * Math.cos(c + Math.PI / 4), i[1] + h * Math.sin(c + Math.PI / 4)];
-            n.push(...this.helper.doubleLineOps(i[0], i[1], u[0], u[1], s), ...this.helper.doubleLineOps(u[0], u[1], l[0], l[1], s));
+            a.push(...this.helper.doubleLineOps(i[0], i[1], u[0], u[1], n), ...this.helper.doubleLineOps(u[0], u[1], l[0], l[1], n));
           }
-        }), n;
+        }), a;
       }
     }
-    const u = {};
-    class p {
+    const c = {};
+    class l {
       constructor(t) {
         this.seed = t;
       }
@@ -21935,116 +21922,113 @@
         return this.seed ? (2 ** 31 - 1 & (this.seed = Math.imul(48271, this.seed))) / 2 ** 31 : Math.random();
       }
     }
-    const f = 0,
-      d = 1,
-      g = 2,
-      M = {
-        A: 7,
-        a: 7,
-        C: 6,
-        c: 6,
-        H: 1,
-        h: 1,
-        L: 2,
-        l: 2,
-        M: 2,
-        m: 2,
-        Q: 4,
-        q: 4,
-        S: 4,
-        s: 4,
-        T: 2,
-        t: 2,
-        V: 1,
-        v: 1,
-        Z: 0,
-        z: 0
-      };
-    function k(t, e) {
+    const u = {
+      A: 7,
+      a: 7,
+      C: 6,
+      c: 6,
+      H: 1,
+      h: 1,
+      L: 2,
+      l: 2,
+      M: 2,
+      m: 2,
+      Q: 4,
+      q: 4,
+      S: 4,
+      s: 4,
+      T: 2,
+      t: 2,
+      V: 1,
+      v: 1,
+      Z: 0,
+      z: 0
+    };
+    function p(t, e) {
       return t.type === e;
     }
-    function b(t) {
+    function f(t) {
       const e = [],
         s = function (t) {
           const e = new Array();
           for (; "" !== t;) if (t.match(/^([ \t\r\n,]+)/)) t = t.substr(RegExp.$1.length);else if (t.match(/^([aAcChHlLmMqQsStTvVzZ])/)) e[e.length] = {
-            type: f,
+            type: 0,
             text: RegExp.$1
           }, t = t.substr(RegExp.$1.length);else {
             if (!t.match(/^(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)/)) return [];
             e[e.length] = {
-              type: d,
+              type: 1,
               text: `${parseFloat(RegExp.$1)}`
             }, t = t.substr(RegExp.$1.length);
           }
           return e[e.length] = {
-            type: g,
+            type: 2,
             text: ""
           }, e;
         }(t);
       let n = "BOD",
-        o = 0,
-        a = s[o];
-      for (; !k(a, g);) {
+        a = 0,
+        o = s[a];
+      for (; !p(o, 2);) {
         let h = 0;
         const r = [];
         if ("BOD" === n) {
-          if ("M" !== a.text && "m" !== a.text) return b("M0,0" + t);
-          o++, h = M[a.text], n = a.text;
-        } else k(a, d) ? h = M[n] : (o++, h = M[a.text], n = a.text);
-        if (!(o + h < s.length)) throw new Error("Path data ended short");
-        for (let t = o; t < o + h; t++) {
+          if ("M" !== o.text && "m" !== o.text) return f("M0,0" + t);
+          a++, h = u[o.text], n = o.text;
+        } else p(o, 1) ? h = u[n] : (a++, h = u[o.text], n = o.text);
+        if (!(a + h < s.length)) throw new Error("Path data ended short");
+        for (let t = a; t < a + h; t++) {
           const e = s[t];
-          if (!k(e, d)) throw new Error("Param not a number: " + n + "," + e.text);
+          if (!p(e, 1)) throw new Error("Param not a number: " + n + "," + e.text);
           r[r.length] = +e.text;
         }
-        if ("number" != typeof M[n]) throw new Error("Bad segment: " + n);
+        if ("number" != typeof u[n]) throw new Error("Bad segment: " + n);
         {
           const t = {
             key: n,
             data: r
           };
-          e.push(t), o += h, a = s[o], "M" === n && (n = "L"), "m" === n && (n = "l");
+          e.push(t), a += h, o = s[a], "M" === n && (n = "L"), "m" === n && (n = "l");
         }
       }
       return e;
     }
-    function y(t) {
+    function d(t) {
       let e = 0,
         s = 0,
         n = 0,
-        o = 0;
-      const a = [];
+        a = 0;
+      const o = [];
       for (const {
         key: h,
         data: r
       } of t) switch (h) {
         case "M":
-          a.push({
+          o.push({
             key: "M",
             data: [...r]
-          }), [e, s] = r, [n, o] = r;
+          }), [e, s] = r, [n, a] = r;
           break;
         case "m":
-          e += r[0], s += r[1], a.push({
+          e += r[0], s += r[1], o.push({
             key: "M",
             data: [e, s]
-          }), n = e, o = s;
+          }), n = e, a = s;
           break;
         case "L":
-          a.push({
+          o.push({
             key: "L",
             data: [...r]
           }), [e, s] = r;
           break;
         case "l":
-          e += r[0], s += r[1], a.push({
+          e += r[0], s += r[1], o.push({
             key: "L",
             data: [e, s]
           });
           break;
         case "C":
-          a.push({
+          o.push({
             key: "C",
             data: [...r]
           }), e = r[4], s = r[5];
@@ -22052,14 +22036,14 @@
         case "c":
           {
             const t = r.map((t, n) => n % 2 ? t + s : t + e);
-            a.push({
+            o.push({
               key: "C",
               data: t
             }), e = t[4], s = t[5];
             break;
           }
         case "Q":
-          a.push({
+          o.push({
             key: "Q",
             data: [...r]
           }), e = r[2], s = r[3];
@@ -22067,50 +22051,50 @@
         case "q":
           {
             const t = r.map((t, n) => n % 2 ? t + s : t + e);
-            a.push({
+            o.push({
               key: "Q",
               data: t
             }), e = t[2], s = t[3];
             break;
           }
         case "A":
-          a.push({
+          o.push({
             key: "A",
             data: [...r]
           }), e = r[5], s = r[6];
           break;
         case "a":
-          e += r[5], s += r[6], a.push({
+          e += r[5], s += r[6], o.push({
             key: "A",
             data: [r[0], r[1], r[2], r[3], r[4], e, s]
           });
           break;
         case "H":
-          a.push({
+          o.push({
             key: "H",
             data: [...r]
           }), e = r[0];
           break;
         case "h":
-          e += r[0], a.push({
+          e += r[0], o.push({
             key: "H",
             data: [e]
           });
           break;
         case "V":
-          a.push({
+          o.push({
             key: "V",
             data: [...r]
           }), s = r[0];
           break;
         case "v":
-          s += r[0], a.push({
+          s += r[0], o.push({
             key: "V",
             data: [s]
           });
           break;
         case "S":
-          a.push({
+          o.push({
             key: "S",
             data: [...r]
           }), e = r[2], s = r[3];
@@ -22118,39 +22102,39 @@
         case "s":
           {
             const t = r.map((t, n) => n % 2 ? t + s : t + e);
-            a.push({
+            o.push({
               key: "S",
               data: t
             }), e = t[2], s = t[3];
             break;
           }
         case "T":
-          a.push({
+          o.push({
             key: "T",
             data: [...r]
           }), e = r[0], s = r[1];
           break;
         case "t":
-          e += r[0], s += r[1], a.push({
+          e += r[0], s += r[1], o.push({
             key: "T",
             data: [e, s]
           });
           break;
         case "Z":
         case "z":
-          a.push({
+          o.push({
             key: "Z",
             data: []
-          }), e = n, s = o;
+          }), e = n, s = a;
       }
-      return a;
+      return o;
     }
-    function m$2(t) {
+    function g(t) {
       const e = [];
       let s = "",
         n = 0,
-        o = 0,
         a = 0,
+        o = 0,
         h = 0,
         r = 0,
         i = 0;
@@ -22163,90 +22147,90 @@
             e.push({
               key: "M",
               data: [...l]
-            }), [n, o] = l, [a, h] = l;
+            }), [n, a] = l, [o, h] = l;
             break;
           case "C":
             e.push({
               key: "C",
               data: [...l]
-            }), n = l[4], o = l[5], r = l[2], i = l[3];
+            }), n = l[4], a = l[5], r = l[2], i = l[3];
             break;
           case "L":
             e.push({
               key: "L",
               data: [...l]
-            }), [n, o] = l;
+            }), [n, a] = l;
             break;
           case "H":
             n = l[0], e.push({
               key: "L",
-              data: [n, o]
+              data: [n, a]
             });
             break;
           case "V":
-            o = l[0], e.push({
+            a = l[0], e.push({
               key: "L",
-              data: [n, o]
+              data: [n, a]
             });
             break;
           case "S":
             {
               let t = 0,
-                a = 0;
-              "C" === s || "S" === s ? (t = n + (n - r), a = o + (o - i)) : (t = n, a = o), e.push({
+                o = 0;
+              "C" === s || "S" === s ? (t = n + (n - r), o = a + (a - i)) : (t = n, o = a), e.push({
                 key: "C",
-                data: [t, a, ...l]
-              }), r = l[0], i = l[1], n = l[2], o = l[3];
+                data: [t, o, ...l]
+              }), r = l[0], i = l[1], n = l[2], a = l[3];
               break;
             }
           case "T":
             {
-              const [t, a] = l;
+              const [t, o] = l;
               let h = 0,
                 c = 0;
-              "Q" === s || "T" === s ? (h = n + (n - r), c = o + (o - i)) : (h = n, c = o);
+              "Q" === s || "T" === s ? (h = n + (n - r), c = a + (a - i)) : (h = n, c = a);
               const u = n + 2 * (h - n) / 3,
-                p = o + 2 * (c - o) / 3,
+                p = a + 2 * (c - a) / 3,
                 f = t + 2 * (h - t) / 3,
-                d = a + 2 * (c - a) / 3;
+                d = o + 2 * (c - o) / 3;
               e.push({
                 key: "C",
-                data: [u, p, f, d, t, a]
-              }), r = h, i = c, n = t, o = a;
+                data: [u, p, f, d, t, o]
+              }), r = h, i = c, n = t, a = o;
               break;
             }
           case "Q":
             {
-              const [t, s, a, h] = l,
+              const [t, s, o, h] = l,
                 c = n + 2 * (t - n) / 3,
-                u = o + 2 * (s - o) / 3,
-                p = a + 2 * (t - a) / 3,
+                u = a + 2 * (s - a) / 3,
+                p = o + 2 * (t - o) / 3,
                 f = h + 2 * (s - h) / 3;
               e.push({
                 key: "C",
-                data: [c, u, p, f, a, h]
-              }), r = t, i = s, n = a, o = h;
+                data: [c, u, p, f, o, h]
+              }), r = t, i = s, n = o, a = h;
               break;
             }
           case "A":
             {
               const t = Math.abs(l[0]),
                 s = Math.abs(l[1]),
-                a = l[2],
+                o = l[2],
                 h = l[3],
                 r = l[4],
                 i = l[5],
                 c = l[6];
               if (0 === t || 0 === s) e.push({
                 key: "C",
-                data: [n, o, i, c, i, c]
-              }), n = i, o = c;else if (n !== i || o !== c) {
-                x(n, o, i, c, t, s, a, h, r).forEach(function (t) {
+                data: [n, a, i, c, i, c]
+              }), n = i, a = c;else if (n !== i || a !== c) {
+                k(n, a, i, c, t, s, o, h, r).forEach(function (t) {
                   e.push({
                     key: "C",
                     data: t
                   });
-                }), n = i, o = c;
+                }), n = i, a = c;
               }
               break;
             }
@@ -22254,180 +22238,171 @@
             e.push({
               key: "Z",
               data: []
-            }), n = a, o = h;
+            }), n = o, a = h;
         }
         s = c;
       }
       return e;
     }
-    function w(t, e, s) {
+    function M(t, e, s) {
       return [t * Math.cos(s) - e * Math.sin(s), t * Math.sin(s) + e * Math.cos(s)];
     }
-    function x(t, e, s, n, o, a, h, r, i, c) {
+    function k(t, e, s, n, a, o, h, r, i, c) {
       const l = (u = h, Math.PI * u / 180);
       var u;
       let p = [],
         f = 0,
         d = 0,
         g = 0,
-        M = 0;
-      if (c) [f, d, g, M] = c;else {
-        [t, e] = w(t, e, -l), [s, n] = w(s, n, -l);
+        b = 0;
+      if (c) [f, d, g, b] = c;else {
+        [t, e] = M(t, e, -l), [s, n] = M(s, n, -l);
         const h = (t - s) / 2,
           c = (e - n) / 2;
-        let u = h * h / (o * o) + c * c / (a * a);
-        u > 1 && (u = Math.sqrt(u), o *= u, a *= u);
-        const p = o * o,
-          k = a * a,
-          b = p * k - p * c * c - k * h * h,
-          y = p * c * c + k * h * h,
-          m = (r === i ? -1 : 1) * Math.sqrt(Math.abs(b / y));
-        g = m * o * c / a + (t + s) / 2, M = m * -a * h / o + (e + n) / 2, f = Math.asin(parseFloat(((e - M) / a).toFixed(9))), d = Math.asin(parseFloat(((n - M) / a).toFixed(9))), t < g && (f = Math.PI - f), s < g && (d = Math.PI - d), f < 0 && (f = 2 * Math.PI + f), d < 0 && (d = 2 * Math.PI + d), i && f > d && (f -= 2 * Math.PI), !i && d > f && (d -= 2 * Math.PI);
-      }
-      let k = d - f;
-      if (Math.abs(k) > 120 * Math.PI / 180) {
+        let u = h * h / (a * a) + c * c / (o * o);
+        u > 1 && (u = Math.sqrt(u), a *= u, o *= u);
+        const p = a * a,
+          k = o * o,
+          y = p * k - p * c * c - k * h * h,
+          m = p * c * c + k * h * h,
+          w = (r === i ? -1 : 1) * Math.sqrt(Math.abs(y / m));
+        g = w * a * c / o + (t + s) / 2, b = w * -o * h / a + (e + n) / 2, f = Math.asin(parseFloat(((e - b) / o).toFixed(9))), d = Math.asin(parseFloat(((n - b) / o).toFixed(9))), t < g && (f = Math.PI - f), s < g && (d = Math.PI - d), f < 0 && (f = 2 * Math.PI + f), d < 0 && (d = 2 * Math.PI + d), i && f > d && (f -= 2 * Math.PI), !i && d > f && (d -= 2 * Math.PI);
+      }
+      let y = d - f;
+      if (Math.abs(y) > 120 * Math.PI / 180) {
         const t = d,
           e = s,
           r = n;
-        d = i && d > f ? f + 120 * Math.PI / 180 * 1 : f + 120 * Math.PI / 180 * -1, p = x(s = g + o * Math.cos(d), n = M + a * Math.sin(d), e, r, o, a, h, 0, i, [d, t, g, M]);
+        d = i && d > f ? f + 120 * Math.PI / 180 * 1 : f + 120 * Math.PI / 180 * -1, p = k(s = g + a * Math.cos(d), n = b + o * Math.sin(d), e, r, a, o, h, 0, i, [d, t, g, b]);
       }
-      k = d - f;
-      const b = Math.cos(f),
-        y = Math.sin(f),
-        m = Math.cos(d),
+      y = d - f;
+      const m = Math.cos(f),
+        w = Math.sin(f),
+        x = Math.cos(d),
         P = Math.sin(d),
-        v = Math.tan(k / 4),
-        S = 4 / 3 * o * v,
+        v = Math.tan(y / 4),
         O = 4 / 3 * a * v,
+        S = 4 / 3 * o * v,
         L = [t, e],
-        T = [t + S * y, e - O * b],
-        D = [s + S * P, n - O * m],
+        T = [t + O * w, e - S * m],
+        D = [s + O * P, n - S * x],
         A = [s, n];
       if (T[0] = 2 * L[0] - T[0], T[1] = 2 * L[1] - T[1], c) return [T, D, A].concat(p);
       {
         p = [T, D, A].concat(p);
         const t = [];
         for (let e = 0; e < p.length; e += 3) {
-          const s = w(p[e][0], p[e][1], l),
-            n = w(p[e + 1][0], p[e + 1][1], l),
-            o = w(p[e + 2][0], p[e + 2][1], l);
-          t.push([s[0], s[1], n[0], n[1], o[0], o[1]]);
+          const s = M(p[e][0], p[e][1], l),
+            n = M(p[e + 1][0], p[e + 1][1], l),
+            a = M(p[e + 2][0], p[e + 2][1], l);
+          t.push([s[0], s[1], n[0], n[1], a[0], a[1]]);
         }
         return t;
       }
     }
-    const P = {
+    const b = {
       randOffset: function (t, e) {
-        return G(t, e);
+        return A(t, e);
       },
       randOffsetWithRange: function (t, e, s) {
-        return E(t, e, s);
+        return D(t, e, s);
       },
-      ellipse: function (t, e, s, n, o) {
-        const a = T(s, n, o);
-        return D(t, e, o, a).opset;
+      ellipse: function (t, e, s, n, a) {
+        const o = P(s, n, a);
+        return v(t, e, a, o).opset;
       },
-      doubleLineOps: function (t, e, s, n, o) {
-        return $(t, e, s, n, o, !0);
+      doubleLineOps: function (t, e, s, n, a) {
+        return I(t, e, s, n, a, !0);
       }
     };
-    function v(t, e, s, n, o) {
+    function y(t, e, s, n, a) {
       return {
         type: "path",
-        ops: $(t, e, s, n, o)
+        ops: I(t, e, s, n, a)
       };
     }
-    function S(t, e, s) {
+    function m$2(t, e, s) {
       const n = (t || []).length;
       if (n > 2) {
-        const o = [];
-        for (let e = 0; e < n - 1; e++) o.push(...$(t[e][0], t[e][1], t[e + 1][0], t[e + 1][1], s));
-        return e && o.push(...$(t[n - 1][0], t[n - 1][1], t[0][0], t[0][1], s)), {
+        const a = [];
+        for (let e = 0; e < n - 1; e++) a.push(...I(t[e][0], t[e][1], t[e + 1][0], t[e + 1][1], s));
+        return e && a.push(...I(t[n - 1][0], t[n - 1][1], t[0][0], t[0][1], s)), {
           type: "path",
-          ops: o
+          ops: a
         };
       }
-      return 2 === n ? v(t[0][0], t[0][1], t[1][0], t[1][1], s) : {
+      return 2 === n ? y(t[0][0], t[0][1], t[1][0], t[1][1], s) : {
         type: "path",
         ops: []
       };
     }
-    function O(t, e, s, n, o) {
+    function w(t, e, s, n, a) {
       return function (t, e) {
-        return S(t, !0, e);
-      }([[t, e], [t + s, e], [t + s, e + n], [t, e + n]], o);
-    }
-    function L(t, e) {
-      if (t.length) {
-        const s = "number" == typeof t[0][0] ? [t] : t,
-          n = j(s[0], 1 * (1 + .2 * e.roughness), e),
-          o = e.disableMultiStroke ? [] : j(s[0], 1.5 * (1 + .22 * e.roughness), z(e));
-        for (let t = 1; t < s.length; t++) {
-          const a = s[t];
-          if (a.length) {
-            const t = j(a, 1 * (1 + .2 * e.roughness), e),
-              s = e.disableMultiStroke ? [] : j(a, 1.5 * (1 + .22 * e.roughness), z(e));
-            for (const e of t) "move" !== e.op && n.push(e);
-            for (const t of s) "move" !== t.op && o.push(t);
-          }
-        }
-        return {
-          type: "path",
-          ops: n.concat(o)
-        };
+        return m$2(t, !0, e);
+      }([[t, e], [t + s, e], [t + s, e + n], [t, e + n]], a);
+    }
+    function x(t, e) {
+      let s = _(t, 1 * (1 + .2 * e.roughness), e);
+      if (!e.disableMultiStroke) {
+        const n = _(t, 1.5 * (1 + .22 * e.roughness), function (t) {
+          const e = Object.assign({}, t);
+          e.randomizer = void 0, t.seed && (e.seed = t.seed + 1);
+          return e;
+        }(e));
+        s = s.concat(n);
       }
       return {
         type: "path",
-        ops: []
+        ops: s
       };
     }
-    function T(t, e, s) {
+    function P(t, e, s) {
       const n = Math.sqrt(2 * Math.PI * Math.sqrt((Math.pow(t / 2, 2) + Math.pow(e / 2, 2)) / 2)),
-        o = Math.ceil(Math.max(s.curveStepCount, s.curveStepCount / Math.sqrt(200) * n)),
-        a = 2 * Math.PI / o;
+        a = Math.ceil(Math.max(s.curveStepCount, s.curveStepCount / Math.sqrt(200) * n)),
+        o = 2 * Math.PI / a;
       let h = Math.abs(t / 2),
         r = Math.abs(e / 2);
       const i = 1 - s.curveFitting;
-      return h += G(h * i, s), r += G(r * i, s), {
-        increment: a,
+      return h += A(h * i, s), r += A(r * i, s), {
+        increment: o,
         rx: h,
         ry: r
       };
     }
-    function D(t, e, s, n) {
-      const [o, a] = F(n.increment, t, e, n.rx, n.ry, 1, n.increment * E(.1, E(.4, 1, s), s), s);
-      let h = q(o, null, s);
+    function v(t, e, s, n) {
+      const [a, o] = z(n.increment, t, e, n.rx, n.ry, 1, n.increment * D(.1, D(.4, 1, s), s), s);
+      let h = W(a, null, s);
       if (!s.disableMultiStroke && 0 !== s.roughness) {
-        const [o] = F(n.increment, t, e, n.rx, n.ry, 1.5, 0, s),
-          a = q(o, null, s);
-        h = h.concat(a);
+        const [a] = z(n.increment, t, e, n.rx, n.ry, 1.5, 0, s),
+          o = W(a, null, s);
+        h = h.concat(o);
       }
       return {
-        estimatedPoints: a,
+        estimatedPoints: o,
         opset: {
           type: "path",
           ops: h
         }
       };
     }
-    function A(t, e, s, n, o, a, h, r, i) {
+    function O(t, e, s, n, a, o, h, r, i) {
       const c = t,
         l = e;
       let u = Math.abs(s / 2),
         p = Math.abs(n / 2);
-      u += G(.01 * u, i), p += G(.01 * p, i);
-      let f = o,
-        d = a;
+      u += A(.01 * u, i), p += A(.01 * p, i);
+      let f = a,
+        d = o;
       for (; f < 0;) f += 2 * Math.PI, d += 2 * Math.PI;
       d - f > 2 * Math.PI && (f = 0, d = 2 * Math.PI);
       const g = 2 * Math.PI / i.curveStepCount,
         M = Math.min(g / 2, (d - f) / 2),
-        k = V(M, c, l, u, p, f, d, 1, i);
+        k = E(M, c, l, u, p, f, d, 1, i);
       if (!i.disableMultiStroke) {
-        const t = V(M, c, l, u, p, f, d, 1.5, i);
+        const t = E(M, c, l, u, p, f, d, 1.5, i);
         k.push(...t);
       }
-      return h && (r ? k.push(...$(c, l, c + u * Math.cos(f), l + p * Math.sin(f), i), ...$(c, l, c + u * Math.cos(d), l + p * Math.sin(d), i)) : k.push({
+      return h && (r ? k.push(...I(c, l, c + u * Math.cos(f), l + p * Math.sin(f), i), ...I(c, l, c + u * Math.cos(d), l + p * Math.sin(d), i)) : k.push({
         op: "lineTo",
         data: [c, l]
       }, {
@@ -22438,48 +22413,19 @@
         ops: k
       };
     }
-    function _(t, e) {
-      const s = m$2(y(b(t))),
-        n = [];
-      let o = [0, 0],
-        a = [0, 0];
-      for (const {
-        key: t,
-        data: h
-      } of s) switch (t) {
-        case "M":
-          a = [h[0], h[1]], o = [h[0], h[1]];
-          break;
-        case "L":
-          n.push(...$(a[0], a[1], h[0], h[1], e)), a = [h[0], h[1]];
-          break;
-        case "C":
-          {
-            const [t, s, o, r, i, c] = h;
-            n.push(...Z(t, s, o, r, i, c, a, e)), a = [i, c];
-            break;
-          }
-        case "Z":
-          n.push(...$(a[0], a[1], o[0], o[1], e)), a = [o[0], o[1]];
-      }
-      return {
-        type: "path",
-        ops: n
-      };
-    }
-    function I(t, e) {
+    function S(t, e) {
       const s = [];
       for (const n of t) if (n.length) {
         const t = e.maxRandomnessOffset || 0,
-          o = n.length;
-        if (o > 2) {
+          a = n.length;
+        if (a > 2) {
           s.push({
             op: "move",
-            data: [n[0][0] + G(t, e), n[0][1] + G(t, e)]
+            data: [n[0][0] + A(t, e), n[0][1] + A(t, e)]
           });
-          for (let a = 1; a < o; a++) s.push({
+          for (let o = 1; o < a; o++) s.push({
             op: "lineTo",
-            data: [n[a][0] + G(t, e), n[a][1] + G(t, e)]
+            data: [n[o][0] + A(t, e), n[o][1] + A(t, e)]
           });
         }
       }
@@ -22488,76 +22434,73 @@
         ops: s
       };
     }
-    function C(t, e) {
+    function L(t, e) {
       return function (t, e) {
         let s = t.fillStyle || "hachure";
-        if (!u[s]) switch (s) {
+        if (!c[s]) switch (s) {
           case "zigzag":
-            u[s] || (u[s] = new h(e));
+            c[s] || (c[s] = new a(e));
             break;
           case "cross-hatch":
-            u[s] || (u[s] = new r(e));
+            c[s] || (c[s] = new o(e));
             break;
           case "dots":
-            u[s] || (u[s] = new i(e));
+            c[s] || (c[s] = new h(e));
             break;
           case "dashed":
-            u[s] || (u[s] = new c(e));
+            c[s] || (c[s] = new r(e));
             break;
           case "zigzag-line":
-            u[s] || (u[s] = new l(e));
+            c[s] || (c[s] = new i(e));
             break;
+          case "hachure":
           default:
-            s = "hachure", u[s] || (u[s] = new o(e));
+            s = "hachure", c[s] || (c[s] = new n(e));
         }
-        return u[s];
-      }(e, P).fillPolygons(t, e);
-    }
-    function z(t) {
-      const e = Object.assign({}, t);
-      return e.randomizer = void 0, t.seed && (e.seed = t.seed + 1), e;
+        return c[s];
+      }(e, b).fillPolygons(t, e);
     }
-    function W(t) {
-      return t.randomizer || (t.randomizer = new p(t.seed || 0)), t.randomizer.next();
+    function T(t) {
+      return t.randomizer || (t.randomizer = new l(t.seed || 0)), t.randomizer.next();
     }
-    function E(t, e, s) {
+    function D(t, e, s) {
       let n = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
-      return s.roughness * n * (W(s) * (e - t) + t);
+      return s.roughness * n * (T(s) * (e - t) + t);
     }
-    function G(t, e) {
+    function A(t, e) {
       let s = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-      return E(-t, t, e, s);
+      return D(-t, t, e, s);
     }
-    function $(t, e, s, n, o) {
-      let a = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : !1;
-      const h = a ? o.disableMultiStrokeFill : o.disableMultiStroke,
-        r = R(t, e, s, n, o, !0, !1);
+    function I(t, e, s, n, a) {
+      let o = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : !1;
+      const h = o ? a.disableMultiStrokeFill : a.disableMultiStroke,
+        r = C(t, e, s, n, a, !0, !1);
       if (h) return r;
-      const i = R(t, e, s, n, o, !0, !0);
+      const i = C(t, e, s, n, a, !0, !0);
       return r.concat(i);
     }
-    function R(t, e, s, n, o, a, h) {
+    function C(t, e, s, n, a, o, h) {
       const r = Math.pow(t - s, 2) + Math.pow(e - n, 2),
         i = Math.sqrt(r);
       let c = 1;
       c = i < 200 ? 1 : i > 500 ? .4 : -.0016668 * i + 1.233334;
-      let l = o.maxRandomnessOffset || 0;
+      let l = a.maxRandomnessOffset || 0;
       l * l * 100 > r && (l = i / 10);
       const u = l / 2,
-        p = .2 + .2 * W(o);
-      let f = o.bowing * o.maxRandomnessOffset * (n - e) / 200,
-        d = o.bowing * o.maxRandomnessOffset * (t - s) / 200;
-      f = G(f, o, c), d = G(d, o, c);
+        p = .2 + .2 * T(a);
+      let f = a.bowing * a.maxRandomnessOffset * (n - e) / 200,
+        d = a.bowing * a.maxRandomnessOffset * (t - s) / 200;
+      f = A(f, a, c), d = A(d, a, c);
       const g = [],
-        M = () => G(u, o, c),
-        k = () => G(l, o, c),
-        b = o.preserveVertices;
-      return a && (h ? g.push({
+        M = () => A(u, a, c),
+        k = () => A(l, a, c),
+        b = a.preserveVertices;
+      return o && (h ? g.push({
         op: "move",
         data: [t + (b ? 0 : M()), e + (b ? 0 : M())]
       }) : g.push({
         op: "move",
-        data: [t + (b ? 0 : G(l, o, c)), e + (b ? 0 : G(l, o, c))]
+        data: [t + (b ? 0 : A(l, a, c)), e + (b ? 0 : A(l, a, c))]
       })), h ? g.push({
         op: "bcurveTo",
         data: [f + t + (s - t) * p + M(), d + e + (n - e) * p + M(), f + t + 2 * (s - t) * p + M(), d + e + 2 * (n - e) * p + M(), s + (b ? 0 : M()), n + (b ? 0 : M())]
@@ -22566,76 +22509,75 @@
         data: [f + t + (s - t) * p + k(), d + e + (n - e) * p + k(), f + t + 2 * (s - t) * p + k(), d + e + 2 * (n - e) * p + k(), s + (b ? 0 : k()), n + (b ? 0 : k())]
       }), g;
     }
-    function j(t, e, s) {
-      if (!t.length) return [];
+    function _(t, e, s) {
       const n = [];
-      n.push([t[0][0] + G(e, s), t[0][1] + G(e, s)]), n.push([t[0][0] + G(e, s), t[0][1] + G(e, s)]);
-      for (let o = 1; o < t.length; o++) n.push([t[o][0] + G(e, s), t[o][1] + G(e, s)]), o === t.length - 1 && n.push([t[o][0] + G(e, s), t[o][1] + G(e, s)]);
-      return q(n, null, s);
+      n.push([t[0][0] + A(e, s), t[0][1] + A(e, s)]), n.push([t[0][0] + A(e, s), t[0][1] + A(e, s)]);
+      for (let a = 1; a < t.length; a++) n.push([t[a][0] + A(e, s), t[a][1] + A(e, s)]), a === t.length - 1 && n.push([t[a][0] + A(e, s), t[a][1] + A(e, s)]);
+      return W(n, null, s);
     }
-    function q(t, e, s) {
+    function W(t, e, s) {
       const n = t.length,
-        o = [];
+        a = [];
       if (n > 3) {
-        const a = [],
+        const o = [],
           h = 1 - s.curveTightness;
-        o.push({
+        a.push({
           op: "move",
           data: [t[1][0], t[1][1]]
         });
         for (let e = 1; e + 2 < n; e++) {
           const s = t[e];
-          a[0] = [s[0], s[1]], a[1] = [s[0] + (h * t[e + 1][0] - h * t[e - 1][0]) / 6, s[1] + (h * t[e + 1][1] - h * t[e - 1][1]) / 6], a[2] = [t[e + 1][0] + (h * t[e][0] - h * t[e + 2][0]) / 6, t[e + 1][1] + (h * t[e][1] - h * t[e + 2][1]) / 6], a[3] = [t[e + 1][0], t[e + 1][1]], o.push({
+          o[0] = [s[0], s[1]], o[1] = [s[0] + (h * t[e + 1][0] - h * t[e - 1][0]) / 6, s[1] + (h * t[e + 1][1] - h * t[e - 1][1]) / 6], o[2] = [t[e + 1][0] + (h * t[e][0] - h * t[e + 2][0]) / 6, t[e + 1][1] + (h * t[e][1] - h * t[e + 2][1]) / 6], o[3] = [t[e + 1][0], t[e + 1][1]], a.push({
             op: "bcurveTo",
-            data: [a[1][0], a[1][1], a[2][0], a[2][1], a[3][0], a[3][1]]
+            data: [o[1][0], o[1][1], o[2][0], o[2][1], o[3][0], o[3][1]]
           });
         }
         if (e && 2 === e.length) {
           const t = s.maxRandomnessOffset;
-          o.push({
+          a.push({
             op: "lineTo",
-            data: [e[0] + G(t, s), e[1] + G(t, s)]
+            data: [e[0] + A(t, s), e[1] + A(t, s)]
           });
         }
-      } else 3 === n ? (o.push({
+      } else 3 === n ? (a.push({
         op: "move",
         data: [t[1][0], t[1][1]]
-      }), o.push({
+      }), a.push({
         op: "bcurveTo",
         data: [t[1][0], t[1][1], t[2][0], t[2][1], t[2][0], t[2][1]]
-      })) : 2 === n && o.push(...R(t[0][0], t[0][1], t[1][0], t[1][1], s, !0, !0));
-      return o;
+      })) : 2 === n && a.push(...I(t[0][0], t[0][1], t[1][0], t[1][1], s));
+      return a;
     }
-    function F(t, e, s, n, o, a, h, r) {
+    function z(t, e, s, n, a, o, h, r) {
       const i = [],
         c = [];
       if (0 === r.roughness) {
-        t /= 4, c.push([e + n * Math.cos(-t), s + o * Math.sin(-t)]);
-        for (let a = 0; a <= 2 * Math.PI; a += t) {
-          const t = [e + n * Math.cos(a), s + o * Math.sin(a)];
+        t /= 4, c.push([e + n * Math.cos(-t), s + a * Math.sin(-t)]);
+        for (let o = 0; o <= 2 * Math.PI; o += t) {
+          const t = [e + n * Math.cos(o), s + a * Math.sin(o)];
           i.push(t), c.push(t);
         }
-        c.push([e + n * Math.cos(0), s + o * Math.sin(0)]), c.push([e + n * Math.cos(t), s + o * Math.sin(t)]);
+        c.push([e + n * Math.cos(0), s + a * Math.sin(0)]), c.push([e + n * Math.cos(t), s + a * Math.sin(t)]);
       } else {
-        const l = G(.5, r) - Math.PI / 2;
-        c.push([G(a, r) + e + .9 * n * Math.cos(l - t), G(a, r) + s + .9 * o * Math.sin(l - t)]);
+        const l = A(.5, r) - Math.PI / 2;
+        c.push([A(o, r) + e + .9 * n * Math.cos(l - t), A(o, r) + s + .9 * a * Math.sin(l - t)]);
         const u = 2 * Math.PI + l - .01;
         for (let h = l; h < u; h += t) {
-          const t = [G(a, r) + e + n * Math.cos(h), G(a, r) + s + o * Math.sin(h)];
+          const t = [A(o, r) + e + n * Math.cos(h), A(o, r) + s + a * Math.sin(h)];
           i.push(t), c.push(t);
         }
-        c.push([G(a, r) + e + n * Math.cos(l + 2 * Math.PI + .5 * h), G(a, r) + s + o * Math.sin(l + 2 * Math.PI + .5 * h)]), c.push([G(a, r) + e + .98 * n * Math.cos(l + h), G(a, r) + s + .98 * o * Math.sin(l + h)]), c.push([G(a, r) + e + .9 * n * Math.cos(l + .5 * h), G(a, r) + s + .9 * o * Math.sin(l + .5 * h)]);
+        c.push([A(o, r) + e + n * Math.cos(l + 2 * Math.PI + .5 * h), A(o, r) + s + a * Math.sin(l + 2 * Math.PI + .5 * h)]), c.push([A(o, r) + e + .98 * n * Math.cos(l + h), A(o, r) + s + .98 * a * Math.sin(l + h)]), c.push([A(o, r) + e + .9 * n * Math.cos(l + .5 * h), A(o, r) + s + .9 * a * Math.sin(l + .5 * h)]);
       }
       return [c, i];
     }
-    function V(t, e, s, n, o, a, h, r, i) {
-      const c = a + G(.1, i),
+    function E(t, e, s, n, a, o, h, r, i) {
+      const c = o + A(.1, i),
         l = [];
-      l.push([G(r, i) + e + .9 * n * Math.cos(c - t), G(r, i) + s + .9 * o * Math.sin(c - t)]);
-      for (let a = c; a <= h; a += t) l.push([G(r, i) + e + n * Math.cos(a), G(r, i) + s + o * Math.sin(a)]);
-      return l.push([e + n * Math.cos(h), s + o * Math.sin(h)]), l.push([e + n * Math.cos(h), s + o * Math.sin(h)]), q(l, null, i);
+      l.push([A(r, i) + e + .9 * n * Math.cos(c - t), A(r, i) + s + .9 * a * Math.sin(c - t)]);
+      for (let o = c; o <= h; o += t) l.push([A(r, i) + e + n * Math.cos(o), A(r, i) + s + a * Math.sin(o)]);
+      return l.push([e + n * Math.cos(h), s + a * Math.sin(h)]), l.push([e + n * Math.cos(h), s + a * Math.sin(h)]), W(l, null, i);
     }
-    function Z(t, e, s, n, o, a, h, r) {
+    function $(t, e, s, n, a, o, h, r) {
       const i = [],
         c = [r.maxRandomnessOffset || 1, (r.maxRandomnessOffset || 1) + .3];
       let l = [0, 0];
@@ -22646,112 +22588,93 @@
         data: [h[0], h[1]]
       }) : i.push({
         op: "move",
-        data: [h[0] + (p ? 0 : G(c[0], r)), h[1] + (p ? 0 : G(c[0], r))]
-      }), l = p ? [o, a] : [o + G(c[f], r), a + G(c[f], r)], i.push({
+        data: [h[0] + (p ? 0 : A(c[0], r)), h[1] + (p ? 0 : A(c[0], r))]
+      }), l = p ? [a, o] : [a + A(c[f], r), o + A(c[f], r)], i.push({
         op: "bcurveTo",
-        data: [t + G(c[f], r), e + G(c[f], r), s + G(c[f], r), n + G(c[f], r), l[0], l[1]]
+        data: [t + A(c[f], r), e + A(c[f], r), s + A(c[f], r), n + A(c[f], r), l[0], l[1]]
       });
       return i;
     }
-    function Q(t) {
+    function G(t) {
       return [...t];
     }
-    function H(t) {
-      let e = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-      const s = t.length;
-      if (s < 3) throw new Error("A curve must have at least three points.");
-      const n = [];
-      if (3 === s) n.push(Q(t[0]), Q(t[1]), Q(t[2]), Q(t[2]));else {
-        const s = [];
-        s.push(t[0], t[0]);
-        for (let e = 1; e < t.length; e++) s.push(t[e]), e === t.length - 1 && s.push(t[e]);
-        const o = [],
-          a = 1 - e;
-        n.push(Q(s[0]));
-        for (let t = 1; t + 2 < s.length; t++) {
-          const e = s[t];
-          o[0] = [e[0], e[1]], o[1] = [e[0] + (a * s[t + 1][0] - a * s[t - 1][0]) / 6, e[1] + (a * s[t + 1][1] - a * s[t - 1][1]) / 6], o[2] = [s[t + 1][0] + (a * s[t][0] - a * s[t + 2][0]) / 6, s[t + 1][1] + (a * s[t][1] - a * s[t + 2][1]) / 6], o[3] = [s[t + 1][0], s[t + 1][1]], n.push(o[1], o[2], o[3]);
-        }
-      }
-      return n;
-    }
-    function N(t, e) {
+    function R(t, e) {
       return Math.pow(t[0] - e[0], 2) + Math.pow(t[1] - e[1], 2);
     }
-    function B(t, e, s) {
-      const n = N(e, s);
-      if (0 === n) return N(t, e);
-      let o = ((t[0] - e[0]) * (s[0] - e[0]) + (t[1] - e[1]) * (s[1] - e[1])) / n;
-      return o = Math.max(0, Math.min(1, o)), N(t, J(e, s, o));
+    function q(t, e, s) {
+      const n = R(e, s);
+      if (0 === n) return R(t, e);
+      let a = ((t[0] - e[0]) * (s[0] - e[0]) + (t[1] - e[1]) * (s[1] - e[1])) / n;
+      return a = Math.max(0, Math.min(1, a)), R(t, j(e, s, a));
     }
-    function J(t, e, s) {
+    function j(t, e, s) {
       return [t[0] + (e[0] - t[0]) * s, t[1] + (e[1] - t[1]) * s];
     }
-    function K(t, e, s, n) {
-      const o = n || [];
+    function F(t, e, s, n) {
+      const a = n || [];
       if (function (t, e) {
         const s = t[e + 0],
           n = t[e + 1],
-          o = t[e + 2],
-          a = t[e + 3];
-        let h = 3 * n[0] - 2 * s[0] - a[0];
+          a = t[e + 2],
+          o = t[e + 3];
+        let h = 3 * n[0] - 2 * s[0] - o[0];
         h *= h;
-        let r = 3 * n[1] - 2 * s[1] - a[1];
+        let r = 3 * n[1] - 2 * s[1] - o[1];
         r *= r;
-        let i = 3 * o[0] - 2 * a[0] - s[0];
+        let i = 3 * a[0] - 2 * o[0] - s[0];
         i *= i;
-        let c = 3 * o[1] - 2 * a[1] - s[1];
+        let c = 3 * a[1] - 2 * o[1] - s[1];
         return c *= c, h < i && (h = i), r < c && (r = c), h + r;
       }(t, e) < s) {
         const s = t[e + 0];
-        if (o.length) {
-          (a = o[o.length - 1], h = s, Math.sqrt(N(a, h))) > 1 && o.push(s);
-        } else o.push(s);
-        o.push(t[e + 3]);
+        if (a.length) {
+          (o = a[a.length - 1], h = s, Math.sqrt(R(o, h))) > 1 && a.push(s);
+        } else a.push(s);
+        a.push(t[e + 3]);
       } else {
         const n = .5,
-          a = t[e + 0],
+          o = t[e + 0],
           h = t[e + 1],
           r = t[e + 2],
           i = t[e + 3],
-          c = J(a, h, n),
-          l = J(h, r, n),
-          u = J(r, i, n),
-          p = J(c, l, n),
-          f = J(l, u, n),
-          d = J(p, f, n);
-        K([a, c, p, d], 0, s, o), K([d, f, u, i], 0, s, o);
-      }
-      var a, h;
-      return o;
+          c = j(o, h, n),
+          l = j(h, r, n),
+          u = j(r, i, n),
+          p = j(c, l, n),
+          f = j(l, u, n),
+          d = j(p, f, n);
+        F([o, c, p, d], 0, s, a), F([d, f, u, i], 0, s, a);
+      }
+      var o, h;
+      return a;
     }
-    function U(t, e) {
-      return X(t, 0, t.length, e);
+    function V(t, e) {
+      return Z(t, 0, t.length, e);
     }
-    function X(t, e, s, n, o) {
-      const a = o || [],
+    function Z(t, e, s, n, a) {
+      const o = a || [],
         h = t[e],
         r = t[s - 1];
       let i = 0,
         c = 1;
       for (let n = e + 1; n < s - 1; ++n) {
-        const e = B(t[n], h, r);
+        const e = q(t[n], h, r);
         e > i && (i = e, c = n);
       }
-      return Math.sqrt(i) > n ? (X(t, e, c + 1, n, a), X(t, c, s, n, a)) : (a.length || a.push(h), a.push(r)), a;
+      return Math.sqrt(i) > n ? (Z(t, e, c + 1, n, o), Z(t, c, s, n, o)) : (o.length || o.push(h), o.push(r)), o;
     }
-    function Y(t) {
+    function Q(t) {
       let e = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : .15;
       let s = arguments.length > 2 ? arguments[2] : undefined;
       const n = [],
-        o = (t.length - 1) / 3;
-      for (let s = 0; s < o; s++) {
-        K(t, 3 * s, e, n);
+        a = (t.length - 1) / 3;
+      for (let s = 0; s < a; s++) {
+        F(t, 3 * s, e, n);
       }
-      return s && s > 0 ? X(n, 0, n.length, s) : n;
+      return s && s > 0 ? Z(n, 0, n.length, s) : n;
     }
-    const tt$1 = "none";
-    class et {
+    const H = "none";
+    class N {
       constructor(t) {
         this.defaultOptions = {
           maxRandomnessOffset: 2,
@@ -22772,8 +22695,7 @@
           seed: 0,
           disableMultiStroke: !1,
           disableMultiStrokeFill: !1,
-          preserveVertices: !1,
-          fillShapeRoughnessGain: .8
+          preserveVertices: !1
         }, this.config = t || {}, this.config.options && (this.defaultOptions = this._o(this.config.options));
       }
       static newSeed() {
@@ -22789,161 +22711,187 @@
           options: s || this.defaultOptions
         };
       }
-      line(t, e, s, n, o) {
-        const a = this._o(o);
-        return this._d("line", [v(t, e, s, n, a)], a);
+      line(t, e, s, n, a) {
+        const o = this._o(a);
+        return this._d("line", [y(t, e, s, n, o)], o);
       }
-      rectangle(t, e, s, n, o) {
-        const a = this._o(o),
+      rectangle(t, e, s, n, a) {
+        const o = this._o(a),
           h = [],
-          r = O(t, e, s, n, a);
-        if (a.fill) {
-          const o = [[t, e], [t + s, e], [t + s, e + n], [t, e + n]];
-          "solid" === a.fillStyle ? h.push(I([o], a)) : h.push(C([o], a));
+          r = w(t, e, s, n, o);
+        if (o.fill) {
+          const a = [[t, e], [t + s, e], [t + s, e + n], [t, e + n]];
+          "solid" === o.fillStyle ? h.push(S([a], o)) : h.push(L([a], o));
         }
-        return a.stroke !== tt$1 && h.push(r), this._d("rectangle", h, a);
+        return o.stroke !== H && h.push(r), this._d("rectangle", h, o);
       }
-      ellipse(t, e, s, n, o) {
-        const a = this._o(o),
+      ellipse(t, e, s, n, a) {
+        const o = this._o(a),
           h = [],
-          r = T(s, n, a),
-          i = D(t, e, a, r);
-        if (a.fill) if ("solid" === a.fillStyle) {
-          const s = D(t, e, a, r).opset;
+          r = P(s, n, o),
+          i = v(t, e, o, r);
+        if (o.fill) if ("solid" === o.fillStyle) {
+          const s = v(t, e, o, r).opset;
           s.type = "fillPath", h.push(s);
-        } else h.push(C([i.estimatedPoints], a));
-        return a.stroke !== tt$1 && h.push(i.opset), this._d("ellipse", h, a);
+        } else h.push(L([i.estimatedPoints], o));
+        return o.stroke !== H && h.push(i.opset), this._d("ellipse", h, o);
       }
       circle(t, e, s, n) {
-        const o = this.ellipse(t, e, s, s, n);
-        return o.shape = "circle", o;
+        const a = this.ellipse(t, e, s, s, n);
+        return a.shape = "circle", a;
       }
       linearPath(t, e) {
         const s = this._o(e);
-        return this._d("linearPath", [S(t, !1, s)], s);
+        return this._d("linearPath", [m$2(t, !1, s)], s);
       }
-      arc(t, e, s, n, o, a) {
+      arc(t, e, s, n, a, o) {
         let h = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : !1;
         let r = arguments.length > 7 ? arguments[7] : undefined;
         const i = this._o(r),
           c = [],
-          l = A(t, e, s, n, o, a, h, !0, i);
+          l = O(t, e, s, n, a, o, h, !0, i);
         if (h && i.fill) if ("solid" === i.fillStyle) {
           const h = Object.assign({}, i);
           h.disableMultiStroke = !0;
-          const r = A(t, e, s, n, o, a, !0, !1, h);
+          const r = O(t, e, s, n, a, o, !0, !1, h);
           r.type = "fillPath", c.push(r);
-        } else c.push(function (t, e, s, n, o, a, h) {
+        } else c.push(function (t, e, s, n, a, o, h) {
           const r = t,
             i = e;
           let c = Math.abs(s / 2),
             l = Math.abs(n / 2);
-          c += G(.01 * c, h), l += G(.01 * l, h);
-          let u = o,
-            p = a;
+          c += A(.01 * c, h), l += A(.01 * l, h);
+          let u = a,
+            p = o;
           for (; u < 0;) u += 2 * Math.PI, p += 2 * Math.PI;
           p - u > 2 * Math.PI && (u = 0, p = 2 * Math.PI);
           const f = (p - u) / h.curveStepCount,
             d = [];
           for (let t = u; t <= p; t += f) d.push([r + c * Math.cos(t), i + l * Math.sin(t)]);
-          return d.push([r + c * Math.cos(p), i + l * Math.sin(p)]), d.push([r, i]), C([d], h);
-        }(t, e, s, n, o, a, i));
-        return i.stroke !== tt$1 && c.push(l), this._d("arc", c, i);
+          return d.push([r + c * Math.cos(p), i + l * Math.sin(p)]), d.push([r, i]), L([d], h);
+        }(t, e, s, n, a, o, i));
+        return i.stroke !== H && c.push(l), this._d("arc", c, i);
       }
       curve(t, e) {
         const s = this._o(e),
           n = [],
-          o = L(t, s);
-        if (s.fill && s.fill !== tt$1) if ("solid" === s.fillStyle) {
-          const e = L(t, Object.assign(Object.assign({}, s), {
-            disableMultiStroke: !0,
-            roughness: s.roughness ? s.roughness + s.fillShapeRoughnessGain : 0
-          }));
-          n.push({
-            type: "fillPath",
-            ops: this._mergedShape(e.ops)
-          });
-        } else {
-          const e = [],
-            o = t;
-          if (o.length) {
-            const t = "number" == typeof o[0][0] ? [o] : o;
-            for (const n of t) n.length < 3 ? e.push(...n) : 3 === n.length ? e.push(...Y(H([n[0], n[0], n[1], n[2]]), 10, (1 + s.roughness) / 2)) : e.push(...Y(H(n), 10, (1 + s.roughness) / 2));
-          }
-          e.length && n.push(C([e], s));
+          a = x(t, s);
+        if (s.fill && s.fill !== H && t.length >= 3) {
+          const e = Q(function (t) {
+            let e = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+            const s = t.length;
+            if (s < 3) throw new Error("A curve must have at least three points.");
+            const n = [];
+            if (3 === s) n.push(G(t[0]), G(t[1]), G(t[2]), G(t[2]));else {
+              const s = [];
+              s.push(t[0], t[0]);
+              for (let e = 1; e < t.length; e++) s.push(t[e]), e === t.length - 1 && s.push(t[e]);
+              const a = [],
+                o = 1 - e;
+              n.push(G(s[0]));
+              for (let t = 1; t + 2 < s.length; t++) {
+                const e = s[t];
+                a[0] = [e[0], e[1]], a[1] = [e[0] + (o * s[t + 1][0] - o * s[t - 1][0]) / 6, e[1] + (o * s[t + 1][1] - o * s[t - 1][1]) / 6], a[2] = [s[t + 1][0] + (o * s[t][0] - o * s[t + 2][0]) / 6, s[t + 1][1] + (o * s[t][1] - o * s[t + 2][1]) / 6], a[3] = [s[t + 1][0], s[t + 1][1]], n.push(a[1], a[2], a[3]);
+              }
+            }
+            return n;
+          }(t), 10, (1 + s.roughness) / 2);
+          "solid" === s.fillStyle ? n.push(S([e], s)) : n.push(L([e], s));
         }
-        return s.stroke !== tt$1 && n.push(o), this._d("curve", n, s);
+        return s.stroke !== H && n.push(a), this._d("curve", n, s);
       }
       polygon(t, e) {
         const s = this._o(e),
           n = [],
-          o = S(t, !0, s);
-        return s.fill && ("solid" === s.fillStyle ? n.push(I([t], s)) : n.push(C([t], s))), s.stroke !== tt$1 && n.push(o), this._d("polygon", n, s);
+          a = m$2(t, !0, s);
+        return s.fill && ("solid" === s.fillStyle ? n.push(S([t], s)) : n.push(L([t], s))), s.stroke !== H && n.push(a), this._d("polygon", n, s);
       }
       path(t, e) {
         const s = this._o(e),
           n = [];
         if (!t) return this._d("path", n, s);
         t = (t || "").replace(/\n/g, " ").replace(/(-\s)/g, "-").replace("/(ss)/g", " ");
-        const o = s.fill && "transparent" !== s.fill && s.fill !== tt$1,
-          a = s.stroke !== tt$1,
+        const a = s.fill && "transparent" !== s.fill && s.fill !== H,
+          o = s.stroke !== H,
           h = !!(s.simplification && s.simplification < 1),
           r = function (t, e, s) {
-            const n = m$2(y(b(t))),
-              o = [];
-            let a = [],
+            const n = g(d(f(t))),
+              a = [];
+            let o = [],
               h = [0, 0],
               r = [];
             const i = () => {
-                r.length >= 4 && a.push(...Y(r, e)), r = [];
+                r.length >= 4 && o.push(...Q(r, e)), r = [];
               },
               c = () => {
-                i(), a.length && (o.push(a), a = []);
+                i(), o.length && (a.push(o), o = []);
               };
             for (const {
               key: t,
               data: e
             } of n) switch (t) {
               case "M":
-                c(), h = [e[0], e[1]], a.push(h);
+                c(), h = [e[0], e[1]], o.push(h);
                 break;
               case "L":
-                i(), a.push([e[0], e[1]]);
+                i(), o.push([e[0], e[1]]);
                 break;
               case "C":
                 if (!r.length) {
-                  const t = a.length ? a[a.length - 1] : h;
+                  const t = o.length ? o[o.length - 1] : h;
                   r.push([t[0], t[1]]);
                 }
                 r.push([e[0], e[1]]), r.push([e[2], e[3]]), r.push([e[4], e[5]]);
                 break;
               case "Z":
-                i(), a.push([h[0], h[1]]);
+                i(), o.push([h[0], h[1]]);
             }
-            if (c(), !s) return o;
+            if (c(), !s) return a;
             const l = [];
-            for (const t of o) {
-              const e = U(t, s);
+            for (const t of a) {
+              const e = V(t, s);
               e.length && l.push(e);
             }
             return l;
-          }(t, 1, h ? 4 - 4 * (s.simplification || 1) : (1 + s.roughness) / 2),
-          i = _(t, s);
-        if (o) if ("solid" === s.fillStyle) {
-          if (1 === r.length) {
-            const e = _(t, Object.assign(Object.assign({}, s), {
-              disableMultiStroke: !0,
-              roughness: s.roughness ? s.roughness + s.fillShapeRoughnessGain : 0
-            }));
-            n.push({
-              type: "fillPath",
-              ops: this._mergedShape(e.ops)
-            });
-          } else n.push(I(r, s));
-        } else n.push(C(r, s));
-        return a && (h ? r.forEach(t => {
-          n.push(S(t, !1, s));
-        }) : n.push(i)), this._d("path", n, s);
+          }(t, 1, h ? 4 - 4 * s.simplification : (1 + s.roughness) / 2);
+        return a && ("solid" === s.fillStyle ? n.push(S(r, s)) : n.push(L(r, s))), o && (h ? r.forEach(t => {
+          n.push(m$2(t, !1, s));
+        }) : n.push(function (t, e) {
+          const s = g(d(f(t))),
+            n = [];
+          let a = [0, 0],
+            o = [0, 0];
+          for (const {
+            key: t,
+            data: h
+          } of s) switch (t) {
+            case "M":
+              {
+                const t = 1 * (e.maxRandomnessOffset || 0),
+                  s = e.preserveVertices;
+                n.push({
+                  op: "move",
+                  data: h.map(n => n + (s ? 0 : A(t, e)))
+                }), o = [h[0], h[1]], a = [h[0], h[1]];
+                break;
+              }
+            case "L":
+              n.push(...I(o[0], o[1], h[0], h[1], e)), o = [h[0], h[1]];
+              break;
+            case "C":
+              {
+                const [t, s, a, r, i, c] = h;
+                n.push(...$(t, s, a, r, i, c, o, e)), o = [i, c];
+                break;
+              }
+            case "Z":
+              n.push(...I(o[0], o[1], a[0], a[1], e)), o = [a[0], a[1]];
+          }
+          return {
+            type: "path",
+            ops: n
+          };
+        }(t, s))), this._d("path", n, s);
       }
       opsToPath(t, e) {
         let s = "";
@@ -22974,15 +22922,15 @@
                 d: this.opsToPath(t),
                 stroke: s.stroke,
                 strokeWidth: s.strokeWidth,
-                fill: tt$1
+                fill: H
               };
               break;
             case "fillPath":
               e = {
                 d: this.opsToPath(t),
-                stroke: tt$1,
+                stroke: H,
                 strokeWidth: 0,
-                fill: s.fill || tt$1
+                fill: s.fill || H
               };
               break;
             case "fillSketch":
@@ -22996,37 +22944,34 @@
         let s = e.fillWeight;
         return s < 0 && (s = e.strokeWidth / 2), {
           d: this.opsToPath(t),
-          stroke: e.fill || tt$1,
+          stroke: e.fill || H,
           strokeWidth: s,
-          fill: tt$1
+          fill: H
         };
       }
-      _mergedShape(t) {
-        return t.filter((t, e) => 0 === e || "move" !== t.op);
-      }
     }
-    class st {
+    class B {
       constructor(t, e) {
-        this.canvas = t, this.ctx = this.canvas.getContext("2d"), this.gen = new et(e);
+        this.canvas = t, this.ctx = this.canvas.getContext("2d"), this.gen = new N(e);
       }
       draw(t) {
         const e = t.sets || [],
           s = t.options || this.getDefaultOptions(),
           n = this.ctx,
-          o = t.options.fixedDecimalPlaceDigits;
-        for (const a of e) switch (a.type) {
+          a = t.options.fixedDecimalPlaceDigits;
+        for (const o of e) switch (o.type) {
           case "path":
-            n.save(), n.strokeStyle = "none" === s.stroke ? "transparent" : s.stroke, n.lineWidth = s.strokeWidth, s.strokeLineDash && n.setLineDash(s.strokeLineDash), s.strokeLineDashOffset && (n.lineDashOffset = s.strokeLineDashOffset), this._drawToContext(n, a, o), n.restore();
+            n.save(), n.strokeStyle = "none" === s.stroke ? "transparent" : s.stroke, n.lineWidth = s.strokeWidth, s.strokeLineDash && n.setLineDash(s.strokeLineDash), s.strokeLineDashOffset && (n.lineDashOffset = s.strokeLineDashOffset), this._drawToContext(n, o, a), n.restore();
             break;
           case "fillPath":
             {
               n.save(), n.fillStyle = s.fill || "";
               const e = "curve" === t.shape || "polygon" === t.shape || "path" === t.shape ? "evenodd" : "nonzero";
-              this._drawToContext(n, a, o, e), n.restore();
+              this._drawToContext(n, o, a, e), n.restore();
               break;
             }
           case "fillSketch":
-            this.fillSketch(n, a, s);
+            this.fillSketch(n, o, s);
         }
       }
       fillSketch(t, e, s) {
@@ -23057,21 +23002,21 @@
       getDefaultOptions() {
         return this.gen.defaultOptions;
       }
-      line(t, e, s, n, o) {
-        const a = this.gen.line(t, e, s, n, o);
-        return this.draw(a), a;
+      line(t, e, s, n, a) {
+        const o = this.gen.line(t, e, s, n, a);
+        return this.draw(o), o;
       }
-      rectangle(t, e, s, n, o) {
-        const a = this.gen.rectangle(t, e, s, n, o);
-        return this.draw(a), a;
+      rectangle(t, e, s, n, a) {
+        const o = this.gen.rectangle(t, e, s, n, a);
+        return this.draw(o), o;
       }
-      ellipse(t, e, s, n, o) {
-        const a = this.gen.ellipse(t, e, s, n, o);
-        return this.draw(a), a;
+      ellipse(t, e, s, n, a) {
+        const o = this.gen.ellipse(t, e, s, n, a);
+        return this.draw(o), o;
       }
       circle(t, e, s, n) {
-        const o = this.gen.circle(t, e, s, n);
-        return this.draw(o), o;
+        const a = this.gen.circle(t, e, s, n);
+        return this.draw(a), a;
       }
       linearPath(t, e) {
         const s = this.gen.linearPath(t, e);
@@ -23081,10 +23026,10 @@
         const s = this.gen.polygon(t, e);
         return this.draw(s), s;
       }
-      arc(t, e, s, n, o, a) {
+      arc(t, e, s, n, a, o) {
         let h = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : !1;
         let r = arguments.length > 7 ? arguments[7] : undefined;
-        const i = this.gen.arc(t, e, s, n, o, a, h, r);
+        const i = this.gen.arc(t, e, s, n, a, o, h, r);
         return this.draw(i), i;
       }
       curve(t, e) {
@@ -23096,38 +23041,38 @@
         return this.draw(s), s;
       }
     }
-    const nt = "http://www.w3.org/2000/svg";
-    class ot {
+    const J = "http://www.w3.org/2000/svg";
+    class K {
       constructor(t, e) {
-        this.svg = t, this.gen = new et(e);
+        this.svg = t, this.gen = new N(e);
       }
       draw(t) {
         const e = t.sets || [],
           s = t.options || this.getDefaultOptions(),
           n = this.svg.ownerDocument || window.document,
-          o = n.createElementNS(nt, "g"),
-          a = t.options.fixedDecimalPlaceDigits;
+          a = n.createElementNS(J, "g"),
+          o = t.options.fixedDecimalPlaceDigits;
         for (const h of e) {
           let e = null;
           switch (h.type) {
             case "path":
-              e = n.createElementNS(nt, "path"), e.setAttribute("d", this.opsToPath(h, a)), e.setAttribute("stroke", s.stroke), e.setAttribute("stroke-width", s.strokeWidth + ""), e.setAttribute("fill", "none"), s.strokeLineDash && e.setAttribute("stroke-dasharray", s.strokeLineDash.join(" ").trim()), s.strokeLineDashOffset && e.setAttribute("stroke-dashoffset", `${s.strokeLineDashOffset}`);
+              e = n.createElementNS(J, "path"), e.setAttribute("d", this.opsToPath(h, o)), e.setAttribute("stroke", s.stroke), e.setAttribute("stroke-width", s.strokeWidth + ""), e.setAttribute("fill", "none"), s.strokeLineDash && e.setAttribute("stroke-dasharray", s.strokeLineDash.join(" ").trim()), s.strokeLineDashOffset && e.setAttribute("stroke-dashoffset", `${s.strokeLineDashOffset}`);
               break;
             case "fillPath":
-              e = n.createElementNS(nt, "path"), e.setAttribute("d", this.opsToPath(h, a)), e.setAttribute("stroke", "none"), e.setAttribute("stroke-width", "0"), e.setAttribute("fill", s.fill || ""), "curve" !== t.shape && "polygon" !== t.shape || e.setAttribute("fill-rule", "evenodd");
+              e = n.createElementNS(J, "path"), e.setAttribute("d", this.opsToPath(h, o)), e.setAttribute("stroke", "none"), e.setAttribute("stroke-width", "0"), e.setAttribute("fill", s.fill || ""), "curve" !== t.shape && "polygon" !== t.shape || e.setAttribute("fill-rule", "evenodd");
               break;
             case "fillSketch":
               e = this.fillSketch(n, h, s);
           }
-          e && o.appendChild(e);
+          e && a.appendChild(e);
         }
-        return o;
+        return a;
       }
       fillSketch(t, e, s) {
         let n = s.fillWeight;
         n < 0 && (n = s.strokeWidth / 2);
-        const o = t.createElementNS(nt, "path");
-        return o.setAttribute("d", this.opsToPath(e, s.fixedDecimalPlaceDigits)), o.setAttribute("stroke", s.fill || ""), o.setAttribute("stroke-width", n + ""), o.setAttribute("fill", "none"), s.fillLineDash && o.setAttribute("stroke-dasharray", s.fillLineDash.join(" ").trim()), s.fillLineDashOffset && o.setAttribute("stroke-dashoffset", `${s.fillLineDashOffset}`), o;
+        const a = t.createElementNS(J, "path");
+        return a.setAttribute("d", this.opsToPath(e, s.fixedDecimalPlaceDigits)), a.setAttribute("stroke", s.fill || ""), a.setAttribute("stroke-width", n + ""), a.setAttribute("fill", "none"), s.fillLineDash && a.setAttribute("stroke-dasharray", s.fillLineDash.join(" ").trim()), s.fillLineDashOffset && a.setAttribute("stroke-dashoffset", `${s.fillLineDashOffset}`), a;
       }
       get generator() {
         return this.gen;
@@ -23138,21 +23083,21 @@
       opsToPath(t, e) {
         return this.gen.opsToPath(t, e);
       }
-      line(t, e, s, n, o) {
-        const a = this.gen.line(t, e, s, n, o);
-        return this.draw(a);
+      line(t, e, s, n, a) {
+        const o = this.gen.line(t, e, s, n, a);
+        return this.draw(o);
       }
-      rectangle(t, e, s, n, o) {
-        const a = this.gen.rectangle(t, e, s, n, o);
-        return this.draw(a);
+      rectangle(t, e, s, n, a) {
+        const o = this.gen.rectangle(t, e, s, n, a);
+        return this.draw(o);
       }
-      ellipse(t, e, s, n, o) {
-        const a = this.gen.ellipse(t, e, s, n, o);
-        return this.draw(a);
+      ellipse(t, e, s, n, a) {
+        const o = this.gen.ellipse(t, e, s, n, a);
+        return this.draw(o);
       }
       circle(t, e, s, n) {
-        const o = this.gen.circle(t, e, s, n);
-        return this.draw(o);
+        const a = this.gen.circle(t, e, s, n);
+        return this.draw(a);
       }
       linearPath(t, e) {
         const s = this.gen.linearPath(t, e);
@@ -23162,10 +23107,10 @@
         const s = this.gen.polygon(t, e);
         return this.draw(s);
       }
-      arc(t, e, s, n, o, a) {
+      arc(t, e, s, n, a, o) {
         let h = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : !1;
         let r = arguments.length > 7 ? arguments[7] : undefined;
-        const i = this.gen.arc(t, e, s, n, o, a, h, r);
+        const i = this.gen.arc(t, e, s, n, a, o, h, r);
         return this.draw(i);
       }
       curve(t, e) {
@@ -23177,11 +23122,11 @@
         return this.draw(s);
       }
     }
-    var at = {
-      canvas: (t, e) => new st(t, e),
-      svg: (t, e) => new ot(t, e),
-      generator: t => new et(t),
-      newSeed: () => et.newSeed()
+    var U = {
+      canvas: (t, e) => new B(t, e),
+      svg: (t, e) => new K(t, e),
+      generator: t => new N(t),
+      newSeed: () => N.newSeed()
     };
 
     const defaultRouthThemeSpec = {
@@ -23620,7 +23565,7 @@
         } = drawContext;
         if (!context) return;
         const canvas = context.canvas.nativeCanvas,
-          rc = at.canvas(canvas),
+          rc = U.canvas(canvas),
           customPath = new CustomPath2D(),
           roughContext = new RoughContext2d(context, customPath);
         context.save(), context.transformFromMatrix(graphic.transMatrix, !0);
@@ -23718,7 +23663,7 @@
         } = drawContext;
         if (!context) return;
         const canvas = context.canvas.nativeCanvas,
-          rc = at.canvas(canvas);
+          rc = U.canvas(canvas);
         context.highPerformanceSave();
         const arcAttribute = arc.getGraphicTheme();
         let {
@@ -23806,7 +23751,7 @@
         if (fillCb) return super.drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb);
         context.highPerformanceSave();
         const canvas = context.canvas.nativeCanvas,
-          rc = at.canvas(canvas, {}),
+          rc = U.canvas(canvas, {}),
           customPath = new CustomPath2D();
         drawAreaSegments(customPath, cache, clipRange, {
           offsetX: offsetX,
@@ -23896,7 +23841,7 @@
         } = drawContext;
         if (!context) return;
         const canvas = context.canvas.nativeCanvas,
-          rc = at.canvas(canvas, {}),
+          rc = U.canvas(canvas, {}),
           circleAttribute = circle.getGraphicTheme();
         let {
           x = circleAttribute.x,
@@ -23970,7 +23915,7 @@
         } = drawContext;
         if (!context) return;
         const canvas = context.canvas.nativeCanvas,
-          rc = at.canvas(canvas, {});
+          rc = U.canvas(canvas, {});
         context.highPerformanceSave();
         const pathAttribute = path.getGraphicTheme();
         context.transformFromMatrix(path.transMatrix, !0);
@@ -39330,7 +39275,7 @@
 
     exports.AXIS_ELEMENT_NAME = void 0;
     !function (AXIS_ELEMENT_NAME) {
-      AXIS_ELEMENT_NAME.innerView = "inner-view", AXIS_ELEMENT_NAME.axisContainer = "axis-container", AXIS_ELEMENT_NAME.labelContainer = "axis-label-container", AXIS_ELEMENT_NAME.tickContainer = "axis-tick-container", AXIS_ELEMENT_NAME.tick = "axis-tick", AXIS_ELEMENT_NAME.subTick = "axis-sub-tick", AXIS_ELEMENT_NAME.label = "axis-label", AXIS_ELEMENT_NAME.title = "axis-title", AXIS_ELEMENT_NAME.gridContainer = "axis-grid-container", AXIS_ELEMENT_NAME.grid = "axis-grid", AXIS_ELEMENT_NAME.gridRegion = "axis-grid-region", AXIS_ELEMENT_NAME.line = "axis-line", AXIS_ELEMENT_NAME.background = "axis-background", AXIS_ELEMENT_NAME.axisLabelBackground = "axis-label-background", AXIS_ELEMENT_NAME.axisBreak = "axis-break", AXIS_ELEMENT_NAME.axisBreakSymbol = "axis-break-symbol";
+      AXIS_ELEMENT_NAME.innerView = "inner-view", AXIS_ELEMENT_NAME.axisContainer = "axis-container", AXIS_ELEMENT_NAME.labelContainer = "axis-label-container", AXIS_ELEMENT_NAME.tickContainer = "axis-tick-container", AXIS_ELEMENT_NAME.tick = "axis-tick", AXIS_ELEMENT_NAME.subTick = "axis-sub-tick", AXIS_ELEMENT_NAME.label = "axis-label", AXIS_ELEMENT_NAME.title = "axis-title", AXIS_ELEMENT_NAME.labelHoverOnAxis = "axis-label-hover-on-axis", AXIS_ELEMENT_NAME.gridContainer = "axis-grid-container", AXIS_ELEMENT_NAME.grid = "axis-grid", AXIS_ELEMENT_NAME.gridRegion = "axis-grid-region", AXIS_ELEMENT_NAME.line = "axis-line", AXIS_ELEMENT_NAME.background = "axis-background", AXIS_ELEMENT_NAME.axisLabelBackground = "axis-label-background", AXIS_ELEMENT_NAME.axisBreak = "axis-break", AXIS_ELEMENT_NAME.axisBreakSymbol = "axis-break-symbol";
     }(exports.AXIS_ELEMENT_NAME || (exports.AXIS_ELEMENT_NAME = {}));
     exports.AxisStateValue = void 0;
     !function (AxisStateValue) {
@@ -39367,6 +39312,25 @@
           fillOpacity: 1
         }
       },
+      labelHoverOnAxis: {
+        visible: !1,
+        space: 4,
+        position: 0,
+        autoRotate: !1,
+        textStyle: {
+          fontSize: 12,
+          fill: "white",
+          fontWeight: "normal",
+          fillOpacity: 1
+        },
+        background: {
+          visible: !0,
+          style: {
+            cornerRadius: 2,
+            fill: "black"
+          }
+        }
+      },
       tick: {
         visible: !0,
         inside: !1,
@@ -40358,7 +40322,8 @@
     loadLineAxisComponent();
     class LineAxis extends AxisBase {
       constructor(attributes, options) {
-        super((null == options ? void 0 : options.skipDefault) ? attributes : merge({}, LineAxis.defaultAttributes, attributes), options);
+        var _a;
+        attributes.labelHoverOnAxis && (attributes.labelHoverOnAxis.textStyle = Object.assign({}, attributes.label.style, attributes.labelHoverOnAxis.textStyle), attributes.labelHoverOnAxis.space = null !== (_a = attributes.labelHoverOnAxis.space) && void 0 !== _a ? _a : attributes.label.space), super((null == options ? void 0 : options.skipDefault) ? attributes : merge({}, LineAxis.defaultAttributes, attributes), options), this.labelHoverOnAxisGroup = null;
       }
       _renderInner(container) {
         var _a;
@@ -40420,6 +40385,15 @@
             }, panel.style));
           bgRect.name = exports.AXIS_ELEMENT_NAME.background, bgRect.id = this._getNodeId("background"), bgRect.states = merge({}, DEFAULT_STATES$1, null !== (_a = panel.state) && void 0 !== _a ? _a : {}), axisContainer.insertBefore(bgRect, axisContainer.firstChild);
         }
+        const {
+          labelHoverOnAxis: labelHoverOnAxis
+        } = this.attribute;
+        labelHoverOnAxis && labelHoverOnAxis.visible && this.renderLabelHoverOnAxis();
+      }
+      renderLabelHoverOnAxis() {
+        const hoverOnLabelAttributes = this.getLabelHoverOnAxisAttribute(),
+          hoverOnLabel = new Tag(Object.assign({}, hoverOnLabelAttributes));
+        hoverOnLabel.name = exports.AXIS_ELEMENT_NAME.title, hoverOnLabel.id = this._getNodeId("hover-on-label"), this.labelHoverOnAxisGroup = hoverOnLabel, this.axisContainer.add(hoverOnLabel);
       }
       renderLine(container) {
         const {
@@ -40560,6 +40534,79 @@
           visible: !0
         }, background.style)), attrs;
       }
+      getLabelHoverOnAxisAttribute() {
+        var _a, _b;
+        const {
+            orient: orient
+          } = this.attribute,
+          _c = this.attribute.labelHoverOnAxis,
+          {
+            position = 0,
+            space = 4,
+            autoRotate = !0,
+            textStyle = {},
+            background = {},
+            formatMethod: formatMethod,
+            text: textContent = "",
+            maxWidth: maxWidth
+          } = _c,
+          restAttrs = __rest$b(_c, ["position", "space", "autoRotate", "textStyle", "background", "formatMethod", "text", "maxWidth"]),
+          point = this.getTickCoord(0);
+        "bottom" === orient || "top" === orient ? point.x = position : point.y = position;
+        let tickLength = 0;
+        (null === (_a = this.attribute.tick) || void 0 === _a ? void 0 : _a.visible) && !1 === this.attribute.tick.inside && (tickLength = this.attribute.tick.length || 4), (null === (_b = this.attribute.subTick) || void 0 === _b ? void 0 : _b.visible) && !1 === this.attribute.subTick.inside && (tickLength = Math.max(tickLength, this.attribute.subTick.length || 2));
+        const offset = tickLength + 0 + space,
+          labelPoint = this.getVerticalCoord(point, offset, !1),
+          vector = this.getVerticalVector(offset, !1, {
+            x: 0,
+            y: 0
+          });
+        let textBaseline,
+          {
+            angle: angle
+          } = restAttrs,
+          textAlign = "center";
+        if (isNil$1(angle) && autoRotate) {
+          const axisVector = this.getRelativeVector();
+          angle = angleTo(axisVector, [1, 0], !0);
+          const {
+            verticalFactor = 1
+          } = this.attribute;
+          textBaseline = 1 === -1 * verticalFactor ? "bottom" : "top";
+        } else textAlign = this.getTextAlign(vector), textBaseline = this.getTextBaseline(vector, !1);
+        let maxTagWidth = maxWidth;
+        if (isNil$1(maxTagWidth)) {
+          const {
+              verticalLimitSize: verticalLimitSize,
+              verticalMinSize: verticalMinSize,
+              orient: orient
+            } = this.attribute,
+            limitSize = Math.min(verticalLimitSize || 1 / 0, verticalMinSize || 1 / 0);
+          if (isValidNumber$1(limitSize)) {
+            if ("bottom" === orient || "top" === orient) {
+              if (angle !== Math.PI / 2) {
+                const cosValue = Math.abs(Math.cos(null != angle ? angle : 0));
+                maxTagWidth = cosValue < 1e-6 ? 1 / 0 : this.attribute.end.x / cosValue;
+              } else maxTagWidth = limitSize - offset;
+            } else if (angle && 0 !== angle) {
+              const sinValue = Math.abs(Math.sin(angle));
+              maxTagWidth = sinValue < 1e-6 ? 1 / 0 : this.attribute.end.y / sinValue;
+            } else maxTagWidth = limitSize - offset;
+          }
+        }
+        const text = formatMethod ? formatMethod(textContent) : textContent,
+          attrs = Object.assign(Object.assign(Object.assign({}, labelPoint), restAttrs), {
+            maxWidth: maxTagWidth,
+            textStyle: Object.assign({
+              textAlign: textAlign,
+              textBaseline: textBaseline
+            }, textStyle),
+            text: text
+          });
+        return attrs.angle = angle, background && background.visible && (attrs.panel = Object.assign(Object.assign({
+          visible: !0
+        }, restAttrs.panel), background.style)), attrs;
+      }
       getTextBaseline(vector, inside) {
         let base = "middle";
         const {
@@ -40750,6 +40797,25 @@
         }
         return limitLength && (limitLength = (limitLength - labelSpace - titleSpacing - titleHeight - axisLineWidth - tickLength) / layerCount), limitLength;
       }
+      showLabelHoverOnAxis(position, text) {
+        if (this.attribute.labelHoverOnAxis) if (this.labelHoverOnAxisGroup) {
+          const {
+              formatMethod: formatMethod
+            } = this.attribute.labelHoverOnAxis,
+            textStr = formatMethod ? formatMethod(text) : text;
+          this.labelHoverOnAxisGroup.setAttribute("text", textStr), this.labelHoverOnAxisGroup.setAttribute("visible", !0), this.labelHoverOnAxisGroup.setAttribute("visibleAll", !0), "left" === this.attribute.orient || "right" === this.attribute.orient ? this.labelHoverOnAxisGroup.setAttributes({
+            y: position
+          }) : this.labelHoverOnAxisGroup.setAttributes({
+            x: position
+          });
+        } else this.attribute.labelHoverOnAxis.visible = !0, this.attribute.labelHoverOnAxis.position = position, this.attribute.labelHoverOnAxis.text = text, this.renderLabelHoverOnAxis();
+      }
+      hideLabelHoverOnAxis() {
+        this.attribute.labelHoverOnAxis && this.labelHoverOnAxisGroup && this.labelHoverOnAxisGroup.setAttributes({
+          visible: !1,
+          visibleAll: !1
+        });
+      }
       release() {
         super.release(), this._breaks = null;
       }
@@ -42808,16 +42874,7 @@
           data = data.filter(d => !seenIds.has(d.id) && seenIds.add(d.id));
         }
         let labels = this._initText(data);
-        labels = isFunction$1(customLayoutFunc) ? customLayoutFunc(data, labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null, this) : this._layout(labels);
-        const filteredLabels = [],
-          overlapLabels = labels;
-        if (!isBoolean$1(overlap) && isFunction$1(overlap.filterBeforeOverlap)) {
-          const getRelatedGraphic = this.getRelatedGraphic.bind(this);
-          labels.forEach(label => {
-            overlap.filterBeforeOverlap(label, getRelatedGraphic, this) ? overlapLabels.push(label) : filteredLabels.push(label);
-          });
-        }
-        isFunction$1(customOverlapFunc) ? labels = customOverlapFunc(overlapLabels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null, this).concat(filteredLabels) : !1 !== overlap && (labels = this._overlapping(overlapLabels).concat(filteredLabels)), isFunction$1(this.attribute.onAfterOverlapping) && this.attribute.onAfterOverlapping(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null, this), labels && labels.length && labels.forEach(label => {
+        labels = isFunction$1(customLayoutFunc) ? customLayoutFunc(data, labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null, this) : this._layout(labels), isFunction$1(customOverlapFunc) ? labels = customOverlapFunc(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null, this) : !1 !== overlap && (labels = this._overlapping(labels)), isFunction$1(this.attribute.onAfterOverlapping) && this.attribute.onAfterOverlapping(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null, this), labels && labels.length && labels.forEach(label => {
           this._bindEvent(label), this._setStatesOfText(label);
         }), !1 !== smartInvert && this._smartInvert(labels), this._renderLabels(labels), !1 !== this._enableAnimation && this._baseMarks.forEach((mark, index) => {
           mark.initAttributes(markAttributeList[index]);
@@ -52817,7 +52874,7 @@
       select: !0
     };
 
-    const version = "1.0.25";
+    const version = "1.0.26-alpha.0";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);