jsxgraph 1.9.1 → 1.9.2

package/src/reader/sketch.js

@@ -36,6 +36,112 @@
 (function () {
     "use strict";
 
+    JXG.extendConstants(JXG, {
+        GENTYPE_ABC: 1, // unused
+        GENTYPE_AXIS: 2,
+        GENTYPE_MID: 3,
+
+        GENTYPE_REFLECTION: 4,
+        GENTYPE_MIRRORELEMENT: 5,
+
+        GENTYPE_REFLECTION_ON_LINE: 4,
+        GENTYPE_REFLECTION_ON_POINT: 5,
+        GENTYPE_TANGENT: 6,
+        GENTYPE_PARALLEL: 7,
+        GENTYPE_BISECTORLINES: 8,
+        GENTYPE_BOARDIMG: 9,
+        GENTYPE_BISECTOR: 10,
+        GENTYPE_NORMAL: 11,
+        GENTYPE_POINT: 12,
+        GENTYPE_GLIDER: 13,
+        GENTYPE_INTERSECTION: 14,
+        GENTYPE_CIRCLE: 15,
+        /**
+         * @ignore @deprecated NOT USED ANY MORE SINCE SKETCHOMETRY 2.0 (only for old constructions needed)
+         */
+        GENTYPE_CIRCLE2POINTS: 16,
+
+        GENTYPE_LINE: 17,
+        GENTYPE_TRIANGLE: 18,
+        GENTYPE_QUADRILATERAL: 19,
+        GENTYPE_TEXT: 20,
+        GENTYPE_POLYGON: 21,
+        GENTYPE_REGULARPOLYGON: 22,
+        GENTYPE_SECTOR: 23,
+        GENTYPE_ANGLE: 24,
+        GENTYPE_PLOT: 25,
+        GENTYPE_SLIDER: 26,
+        GENTYPE_TRUNCATE: 27,
+        GENTYPE_JCODE: 28,
+        GENTYPE_MOVEMENT: 29,
+        GENTYPE_COMBINED: 30,
+        GENTYPE_RULER: 31,
+        GENTYPE_SLOPETRIANGLE: 32,
+        GENTYPE_PERPSEGMENT: 33,
+        GENTYPE_LABELMOVEMENT: 34,
+        GENTYPE_VECTOR: 35,
+        GENTYPE_NONREFLEXANGLE: 36,
+        GENTYPE_REFLEXANGLE: 37,
+        GENTYPE_PATH: 38,
+        GENTYPE_DERIVATIVE: 39,
+        // 40 // unused ...
+        GENTYPE_DELETE: 41,
+        GENTYPE_COPY: 42,
+        GENTYPE_MIRROR: 43,
+        GENTYPE_ROTATE: 44,
+        GENTYPE_ABLATION: 45,
+        GENTYPE_MIGRATE: 46,
+        GENTYPE_VECTORCOPY: 47,
+        GENTYPE_POLYGONCOPY: 48,
+        //        GENTYPE_TRANSFORM: 48, // unused
+        // 49 ... 50 // unused ...
+
+        // IMPORTANT:
+        // ----------
+        // For being able to differentiate between the (GUI-specific) CTX and
+        // (CORE-specific) non-CTX steps, the non-CTX steps MUST NOT be changed
+        // to values > 50.
+
+        GENTYPE_CTX_TYPE_G: 51,
+        GENTYPE_CTX_TYPE_P: 52,
+        GENTYPE_CTX_TRACE: 53,
+        GENTYPE_CTX_VISIBILITY: 54,
+        GENTYPE_CTX_CCVISIBILITY: 55, // unused
+        GENTYPE_CTX_MPVISIBILITY: 56,
+        GENTYPE_CTX_WITHLABEL: 57,
+        GENTYPE_CTX_LABEL: 58,
+        GENTYPE_CTX_FIXED: 59,
+        GENTYPE_CTX_STROKEWIDTH: 60,
+        GENTYPE_CTX_LABELSIZE: 61,
+        GENTYPE_CTX_SIZE: 62,
+        GENTYPE_CTX_FACE: 63,
+        GENTYPE_CTX_STRAIGHT: 64,
+        GENTYPE_CTX_ARROW: 65,
+        GENTYPE_CTX_COLOR: 66,
+        GENTYPE_CTX_RADIUS: 67,
+        GENTYPE_CTX_COORDS: 68,
+        GENTYPE_CTX_TEXT: 69,
+        GENTYPE_CTX_ANGLERADIUS: 70,
+        GENTYPE_CTX_DOTVISIBILITY: 71,
+        GENTYPE_CTX_FILLOPACITY: 72,
+        GENTYPE_CTX_PLOT: 73,
+        GENTYPE_CTX_SCALE: 74,
+        GENTYPE_CTX_SLIDER_BOUND: 75,
+        GENTYPE_CTX_POINT1: 76,
+        GENTYPE_CTX_POINT2: 77,
+        GENTYPE_CTX_LABELSTICKY: 78,
+        GENTYPE_CTX_TYPE_I: 79,
+        GENTYPE_CTX_HASINNERPOINTS: 80,
+        GENTYPE_CTX_SLIDER_STEP: 81,
+        GENTYPE_CTX_SNAPTOGRID: 82,
+        GENTYPE_CTX_SNAPTOPOINTS: 83,
+        GENTYPE_CTX_STROKEDASH: 84,
+        GENTYPE_CTX_SLIDER_VALUE: 85,
+        GENTYPE_CTX_SECTORBORDERS: 86,
+        GENTYPE_CTX_CURVETAU: 87,
+        GENTYPE_CTX_SLIDER_POS: 88
+    });
+
     // this is a small workaround to adapt the SketchReader to our new file API
     // we don't have to change anything in sketchometry.
     JXG.SketchReader = function (board, str) {

package/src/renderer/svg.js

@@ -889,6 +889,8 @@ JXG.extend(
             node2 = el.rendNodeTriangleStart;
             if (ev_fa) {
                 str = this.toStr(this.container.id, '_', el.id, 'TriangleStart', a.typeFirst);
+
+                // If we try to set the same arrow head as is already set, we can bail out now
                 if (!Type.exists(node2) || node2.id !== str) {
                     node2 = this.container.ownerDocument.getElementById(str);
                     // Check if the marker already exists.
@@ -900,14 +902,19 @@ JXG.extend(
                     el.rendNodeTriangleStart = node2;
                     el.rendNode.setAttributeNS(null, "marker-start", this.toURL(str));
                 }
-            } else if (Type.exists(node2)) {
-                this.remove(node2);
-                el.rendNodeTriangleStart = null;
+            } else {
+                if (Type.exists(node2)) {
+                    this.remove(node2);
+                    el.rendNodeTriangleStart = null;
+                }
+                el.rendNode.setAttributeNS(null, "marker-start", null);
             }
 
             node2 = el.rendNodeTriangleEnd;
             if (ev_la) {
                 str = this.toStr(this.container.id, '_', el.id, 'TriangleEnd', a.typeLast);
+
+                // If we try to set the same arrow head as is already set, we can bail out now
                 if (!Type.exists(node2) || node2.id !== str) {
                     node2 = this.container.ownerDocument.getElementById(str);
                     // Check if the marker already exists.
@@ -919,9 +926,12 @@ JXG.extend(
                     el.rendNodeTriangleEnd = node2;
                     el.rendNode.setAttributeNS(null, "marker-end", this.toURL(str));
                 }
-            } else if (Type.exists(node2)) {
-                this.remove(node2);
-                el.rendNodeTriangleEnd = null;
+            } else {
+                if (Type.exists(node2)) {
+                    this.remove(node2);
+                    el.rendNodeTriangleEnd = null;
+                }
+                el.rendNode.setAttributeNS(null, "marker-end", null);
             }
         },
 

package/src/utils/env.js

@@ -532,7 +532,7 @@ JXG.extend(
             }
 
             if (!Type.exists(owner["x_internal" + type])) {
-                JXG.debug("no such type: " + type);
+                JXG.debug("removeEvent: no such type: " + type);
                 return;
             }
 
@@ -559,7 +559,7 @@ JXG.extend(
                     obj.detachEvent("on" + type, owner["x_internal" + type][i]);
                 }
             } catch (e) {
-                JXG.debug("event not registered in browser: (" + type + " -- " + fn + ")");
+                JXG.debug("removeEvent: event not registered in browser: (" + type + " -- " + fn + ")");
             }
 
             owner["x_internal" + type].splice(i, 1);

package/src/utils/type.js

@@ -194,8 +194,8 @@ JXG.extend(
          * @returns {Boolean} True, if v is of type JXG.Point3D.
          */
         isPoint3D: function (v) {
-            if (v !== null && typeof v === "object" && this.exists(v.elType)) {
-                return v.elType === "point3d";
+            if (v !== null && typeof v === "object" && this.exists(v.type)) {
+                return v.type === Const.OBJECT_TYPE_POINT3D;
             }
 
             return false;
@@ -437,7 +437,7 @@ JXG.extend(
                 f = board.jc.snippet(term, true, variableName, false);
             } else if (this.isFunction(term)) {
                 f = term;
-                f.deps = {};
+                f.deps = (this.isObject(term.deps)) ? term.deps : {};
             } else if (this.isNumber(term)) {
                 /** @ignore */
                 f = function () { return term; };
@@ -1364,7 +1364,7 @@ JXG.extend(
          * @returns {Object} The resulting attributes object
          */
         copyAttributes: function (attributes, options, s) {
-            var a, i, len, o, isAvail,
+            var a, arg, i, len, o, isAvail,
                 primitives = {
                     circle: 1,
                     curve: 1,
@@ -1392,12 +1392,15 @@ JXG.extend(
             }
 
             // Default options from the specific element like 'line' in
-            // copyAttribute(attributes, board.options, 'line')
+            //     copyAttribute(attributes, board.options, 'line')
+            // but also like in
+            //     Type.copyAttributes(attributes, board.options, 'view3d', 'az', 'slider');
             o = options;
             isAvail = true;
             for (i = 2; i < len; i++) {
-                if (this.exists(o[arguments[i]])) {
-                    o = o[arguments[i]];
+                arg = arguments[i];
+                if (this.exists(o[arg])) {
+                    o = o[arg];
                 } else {
                     isAvail = false;
                     break;
@@ -1409,14 +1412,16 @@ JXG.extend(
 
             // Merge the specific options given in the parameter 'attributes'
             // into the default options.
-            // Additionally, we step into a subelement of attribute like line.point1 in case it is supplied as in
-            // copyAttribute(attributes, board.options, 'line', 'point1')
+            // Additionally, we step into a sub-element of attribute like line.point1 -
+            // in case it is supplied as in
+            //     copyAttribute(attributes, board.options, 'line', 'point1')
             // In this case we would merge attributes.point1 into the global line.point1 attributes.
             o = (typeof attributes === 'object') ? this.keysToLowerCase(attributes) : {};
             isAvail = true;
             for (i = 3; i < len; i++) {
-                if (this.exists(o[arguments[i]])) {
-                    o = o[arguments[i]];
+                arg = arguments[i].toLowerCase();
+                if (this.exists(o[arg])) {
+                    o = o[arg];
                 } else {
                     isAvail = false;
                     break;
@@ -1435,8 +1440,9 @@ JXG.extend(
             o = options;
             isAvail = true;
             for (i = 2; i < len; i++) {
-                if (this.exists(o[arguments[i]])) {
-                    o = o[arguments[i]];
+                arg = arguments[i];
+                if (this.exists(o[arg])) {
+                    o = o[arg];
                 } else {
                     isAvail = false;
                     break;
@@ -1734,6 +1740,7 @@ JXG.extend(
                 str = '';
 
             if (arr[1] === 0 && arr[2] === 0) {
+                // 0
                 str += '0';
             } else {
                 // Sign
@@ -1741,12 +1748,15 @@ JXG.extend(
                     str += '-';
                 }
                 if (arr[2] === 0) {
+                    // Integer
                     str += arr[1];
                 } else if (!(arr[2] === 1 && arr[3] === 1)) {
-                    // arr[2] !== 0
+                    // Proper fraction
                     if (arr[1] !== 0) {
-                        str += ' ';
+                        // Absolute value larger than 1
+                        str += arr[1] + ' ';
                     }
+                    // Add fractional part
                     if (useTeX === true) {
                         str += '\\frac{' + arr[2] + '}{' + arr[3] + '}';
                     } else {
@@ -1819,6 +1829,8 @@ JXG.extend(
         /**
          * Convert a string containing a MAXIMA /STACK expression into a JSXGraph / JessieCode string
          * or an array of JSXGraph / JessieCode strings.
+         * <p>
+         * This function is meanwhile superseded by stack_jxg.stack2jsxgraph.
          *
          * @example
          * console.log( JXG.stack2jsxgraph("%e**x") );