jsxgraph 1.9.0 → 1.9.2

package/src/math/math.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -109,6 +109,48 @@ JXG.Math = {
         return a - Math.floor(a / m) * m;
     },
 
+    /**
+     * Translate <code>x</code> into the interval <code>[a, b)</code> by adding
+     * a multiple of <code>b - a</code>.
+     * @param {Number} x
+     * @param {Number} a
+     * @param {Number} b
+     */
+    wrap: function (x, a, b) {
+        return a + this.mod(x - a, b - a);
+    },
+
+    /**
+     * Clamp <code>x</code> within the interval <code>[a, b]</code>. If
+     * <code>x</code> is below <code>a</code>, increase it to <code>a</code>. If
+     * it's above <code>b</code>, decrease it to <code>b</code>.
+     */
+    clamp: function (x, a, b) {
+        return Math.min(Math.max(x, a), b);
+    },
+
+    /**
+     * A way of clamping a periodic variable. If <code>x</code> is congruent mod
+     * <code>period</code> to a point in <code>[a, b]</code>, return that point.
+     * Otherwise, wrap it into <code>[mid - period/2, mid + period/2]</code>,
+     * where <code>mid</code> is the mean of <code>a</code> and <code>b</code>,
+     * and then clamp it to <code>[a, b]</code> from there.
+     */
+    wrapAndClamp: function (x, a, b, period) {
+        var mid = 0.5 * (a + b),
+            half_period = 0.5 * period;
+
+        return this.clamp(
+            this.wrap(
+                x,
+                mid - half_period,
+                mid + half_period
+            ),
+            a,
+            b
+        );
+    },
+
     /**
      * Initializes a vector of size <tt>n</tt> wih coefficients set to the init value (default 0)
      * @param {Number} n Length of the vector
@@ -882,7 +924,7 @@ JXG.Math = {
 
         minOr0 = min || 0;
 
-        if ( JXG.exists(step)) {
+        if (JXG.exists(step)) {
             tmp = (n - minOr0) / step;
             if (Number.isInteger(tmp)) {
                 return n;
@@ -968,7 +1010,7 @@ JXG.Math = {
      * @param {Number} a Variable number of arguments.
      * @returns Number
      */
-    hypot: function() {
+    hypot: function () {
         var i, le, a, sum;
 
         le = arguments.length;
@@ -985,7 +1027,7 @@ JXG.Math = {
      * @param {Number} x
      * @returns Number
      */
-    hstep: function(x) {
+    hstep: function (x) {
         return (x > 0.0) ? 1 :
             ((x < 0.0) ? 0.0 : 0.5);
     },
@@ -997,7 +1039,7 @@ JXG.Math = {
      * @param {Number} z
      * @returns Number
      */
-    gamma: function(z) {
+    gamma: function (z) {
         var x, y, t, i, le,
             g = 7,
             // n = 9,
@@ -1164,7 +1206,7 @@ JXG.Math = {
      * JXG.Math.decToFraction(-10.66666666666667);
      * // Result: [-1, 10, 2, 3 ]
     */
-    decToFraction: function(x, order) {
+    decToFraction: function (x, order) {
         var lead, sign, a,
             n, n1, n2,
             d, d1, d2,

package/src/math/metapost.js

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

package/src/math/nlp.js

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

package/src/math/numerics.js

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

package/src/math/plot.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -2028,7 +2028,9 @@ Mat.Plot = {
     },
 
     getInterval: function (curve, ta, tb) {
-        var t_int, x_int, y_int;
+        var t_int,
+            // x_int,
+            y_int;
 
         //console.log('critical point', ta, tb);
         IntervalArithmetic.disable();
@@ -2036,7 +2038,7 @@ Mat.Plot = {
         t_int = IntervalArithmetic.Interval(ta, tb);
         curve.board.mathLib = IntervalArithmetic;
         curve.board.mathLibJXG = IntervalArithmetic;
-        x_int = curve.X(t_int, true);
+        // x_int = curve.X(t_int, true);
         y_int = curve.Y(t_int, true);
         curve.board.mathLib = Math;
         curve.board.mathLibJXG = JXG.Math;
@@ -2221,16 +2223,16 @@ Mat.Plot = {
             i1,
             i2,
             x,
-            y,
+            // y,
             lo,
             hi,
             d_lft,
             d_rgt,
             d_thresh = 100,
+            // d1,
+            // d2,
             di1 = 5,
-            di2 = 3,
-            d1,
-            d2;
+            di2 = 3;
 
         t = group.t;
         console.log("HandleSingularity at t =", t);
@@ -2366,7 +2368,7 @@ Mat.Plot = {
 
     plot_v4: function (curve, ta, tb, steps) {
         var i,
-            j,
+            // j,
             le,
             components,
             idx,
@@ -2375,17 +2377,14 @@ Mat.Plot = {
             g,
             start,
             ret,
-            x_table,
-            y_table,
-            t,
-            t1,
-            t2,
-            good,
-            bad,
-            x_int,
+            x_table, y_table,
+            t, t1, t2,
+            // good,
+            // bad,
+            // x_int,
             y_int,
-            degree_x,
-            degree_y,
+            // degree_x,
+            // degree_y,
             h = (tb - ta) / steps,
             Ypl = function (x) {
                 return curve.Y(x, true);
@@ -2402,9 +2401,9 @@ Mat.Plot = {
             groups = ret[0];
             x_table = ret[1];
             y_table = ret[2];
-            degree_x = ret[3];
-            degree_y = ret[4];
 
+            // degree_x = ret[3];
+            // degree_y = ret[4];
             // if (degree_x >= 0) {
             //     console.log("x polynomial of degree", degree_x);
             // }
@@ -2439,8 +2438,8 @@ Mat.Plot = {
                     le = groups[g].idx - 1;
                 }
 
-                good = 0;
-                bad = 0;
+                // good = 0;
+                // bad = 0;
                 // Insert all uncritical points until next critical point
                 for (i = start; i < le - 2; i++) {
                     this._insertPoint_v4(
@@ -2448,7 +2447,7 @@ Mat.Plot = {
                         [1, comp.x_values[i], comp.y_values[i]],
                         comp.t_values[i]
                     );
-                    j = Math.max(0, i - 2);
+                    // j = Math.max(0, i - 2);
                     // Add more points in critical intervals
                     if (
                         //degree_y === -1 && // No polynomial
@@ -2497,9 +2496,9 @@ Mat.Plot = {
                                 );
                             }
                         }
-                        bad++;
-                    } else {
-                        good++;
+                        // bad++;
+                    // } else {
+                        // good++;
                     }
                 }
                 // console.log("GOOD", good, "BAD", bad);

package/src/math/poly.js

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

package/src/math/probfuncs.js

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

package/src/math/qdt.js

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

package/src/math/statistics.js

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

package/src/math/symbolic.js

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

package/src/options.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -2054,6 +2054,50 @@ JXG.Options = {
          */
         needsRegularUpdate: true,
 
+        /**
+         * If some size of an element is controlled by a function, like the circle radius
+         * or segments of fixed length, this attribute controls what happens if the value
+         * is negative. By default, the absolute value is taken. If true, the maximum
+         * of 0 and the value is used.
+         *
+         * @type Boolean
+         * @default false
+         * @name JXG.GeometryElement#nonnegativeOnly
+         * @example
+         * var slider = board.create('slider', [[4, -3], [4, 3], [-4, 1, 4]], { name: 'a'});
+         * var circle = board.create('circle', [[-1, 0], 1], {
+         *     nonnegativeOnly: true
+         * });
+         * circle.setRadius('a');         // Use JessieCode
+         * var seg = board.create('segment', [[-4, 3], [0, 3], () => slider.Value()], {
+         *     point1: {visible: true},
+         *     point2: {visible: true},
+         *     nonnegativeOnly: true
+         * });
+         *
+         * </pre><div id="JXG9cb76224-1f78-4488-b20f-800788768bc9" class="jxgbox" style="width: 300px; height: 300px;"></div>
+         * <script type="text/javascript">
+         *     (function() {
+         *         var board = JXG.JSXGraph.initBoard('JXG9cb76224-1f78-4488-b20f-800788768bc9',
+         *             {boundingbox: [-8, 8, 8,-8], axis: true, showcopyright: false, shownavigation: false});
+         *     var slider = board.create('slider', [[4, -3], [4, 3], [-4, 1, 4]], { name: 'a'});
+         *     var circle = board.create('circle', [[-1, 0], 1], {
+         *         nonnegativeOnly: true
+         *     });
+         *     circle.setRadius('a');         // Use JessieCode
+         *     var seg = board.create('segment', [[-4, 3], [0, 3], () => slider.Value()], {
+         *         point1: {visible: true},
+         *         point2: {visible: true},
+         *         nonnegativeOnly: true
+         *     });
+         *
+         *     })();
+         *
+         * </script><pre>
+         *
+         */
+        nonnegativeOnly: false,
+
         /**
          * Precision options for JSXGraph elements.
          * This attributes takes either the value 'inherit' or an object of the form:
@@ -4410,6 +4454,7 @@ JXG.Options = {
         label: {
             position: 'urt'
         }
+
         /**#@-*/
     },
 
@@ -9478,9 +9523,9 @@ JXG.Options = {
             validatePositiveInteger = function (v) {
                 return validateInteger(v) && v > 0;
             },
-            validateScreenCoords = function (v) {
-                return v.length >= 2 && validateInteger(v[0]) && validateInteger(v[1]);
-            },
+            // validateScreenCoords = function (v) {
+            //     return v.length >= 2 && validateInteger(v[0]) && validateInteger(v[1]);
+            // },
             validateRenderer = function (v) {
                 return (v === 'vml' || v === 'svg' || v === 'canvas' || v === 'no');
             },

package/src/options3d.js

@@ -31,7 +31,7 @@ JXG.extend(Options, {
          * @type Line3D
          * @name View3D#xAxis
          */
-        xAxis: { visible: true, point2: { name: "x" } },
+        xAxis: { visible: true, point2: { name: "x" }, strokeColor: JXG.palette.red },
 
         /**
          * Attributes of the 3D y-axis.
@@ -39,7 +39,7 @@ JXG.extend(Options, {
          * @type Line3D
          * @name View3D#yAxis
          */
-        yAxis: { visible: true, point2: { name: "y" } },
+        yAxis: { visible: true, point2: { name: "y" }, strokeColor: JXG.palette.green },
 
         /**
          * Attributes of the 3D z-axis.
@@ -47,7 +47,7 @@ JXG.extend(Options, {
          * @type Line3D
          * @name View3D#zAxis
          */
-        zAxis: { visible: true, point2: { name: "z" } },
+        zAxis: { visible: true, point2: { name: "z" }, strokeColor: JXG.palette.blue },
 
         // Planes
         /**
@@ -492,7 +492,7 @@ JXG.extend(Options, {
             },
             continuous: true,
             slider: {
-                visible: true,
+                visible: 'inherit',
                 style: 6,
                 point1: { frozen: true },
                 point2: { frozen: true },
@@ -560,7 +560,7 @@ JXG.extend(Options, {
             },
             continuous: true,
             slider: {
-                visible: true,
+                visible: 'inherit',
                 style: 6,
                 point1: { frozen: true },
                 point2: { frozen: true },
@@ -570,6 +570,74 @@ JXG.extend(Options, {
             }
         },
 
+        /**
+         * Specify the user handling of the bank angle.
+         * <ul>
+         *  <li><tt>pointer</tt> sub-attributes:
+         *      <ul>
+         *          <li><tt>enabled</tt>: Boolean that specifies whether pointer navigation is allowed by elevation.
+         *          <li><tt>speed</tt>: Number indicating how many passes the range of the el_slider makes when the cursor crosses the entire board once in the horizontal direction.
+         *          <li><tt>outside</tt>: Boolean that specifies whether the pointer navigation is continued when the cursor leaves the board.
+         *          <li><tt>button</tt>: Which button of the pointer should be used? (<tt>'-1'</tt> (=no button), <tt>'0'</tt> or <tt>'2'</tt>)
+         *          <li><tt>key</tt>: Should an additional key be pressed? (<tt>'none'</tt>, <tt>'shift'</tt> or <tt>'ctrl'</tt>)
+         *      </ul>
+         *  <li><tt>keyboard</tt> sub-attributes:
+         *      <ul>
+         *          <li><tt>enabled</tt>: Boolean that specifies whether the keyboard (arrow keys) can be used to navigate the board.
+         *          <li><tt>step</tt>: Size of the step per keystroke.
+         *          <li><tt>key</tt>: Should an additional key be pressed? (<tt>'none'</tt>, <tt>'shift'</tt> or <tt>'ctrl'</tt>)
+         *      </ul>
+         *  <li><tt>continuous</tt>: Boolean that specifies whether the el_slider starts again from the beginning when its end is reached.
+         *  <li><tt>slider</tt> attributes of the el_slider ({@link Slider}) with additional
+         *      <ul>
+         *          <li><tt>min</tt>: Minimum value.
+         *          <li><tt>max</tt>: Maximum value.
+         *          <li><tt>start</tt>: Start value.
+         *      </ul>
+         * </ul>
+         *
+         * @name View3D#bank
+         * @type Object
+         * @default <pre>{
+         *      pointer: {enabled: true, speed: 1, outside: true, button: -1, key: 'none'},
+         *      keyboard: {enabled: true, step: 10, key: 'ctrl'},
+         *      continuous: true,
+         *      slider: {
+         *          visible: true,
+         *          style: 6,
+         *          point1: {frozen: true},
+         *          point2: {frozen: true},
+         *          min: 0,
+         *          max: 2 * Math.PI,
+         *          start: 0.3
+         *      },
+         * }<pre>
+         */
+        bank: {
+            pointer: {
+                enabled: true,
+                speed: 0.08,
+                outside: true,
+                button: -1,
+                key: 'none'
+            },
+            keyboard: {
+                enabled: true,
+                step: 10,
+                key: 'ctrl'
+            },
+            continuous: true,
+            slider: {
+                visible: 'inherit',
+                style: 6,
+                point1: { frozen: true },
+                point2: { frozen: true },
+                min: -Math.PI,
+                max:  Math.PI,
+                start: 0.0
+            }
+        },
+
         trackball: {
             enabled: false,
             outside: true,
@@ -594,6 +662,15 @@ JXG.extend(Options, {
          */
         fov: 1 / 5 * 2 * Math.PI,
 
+        /**
+         * When this option is enabled, points closer to the screen are drawn
+         * over points further from the screen within each layer.
+         *
+         * @name View3D#depthOrderPoints
+         * @default false
+         */
+        depthOrderPoints: false,
+
         /**
          * Fixed values for the view, which can be changed using keyboard keys `picture-up` and `picture-down`.
          * Array of the form: [[el0, az0, r0], [el1, az1, r1, ...[eln, azn, rn]]

package/src/parser/datasource.js

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

package/src/parser/geonext.js

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

package/src/parser/jessiecode.js

@@ -1,7 +1,7 @@
 /*
  JessieCode Interpreter and Compiler
 
-    Copyright 2011-2023
+    Copyright 2011-2024
         Michael Gerhaeuser,
         Alfred Wassermann
 
@@ -36,15 +36,15 @@
  * JSXGraph to display interactive math graphics.
  */
 
-import JXG from "../jxg";
-import Const from "../base/constants";
-import Text from "../base/text";
-import Mat from "../math/math";
-import Interval from "../math/ia";
-import Geometry from "../math/geometry";
-import Statistics from "../math/statistics";
-import Type from "../utils/type";
-import Env from "../utils/env";
+import JXG from "../jxg.js";
+import Const from "../base/constants.js";
+import Text from "../base/text.js";
+import Mat from "../math/math.js";
+import Interval from "../math/ia.js";
+import Geometry from "../math/geometry.js";
+import Statistics from "../math/statistics.js";
+import Type from "../utils/type.js";
+import Env from "../utils/env.js";
 
 // IE 6-8 compatibility
 if (!Object.create) {
@@ -1110,7 +1110,8 @@ JXG.extend(JXG.JessieCode.prototype, /** @lends JXG.JessieCode.prototype */ {
 
         // The $()-function-calls are special because their parameter is given as a string, not as a node_var.
         if (node.type === 'node_op' && node.value === 'op_execfun' &&
-            node.children.length > 1 && node.children[0].value === '$' &&
+            node.children.length > 1 &&
+            (node.children[0].value === '$' || node.children[0].value === '$value') &&
             node.children[1].length > 0) {
 
             e = node.children[1][0].value;

package/src/parser/jessiescript.js

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

package/src/parser/prefix.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2023
+    Copyright 2008-2024
         Matthias Ehmann,
         Carsten Miller,
         Alfred Wassermann
@@ -156,12 +156,19 @@ JXG.PrefixParser = {
                     throw new Error("PrefixParser.parse: " + fun + " is not allowed");
                 }
             } else {
-                // Allow shortcut 'V' for 'Value'
                 fun = term[0];
+
+                // Allow shortcut 'V' for 'Value'
                 if (fun === 'V') {
                     fun = 'Value';
                 }
 
+                // get coords always with z
+                // (its visibility is controlled by the attribute function formatCoords)
+                if (fun === 'Coords') {
+                    term[2] = 'true';
+                }
+
                 if (!Type.exists(term[1][fun])) {
                     throw new Error("PrefixParser.parse: " + fun + " is not a method of " + term[1]);
                 }

package/src/reader/cinderella.js

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

package/src/reader/file.js

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

package/src/reader/geogebra.js

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

package/src/reader/geonext.js

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

package/src/reader/graph.js

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

package/src/reader/intergeo.js

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