jsxgraph 1.9.0 → 1.9.2

package/src/element/slider.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -254,7 +254,7 @@ JXG.createSlider = function (board, parents, attributes) {
     p3.Value = function () {
         var d = this._smax - this._smin,
             ev_sw = Type.evaluate(this.visProp.snapwidth);
-            // snapValues, i, v;
+        // snapValues, i, v;
 
         // snapValues = Type.evaluate(this.visProp.snapvalues);
         // if (Type.isArray(snapValues)) {
@@ -354,48 +354,48 @@ JXG.createSlider = function (board, parents, attributes) {
     if (withText) {
         // attr = Type.copyAttributes(attributes, board.options, 'slider', 'label');
         t = board.create('text', [
-                function () {
-                    return (p2.X() - p1.X()) * 0.05 + p2.X();
-                },
-                function () {
-                    return (p2.Y() - p1.Y()) * 0.05 + p2.Y();
-                },
-                function () {
-                    var n,
-                        d = Type.evaluate(p3.visProp.digits),
-                        sl = Type.evaluate(p3.visProp.suffixlabel),
-                        ul = Type.evaluate(p3.visProp.unitlabel),
-                        pl = Type.evaluate(p3.visProp.postlabel);
-
-                    if (d === 2 && Type.evaluate(p3.visProp.precision) !== 2) {
-                        // Backwards compatibility
-                        d = Type.evaluate(p3.visProp.precision);
-                    }
-
-                    if (sl !== null) {
-                        n = sl;
-                    } else if (p3.name && p3.name !== "") {
-                        n = p3.name + " = ";
-                    } else {
-                        n = "";
-                    }
+            function () {
+                return (p2.X() - p1.X()) * 0.05 + p2.X();
+            },
+            function () {
+                return (p2.Y() - p1.Y()) * 0.05 + p2.Y();
+            },
+            function () {
+                var n,
+                    d = Type.evaluate(p3.visProp.digits),
+                    sl = Type.evaluate(p3.visProp.suffixlabel),
+                    ul = Type.evaluate(p3.visProp.unitlabel),
+                    pl = Type.evaluate(p3.visProp.postlabel);
+
+                if (d === 2 && Type.evaluate(p3.visProp.precision) !== 2) {
+                    // Backwards compatibility
+                    d = Type.evaluate(p3.visProp.precision);
+                }
 
-                    if (p3.useLocale()) {
-                        n += p3.formatNumberLocale(p3.Value(), d);
-                    } else {
-                        n += Type.toFixed(p3.Value(), d);
-                    }
+                if (sl !== null) {
+                    n = sl;
+                } else if (p3.name && p3.name !== "") {
+                    n = p3.name + " = ";
+                } else {
+                    n = "";
+                }
 
-                    if (ul !== null) {
-                        n += ul;
-                    }
-                    if (pl !== null) {
-                        n += pl;
-                    }
+                if (p3.useLocale()) {
+                    n += p3.formatNumberLocale(p3.Value(), d);
+                } else {
+                    n += Type.toFixed(p3.Value(), d);
+                }
 
-                    return n;
+                if (ul !== null) {
+                    n += ul;
                 }
-            ],
+                if (pl !== null) {
+                    n += pl;
+                }
+
+                return n;
+            }
+        ],
             attr.label
         );
 
@@ -527,6 +527,9 @@ JXG.createSlider = function (board, parents, attributes) {
         highLine: l2
     };
     p3.inherits.push(p1, p2, l1, l2);
+    // Remove inherits to avoid circular inherits.
+    l1.inherits = [];
+    l2.inherits = [];
 
     if (withTicks) {
         ti.dump = false;

package/src/element/slopetriangle.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/element/smartlabel.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Carsten Miller,
         Alfred Wassermann

package/src/element/vectorfield.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Carsten Miller,
         Alfred Wassermann

package/src/index.d.ts

@@ -9,7 +9,7 @@
 // Definitions by: David Holmes https://github.com/geometryzen
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
-// Copyright 2015-2023 David Holmes, https://github.com/geometryzen
+// Copyright 2015-2024 David Holmes, https://github.com/geometryzen
 //
 
 /**

package/src/jsxgraph.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -42,7 +42,7 @@
 import JXG from "./jxg.js";
 import Env from "./utils/env.js";
 import Type from "./utils/type.js";
-import Mat from "./math/math.js";
+// import Mat from "./math/math.js";
 import Board from "./base/board.js";
 import FileReader from "./reader/file.js";
 import Options from "./options.js";
@@ -350,8 +350,10 @@ JXG.JSXGraph = {
             // Size of HTML div.
             // If zero, the size is set to a small value to avoid
             // division by zero.
-            w = Math.max(parseInt(dimensions.width, 10), Mat.eps);
-            h = Math.max(parseInt(dimensions.height, 10), Mat.eps);
+            // w = Math.max(parseInt(dimensions.width, 10), Mat.eps);
+            // h = Math.max(parseInt(dimensions.height, 10), Mat.eps);
+            w = parseInt(dimensions.width, 10);
+            h = parseInt(dimensions.height, 10);
 
             if (Type.exists(bbox) && attr.keepaspectratio) {
                 /*

package/src/jxg.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/math/bqdt.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/math/clip.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/math/complex.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/math/extrapolate.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/math/geometry.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -1569,7 +1569,7 @@ JXG.extend(
             return func;
         },
 
-        otherIntersectionFunction: function(input, others, alwaysintersect, precision) {
+        otherIntersectionFunction: function (input, others, alwaysintersect, precision) {
             var func, board,
                 el1, el2,
                 that = this;
@@ -1577,22 +1577,22 @@ JXG.extend(
             el1 = input[0];
             el2 = input[1];
             board = el1.board;
-            func = function() {
+            func = function () {
                 var i, k, c, d,
                     isClose,
                     le = others.length,
                     eps = Type.evaluate(precision);
 
                 for (i = le; i >= 0; i--) {
-                    if (el1.elementClass ===  Const.OBJECT_CLASS_CIRCLE &&
+                    if (el1.elementClass === Const.OBJECT_CLASS_CIRCLE &&
                         [Const.OBJECT_CLASS_CIRCLE, Const.OBJECT_CLASS_LINE].indexOf(el2.elementClass) >= 0) {
                         // circle, circle|line
                         c = that.meet(el1.stdform, el2.stdform, i, board);
-                    } else if (el1.elementClass ===  Const.OBJECT_CLASS_CURVE &&
+                    } else if (el1.elementClass === Const.OBJECT_CLASS_CURVE &&
                         [Const.OBJECT_CLASS_CURVE, Const.OBJECT_CLASS_CIRCLE].indexOf(el2.elementClass) >= 0) {
                         // curve, circle|curve
                         c = that.meetCurveCurve(el1, el2, i, 0, board, 'segment');
-                    } else if (el1.elementClass ===  Const.OBJECT_CLASS_CURVE && el2.elementClass === Const.OBJECT_CLASS_LINE) {
+                    } else if (el1.elementClass === Const.OBJECT_CLASS_CURVE && el2.elementClass === Const.OBJECT_CLASS_LINE) {
                         // curve, line
                         if (Type.exists(el1.dataX)) {
                             c = JXG.Math.Geometry.meetCurveLine(el1, el2, i, el1.board, Type.evaluate(alwaysintersect));
@@ -1608,7 +1608,7 @@ JXG.extend(
                         d = c.distance(JXG.COORDS_BY_USER, others[k].coords);
                         if (d < eps) {
                             isClose = true;
-                       }
+                        }
                     }
                     if (!isClose) {
                         // We are done, the intersection is away from any other
@@ -2375,7 +2375,7 @@ JXG.extend(
         meetPlaneSphere: function (el1, el2) {
             var dis = function () {
                 return (
-                      el1.normal[0] * el2.center.X()
+                    el1.normal[0] * el2.center.X()
                     + el1.normal[1] * el2.center.Y()
                     + el1.normal[2] * el2.center.Z()
                     - el1.d
@@ -2385,13 +2385,13 @@ JXG.extend(
                 [
                     // Center
                     function () {
-                        return el2.center.X() - dis()*el1.normal[0];
+                        return el2.center.X() - dis() * el1.normal[0];
                     },
                     function () {
-                        return el2.center.Y() - dis()*el1.normal[1];
+                        return el2.center.Y() - dis() * el1.normal[1];
                     },
                     function () {
-                        return el2.center.Z() - dis()*el1.normal[2];
+                        return el2.center.Z() - dis() * el1.normal[2];
                     }
                 ],
                 [
@@ -2402,34 +2402,34 @@ JXG.extend(
                 ],
                 function () {
                     // Radius (returns NaN if spheres don't touch)
-                    let r = el2.Radius(),
+                    var r = el2.Radius(),
                         s = dis();
-                    return Math.sqrt(r*r - s*s);
+                    return Math.sqrt(r * r - s * s);
                 }
             ];
         },
 
         meetSphereSphere: function (el1, el2) {
             var skew = function () {
-                let dist = el1.center.distance(el2.center),
+                var dist = el1.center.distance(el2.center),
                     r1 = el1.Radius(),
                     r2 = el2.Radius();
-                return (r1 - r2)*(r1 + r2) / (dist*dist);
+                return (r1 - r2) * (r1 + r2) / (dist * dist);
             };
             return [
                 [
                     // Center
                     function () {
-                        let s = skew();
-                        return 0.5*((1-s)*el1.center.X() + (1+s)*el2.center.X());
+                        var s = skew();
+                        return 0.5 * ((1 - s) * el1.center.X() + (1 + s) * el2.center.X());
                     },
                     function () {
-                        let s = skew();
-                        return 0.5*((1-s)*el1.center.Y() + (1+s)*el2.center.Y());
+                        var s = skew();
+                        return 0.5 * ((1 - s) * el1.center.Y() + (1 + s) * el2.center.Y());
                     },
                     function () {
-                        let s = skew();
-                        return 0.5*((1-s)*el1.center.Z() + (1+s)*el2.center.Z());
+                        var s = skew();
+                        return 0.5 * ((1 - s) * el1.center.Z() + (1 + s) * el2.center.Z());
                     }
                 ],
                 [
@@ -2440,11 +2440,11 @@ JXG.extend(
                 ],
                 function () {
                     // Radius (returns NaN if spheres don't touch)
-                    let dist = el1.center.distance(el2.center),
+                    var dist = el1.center.distance(el2.center),
                         r1 = el1.Radius(),
                         r2 = el2.Radius(),
                         s = skew(),
-                        rIxnSq = 0.5*(r1*r1 + r2*r2 - 0.5*dist*dist*(1 + s*s));
+                        rIxnSq = 0.5 * (r1 * r1 + r2 * r2 - 0.5 * dist * dist * (1 + s * s));
                     return Math.sqrt(rIxnSq);
                 }
             ];
@@ -2854,28 +2854,19 @@ JXG.extend(
          * @param {Number} sgn Wither 1 or -1. Needed for minor and major arcs. In case of doubt, use 1.
          */
         bezierArc: function (A, B, C, withLegs, sgn) {
-            var p1,
-                p2,
-                p3,
-                p4,
+            var p1, p2, p3, p4,
                 r,
-                phi,
-                beta,
-                PI2 = Math.PI * 0.5,
+                phi, beta, delta,
+                // PI2 = Math.PI * 0.5,
                 x = B[1],
                 y = B[2],
                 z = B[0],
                 dataX = [],
                 dataY = [],
-                co,
-                si,
-                ax,
-                ay,
-                bx,
-                by,
-                k,
-                v,
-                d,
+                co, si,
+                ax, ay,
+                bx, by,
+                k, v, d,
                 matrix;
 
             r = this.distance(B, A);
@@ -2889,6 +2880,12 @@ JXG.extend(
                 phi = 2 * Math.PI - phi;
             }
 
+            // Always divide the arc into four Bezier arcs.
+            // Otherwise, the position of gliders on this arc
+            // will be wrong.
+            delta = phi / 4;
+
+
             p1 = A;
             p1[1] /= p1[0];
             p1[2] /= p1[0];
@@ -2905,9 +2902,16 @@ JXG.extend(
             }
 
             while (phi > Mat.eps) {
-                if (phi > PI2) {
-                    beta = PI2;
-                    phi -= PI2;
+                // if (phi > PI2) {
+                //     beta = PI2;
+                //     phi -= PI2;
+                // } else {
+                //     beta = phi;
+                //     phi = 0;
+                // }
+                if (phi > delta) {
+                    beta = delta;
+                    phi -= delta;
                 } else {
                     beta = phi;
                     phi = 0;
@@ -3112,8 +3116,13 @@ JXG.extend(
 
             var x = point.X(),
                 y = point.Y(),
-                t = point.position || 0.0,
-                result = this.projectCoordsToCurve(x, y, t, curve, board);
+                t = point.position,
+                result;
+
+            if (!Type.exists(t)) {
+                t = Type.evaluate(curve.visProp.curvetype) === 'functiongraph' ? x : 0.0;
+            }
+            result = this.projectCoordsToCurve(x, y, t, curve, board);
 
             // point.position = result[1];
 
@@ -3202,6 +3211,21 @@ JXG.extend(
                 newCoordsObj = new Coords(Const.COORDS_BY_USER, newCoords, board);
             } else {
                 // 'parameter', 'polar', 'functiongraph'
+
+                if (Type.evaluate(curve.visProp.curvetype) === 'functiongraph') {
+                    let dy = Math.abs(y - curve.Y(x));
+                    if (!isNaN(dy)) {
+                        minX = x - dy;
+                        maxX = x + dy;
+                    } else {
+                        minX = curve.minX();
+                        maxX = curve.maxX();
+                    }
+                } else {
+                    minX = curve.minX();
+                    maxX = curve.maxX();
+                }
+
                 /** @ignore */
                 minfunc = function (t) {
                     var dx, dy;
@@ -3215,8 +3239,6 @@ JXG.extend(
 
                 f_old = minfunc(t);
                 steps = 50;
-                minX = curve.minX();
-                maxX = curve.maxX();
 
                 delta = (maxX - minX) / steps;
                 t_new = minX;
@@ -3454,9 +3476,9 @@ JXG.extend(
 
             // adapt simplex size to parameter range
             if (dim === 1) {
-                rhobeg = 0.1*(target.range[1] - target.range[0]);
+                rhobeg = 0.1 * (target.range[1] - target.range[0]);
             } else if (dim === 2) {
-                rhobeg = 0.1*Math.min(
+                rhobeg = 0.1 * Math.min(
                     target.range_u[1] - target.range_u[0],
                     target.range_v[1] - target.range_v[0]
                 );
@@ -3473,17 +3495,17 @@ JXG.extend(
                     zDiff = p[2] - target.Z.apply(null, w);
 
                 if (n === 1) {
-                    con[0] =  w[0] - target.range[0];
+                    con[0] = w[0] - target.range[0];
                     con[1] = -w[0] + target.range[1];
                 } else if (n === 2) {
-                    con[0] =  w[0] - target.range_u[0];
+                    con[0] = w[0] - target.range_u[0];
                     con[1] = -w[0] + target.range_u[1];
-                    con[2] =  w[1] - target.range_v[0];
+                    con[2] = w[1] - target.range_v[0];
                     con[3] = -w[1] + target.range_v[1];
                 }
-                return xDiff*xDiff + yDiff*yDiff + zDiff*zDiff;
+                return xDiff * xDiff + yDiff * yDiff + zDiff * zDiff;
             };
-            Mat.Nlp.FindMinimum(_minFunc, dim, 2*dim, params, rhobeg, rhoend, iprint, maxfun);
+            Mat.Nlp.FindMinimum(_minFunc, dim, 2 * dim, params, rhobeg, rhoend, iprint, maxfun);
 
             // return [1, target.X(...params), target.Y(...params), target.Z(...params)];
             return [1, target.X.apply(null, params), target.Y.apply(null, params), target.Z.apply(null, params)];
@@ -3511,9 +3533,9 @@ JXG.extend(
 
             // adapt simplex size to parameter range
             if (dim === 1) {
-                rhobeg = 0.1*(target.range[1] - target.range[0]);
+                rhobeg = 0.1 * (target.range[1] - target.range[0]);
             } else if (dim === 2) {
-                rhobeg = 0.1*Math.min(
+                rhobeg = 0.1 * Math.min(
                     target.range_u[1] - target.range_u[0],
                     target.range_v[1] - target.range_v[0]
                 );
@@ -3529,27 +3551,27 @@ JXG.extend(
                 //         target.Z(...w)
                 //     ],
                 var c3d = [
-                        1,
-                        target.X.apply(null, w),
-                        target.Y.apply(null, w),
-                        target.Z.apply(null, w)
-                    ],
+                    1,
+                    target.X.apply(null, w),
+                    target.Y.apply(null, w),
+                    target.Z.apply(null, w)
+                ],
                     c2d = target.view.project3DTo2D(c3d),
                     xDiff = pScr[0] - c2d[1],
                     yDiff = pScr[1] - c2d[2];
 
                 if (n === 1) {
-                    con[0] =  w[0] - target.range[0];
+                    con[0] = w[0] - target.range[0];
                     con[1] = -w[0] + target.range[1];
                 } else if (n === 2) {
-                    con[0] =  w[0] - target.range_u[0];
+                    con[0] = w[0] - target.range_u[0];
                     con[1] = -w[0] + target.range_u[1];
-                    con[2] =  w[1] - target.range_v[0];
+                    con[2] = w[1] - target.range_v[0];
                     con[3] = -w[1] + target.range_v[1];
                 }
-                return xDiff*xDiff + yDiff*yDiff;
+                return xDiff * xDiff + yDiff * yDiff;
             };
-            Mat.Nlp.FindMinimum(_minFunc, dim, 2*dim, params, rhobeg, rhoend, iprint, maxfun);
+            Mat.Nlp.FindMinimum(_minFunc, dim, 2 * dim, params, rhobeg, rhoend, iprint, maxfun);
 
             // return [1, target.X(...params), target.Y(...params), target.Z(...params)];
             return [1, target.X.apply(null, params), target.Y.apply(null, params), target.Z.apply(null, params)];

package/src/math/ia.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -35,25 +35,25 @@ import Mat from "./math.js";
 import Type from "../utils/type.js";
 
 JXG.Math.DoubleBits = function () {
-    var hasTypedArrays = false,
-        DOUBLE_VIEW = new Float64Array(1),
+    var DOUBLE_VIEW = new Float64Array(1),
         UINT_VIEW = new Uint32Array(DOUBLE_VIEW.buffer),
         doubleBitsLE,
         toDoubleLE,
         lowUintLE,
         highUintLE,
+        // doubleBits,
+        // toDouble,
+        // lowUint,
+        // highUint,
+        // hasTypedArrays = false,
         doubleBitsBE,
         toDoubleBE,
         lowUintBE,
-        highUintBE,
-        doubleBits,
-        toDouble,
-        lowUint,
-        highUint;
+        highUintBE;
 
     if (Float64Array !== undefined) {
         DOUBLE_VIEW[0] = 1.0;
-        hasTypedArrays = true;
+        // hasTypedArrays = true;
         if (UINT_VIEW[1] === 0x3ff00000) {
             // Use little endian
             doubleBitsLE = function (n) {
@@ -81,7 +81,7 @@ JXG.Math.DoubleBits = function () {
             this.lo = lowUintLE;
             this.hi = highUintLE;
         } else if (UINT_VIEW[0] === 0x3ff00000) {
-            //Use big endian
+            // Use big endian
             doubleBitsBE = function (n) {
                 DOUBLE_VIEW[0] = n;
                 return [UINT_VIEW[1], UINT_VIEW[0]];
@@ -107,8 +107,8 @@ JXG.Math.DoubleBits = function () {
             this.pack = toDoubleBE;
             this.lo = lowUintBE;
             this.hi = highUintBE;
-        } else {
-            hasTypedArrays = false;
+        // } else {
+        //     hasTypedArrays = false;
         }
     }
 

package/src/math/implicitplot.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Carsten Miller,
         Alfred Wassermann