web-core-tcm 0.0.62 → 0.0.63

package/dist/node_modules/zrender/lib/tool/morphPath.js

@@ -1,57 +1,57 @@
 import { cubicSubdivide as P } from "../core/curve.js";
 import z from "../graphic/Path.js";
-import { defaults as Q, map as w } from "../core/util.js";
+import { defaults as W, map as O } from "../core/util.js";
 import { lerp as vr } from "../core/vector.js";
 import { clonePath as nr } from "./path.js";
 import ar from "../core/Transformable.js";
 import { split as er } from "./dividePath.js";
-import { pathToBezierCurves as O } from "./convertPath.js";
+import { pathToBezierCurves as j } from "./convertPath.js";
 function fr(v, r) {
   var a = v.length, n = r.length;
   if (a === n)
     return [v, r];
-  for (var o = [], i = [], l = a < n ? v : r, e = Math.min(a, n), t = Math.abs(n - a) / 6, f = (e - 2) / 6, u = Math.ceil(t / f) + 1, d = [l[0], l[1]], c = t, h = 2; h < e; ) {
-    var I = l[h - 2], M = l[h - 1], C = l[h++], _ = l[h++], D = l[h++], T = l[h++], Z = l[h++], s = l[h++];
+  for (var l = [], i = [], o = a < n ? v : r, e = Math.min(a, n), t = Math.abs(n - a) / 6, f = (e - 2) / 6, u = Math.ceil(t / f) + 1, d = [o[0], o[1]], c = t, h = 2; h < e; ) {
+    var I = o[h - 2], T = o[h - 1], Z = o[h++], _ = o[h++], D = o[h++], M = o[h++], C = o[h++], s = o[h++];
     if (c <= 0) {
-      d.push(C, _, D, T, Z, s);
+      d.push(Z, _, D, M, C, s);
       continue;
     }
     for (var g = Math.min(c, u - 1) + 1, R = 1; R <= g; R++) {
-      var E = R / g;
-      P(I, C, D, Z, E, o), P(M, _, T, s, E, i), I = o[3], M = i[3], d.push(o[1], i[1], o[2], i[2], I, M), C = o[5], _ = i[5], D = o[6], T = i[6];
+      var y = R / g;
+      P(I, Z, D, C, y, l), P(T, _, M, s, y, i), I = l[3], T = i[3], d.push(l[1], i[1], l[2], i[2], I, T), Z = l[5], _ = i[5], D = l[6], M = i[6];
     }
     c -= g - 1;
   }
-  return l === v ? [d, r] : [v, d];
+  return o === v ? [d, r] : [v, d];
 }
-function j(v, r) {
-  for (var a = v.length, n = v[a - 2], o = v[a - 1], i = [], l = 0; l < r.length; )
-    i[l++] = n, i[l++] = o;
+function w(v, r) {
+  for (var a = v.length, n = v[a - 2], l = v[a - 1], i = [], o = 0; o < r.length; )
+    i[o++] = n, i[o++] = l;
   return i;
 }
-function or(v, r) {
-  for (var a, n, o, i = [], l = [], e = 0; e < Math.max(v.length, r.length); e++) {
+function lr(v, r) {
+  for (var a, n, l, i = [], o = [], e = 0; e < Math.max(v.length, r.length); e++) {
     var t = v[e], f = r[e], u = void 0, d = void 0;
-    t ? f ? (a = fr(t, f), u = a[0], d = a[1], n = u, o = d) : (d = j(o || t, t), u = t) : (u = j(n || f, f), d = f), i.push(u), l.push(d);
+    t ? f ? (a = fr(t, f), u = a[0], d = a[1], n = u, l = d) : (d = w(l || t, t), u = t) : (u = w(n || f, f), d = f), i.push(u), o.push(d);
   }
-  return [i, l];
+  return [i, o];
 }
 function k(v) {
-  for (var r = 0, a = 0, n = 0, o = v.length, i = 0, l = o - 2; i < o; l = i, i += 2) {
-    var e = v[l], t = v[l + 1], f = v[i], u = v[i + 1], d = e * u - f * t;
+  for (var r = 0, a = 0, n = 0, l = v.length, i = 0, o = l - 2; i < l; o = i, i += 2) {
+    var e = v[o], t = v[o + 1], f = v[i], u = v[i + 1], d = e * u - f * t;
     r += d, a += (e + f) * d, n += (t + u) * d;
   }
   return r === 0 ? [v[0] || 0, v[1] || 0] : [a / r / 3, n / r / 3, r];
 }
-function lr(v, r, a, n) {
-  for (var o = (v.length - 2) / 6, i = 1 / 0, l = 0, e = v.length, t = e - 2, f = 0; f < o; f++) {
+function or(v, r, a, n) {
+  for (var l = (v.length - 2) / 6, i = 1 / 0, o = 0, e = v.length, t = e - 2, f = 0; f < l; f++) {
     for (var u = f * 6, d = 0, c = 0; c < e; c += 2) {
-      var h = c === 0 ? u : (u + c - 2) % t + 2, I = v[h] - a[0], M = v[h + 1] - a[1], C = r[c] - n[0], _ = r[c + 1] - n[1], D = C - I, T = _ - M;
-      d += D * D + T * T;
+      var h = c === 0 ? u : (u + c - 2) % t + 2, I = v[h] - a[0], T = v[h + 1] - a[1], Z = r[c] - n[0], _ = r[c + 1] - n[1], D = Z - I, M = _ - T;
+      d += D * D + M * M;
     }
-    d < i && (i = d, l = f);
+    d < i && (i = d, o = f);
   }
-  return l;
+  return o;
 }
 function dr(v) {
   for (var r = [], a = v.length, n = 0; n < a; n += 2)
@@ -59,30 +59,33 @@ function dr(v) {
   return r;
 }
 function ir(v, r, a, n) {
-  for (var o = [], i, l = 0; l < v.length; l++) {
-    var e = v[l], t = r[l], f = k(e), u = k(t);
+  for (var l = [], i, o = 0; o < v.length; o++) {
+    var e = v[o], t = r[o], f = k(e), u = k(t);
     i == null && (i = f[2] < 0 != u[2] < 0);
-    var d = [], c = [], h = 0, I = 1 / 0, M = [], C = e.length;
+    var d = [], c = [], h = 0, I = 1 / 0, T = [], Z = e.length;
     i && (e = dr(e));
-    for (var _ = lr(e, t, f, u) * 6, D = C - 2, T = 0; T < D; T += 2) {
-      var Z = (_ + T) % D + 2;
-      d[T + 2] = e[Z] - f[0], d[T + 3] = e[Z + 1] - f[1];
+    for (var _ = or(e, t, f, u) * 6, D = Z - 2, M = 0; M < D; M += 2) {
+      var C = (_ + M) % D + 2;
+      d[M + 2] = e[C] - f[0], d[M + 3] = e[C + 1] - f[1];
     }
-    d[0] = e[_] - f[0], d[1] = e[_ + 1] - f[1];
-    for (var s = n / a, g = -n / 2; g <= n / 2; g += s) {
-      for (var R = Math.sin(g), E = Math.cos(g), p = 0, T = 0; T < e.length; T += 2) {
-        var m = d[T], N = d[T + 1], y = t[T] - u[0], U = t[T + 1] - u[1], A = y * E - U * R, F = y * R + U * E;
-        M[T] = A, M[T + 1] = F;
-        var V = A - m, q = F - N;
-        p += V * V + q * q;
-      }
-      if (p < I) {
-        I = p, h = g;
-        for (var H = 0; H < M.length; H++)
-          c[H] = M[H];
+    if (d[0] = e[_] - f[0], d[1] = e[_ + 1] - f[1], a > 0)
+      for (var s = n / a, g = -n / 2; g <= n / 2; g += s) {
+        for (var R = Math.sin(g), y = Math.cos(g), p = 0, M = 0; M < e.length; M += 2) {
+          var N = d[M], X = d[M + 1], U = t[M] - u[0], H = t[M + 1] - u[1], F = U * y - H * R, G = U * R + H * y;
+          T[M] = F, T[M + 1] = G;
+          var m = F - N, q = G - X;
+          p += m * m + q * q;
+        }
+        if (p < I) {
+          I = p, h = g;
+          for (var V = 0; V < T.length; V++)
+            c[V] = T[V];
+        }
       }
-    }
-    o.push({
+    else
+      for (var E = 0; E < Z; E += 2)
+        c[E] = t[E] - u[0], c[E + 1] = t[E + 1] - u[1];
+    l.push({
       from: d,
       to: c,
       fromCp: f,
@@ -90,52 +93,55 @@ function ir(v, r, a, n) {
       rotation: -h
     });
   }
-  return o;
+  return l;
 }
-function X(v) {
+function Y(v) {
   return v.__isCombineMorphing;
 }
+function pr(v) {
+  return v.__morphT >= 0;
+}
 var S = "__mOriginal_";
-function W(v, r, a) {
-  var n = S + r, o = v[n] || v[r];
+function $(v, r, a) {
+  var n = S + r, l = v[n] || v[r];
   v[n] || (v[n] = v[r]);
-  var i = a.replace, l = a.after, e = a.before;
+  var i = a.replace, o = a.after, e = a.before;
   v[r] = function() {
     var t = arguments, f;
-    return e && e.apply(this, t), i ? f = i.apply(this, t) : f = o.apply(this, t), l && l.apply(this, t), f;
+    return e && e.apply(this, t), i ? f = i.apply(this, t) : f = l.apply(this, t), o && o.apply(this, t), f;
   };
 }
-function G(v, r) {
+function J(v, r) {
   var a = S + r;
   v[a] && (v[r] = v[a], v[a] = null);
 }
 function x(v, r) {
   for (var a = 0; a < v.length; a++)
-    for (var n = v[a], o = 0; o < n.length; ) {
-      var i = n[o], l = n[o + 1];
-      n[o++] = r[0] * i + r[2] * l + r[4], n[o++] = r[1] * i + r[3] * l + r[5];
+    for (var n = v[a], l = 0; l < n.length; ) {
+      var i = n[l], o = n[l + 1];
+      n[l++] = r[0] * i + r[2] * o + r[4], n[l++] = r[1] * i + r[3] * o + r[5];
     }
 }
 function B(v, r) {
-  var a = v.getUpdatedPathProxy(), n = r.getUpdatedPathProxy(), o = or(O(a), O(n)), i = o[0], l = o[1], e = v.getComputedTransform(), t = r.getComputedTransform();
+  var a = v.getUpdatedPathProxy(), n = r.getUpdatedPathProxy(), l = lr(j(a), j(n)), i = l[0], o = l[1], e = v.getComputedTransform(), t = r.getComputedTransform();
   function f() {
     this.transform = null;
   }
-  e && x(i, e), t && x(l, t), W(r, "updateTransform", { replace: f }), r.transform = null;
-  var u = ir(i, l, 10, Math.PI), d = [];
-  W(r, "buildPath", { replace: function(c) {
-    for (var h = r.__morphT, I = 1 - h, M = [], C = 0; C < u.length; C++) {
-      var _ = u[C], D = _.from, T = _.to, Z = _.rotation * h, s = _.fromCp, g = _.toCp, R = Math.sin(Z), E = Math.cos(Z);
-      vr(M, s, g, h);
+  e && x(i, e), t && x(o, t), $(r, "updateTransform", { replace: f }), r.transform = null;
+  var u = ir(i, o, 10, Math.PI), d = [];
+  $(r, "buildPath", { replace: function(c) {
+    for (var h = r.__morphT, I = 1 - h, T = [], Z = 0; Z < u.length; Z++) {
+      var _ = u[Z], D = _.from, M = _.to, C = _.rotation * h, s = _.fromCp, g = _.toCp, R = Math.sin(C), y = Math.cos(C);
+      vr(T, s, g, h);
       for (var p = 0; p < D.length; p += 2) {
-        var m = D[p], N = D[p + 1], y = T[p], U = T[p + 1], A = m * I + y * h, F = N * I + U * h;
-        d[p] = A * E - F * R + M[0], d[p + 1] = A * R + F * E + M[1];
+        var N = D[p], X = D[p + 1], U = M[p], H = M[p + 1], F = N * I + U * h, G = X * I + H * h;
+        d[p] = F * y - G * R + T[0], d[p + 1] = F * R + G * y + T[1];
       }
-      var V = d[0], q = d[1];
-      c.moveTo(V, q);
+      var m = d[0], q = d[1];
+      c.moveTo(m, q);
       for (var p = 2; p < D.length; ) {
-        var y = d[p++], U = d[p++], H = d[p++], L = d[p++], J = d[p++], K = d[p++];
-        V === y && q === U && H === J && L === K ? c.lineTo(J, K) : c.bezierCurveTo(y, U, H, L, J, K), V = J, q = K;
+        var U = d[p++], H = d[p++], V = d[p++], E = d[p++], K = d[p++], Q = d[p++];
+        m === U && q === H && V === K && E === Q ? c.lineTo(K, Q) : c.bezierCurveTo(U, H, V, E, K, Q), m = K, q = Q;
       }
     }
   } });
@@ -143,43 +149,43 @@ function B(v, r) {
 function b(v, r, a) {
   if (!v || !r)
     return r;
-  var n = a.done, o = a.during;
+  var n = a.done, l = a.during;
   B(v, r), r.__morphT = 0;
   function i() {
-    G(r, "buildPath"), G(r, "updateTransform"), r.__morphT = -1, r.createPathProxy(), r.dirtyShape();
+    J(r, "buildPath"), J(r, "updateTransform"), r.__morphT = -1, r.createPathProxy(), r.dirtyShape();
   }
   return r.animateTo({
     __morphT: 1
-  }, Q({
-    during: function(l) {
-      r.dirtyShape(), o && o(l);
+  }, W({
+    during: function(o) {
+      r.dirtyShape(), l && l(o);
     },
     done: function() {
       i(), n && n();
     }
   }, a)), r;
 }
-function tr(v, r, a, n, o, i) {
-  var l = 16;
-  v = o === a ? 0 : Math.round(32767 * (v - a) / (o - a)), r = i === n ? 0 : Math.round(32767 * (r - n) / (i - n));
-  for (var e = 0, t, f = (1 << l) / 2; f > 0; f /= 2) {
+function tr(v, r, a, n, l, i) {
+  var o = 16;
+  v = l === a ? 0 : Math.round(32767 * (v - a) / (l - a)), r = i === n ? 0 : Math.round(32767 * (r - n) / (i - n));
+  for (var e = 0, t, f = (1 << o) / 2; f > 0; f /= 2) {
     var u = 0, d = 0;
     (v & f) > 0 && (u = 1), (r & f) > 0 && (d = 1), e += f * f * (3 * u ^ d), d === 0 && (u === 1 && (v = f - 1 - v, r = f - 1 - r), t = v, v = r, r = t);
   }
   return e;
 }
-function $(v) {
-  var r = 1 / 0, a = 1 / 0, n = -1 / 0, o = -1 / 0, i = w(v, function(e) {
+function A(v) {
+  var r = 1 / 0, a = 1 / 0, n = -1 / 0, l = -1 / 0, i = O(v, function(e) {
     var t = e.getBoundingRect(), f = e.getComputedTransform(), u = t.x + t.width / 2 + (f ? f[4] : 0), d = t.y + t.height / 2 + (f ? f[5] : 0);
-    return r = Math.min(u, r), a = Math.min(d, a), n = Math.max(u, n), o = Math.max(d, o), [u, d];
-  }), l = w(i, function(e, t) {
+    return r = Math.min(u, r), a = Math.min(d, a), n = Math.max(u, n), l = Math.max(d, l), [u, d];
+  }), o = O(i, function(e, t) {
     return {
       cp: e,
-      z: tr(e[0], e[1], r, a, n, o),
+      z: tr(e[0], e[1], r, a, n, l),
       path: v[t]
     };
   });
-  return l.sort(function(e, t) {
+  return o.sort(function(e, t) {
     return e.z - t.z;
   }).map(function(e) {
     return e.path;
@@ -188,32 +194,32 @@ function $(v) {
 function rr(v) {
   return er(v.path, v.count);
 }
-function Y() {
+function L() {
   return {
     fromIndividuals: [],
     toIndividuals: [],
     count: 0
   };
 }
-function pr(v, r, a) {
+function Ir(v, r, a) {
   var n = [];
-  function o(s) {
+  function l(s) {
     for (var g = 0; g < s.length; g++) {
       var R = s[g];
-      X(R) ? o(R.childrenRef()) : R instanceof z && n.push(R);
+      Y(R) ? l(R.childrenRef()) : R instanceof z && n.push(R);
     }
   }
-  o(v);
+  l(v);
   var i = n.length;
   if (!i)
-    return Y();
-  var l = a.dividePath || rr, e = l({
+    return L();
+  var o = a.dividePath || rr, e = o({
     path: r,
     count: i
   });
   if (e.length !== i)
-    return console.error("Invalid morphing: unmatched splitted path"), Y();
-  n = $(n), e = $(e);
+    return console.error("Invalid morphing: unmatched splitted path"), L();
+  n = A(n), e = A(e);
   for (var t = a.done, f = a.during, u = a.individualDelay, d = new ar(), c = 0; c < i; c++) {
     var h = n[c], I = e[c];
     I.parent = r, I.copyTransform(d), u || B(h, I);
@@ -221,38 +227,38 @@ function pr(v, r, a) {
   r.__isCombineMorphing = !0, r.childrenRef = function() {
     return e;
   };
-  function M(s) {
+  function T(s) {
     for (var g = 0; g < e.length; g++)
       e[g].addSelfToZr(s);
   }
-  W(r, "addSelfToZr", {
+  $(r, "addSelfToZr", {
     after: function(s) {
-      M(s);
+      T(s);
     }
-  }), W(r, "removeSelfFromZr", {
+  }), $(r, "removeSelfFromZr", {
     after: function(s) {
       for (var g = 0; g < e.length; g++)
         e[g].removeSelfFromZr(s);
     }
   });
-  function C() {
-    r.__isCombineMorphing = !1, r.__morphT = -1, r.childrenRef = null, G(r, "addSelfToZr"), G(r, "removeSelfFromZr");
+  function Z() {
+    r.__isCombineMorphing = !1, r.__morphT = -1, r.childrenRef = null, J(r, "addSelfToZr"), J(r, "removeSelfFromZr");
   }
   var _ = e.length;
   if (u)
-    for (var D = _, T = function() {
-      D--, D === 0 && (C(), t && t());
+    for (var D = _, M = function() {
+      D--, D === 0 && (Z(), t && t());
     }, c = 0; c < _; c++) {
-      var Z = u ? Q({
+      var C = u ? W({
         delay: (a.delay || 0) + u(c, _, n[c], e[c]),
-        done: T
+        done: M
       }, a) : a;
-      b(n[c], e[c], Z);
+      b(n[c], e[c], C);
     }
   else
     r.__morphT = 0, r.animateTo({
       __morphT: 1
-    }, Q({
+    }, W({
       during: function(s) {
         for (var g = 0; g < _; g++) {
           var R = e[g];
@@ -261,59 +267,60 @@ function pr(v, r, a) {
         f && f(s);
       },
       done: function() {
-        C();
+        Z();
         for (var s = 0; s < v.length; s++)
-          G(v[s], "updateTransform");
+          J(v[s], "updateTransform");
         t && t();
       }
     }, a));
-  return r.__zr && M(r.__zr), {
+  return r.__zr && T(r.__zr), {
     fromIndividuals: n,
     toIndividuals: e,
     count: _
   };
 }
-function Ir(v, r, a) {
-  var n = r.length, o = [], i = a.dividePath || rr;
-  function l(h) {
+function Dr(v, r, a) {
+  var n = r.length, l = [], i = a.dividePath || rr;
+  function o(h) {
     for (var I = 0; I < h.length; I++) {
-      var M = h[I];
-      X(M) ? l(M.childrenRef()) : M instanceof z && o.push(M);
+      var T = h[I];
+      Y(T) ? o(T.childrenRef()) : T instanceof z && l.push(T);
     }
   }
-  if (X(v)) {
-    l(v.childrenRef());
-    var e = o.length;
+  if (Y(v)) {
+    o(v.childrenRef());
+    var e = l.length;
     if (e < n)
       for (var t = 0, f = e; f < n; f++)
-        o.push(nr(o[t++ % e]));
-    o.length = n;
+        l.push(nr(l[t++ % e]));
+    l.length = n;
   } else {
-    o = i({ path: v, count: n });
-    for (var u = v.getComputedTransform(), f = 0; f < o.length; f++)
-      o[f].setLocalTransform(u);
-    if (o.length !== n)
-      return console.error("Invalid morphing: unmatched splitted path"), Y();
+    l = i({ path: v, count: n });
+    for (var u = v.getComputedTransform(), f = 0; f < l.length; f++)
+      l[f].setLocalTransform(u);
+    if (l.length !== n)
+      return console.error("Invalid morphing: unmatched splitted path"), L();
   }
-  o = $(o), r = $(r);
+  l = A(l), r = A(r);
   for (var d = a.individualDelay, f = 0; f < n; f++) {
-    var c = d ? Q({
-      delay: (a.delay || 0) + d(f, n, o[f], r[f])
+    var c = d ? W({
+      delay: (a.delay || 0) + d(f, n, l[f], r[f])
     }, a) : a;
-    b(o[f], r[f], c);
+    b(l[f], r[f], c);
   }
   return {
-    fromIndividuals: o,
+    fromIndividuals: l,
     toIndividuals: r,
     count: r.length
   };
 }
 export {
-  or as alignBezierCurves,
+  lr as alignBezierCurves,
   k as centroid,
-  pr as combineMorph,
+  Ir as combineMorph,
   er as defaultDividePath,
-  X as isCombineMorphing,
+  Y as isCombineMorphing,
+  pr as isMorphing,
   b as morphPath,
-  Ir as separateMorph
+  Dr as separateMorph
 };

package/dist/node_modules/zrender/lib/tool/parseSVG.js

@@ -6,14 +6,14 @@ import V from "../graphic/shape/Ellipse.js";
 import j from "../graphic/shape/Line.js";
 import H from "../graphic/shape/Polygon.js";
 import J from "../graphic/shape/Polyline.js";
-import { mul as T, rotate as K, scale as q, translate as Z, create as z } from "../core/matrix.js";
+import { create as K, mul as T, rotate as q, scale as Z, translate as z } from "../core/matrix.js";
 import { createFromString as Q } from "./path.js";
 import { keys as D, hasOwn as _, defaults as $, each as E, map as m, trim as B } from "../core/util.js";
 import N from "../graphic/LinearGradient.js";
 import tt from "../graphic/RadialGradient.js";
 import et from "../graphic/TSpan.js";
 import { parseXML as rt } from "./parseXML.js";
-var A, F = {
+var w, F = {
   fill: "fill",
   stroke: "stroke",
   "stroke-width": "lineWidth",
@@ -80,8 +80,8 @@ var A, F = {
       n = i;
     else {
       if (!a) {
-        var y = A[l];
-        if (y && _(A, l)) {
+        var y = w[l];
+        if (y && _(w, l)) {
           n = y.call(this, e, i);
           var v = e.getAttribute("name");
           if (v) {
@@ -132,7 +132,7 @@ var A, F = {
     var l = t.getBoundingRect();
     return this._textX += l.width, i.add(t), t;
   }, s.internalField = (function() {
-    A = {
+    w = {
       g: function(e, i) {
         var t = new b();
         return u(i, t), o(e, t, this._defsUsePending, !1, !1), t;
@@ -319,7 +319,7 @@ var lt = /-?([0-9]*\.)?[0-9]+([eE]-?[0-9]+)?/g;
 function S(s) {
   return s.match(lt) || [];
 }
-var ft = /(translate|scale|rotate|skewX|skewY|matrix)\(([\-\s0-9\.eE,]*)\)/g, w = Math.PI / 180;
+var ft = /(translate|scale|rotate|skewX|skewY|matrix)\(([\-\s0-9\.eE,]*)\)/g, A = Math.PI / 180;
 function ot(s, e) {
   var i = s.getAttribute("transform");
   if (i) {
@@ -330,25 +330,25 @@ function ot(s, e) {
     });
     for (var a = t.length - 1; a > 0; a -= 2) {
       var f = t[a], l = t[a - 1], n = S(f);
-      switch (r = r || z(), l) {
+      switch (r = r || K(), l) {
         case "translate":
-          Z(r, r, [parseFloat(n[0]), parseFloat(n[1] || "0")]);
+          z(r, r, [parseFloat(n[0]), parseFloat(n[1] || "0")]);
           break;
         case "scale":
-          q(r, r, [parseFloat(n[0]), parseFloat(n[1] || n[0])]);
+          Z(r, r, [parseFloat(n[0]), parseFloat(n[1] || n[0])]);
           break;
         case "rotate":
-          K(r, r, -parseFloat(n[0]) * w, [
+          q(r, r, -parseFloat(n[0]) * A, [
             parseFloat(n[1] || "0"),
             parseFloat(n[2] || "0")
           ]);
           break;
         case "skewX":
-          var g = Math.tan(parseFloat(n[0]) * w);
+          var g = Math.tan(parseFloat(n[0]) * A);
           T(r, [1, 0, g, 1, 0, 0], r);
           break;
         case "skewY":
-          var y = Math.tan(parseFloat(n[0]) * w);
+          var y = Math.tan(parseFloat(n[0]) * A);
           T(r, [1, y, 0, 1, 0, 0], r);
           break;
         case "matrix":