@pie-element/complex-rubric 3.1.2-next.29 → 3.1.2-next.31

package/controller/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.0.11",
+    "@pie-lib/pie-toolbox": "2.0.12",
     "lodash": "^4.17.15"
   },
   "author": "",

package/module/configure.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.9/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.10/module/index.js";
 import RubricConfigure from '@pie-element/rubric/configure/lib';
 import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.7/module/index.js";
 function _mergeNamespaces(n, m) {
@@ -49027,6 +49027,52 @@ MmlVisitor$1.MmlVisitor = MmlVisitor;
   exports.SerializedMmlVisitor = SerializedMmlVisitor;
 })(SerializedMmlVisitor);
 getDefaultExportFromCjs(SerializedMmlVisitor);
+var TexError$1 = {};
+Object.defineProperty(TexError$1, "__esModule", {
+  value: true
+});
+var TexError = (function () {
+  function TexError(id, message) {
+    var rest = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+      rest[_i - 2] = arguments[_i];
+    }
+    this.id = id;
+    this.message = TexError.processString(message, rest);
+  }
+  TexError.processString = function (str, args) {
+    var parts = str.split(TexError.pattern);
+    for (var i = 1, m = parts.length; i < m; i += 2) {
+      var c = parts[i].charAt(0);
+      if (c >= '0' && c <= '9') {
+        parts[i] = args[parseInt(parts[i], 10) - 1];
+        if (typeof parts[i] === 'number') {
+          parts[i] = parts[i].toString();
+        }
+      } else if (c === '{') {
+        c = parts[i].substr(1);
+        if (c >= '0' && c <= '9') {
+          parts[i] = args[parseInt(parts[i].substr(1, parts[i].length - 2), 10) - 1];
+          if (typeof parts[i] === 'number') {
+            parts[i] = parts[i].toString();
+          }
+        } else {
+          var match = parts[i].match(/^\{([a-z]+):%(\d+)\|(.*)\}$/);
+          if (match) {
+            parts[i] = '%' + parts[i];
+          }
+        }
+      }
+      if (parts[i] == null) {
+        parts[i] = '???';
+      }
+    }
+    return parts.join('');
+  };
+  TexError.pattern = /%(\d+|\{\d+\}|\{[a-z]+:\%\d+(?:\|(?:%\{\d+\}|%.|[^\}])*)+\}|.)/g;
+  return TexError;
+})();
+TexError$1.default = TexError;
 (function (exports) {
   var _interopRequireDefault = interopRequireDefault.exports;
   Object.defineProperty(exports, "__esModule", {
@@ -49036,6 +49082,7 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
   var _typeof2 = _interopRequireDefault(_typeof$s.exports);
   var _normalization = normalization;
   var _SerializedMmlVisitor = SerializedMmlVisitor;
+  var _TexError = _interopRequireDefault(TexError$1);
   var visitor = new _SerializedMmlVisitor.SerializedMmlVisitor();
   var toMMl = function toMMl(node) {
     return visitor.visitTree(node);
@@ -49150,10 +49197,77 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
       });
     }
   };
+  var convertMathJax2ToMathJax3 = function convertMathJax2ToMathJax3() {
+    var CommandMap = MathJax._.input.tex.SymbolMap.CommandMap;
+    var requireMap = MathJax.config.startup.requireMap;
+    var RequireLoad = MathJax._.input.tex.require.RequireConfiguration.RequireLoad;
+    var RequireMethods = {
+      Require: function Require(parser, name) {
+        var required = parser.GetArgument(name);
+        if (required.match(/[^_a-zA-Z0-9]/) || required === "") {
+          throw new _TexError["default"]("BadPackageName", "Argument for %1 is not a valid package name", name);
+        }
+        if (requireMap.hasOwnProperty(required)) {
+          required = requireMap[required];
+        }
+        RequireLoad(parser, required);
+      }
+    };
+    new CommandMap("require", {
+      require: "Require"
+    }, RequireMethods);
+    MathJax.Callback = function (args) {
+      if (Array.isArray(args)) {
+        if (args.length === 1 && typeof args[0] === "function") {
+          return args[0];
+        } else if (typeof args[0] === "string" && args[1] instanceof Object && typeof args[1][args[0]] === "function") {
+          return Function.bind.apply(args[1][args[0]], args.slice(1));
+        } else if (typeof args[0] === "function") {
+          return Function.bind.apply(args[0], [window].concat(args.slice(1)));
+        } else if (typeof args[1] === "function") {
+          return Function.bind.apply(args[1], [args[0]].concat(args.slice(2)));
+        }
+      } else if (typeof args === "function") {
+        return args;
+      }
+      throw Error("Can't make callback from given data");
+    };
+    MathJax.Hub = {
+      Queue: function Queue() {
+        for (var i = 0, m = arguments.length; i < m; i++) {
+          var fn = MathJax.Callback(arguments[i]);
+          MathJax.startup.promise = MathJax.startup.promise.then(fn);
+        }
+        return MathJax.startup.promise;
+      },
+      Typeset: function Typeset(elements, callback) {
+        var promise = MathJax.typesetPromise(elements);
+        if (callback) {
+          promise = promise.then(callback);
+        }
+        return promise;
+      },
+      Register: {
+        MessageHook: function MessageHook() {
+          console.log("MessageHooks are not supported in version 3");
+        },
+        StartupHook: function StartupHook() {
+          console.log("StartupHooks are not supported in version 3");
+        },
+        LoadHook: function LoadHook() {
+          console.log("LoadHooks are not supported in version 3");
+        }
+      },
+      Config: function Config() {
+        console.log("MathJax configurations should be converted for version 3");
+      }
+    };
+  };
   var initializeMathJax = function initializeMathJax(callback) {
     if (window.mathjaxLoadedP) {
       return;
     }
+    var PreviousMathJaxIsUsed = window.MathJax && window.MathJax.version && window.MathJax.version !== MathJaxVersion && window.MathJax.version[0] === '2';
     var texConfig = {
       macros: {
         parallelogram: "\\lower.2em{\\Huge\\unicode{x25B1}}",
@@ -49163,11 +49277,28 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
       },
       displayMath: [["$$", "$$"], ["\\[", "\\]"]]
     };
+    if (PreviousMathJaxIsUsed) {
+      texConfig.autoload = {
+        color: [],
+        colorv2: ["color"]
+      };
+    }
     window.mathjaxLoadedP = new Promise(function (resolve) {
       window.MathJax = {
         startup: {
+          requireMap: PreviousMathJaxIsUsed ? {
+            AMSmath: "ams",
+            AMSsymbols: "ams",
+            AMScd: "amscd",
+            HTML: "html",
+            noErrors: "noerrors",
+            noUndefined: "noundefined"
+          } : {},
           typeset: false,
           ready: function ready() {
+            if (PreviousMathJaxIsUsed) {
+              convertMathJax2ToMathJax3();
+            }
             var mathjax = MathJax._.mathjax.mathjax;
             var STATE = MathJax._.core.MathItem.STATE;
             var Menu = MathJax._.ui.menu.Menu.Menu;

package/module/element.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.9/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.10/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.7/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -72307,6 +72307,52 @@ MmlVisitor$1.MmlVisitor = MmlVisitor;
   exports.SerializedMmlVisitor = SerializedMmlVisitor;
 })(SerializedMmlVisitor);
 getDefaultExportFromCjs(SerializedMmlVisitor);
+var TexError$1 = {};
+Object.defineProperty(TexError$1, "__esModule", {
+  value: true
+});
+var TexError = (function () {
+  function TexError(id, message) {
+    var rest = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+      rest[_i - 2] = arguments[_i];
+    }
+    this.id = id;
+    this.message = TexError.processString(message, rest);
+  }
+  TexError.processString = function (str, args) {
+    var parts = str.split(TexError.pattern);
+    for (var i = 1, m = parts.length; i < m; i += 2) {
+      var c = parts[i].charAt(0);
+      if (c >= '0' && c <= '9') {
+        parts[i] = args[parseInt(parts[i], 10) - 1];
+        if (typeof parts[i] === 'number') {
+          parts[i] = parts[i].toString();
+        }
+      } else if (c === '{') {
+        c = parts[i].substr(1);
+        if (c >= '0' && c <= '9') {
+          parts[i] = args[parseInt(parts[i].substr(1, parts[i].length - 2), 10) - 1];
+          if (typeof parts[i] === 'number') {
+            parts[i] = parts[i].toString();
+          }
+        } else {
+          var match = parts[i].match(/^\{([a-z]+):%(\d+)\|(.*)\}$/);
+          if (match) {
+            parts[i] = '%' + parts[i];
+          }
+        }
+      }
+      if (parts[i] == null) {
+        parts[i] = '???';
+      }
+    }
+    return parts.join('');
+  };
+  TexError.pattern = /%(\d+|\{\d+\}|\{[a-z]+:\%\d+(?:\|(?:%\{\d+\}|%.|[^\}])*)+\}|.)/g;
+  return TexError;
+})();
+TexError$1.default = TexError;
 (function (exports) {
   var _interopRequireDefault = interopRequireDefault.exports;
   Object.defineProperty(exports, "__esModule", {
@@ -72316,6 +72362,7 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
   var _typeof2 = _interopRequireDefault(_typeof$s.exports);
   var _normalization = normalization;
   var _SerializedMmlVisitor = SerializedMmlVisitor;
+  var _TexError = _interopRequireDefault(TexError$1);
   var visitor = new _SerializedMmlVisitor.SerializedMmlVisitor();
   var toMMl = function toMMl(node) {
     return visitor.visitTree(node);
@@ -72430,10 +72477,77 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
       });
     }
   };
+  var convertMathJax2ToMathJax3 = function convertMathJax2ToMathJax3() {
+    var CommandMap = MathJax._.input.tex.SymbolMap.CommandMap;
+    var requireMap = MathJax.config.startup.requireMap;
+    var RequireLoad = MathJax._.input.tex.require.RequireConfiguration.RequireLoad;
+    var RequireMethods = {
+      Require: function Require(parser, name) {
+        var required = parser.GetArgument(name);
+        if (required.match(/[^_a-zA-Z0-9]/) || required === "") {
+          throw new _TexError["default"]("BadPackageName", "Argument for %1 is not a valid package name", name);
+        }
+        if (requireMap.hasOwnProperty(required)) {
+          required = requireMap[required];
+        }
+        RequireLoad(parser, required);
+      }
+    };
+    new CommandMap("require", {
+      require: "Require"
+    }, RequireMethods);
+    MathJax.Callback = function (args) {
+      if (Array.isArray(args)) {
+        if (args.length === 1 && typeof args[0] === "function") {
+          return args[0];
+        } else if (typeof args[0] === "string" && args[1] instanceof Object && typeof args[1][args[0]] === "function") {
+          return Function.bind.apply(args[1][args[0]], args.slice(1));
+        } else if (typeof args[0] === "function") {
+          return Function.bind.apply(args[0], [window].concat(args.slice(1)));
+        } else if (typeof args[1] === "function") {
+          return Function.bind.apply(args[1], [args[0]].concat(args.slice(2)));
+        }
+      } else if (typeof args === "function") {
+        return args;
+      }
+      throw Error("Can't make callback from given data");
+    };
+    MathJax.Hub = {
+      Queue: function Queue() {
+        for (var i = 0, m = arguments.length; i < m; i++) {
+          var fn = MathJax.Callback(arguments[i]);
+          MathJax.startup.promise = MathJax.startup.promise.then(fn);
+        }
+        return MathJax.startup.promise;
+      },
+      Typeset: function Typeset(elements, callback) {
+        var promise = MathJax.typesetPromise(elements);
+        if (callback) {
+          promise = promise.then(callback);
+        }
+        return promise;
+      },
+      Register: {
+        MessageHook: function MessageHook() {
+          console.log("MessageHooks are not supported in version 3");
+        },
+        StartupHook: function StartupHook() {
+          console.log("StartupHooks are not supported in version 3");
+        },
+        LoadHook: function LoadHook() {
+          console.log("LoadHooks are not supported in version 3");
+        }
+      },
+      Config: function Config() {
+        console.log("MathJax configurations should be converted for version 3");
+      }
+    };
+  };
   var initializeMathJax = function initializeMathJax(callback) {
     if (window.mathjaxLoadedP) {
       return;
     }
+    var PreviousMathJaxIsUsed = window.MathJax && window.MathJax.version && window.MathJax.version !== MathJaxVersion && window.MathJax.version[0] === '2';
     var texConfig = {
       macros: {
         parallelogram: "\\lower.2em{\\Huge\\unicode{x25B1}}",
@@ -72443,11 +72557,28 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
       },
       displayMath: [["$$", "$$"], ["\\[", "\\]"]]
     };
+    if (PreviousMathJaxIsUsed) {
+      texConfig.autoload = {
+        color: [],
+        colorv2: ["color"]
+      };
+    }
     window.mathjaxLoadedP = new Promise(function (resolve) {
       window.MathJax = {
         startup: {
+          requireMap: PreviousMathJaxIsUsed ? {
+            AMSmath: "ams",
+            AMSsymbols: "ams",
+            AMScd: "amscd",
+            HTML: "html",
+            noErrors: "noerrors",
+            noUndefined: "noundefined"
+          } : {},
           typeset: false,
           ready: function ready() {
+            if (PreviousMathJaxIsUsed) {
+              convertMathJax2ToMathJax3();
+            }
             var mathjax = MathJax._.mathjax.mathjax;
             var STATE = MathJax._.core.MathItem.STATE;
             var Menu = MathJax._.ui.menu.Menu.Menu;

package/module/manifest.json

@@ -4,7 +4,7 @@
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "2.0.9"
+      "version": "2.0.10"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",

package/module/print.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.9/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_react_dom, _dll_classnames, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.10/module/index.js";
 import {_dll_pie_lib__pie_toolbox_render_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.7/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
@@ -72307,6 +72307,52 @@ MmlVisitor$1.MmlVisitor = MmlVisitor;
   exports.SerializedMmlVisitor = SerializedMmlVisitor;
 })(SerializedMmlVisitor);
 getDefaultExportFromCjs(SerializedMmlVisitor);
+var TexError$1 = {};
+Object.defineProperty(TexError$1, "__esModule", {
+  value: true
+});
+var TexError = (function () {
+  function TexError(id, message) {
+    var rest = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+      rest[_i - 2] = arguments[_i];
+    }
+    this.id = id;
+    this.message = TexError.processString(message, rest);
+  }
+  TexError.processString = function (str, args) {
+    var parts = str.split(TexError.pattern);
+    for (var i = 1, m = parts.length; i < m; i += 2) {
+      var c = parts[i].charAt(0);
+      if (c >= '0' && c <= '9') {
+        parts[i] = args[parseInt(parts[i], 10) - 1];
+        if (typeof parts[i] === 'number') {
+          parts[i] = parts[i].toString();
+        }
+      } else if (c === '{') {
+        c = parts[i].substr(1);
+        if (c >= '0' && c <= '9') {
+          parts[i] = args[parseInt(parts[i].substr(1, parts[i].length - 2), 10) - 1];
+          if (typeof parts[i] === 'number') {
+            parts[i] = parts[i].toString();
+          }
+        } else {
+          var match = parts[i].match(/^\{([a-z]+):%(\d+)\|(.*)\}$/);
+          if (match) {
+            parts[i] = '%' + parts[i];
+          }
+        }
+      }
+      if (parts[i] == null) {
+        parts[i] = '???';
+      }
+    }
+    return parts.join('');
+  };
+  TexError.pattern = /%(\d+|\{\d+\}|\{[a-z]+:\%\d+(?:\|(?:%\{\d+\}|%.|[^\}])*)+\}|.)/g;
+  return TexError;
+})();
+TexError$1.default = TexError;
 (function (exports) {
   var _interopRequireDefault = interopRequireDefault.exports;
   Object.defineProperty(exports, "__esModule", {
@@ -72316,6 +72362,7 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
   var _typeof2 = _interopRequireDefault(_typeof$s.exports);
   var _normalization = normalization;
   var _SerializedMmlVisitor = SerializedMmlVisitor;
+  var _TexError = _interopRequireDefault(TexError$1);
   var visitor = new _SerializedMmlVisitor.SerializedMmlVisitor();
   var toMMl = function toMMl(node) {
     return visitor.visitTree(node);
@@ -72430,10 +72477,77 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
       });
     }
   };
+  var convertMathJax2ToMathJax3 = function convertMathJax2ToMathJax3() {
+    var CommandMap = MathJax._.input.tex.SymbolMap.CommandMap;
+    var requireMap = MathJax.config.startup.requireMap;
+    var RequireLoad = MathJax._.input.tex.require.RequireConfiguration.RequireLoad;
+    var RequireMethods = {
+      Require: function Require(parser, name) {
+        var required = parser.GetArgument(name);
+        if (required.match(/[^_a-zA-Z0-9]/) || required === "") {
+          throw new _TexError["default"]("BadPackageName", "Argument for %1 is not a valid package name", name);
+        }
+        if (requireMap.hasOwnProperty(required)) {
+          required = requireMap[required];
+        }
+        RequireLoad(parser, required);
+      }
+    };
+    new CommandMap("require", {
+      require: "Require"
+    }, RequireMethods);
+    MathJax.Callback = function (args) {
+      if (Array.isArray(args)) {
+        if (args.length === 1 && typeof args[0] === "function") {
+          return args[0];
+        } else if (typeof args[0] === "string" && args[1] instanceof Object && typeof args[1][args[0]] === "function") {
+          return Function.bind.apply(args[1][args[0]], args.slice(1));
+        } else if (typeof args[0] === "function") {
+          return Function.bind.apply(args[0], [window].concat(args.slice(1)));
+        } else if (typeof args[1] === "function") {
+          return Function.bind.apply(args[1], [args[0]].concat(args.slice(2)));
+        }
+      } else if (typeof args === "function") {
+        return args;
+      }
+      throw Error("Can't make callback from given data");
+    };
+    MathJax.Hub = {
+      Queue: function Queue() {
+        for (var i = 0, m = arguments.length; i < m; i++) {
+          var fn = MathJax.Callback(arguments[i]);
+          MathJax.startup.promise = MathJax.startup.promise.then(fn);
+        }
+        return MathJax.startup.promise;
+      },
+      Typeset: function Typeset(elements, callback) {
+        var promise = MathJax.typesetPromise(elements);
+        if (callback) {
+          promise = promise.then(callback);
+        }
+        return promise;
+      },
+      Register: {
+        MessageHook: function MessageHook() {
+          console.log("MessageHooks are not supported in version 3");
+        },
+        StartupHook: function StartupHook() {
+          console.log("StartupHooks are not supported in version 3");
+        },
+        LoadHook: function LoadHook() {
+          console.log("LoadHooks are not supported in version 3");
+        }
+      },
+      Config: function Config() {
+        console.log("MathJax configurations should be converted for version 3");
+      }
+    };
+  };
   var initializeMathJax = function initializeMathJax(callback) {
     if (window.mathjaxLoadedP) {
       return;
     }
+    var PreviousMathJaxIsUsed = window.MathJax && window.MathJax.version && window.MathJax.version !== MathJaxVersion && window.MathJax.version[0] === '2';
     var texConfig = {
       macros: {
         parallelogram: "\\lower.2em{\\Huge\\unicode{x25B1}}",
@@ -72443,11 +72557,28 @@ getDefaultExportFromCjs(SerializedMmlVisitor);
       },
       displayMath: [["$$", "$$"], ["\\[", "\\]"]]
     };
+    if (PreviousMathJaxIsUsed) {
+      texConfig.autoload = {
+        color: [],
+        colorv2: ["color"]
+      };
+    }
     window.mathjaxLoadedP = new Promise(function (resolve) {
       window.MathJax = {
         startup: {
+          requireMap: PreviousMathJaxIsUsed ? {
+            AMSmath: "ams",
+            AMSsymbols: "ams",
+            AMScd: "amscd",
+            HTML: "html",
+            noErrors: "noerrors",
+            noUndefined: "noundefined"
+          } : {},
           typeset: false,
           ready: function ready() {
+            if (PreviousMathJaxIsUsed) {
+              convertMathJax2ToMathJax3();
+            }
             var mathjax = MathJax._.mathjax.mathjax;
             var STATE = MathJax._.core.MathItem.STATE;
             var Menu = MathJax._.ui.menu.Menu.Menu;

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@pie-element/complex-rubric",
   "repository": "pie-framework/pie-elements",
-  "version": "3.1.2-next.29+059d1f271",
+  "version": "3.1.2-next.31+021ff6e7c",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multi-trait-rubric": "^4.1.2-next.29+059d1f271",
-    "@pie-element/rubric": "^4.1.2-next.29+059d1f271",
+    "@pie-element/multi-trait-rubric": "^4.1.2-next.31+021ff6e7c",
+    "@pie-element/rubric": "^4.1.2-next.31+021ff6e7c",
     "@pie-framework/pie-player-events": "^0.1.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2"
   },
-  "gitHead": "059d1f271a6ac564f432c0567dc5e076be408393",
+  "gitHead": "021ff6e7c7eb5b16a8b1239730c480fc09d58e5e",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },