jsxgraph 1.4.0 → 1.4.1

package/src/base/point.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -156,7 +156,7 @@ define([
          * @returns {JXG.CoordsElement} Reference to this object.
          */
         updateTransform: function (fromParent) {
-            var c, i, invMat;
+            var c, i;
 
             if (this.transformations.length === 0 || this.baseElement === null) {
                 return this;
@@ -167,17 +167,6 @@ define([
                 c = this.transformations[0].apply(this.baseElement, 'self');
                 this.coords.setCoordinates(Const.COORDS_BY_USER, c);
             } else {
-                // Case of board.create('point',[baseElement, transform]);
-                // if (!fromParent) {
-                //     // The element has been dragged or it is the initial update,
-                //     // now we transform the baseElement
-                //     if (this.draggable() && this.baseElement.draggable()) {
-                //         this.transformations[0].update();
-                //         invMat = Mat.inverse(this.transformations[0].matrix);
-                //         c = Mat.matVecMult(invMat, this.coords.usrCoords);
-                //         this.baseElement.coords.setCoordinates(Const.COORDS_BY_USER, c);
-                //     }
-                // }
                 c = this.transformations[0].apply(this.baseElement);
             }
             this.coords.setCoordinates(Const.COORDS_BY_USER, c);
@@ -352,12 +341,12 @@ define([
          *     var pol = board.create('polygon', [[2,2], [4,2], [4,3]], {strokeColor: 'blue'});
          *
          *     var point = board.create('point', [-1, 1], {
-         *     			  attractors: [line, seg, circ, po, curve, pol],
+         *                   attractors: [line, seg, circ, po, curve, pol],
          *                   attractorDistance: 0.2
          *                 });
          *
          *     var txt = board.create('text', [-4, 3, function() {
-         *     		return 'point on line: ' + point.isOn(line) + '<br>' +
+         *             return 'point on line: ' + point.isOn(line) + '<br>' +
          *                     'point on seg: ' + point.isOn(seg) + '<br>' +
          *                     'point on circ = ' + point.isOn(circ) + '<br>' +
          *                     'point on point = ' + point.isOn(po) + '<br>' +
@@ -380,14 +369,14 @@ define([
             } else if (el.elementClass === Const.OBJECT_CLASS_LINE) {
                 if (el.elType === 'segment' && !Type.evaluate(this.visProp.alwaysintersect)) {
                     arr = JXG.Math.Geometry.projectCoordsToSegment(
-            			        this.coords.usrCoords,
+                                this.coords.usrCoords,
                                 el.point1.coords.usrCoords,
                                 el.point2.coords.usrCoords);
                     if (arr[1] >= 0 && arr[1] <= 1 &&
                         Geometry.distPointLine(this.coords.usrCoords, el.stdform) < tol) {
-       				    return true;
+                           return true;
                     } else {
-            		    return false;
+                        return false;
                     }
                 } else {
                     return Geometry.distPointLine(this.coords.usrCoords, el.stdform) < tol;

package/src/base/polygon.js

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

package/src/base/text.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -308,7 +308,7 @@ define([
          * @return {[type]} [description]
          */
         updateSize: function () {
-            var tmp, s, that, node,
+            var tmp, that, node,
                 ev_d = Type.evaluate(this.visProp.display);
 
             if (!Env.isBrowser || this.board.renderer.type === 'no') {
@@ -576,7 +576,7 @@ define([
          * @returns {string} expanded String
          */
         expandShortMath: function (expr) {
-            var re = /([\)0-9\.])\s*([\(a-zA-Z_])/g;
+            var re = /([)0-9.])\s*([(a-zA-Z_])/g;
             return expr.replace(re, '$1*$2');
         },
 
@@ -746,7 +746,7 @@ define([
             content = content.replace(/&lt;\/value&gt;/g, '</value>');
 
             do {
-                search = /<value>([\w\s\*\/\^\-\+\(\)\[\],<>=!]+)<\/value>/;
+                search = /<value>([\w\s*/^\-+()[\],<>=!]+)<\/value>/;
                 res = search.exec(content);
 
                 if (res !== null) {
@@ -874,7 +874,8 @@ define([
          */
         setAutoPosition: function () {
             var x, y, cx, cy,
-                anchorCoords, anchorX, anchorY,
+                anchorCoords,
+                // anchorX, anchorY,
                 w = this.size[0],
                 h = this.size[1],
                 start_angle, angle,
@@ -896,8 +897,8 @@ define([
                 return this;
             }
 
-            anchorX = Type.evaluate(this.visProp.anchorx);
-            anchorY = Type.evaluate(this.visProp.anchory);
+            // anchorX = Type.evaluate(this.visProp.anchorx);
+            // anchorY = Type.evaluate(this.visProp.anchory);
             offset = Type.evaluate(this.visProp.offset);
             anchorCoords = this.element.getLabelAnchor();
             cx = anchorCoords.scrCoords[1];

package/src/base/ticks.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -1017,13 +1017,20 @@ define([
          */
         formatLabelText: function(value) {
             var labelText = value.toString(),
+                digits,
                 ev_s = Type.evaluate(this.visProp.scalesymbol);
 
             // if value is Number
             if (Type.isNumber(value)) {
                 if (labelText.length > Type.evaluate(this.visProp.maxlabellength) ||
                         labelText.indexOf('e') !== -1) {
-                    labelText = value.toPrecision(Type.evaluate(this.visProp.precision)).toString();
+
+                    digits = Type.evaluate(this.visProp.digits);
+                    if (Type.evaluate(this.visProp.precision) !== 3 && digits === 3) {
+                        // Use the deprecated attribute "precision"
+                        digits = Type.evaluate(this.visProp.precision);
+                    }
+                    labelText = value.toPrecision(digits).toString();
                 }
 
                 if (Type.evaluate(this.visProp.beautifulscientificticklabels)) {

package/src/base/transformation.js

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

package/src/base/turtle.js

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

package/src/element/arc.js

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

package/src/element/button.js

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

package/src/element/checkbox.js

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

package/src/element/comb.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2018-2021
+    Copyright 2018-2022
         Alfred Wassermann,
         Tigran Saluev
 

package/src/element/composition.js

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

package/src/element/conic.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -545,7 +545,7 @@ define([
      *
      */
     JXG.createParabola = function (board, parents, attributes) {
-        var polarForm, curve, M, i,
+        var polarForm, curve, M,
             // focus
             F1 = parents[0],
             // directrix
@@ -574,7 +574,7 @@ define([
         }
 
         // Create line if given as array of two points.
-        if (Type.isArray(l) && l.length == 2) {
+        if (Type.isArray(l) && l.length === 2) {
             attr_line = Type.copyAttributes(attributes, board.options, 'conic', 'line');
             l = board.create('line', l, attr_line);
         }

package/src/element/input.js

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

package/src/element/locus.js

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

package/src/element/measure.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -85,7 +85,7 @@ define([
      */
     JXG.createTapemeasure = function (board, parents, attributes) {
         var pos0, pos1,
-            attr, withTicks, withText, precision,
+            attr, withTicks, withText, digits,
             li, p1, p2, n, ti;
 
         pos0 = parents[0];
@@ -106,7 +106,12 @@ define([
         attr = Type.copyAttributes(attributes, board.options, 'tapemeasure');
         withTicks = attr.withticks;
         withText = attr.withlabel;
-        precision = attr.precision;
+        digits = attr.digits;
+
+        if (digits === 2 && attr.precision !== 2) {
+            // Backward compatibility
+            digits = attr.precision;
+        }
 
         // Below, we will replace the label by the measurement function.
         if (withText) {
@@ -122,7 +127,7 @@ define([
                 n = '';
             }
             li.label.setText(function () {
-                return n + Type.toFixed(p1.Dist(p2), precision);
+                return n + Type.toFixed(p1.Dist(p2), digits);
             });
         }
 

package/src/element/sector.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -199,7 +199,7 @@ define([
 
         if (type === '2lines') {
             /**
-             * @ignore 
+             * @ignore
              */
              el.Radius = function () {
                 var r = Type.evaluate(parents[4]);
@@ -583,7 +583,7 @@ define([
          */
         el.setRadius = function (val) {
             /**
-             * @ignore 
+             * @ignore
              */
              el.Radius = function () {
                 var r = Type.evaluate(val);
@@ -972,7 +972,7 @@ define([
             el.pointsquare = el.point3 = el.anglepoint = points[2];
 
             /**
-             * @ignore 
+             * @ignore
              */
             el.Radius = function () {
                 // Set the angle radius, also @see @link Sector#autoRadius
@@ -1164,7 +1164,7 @@ define([
             */
             el.free = function () {
                 var p = this.anglepoint;
-                    
+
                 if (p.transformations.length > 0) {
                     p.transformations.pop();
                     p.isDraggable = true;

package/src/element/slider.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -143,7 +143,7 @@ define([
      * @example
      * // Set colors
      * var sl = board.create('slider', [[-3, 1], [1, 1], [-10, 1, 10]], {
-     * 
+     *
      *   baseline: { strokeColor: 'blue'},
      *   highline: { strokeColor: 'red'},
      *   fillColor: 'yellow',
@@ -151,16 +151,16 @@ define([
      *   name: 'xyz', // Not shown, if suffixLabel is set
      *   suffixLabel: 'x = ',
      *   postLabel: ' u'
-     * 
+     *
      * });
-     * 
+     *
      * </pre><div id="JXGd96c9e2c-2c25-4131-b6cf-9dbb80819401" class="jxgbox" style="width: 300px; height: 300px;"></div>
      * <script type="text/javascript">
      *     (function() {
      *         var board = JXG.JSXGraph.initBoard('JXGd96c9e2c-2c25-4131-b6cf-9dbb80819401',
      *             {boundingbox: [-8, 8, 8,-8], axis: true, showcopyright: false, shownavigation: false});
      *     var sl = board.create('slider', [[-3, 1], [1, 1], [-10, 1, 10]], {
-     *     
+     *
      *       baseline: { strokeColor: 'blue'},
      *       highline: { strokeColor: 'red'},
      *       fillColor: 'yellow',
@@ -168,24 +168,23 @@ define([
      *       name: 'xyz', // Not shown, if suffixLabel is set
      *       suffixLabel: 'x = ',
      *       postLabel: ' u'
-     *     
+     *
      *     });
-     * 
+     *
      *     })();
-     * 
+     *
      * </script><pre>
-     * 
+     *
  */
     JXG.createSlider = function (board, parents, attributes) {
         var pos0, pos1, smin, start, smax, sdiff,
             p1, p2, l1, ticks, ti, startx, starty, p3, l2, t,
-            withText, withTicks, snapWidth, sw, s, attr, precision;
+            withText, withTicks, snapWidth, sw, s, attr, digits;
 
         attr = Type.copyAttributes(attributes, board.options, 'slider');
         withTicks = attr.withticks;
         withText = attr.withlabel;
         snapWidth = attr.snapwidth;
-        precision = attr.precision;
 
         // start point
         attr = Type.copyAttributes(attributes, board.options, 'slider', 'point1');
@@ -324,10 +323,16 @@ define([
                 },
                 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 !== '') {
@@ -336,7 +341,7 @@ define([
                         n = '';
                     }
 
-                    n += Type.toFixed(p3.Value(), precision);
+                    n += Type.toFixed(p3.Value(), d);
 
                     if (ul !== null) {
                         n += ul;

package/src/element/slopetriangle.js

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

package/src/jsxgraph.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -304,6 +304,8 @@ define([
         initBoard: function (box, attributes) {
             var originX, originY, unitX, unitY,
                 renderer,
+                offX = 0,
+                offY = 0,
                 w, h, dimensions,
                 bbox, attr, axattr, axattr_x, axattr_y,
                 board;
@@ -339,15 +341,19 @@ define([
 
                     if (Math.abs(unitX) < Math.abs(unitY)) {
                         unitY = Math.abs(unitX) * unitY / Math.abs(unitY);
+                        // Add the additional units in equal portions above and below
+                        offY = (h / unitY - (bbox[1] - bbox[3])) * 0.5;
                     } else {
                         unitX = Math.abs(unitY) * unitX / Math.abs(unitX);
+                        // Add the additional units in equal portions left and right
+                        offX = (w / unitX - (bbox[2] - bbox[0])) * 0.5;
                     }
                 } else {
                     unitX = w / (bbox[2] - bbox[0]);
                     unitY = h / (bbox[1] - bbox[3]);
                 }
-                originX = -unitX * bbox[0];
-                originY = unitY * bbox[1];
+                originX = -unitX * (bbox[0] - offX);
+                originY = unitY * (bbox[1] + offY);
             }
 
             renderer = this.initRenderer(box, dimensions, attr.document, attr.renderer);

package/src/jxg.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -131,9 +131,9 @@ define([], function () {
         onlyOwn = onlyOwn || false;
         toUpper = toUpper || false;
 
-        // the purpose of this for...in loop is indeed to use hasOwnProperty only if the caller explicitly wishes so.
+        // The purpose of this for...in loop is indeed to use hasOwnProperty only if the caller explicitly wishes so.
         for (e in constants) {
-            if (!onlyOwn || (onlyOwn && extension.hasOwnProperty(e))) {
+            if (!onlyOwn || (onlyOwn && constants.hasOwnProperty(e))) {
                 if (toUpper) {
                     e2 = e.toUpperCase();
                 } else {

package/src/loadjsxgraph.js

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

package/src/math/bst.js

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