@wcardinal/wcardinal-ui 0.409.0 → 0.410.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.409.0
+ Winter Cardinal UI v0.410.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1388,12 +1388,14 @@ var DOTTED_LOOSELY = 64;
 var DASHED = 128;
 var DASHED_DENSELY = 256;
 var DASHED_LOOSELY = 512;
-var CURVE = 1024;
 var FORMATTER_SHIFT = 10;
 var FORMATTER_MASK = 0xffc00;
 var FORMATTER_EXTENSION_LOWEST = 512;
 var FORMATTER_EXTENSION_HIGHEST = 1023;
-var FORMATTER_CURVE = 1;
+var FORMATTER_CURVE_SPLINE = 1;
+var FORMATTER_CURVE_BEZIER_QUADRATIC = 2;
+var CURVE_SPLINE = FORMATTER_CURVE_SPLINE << FORMATTER_SHIFT;
+var CURVE_BEZIER_QUADRATIC = FORMATTER_CURVE_BEZIER_QUADRATIC << FORMATTER_SHIFT;
 /**
  * EShape point style.
  *
@@ -1427,12 +1429,18 @@ var EShapePointsStyle = {
     DASHED_LOOSELY: DASHED_LOOSELY,
     /** @deprecated in favor of EShapeStrokeStyle. */
     DASHED_MASK: DASHED | DASHED_DENSELY | DASHED_LOOSELY,
-    CURVE: CURVE,
+    /** @deprecated in favor of CURVE_SPLINE. */
+    CURVE: CURVE_SPLINE,
+    CURVE_SPLINE: CURVE_SPLINE,
+    CURVE_BEZIER_QUADRATIC: CURVE_BEZIER_QUADRATIC,
     FORMATTER_SHIFT: FORMATTER_SHIFT,
     FORMATTER_MASK: FORMATTER_MASK,
     FORMATTER_EXTENSION_LOWEST: FORMATTER_EXTENSION_LOWEST,
     FORMATTER_EXTENSION_HIGHEST: FORMATTER_EXTENSION_HIGHEST,
-    FORMATTER_CURVE: FORMATTER_CURVE
+    /** @deprecated in favor of FORMATTER_CURVE_SPLINE. */
+    FORMATTER_CURVE: FORMATTER_CURVE_SPLINE,
+    FORMATTER_CURVE_SPLINE: FORMATTER_CURVE_SPLINE,
+    FORMATTER_CURVE_BEZIER_QUADRATIC: FORMATTER_CURVE_BEZIER_QUADRATIC
 };
 
 /*
@@ -13944,12 +13952,20 @@ var DBaseSnippetContainer = /** @class */ (function () {
         if (this._renderable) {
             var list = phase ? this._befores : this._afters;
             for (var i = 0, imax = list.length; i < imax; ++i) {
-                var snippet = list[i];
-                snippet.updateTransform();
-                snippet.render(renderer);
+                list[i].render(renderer);
             }
         }
     };
+    DBaseSnippetContainer.prototype.updateTransform = function () {
+        var befores = this._befores;
+        for (var i = 0, imax = befores.length; i < imax; ++i) {
+            befores[i].updateTransform();
+        }
+        var afters = this._afters;
+        for (var i = 0, imax = afters.length; i < imax; ++i) {
+            afters[i].updateTransform();
+        }
+    };
     return DBaseSnippetContainer;
 }());
 
@@ -15228,6 +15244,10 @@ var DBase = /** @class */ (function (_super) {
             snippet.render(renderer, false);
         }
     };
+    DBase.prototype.updateTransform = function () {
+        _super.prototype.updateTransform.call(this);
+        this._snippet.updateTransform();
+    };
     //
     DBase.prototype.getThemeDefault = function () {
         return DThemes.getInstance().get(this.getType());
@@ -19440,7 +19460,7 @@ var pcopy = function (source, result) {
     var a = source.angle;
     return pset(c[0], c[1], a1[0], a1[1], a2[0], a2[1], a[0], a[1], a[2], result);
 };
-var acopy = function (source, result) {
+var acopy$1 = function (source, result) {
     var sourceLength = source.length;
     for (var i = 0; i < sourceLength; ++i) {
         result[i] = source[i];
@@ -19505,8 +19525,8 @@ var UtilCurve = /** @class */ (function () {
         var rvalues = result.values;
         var rsegments = result.segments;
         if (length <= 2) {
-            acopy(values, rvalues);
-            acopy(segments, rsegments);
+            acopy$1(values, rvalues);
+            acopy$1(segments, rsegments);
             return result;
         }
         var c0 = this.WORK_P0 || pnew();
@@ -19785,6 +19805,168 @@ var eShapePointsFormatterCurve = function (length, values, segments, style, resu
     return result;
 };
 
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var acopy = function (source, result) {
+    var sourceLength = source.length;
+    for (var i = 0; i < sourceLength; ++i) {
+        result[i] = source[i];
+    }
+    if (result.length !== sourceLength) {
+        result.length = sourceLength;
+    }
+    return result;
+};
+var amix = function (x0, y0, x1, y1, t, result) {
+    var u = 1 - t;
+    result[0] = x0 * u + x1 * t;
+    result[1] = y0 * u + y1 * t;
+    return result;
+};
+var interpolate2 = function (x0, y0, x1, y1, x2, y2, is0, is1, nsegment, rvalues, rvaluesCount) {
+    var v3 = [0, 0];
+    var v4 = [0, 0];
+    var v5 = [0, 0];
+    for (var is = is0; is < is1; ++is) {
+        var t = is / nsegment;
+        amix(x0, y0, x1, y1, t, v3);
+        amix(x1, y1, x2, y2, t, v4);
+        amix(v3[0], v3[1], v4[0], v4[1], t, v5);
+        rvalues[++rvaluesCount] = v5[0];
+        rvalues[++rvaluesCount] = v5[1];
+    }
+    return rvaluesCount;
+};
+var interpolate1 = function (length, values, segments, isClosed, nsegment, result) {
+    var rvalues = result.values;
+    var rsegments = result.segments;
+    if (length <= 2) {
+        acopy(values, rvalues);
+        acopy(segments, rsegments);
+        return result;
+    }
+    var rvaluesCount = -1;
+    var rsegmentsCount = -1;
+    var ism = nsegment >> 1;
+    if (isClosed) {
+        var i = 0;
+        for (; i + 2 < length; i += 2) {
+            var j = i << 1;
+            var s0 = 0 <= toIndexOf(segments, i + 1);
+            var s1 = 0 <= toIndexOf(segments, i + 2);
+            if (s0 && s1) {
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+            }
+            else if (s0) {
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], ism, nsegment, nsegment, rvalues, rvaluesCount);
+            }
+            else if (s1) {
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, ism, nsegment, rvalues, rvaluesCount);
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+            }
+            else {
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, nsegment, nsegment, rvalues, rvaluesCount);
+            }
+        }
+        if (i + 1 < length) {
+            var j = i << 1;
+            var s0 = 0 <= toIndexOf(segments, i + 1);
+            var s1 = 0 <= toIndexOf(segments, 0);
+            if (s0 && s1) {
+                rvalues[++rvaluesCount] = values[0];
+                rvalues[++rvaluesCount] = values[1];
+                rsegments.unshift(0);
+                rsegmentsCount += 1;
+            }
+            else if (s0) {
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], ism, nsegment, nsegment, rvalues, rvaluesCount);
+            }
+            else if (s1) {
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], 0, ism, nsegment, rvalues, rvaluesCount);
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+            }
+            else {
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], 0, nsegment, nsegment, rvalues, rvaluesCount);
+            }
+        }
+        else if (i < length) {
+            var j = i << 1;
+            rvalues[++rvaluesCount] = values[j + 0];
+            rvalues[++rvaluesCount] = values[j + 1];
+            if (0 <= toIndexOf(segments, 0)) {
+                rsegments.unshift(0);
+                rsegmentsCount += 1;
+            }
+        }
+    }
+    else {
+        var i = 0;
+        for (; i + 2 < length; i += 2) {
+            var j = i << 1;
+            var s0 = 0 <= toIndexOf(segments, i + 1);
+            var s1 = 0 <= toIndexOf(segments, i + 2);
+            if (s0 && s1) {
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+            }
+            else if (s0) {
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], ism, nsegment, nsegment, rvalues, rvaluesCount);
+            }
+            else if (s1) {
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, ism, nsegment, rvalues, rvaluesCount);
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+            }
+            else {
+                rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, nsegment, nsegment, rvalues, rvaluesCount);
+            }
+        }
+        for (; i + 1 < length; ++i) {
+            var j = i << 1;
+            rvalues[++rvaluesCount] = values[j + 0];
+            rvalues[++rvaluesCount] = values[j + 1];
+            rvalues[++rvaluesCount] = values[j + 2];
+            rvalues[++rvaluesCount] = values[j + 3];
+            if (0 <= toIndexOf(segments, i + 1)) {
+                rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+            }
+        }
+        for (; i < length; ++i) {
+            var j = i << 1;
+            rvalues[++rvaluesCount] = values[j + 0];
+            rvalues[++rvaluesCount] = values[j + 1];
+        }
+    }
+    rvaluesCount += 1;
+    if (rvalues.length !== rvaluesCount) {
+        rvalues.length = rvaluesCount;
+    }
+    rsegmentsCount += 1;
+    if (rsegments.length !== rsegmentsCount) {
+        rsegments.length = rsegmentsCount;
+    }
+    return result;
+};
+var eShapePointsFormatterCurveBezierQuadratic = function (length, values, segments, style, result) {
+    interpolate1(length, values, segments, !!(style & EShapePointsStyle.CLOSED), EShapeDefaults.CURVE_SEGMENT_COUNT, result);
+    result.length = result.values.length >> 1;
+    result.style = style;
+    return result;
+};
+
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -19818,10 +20000,14 @@ var EShapePointsFormatters = /** @class */ (function () {
     EShapePointsFormatters.newData = function () {
         var result = new Map();
         var theme = DThemes.get("EShapePointsFormatter");
-        result.set(EShapePointsStyle.FORMATTER_CURVE, {
-            label: theme.getCurveLabel(),
+        result.set(EShapePointsStyle.FORMATTER_CURVE_SPLINE, {
+            label: theme.getCurveSplineLabel(),
             formatter: eShapePointsFormatterCurve
         });
+        result.set(EShapePointsStyle.FORMATTER_CURVE_BEZIER_QUADRATIC, {
+            label: theme.getCurveBezierQuadraticLabel(),
+            formatter: eShapePointsFormatterCurveBezierQuadratic
+        });
         return result;
     };
     return EShapePointsFormatters;
@@ -55785,8 +55971,11 @@ var EThemeWhiteEnUsShapePointsFormatter = /** @class */ (function (_super) {
     function EThemeWhiteEnUsShapePointsFormatter() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    EThemeWhiteEnUsShapePointsFormatter.prototype.getCurveLabel = function () {
-        return "Curve";
+    EThemeWhiteEnUsShapePointsFormatter.prototype.getCurveSplineLabel = function () {
+        return "Spline Curve";
+    };
+    EThemeWhiteEnUsShapePointsFormatter.prototype.getCurveBezierQuadraticLabel = function () {
+        return "Quadratic Bezier Curve";
     };
     return EThemeWhiteEnUsShapePointsFormatter;
 }(EThemeWhiteShapePointsFormatter));
@@ -58725,8 +58914,11 @@ var EThemeWhiteJaJpShapePointsFormatter = /** @class */ (function (_super) {
     function EThemeWhiteJaJpShapePointsFormatter() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    EThemeWhiteJaJpShapePointsFormatter.prototype.getCurveLabel = function () {
-        return "曲線";
+    EThemeWhiteJaJpShapePointsFormatter.prototype.getCurveSplineLabel = function () {
+        return "スプライン曲線";
+    };
+    EThemeWhiteJaJpShapePointsFormatter.prototype.getCurveBezierQuadraticLabel = function () {
+        return "２次ベジェ曲線";
     };
     return EThemeWhiteJaJpShapePointsFormatter;
 }(EThemeWhiteShapePointsFormatter));
@@ -66297,8 +66489,11 @@ var EThemeDarkEnUsShapePointsFormatter = /** @class */ (function (_super) {
     function EThemeDarkEnUsShapePointsFormatter() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    EThemeDarkEnUsShapePointsFormatter.prototype.getCurveLabel = function () {
-        return "Curve";
+    EThemeDarkEnUsShapePointsFormatter.prototype.getCurveSplineLabel = function () {
+        return "Spline Curve";
+    };
+    EThemeDarkEnUsShapePointsFormatter.prototype.getCurveBezierQuadraticLabel = function () {
+        return "Quadratic Bezier Curve";
     };
     return EThemeDarkEnUsShapePointsFormatter;
 }(EThemeDarkShapePointsFormatter));
@@ -69234,8 +69429,11 @@ var EThemeDarkJaJpShapePointsFormatter = /** @class */ (function (_super) {
     function EThemeDarkJaJpShapePointsFormatter() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    EThemeDarkJaJpShapePointsFormatter.prototype.getCurveLabel = function () {
-        return "曲線";
+    EThemeDarkJaJpShapePointsFormatter.prototype.getCurveSplineLabel = function () {
+        return "スプライン曲線";
+    };
+    EThemeDarkJaJpShapePointsFormatter.prototype.getCurveBezierQuadraticLabel = function () {
+        return "２次ベジェ曲線";
     };
     return EThemeDarkJaJpShapePointsFormatter;
 }(EThemeDarkShapePointsFormatter));
@@ -76959,6 +77157,7 @@ var DScrollBar = /** @class */ (function (_super) {
                 }
                 if (!this.visible) {
                     this.visible = true;
+                    this.updateTransform();
                 }
             }
             else {
@@ -99993,6 +100192,7 @@ exports.deserializeSemicircle = deserializeSemicircle;
 exports.deserializeTriangle = deserializeTriangle;
 exports.deserializeTriangleRounded = deserializeTriangleRounded;
 exports.eShapePointsFormatterCurve = eShapePointsFormatterCurve;
+exports.eShapePointsFormatterCurveBezierQuadratic = eShapePointsFormatterCurveBezierQuadratic;
 exports.hitTestBBox = hitTestBBox;
 exports.hitTestCircle = hitTestCircle;
 exports.hitTestRectangle = hitTestRectangle;

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.409.0
+ Winter Cardinal UI v0.410.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1385,12 +1385,14 @@
     var DASHED = 128;
     var DASHED_DENSELY = 256;
     var DASHED_LOOSELY = 512;
-    var CURVE = 1024;
     var FORMATTER_SHIFT = 10;
     var FORMATTER_MASK = 0xffc00;
     var FORMATTER_EXTENSION_LOWEST = 512;
     var FORMATTER_EXTENSION_HIGHEST = 1023;
-    var FORMATTER_CURVE = 1;
+    var FORMATTER_CURVE_SPLINE = 1;
+    var FORMATTER_CURVE_BEZIER_QUADRATIC = 2;
+    var CURVE_SPLINE = FORMATTER_CURVE_SPLINE << FORMATTER_SHIFT;
+    var CURVE_BEZIER_QUADRATIC = FORMATTER_CURVE_BEZIER_QUADRATIC << FORMATTER_SHIFT;
     /**
      * EShape point style.
      *
@@ -1424,12 +1426,18 @@
         DASHED_LOOSELY: DASHED_LOOSELY,
         /** @deprecated in favor of EShapeStrokeStyle. */
         DASHED_MASK: DASHED | DASHED_DENSELY | DASHED_LOOSELY,
-        CURVE: CURVE,
+        /** @deprecated in favor of CURVE_SPLINE. */
+        CURVE: CURVE_SPLINE,
+        CURVE_SPLINE: CURVE_SPLINE,
+        CURVE_BEZIER_QUADRATIC: CURVE_BEZIER_QUADRATIC,
         FORMATTER_SHIFT: FORMATTER_SHIFT,
         FORMATTER_MASK: FORMATTER_MASK,
         FORMATTER_EXTENSION_LOWEST: FORMATTER_EXTENSION_LOWEST,
         FORMATTER_EXTENSION_HIGHEST: FORMATTER_EXTENSION_HIGHEST,
-        FORMATTER_CURVE: FORMATTER_CURVE
+        /** @deprecated in favor of FORMATTER_CURVE_SPLINE. */
+        FORMATTER_CURVE: FORMATTER_CURVE_SPLINE,
+        FORMATTER_CURVE_SPLINE: FORMATTER_CURVE_SPLINE,
+        FORMATTER_CURVE_BEZIER_QUADRATIC: FORMATTER_CURVE_BEZIER_QUADRATIC
     };
 
     /*
@@ -13941,12 +13949,20 @@
             if (this._renderable) {
                 var list = phase ? this._befores : this._afters;
                 for (var i = 0, imax = list.length; i < imax; ++i) {
-                    var snippet = list[i];
-                    snippet.updateTransform();
-                    snippet.render(renderer);
+                    list[i].render(renderer);
                 }
             }
         };
+        DBaseSnippetContainer.prototype.updateTransform = function () {
+            var befores = this._befores;
+            for (var i = 0, imax = befores.length; i < imax; ++i) {
+                befores[i].updateTransform();
+            }
+            var afters = this._afters;
+            for (var i = 0, imax = afters.length; i < imax; ++i) {
+                afters[i].updateTransform();
+            }
+        };
         return DBaseSnippetContainer;
     }());
 
@@ -15225,6 +15241,10 @@
                 snippet.render(renderer, false);
             }
         };
+        DBase.prototype.updateTransform = function () {
+            _super.prototype.updateTransform.call(this);
+            this._snippet.updateTransform();
+        };
         //
         DBase.prototype.getThemeDefault = function () {
             return DThemes.getInstance().get(this.getType());
@@ -19437,7 +19457,7 @@
         var a = source.angle;
         return pset(c[0], c[1], a1[0], a1[1], a2[0], a2[1], a[0], a[1], a[2], result);
     };
-    var acopy = function (source, result) {
+    var acopy$1 = function (source, result) {
         var sourceLength = source.length;
         for (var i = 0; i < sourceLength; ++i) {
             result[i] = source[i];
@@ -19502,8 +19522,8 @@
             var rvalues = result.values;
             var rsegments = result.segments;
             if (length <= 2) {
-                acopy(values, rvalues);
-                acopy(segments, rsegments);
+                acopy$1(values, rvalues);
+                acopy$1(segments, rsegments);
                 return result;
             }
             var c0 = this.WORK_P0 || pnew();
@@ -19782,6 +19802,168 @@
         return result;
     };
 
+    /*
+     * Copyright (C) 2019 Toshiba Corporation
+     * SPDX-License-Identifier: Apache-2.0
+     */
+    var acopy = function (source, result) {
+        var sourceLength = source.length;
+        for (var i = 0; i < sourceLength; ++i) {
+            result[i] = source[i];
+        }
+        if (result.length !== sourceLength) {
+            result.length = sourceLength;
+        }
+        return result;
+    };
+    var amix = function (x0, y0, x1, y1, t, result) {
+        var u = 1 - t;
+        result[0] = x0 * u + x1 * t;
+        result[1] = y0 * u + y1 * t;
+        return result;
+    };
+    var interpolate2 = function (x0, y0, x1, y1, x2, y2, is0, is1, nsegment, rvalues, rvaluesCount) {
+        var v3 = [0, 0];
+        var v4 = [0, 0];
+        var v5 = [0, 0];
+        for (var is = is0; is < is1; ++is) {
+            var t = is / nsegment;
+            amix(x0, y0, x1, y1, t, v3);
+            amix(x1, y1, x2, y2, t, v4);
+            amix(v3[0], v3[1], v4[0], v4[1], t, v5);
+            rvalues[++rvaluesCount] = v5[0];
+            rvalues[++rvaluesCount] = v5[1];
+        }
+        return rvaluesCount;
+    };
+    var interpolate1 = function (length, values, segments, isClosed, nsegment, result) {
+        var rvalues = result.values;
+        var rsegments = result.segments;
+        if (length <= 2) {
+            acopy(values, rvalues);
+            acopy(segments, rsegments);
+            return result;
+        }
+        var rvaluesCount = -1;
+        var rsegmentsCount = -1;
+        var ism = nsegment >> 1;
+        if (isClosed) {
+            var i = 0;
+            for (; i + 2 < length; i += 2) {
+                var j = i << 1;
+                var s0 = 0 <= toIndexOf(segments, i + 1);
+                var s1 = 0 <= toIndexOf(segments, i + 2);
+                if (s0 && s1) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else if (s0) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], ism, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+                else if (s1) {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, ism, nsegment, rvalues, rvaluesCount);
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+            }
+            if (i + 1 < length) {
+                var j = i << 1;
+                var s0 = 0 <= toIndexOf(segments, i + 1);
+                var s1 = 0 <= toIndexOf(segments, 0);
+                if (s0 && s1) {
+                    rvalues[++rvaluesCount] = values[0];
+                    rvalues[++rvaluesCount] = values[1];
+                    rsegments.unshift(0);
+                    rsegmentsCount += 1;
+                }
+                else if (s0) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], ism, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+                else if (s1) {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], 0, ism, nsegment, rvalues, rvaluesCount);
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], 0, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+            }
+            else if (i < length) {
+                var j = i << 1;
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                if (0 <= toIndexOf(segments, 0)) {
+                    rsegments.unshift(0);
+                    rsegmentsCount += 1;
+                }
+            }
+        }
+        else {
+            var i = 0;
+            for (; i + 2 < length; i += 2) {
+                var j = i << 1;
+                var s0 = 0 <= toIndexOf(segments, i + 1);
+                var s1 = 0 <= toIndexOf(segments, i + 2);
+                if (s0 && s1) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else if (s0) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], ism, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+                else if (s1) {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, ism, nsegment, rvalues, rvaluesCount);
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+            }
+            for (; i + 1 < length; ++i) {
+                var j = i << 1;
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                rvalues[++rvaluesCount] = values[j + 2];
+                rvalues[++rvaluesCount] = values[j + 3];
+                if (0 <= toIndexOf(segments, i + 1)) {
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+            }
+            for (; i < length; ++i) {
+                var j = i << 1;
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+            }
+        }
+        rvaluesCount += 1;
+        if (rvalues.length !== rvaluesCount) {
+            rvalues.length = rvaluesCount;
+        }
+        rsegmentsCount += 1;
+        if (rsegments.length !== rsegmentsCount) {
+            rsegments.length = rsegmentsCount;
+        }
+        return result;
+    };
+    var eShapePointsFormatterCurveBezierQuadratic = function (length, values, segments, style, result) {
+        interpolate1(length, values, segments, !!(style & EShapePointsStyle.CLOSED), EShapeDefaults.CURVE_SEGMENT_COUNT, result);
+        result.length = result.values.length >> 1;
+        result.style = style;
+        return result;
+    };
+
     /*
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
@@ -19815,10 +19997,14 @@
         EShapePointsFormatters.newData = function () {
             var result = new Map();
             var theme = DThemes.get("EShapePointsFormatter");
-            result.set(EShapePointsStyle.FORMATTER_CURVE, {
-                label: theme.getCurveLabel(),
+            result.set(EShapePointsStyle.FORMATTER_CURVE_SPLINE, {
+                label: theme.getCurveSplineLabel(),
                 formatter: eShapePointsFormatterCurve
             });
+            result.set(EShapePointsStyle.FORMATTER_CURVE_BEZIER_QUADRATIC, {
+                label: theme.getCurveBezierQuadraticLabel(),
+                formatter: eShapePointsFormatterCurveBezierQuadratic
+            });
             return result;
         };
         return EShapePointsFormatters;
@@ -55828,6 +56014,7 @@
                     }
                     if (!this.visible) {
                         this.visible = true;
+                        this.updateTransform();
                     }
                 }
                 else {
@@ -77864,6 +78051,7 @@
         EShapeEditor: EShapeEditor,
         EShapeLayerState: EShapeLayerState,
         toPointsBoundary: toPointsBoundary,
+        eShapePointsFormatterCurveBezierQuadratic: eShapePointsFormatterCurveBezierQuadratic,
         eShapePointsFormatterCurve: eShapePointsFormatterCurve,
         EShapePointsFormatters: EShapePointsFormatters,
         EShapePointsMarkerBase: EShapePointsMarkerBase,