@pie-lib/math-rendering 3.2.2-next.4 → 3.4.0-beta.0

package/lib/render-math.js

@@ -13,8 +13,30 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
 var _mathjax = require("mathjax-full/js/mathjax");
 
+var _global = require("mathjax-full/js/components/global");
+
+var _assistiveMml = require("mathjax-full/js/a11y/assistive-mml");
+
+var _semanticEnrich = require("mathjax-full/js/a11y/semantic-enrich");
+
+var _MenuHandler = require("mathjax-full/js/ui/menu/MenuHandler");
+
+var _FindMathML2 = require("mathjax-full/js/input/mathml/FindMathML");
+
 var _mathml = require("mathjax-full/js/input/mathml");
 
 var _tex = require("mathjax-full/js/input/tex");
@@ -27,7 +49,7 @@ var _browserAdaptor = require("mathjax-full/js/adaptors/browserAdaptor");
 
 var _AllPackages = require("mathjax-full/js/input/tex/AllPackages");
 
-var _package = _interopRequireDefault(require("../package.json"));
+var _system = require("speech-rule-engine/js/common/system");
 
 var _mstack = require("./mstack");
 
@@ -43,14 +65,25 @@ var _WrapperFactory = require("mathjax-full/js/output/chtml/WrapperFactory");
 
 var _mspace = require("mathjax-full/js/output/chtml/Wrappers/mspace");
 
+var _HTMLDomStrings = require("mathjax-full/js/handlers/html/HTMLDomStrings");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 if (typeof window !== 'undefined') {
   (0, _html.RegisterHTMLHandler)((0, _browserAdaptor.browserAdaptor)());
 }
 
+var sreReady = false;
+(0, _system.engineReady)().then(function () {
+  sreReady = true;
+}); // import pkg from '../../package.json';
+
 var visitor = new _SerializedMmlVisitor.SerializedMmlVisitor();
 
 var toMMl = function toMMl(node) {
@@ -62,7 +95,14 @@ var NEWLINE_BLOCK_REGEX = /\\embed\{newLine\}\[\]/g;
 var NEWLINE_LATEX = '\\newline ';
 
 var getGlobal = function getGlobal() {
-  var key = "".concat(_package["default"].name, "@").concat(_package["default"].version.split('.')[0]);
+  // TODO does it make sense to use version?
+  // const key = `${pkg.name}@${pkg.version.split('.')[0]}`;
+  // It looks like Ed made this change when he switched from mathjax3 to mathjax-full
+  // I think it was supposed to make sure version 1 (using mathjax3) is not used
+  // in combination with version 2 (using mathjax-full)
+  // TODO higher level wrappers use this instance of math-rendering, and if 2 different instances are used, math rendering is not working
+  //  so I will hardcode this for now until a better solution is found
+  var key = '@pie-lib/math-rendering@2';
 
   if (typeof window !== 'undefined') {
     if (!window[key]) {
@@ -127,6 +167,35 @@ var adjustMathMLStyle = function adjustMathMLStyle() {
   });
 };
 
+var myFindMathML = /*#__PURE__*/function (_FindMathML) {
+  (0, _inherits2["default"])(myFindMathML, _FindMathML);
+
+  var _super = _createSuper(myFindMathML);
+
+  function myFindMathML() {
+    (0, _classCallCheck2["default"])(this, myFindMathML);
+    return _super.apply(this, arguments);
+  }
+
+  (0, _createClass2["default"])(myFindMathML, [{
+    key: "processMath",
+    value: function processMath(set) {
+      var adaptor = this.adaptor;
+
+      for (var _i = 0, _Array$from = Array.from(set); _i < _Array$from.length; _i++) {
+        var mml = _Array$from[_i];
+
+        if (adaptor.kind(adaptor.parent(mml)) === 'mjx-assistive-mml') {
+          set["delete"](mml);
+        }
+      }
+
+      return (0, _get2["default"])((0, _getPrototypeOf2["default"])(myFindMathML.prototype), "processMath", this).call(this, set);
+    }
+  }]);
+  return myFindMathML;
+}(_FindMathML2.FindMathML);
+
 var createMathMLInstance = function createMathMLInstance(opts) {
   var docProvided = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : document;
   opts = opts || defaultOpts();
@@ -154,68 +223,40 @@ var createMathMLInstance = function createMathMLInstance(opts) {
     packages: packages,
     macros: macros,
     inlineMath: [['$', '$'], ['\\(', '\\)']],
-    processEscapes: true,
-    options: {
-      enableExplorer: true,
-      enableAssistiveMml: true,
-      a11y: {
-        speech: true,
-        braille: true,
-        subtitles: true
-      },
-      sre: {
-        domain: 'default',
-        style: 'default',
-        locale: 'en'
-      }
-    }
+    processEscapes: true
   } : {
     packages: packages,
-    macros: macros,
-    options: {
-      enableExplorer: true,
-      enableAssistiveMml: true,
-      a11y: {
-        speech: true,
-        braille: true,
-        subtitles: true
-      },
-      sre: {
-        domain: 'default',
-        style: 'default',
-        locale: 'en'
-      }
-    }
+    macros: macros
   };
   var mmlConfig = {
-    options: {
-      a11y: {
-        speech: true,
-        braille: true,
-        subtitles: true
-      }
-    },
     parseError: function parseError(node) {
       // function to process parsing errors
       // eslint-disable-next-line no-console
       console.log('error:', node);
       this.error(this.adaptor.textContent(node).replace(/\n.*/g, ''));
-    }
+    },
+    FindMathML: new myFindMathML()
   };
+  var cachedMathjax;
+
+  if (_global.MathJax && _global.MathJax.version !== _mathjax.mathjax.version) {
+    // handling other MathJax version on the page
+    // replacing it temporarily with the version we have
+    window.MathJax._ = window.MathJax._ || {};
+    window.MathJax.config = window.MathJax.config || {};
+    cachedMathjax = window.MathJax;
+    Object.assign(_global.MathJax, _mathjax.mathjax);
+  }
+
   var fontURL = "https://unpkg.com/mathjax-full@".concat(_mathjax.mathjax.version, "/ts/output/chtml/fonts/tex-woff-v2");
   var htmlConfig = {
     fontURL: fontURL,
-    wrapperFactory: new _WrapperFactory.CHTMLWrapperFactory(_objectSpread(_objectSpread({}, _WrapperFactory.CHTMLWrapperFactory.defaultNodes), _mstack.chtmlNodes)),
-    options: {
-      renderActions: {
-        assistiveMml: [['AssistiveMmlHandler']]
-      }
-    }
+    wrapperFactory: new _WrapperFactory.CHTMLWrapperFactory(_objectSpread(_objectSpread({}, _WrapperFactory.CHTMLWrapperFactory.defaultNodes), _mstack.chtmlNodes))
   };
   var mml = new _mathml.MathML(mmlConfig);
   var customMmlFactory = new _MmlFactory.MmlFactory(_objectSpread(_objectSpread({}, _MmlFactory.MmlFactory.defaultNodes), _mstack.mmlNodes));
-
-  var html = _mathjax.mathjax.document(docProvided, {
+  var classFactory = (0, _semanticEnrich.EnrichHandler)((0, _MenuHandler.MenuHandler)((0, _assistiveMml.AssistiveMmlHandler)(_mathjax.mathjax.handlers.handlesDocument(docProvided))), mml);
+  var html = classFactory.create(docProvided, {
     compileError: function compileError(mj, math, err) {
       // eslint-disable-next-line no-console
       console.log('bad math?:', math); // eslint-disable-next-line no-console
@@ -229,25 +270,29 @@ var createMathMLInstance = function createMathMLInstance(opts) {
       console.error(err);
       doc.typesetError(math, err);
     },
-    options: {
-      enableAssistiveMml: true,
-      menuOptions: {
-        settings: {
-          assistiveMml: true,
-          collapsible: true,
-          explorer: true
-        }
-      }
+    sre: {
+      speech: 'deep'
     },
+    enrichSpeech: 'deep',
     InputJax: [new _tex.TeX(texConfig), mml],
-    OutputJax: new _chtml.CHTML(htmlConfig)
+    OutputJax: new _chtml.CHTML(htmlConfig),
+    DomStrings: new _HTMLDomStrings.HTMLDomStrings({
+      skipHtmlTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code', 'annotation', 'annotation-xml', 'mjx-assistive-mml', 'mjx-container']
+    })
   }); // Note: we must set this *after* mathjax.document (no idea why)
 
-
   mml.setMmlFactory(customMmlFactory);
+
+  if (cachedMathjax) {
+    // if we have a cached version, we replace it here
+    window.MathJax = cachedMathjax;
+  }
+
   return html;
 };
 
+var enrichSpeechInitialized = false;
+
 var bootstrap = function bootstrap(opts) {
   if (typeof window === 'undefined') {
     return {
@@ -262,33 +307,68 @@ var bootstrap = function bootstrap(opts) {
     version: _mathjax.mathjax.version,
     html: html,
     Typeset: function Typeset() {
+      var _this = this;
+
       for (var _len = arguments.length, elements = new Array(_len), _key = 0; _key < _len; _key++) {
         elements[_key] = arguments[_key];
       }
 
-      var updatedDocument = this.html.findMath(elements.length ? {
-        elements: elements
-      } : {}).compile().getMetrics().typeset().updateDocument();
+      var attemptRender = function attemptRender() {
+        var _updatedDocument$math, _updatedDocument$math2;
+
+        var temporary = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
 
-      try {
-        var list = updatedDocument.math.list;
+        var updatedDocument = _this.html.findMath(elements.length ? {
+          elements: elements
+        } : {}).compile();
 
-        for (var item = list.next; (0, _typeof2["default"])(item.data) !== 'symbol'; item = item.next) {
-          var mathMl = toMMl(item.data.root);
-          var parsedMathMl = mathMl.replaceAll('\n', '');
-          item.data.typesetRoot.setAttribute('data-mathml', parsedMathMl);
+        if (!temporary && sreReady) {
+          updatedDocument = updatedDocument.enrich();
         }
-      } catch (e) {
-        // eslint-disable-next-line no-console
-        console.error(e.toString());
+
+        updatedDocument = updatedDocument.getMetrics().typeset().assistiveMml().attachSpeech().addMenu().updateDocument();
+
+        if (!enrichSpeechInitialized && (0, _typeof2["default"])((_updatedDocument$math = updatedDocument.math.list) === null || _updatedDocument$math === void 0 ? void 0 : (_updatedDocument$math2 = _updatedDocument$math.next) === null || _updatedDocument$math2 === void 0 ? void 0 : _updatedDocument$math2.data) === 'object') {
+          enrichSpeechInitialized = true;
+        }
+
+        try {
+          var list = updatedDocument.math.list;
+
+          if (list) {
+            for (var item = list.next; (0, _typeof2["default"])(item.data) !== 'symbol'; item = item.next) {
+              var mathMl = toMMl(item.data.root);
+              var parsedMathMl = mathMl.replaceAll('\n', '');
+              item.data.typesetRoot.setAttribute('data-mathml', parsedMathMl);
+              item.data.typesetRoot.setAttribute('tabindex', '-1');
+            }
+          }
+        } catch (e) {
+          // eslint-disable-next-line no-console
+          console.error(e.toString());
+        }
+
+        updatedDocument.clear();
+      };
+
+      if (!enrichSpeechInitialized) {
+        attemptRender(true);
       }
 
-      updatedDocument.clear();
+      _mathjax.mathjax.handleRetriesFor(function () {
+        attemptRender();
+      });
     }
   };
 };
 
 var renderMath = function renderMath(el, renderOpts) {
+  var _getGlobal$instance, _getGlobal$instance2;
+
+  if (window && window.MathJax && window.MathJax.customKey && window.MathJax.customKey == '@pie-lib/math-rendering-accessible@1') {
+    return;
+  }
+
   var isString = typeof el === 'string';
   var executeOn = document.body;
 
@@ -325,14 +405,14 @@ var renderMath = function renderMath(el, renderOpts) {
     return;
   }
 
-  if (el instanceof Element) {
+  if (el instanceof Element && (_getGlobal$instance = getGlobal().instance) !== null && _getGlobal$instance !== void 0 && _getGlobal$instance.Typeset) {
     getGlobal().instance.Typeset(el);
-  } else if (el.length) {
-    var _getGlobal$instance;
+  } else if (el.length && (_getGlobal$instance2 = getGlobal().instance) !== null && _getGlobal$instance2 !== void 0 && _getGlobal$instance2.Typeset) {
+    var _getGlobal$instance3;
 
     var arr = Array.from(el);
 
-    (_getGlobal$instance = getGlobal().instance).Typeset.apply(_getGlobal$instance, (0, _toConsumableArray2["default"])(arr));
+    (_getGlobal$instance3 = getGlobal().instance).Typeset.apply(_getGlobal$instance3, (0, _toConsumableArray2["default"])(arr));
   }
 };
 /**
@@ -355,4 +435,4 @@ _mspace.CHTMLmspace.styles = {
 };
 var _default = renderMath;
 exports["default"] = _default;
-//# sourceMappingURL=render-math.js.map
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/render-math.js"],"names":["window","sreReady","then","visitor","SerializedMmlVisitor","toMMl","node","visitTree","log","NEWLINE_BLOCK_REGEX","NEWLINE_LATEX","getGlobal","key","defaultOpts","opts","fixMathElement","element","dataset","mathHandled","property","textContent","unwrapped","replace","fixMathElements","el","document","mathElements","querySelectorAll","forEach","item","adjustMathMLStyle","nodes","setAttribute","myFindMathML","set","adaptor","Array","from","mml","kind","parent","FindMathML","createMathMLInstance","docProvided","useSingleDollar","console","warn","packages","AllPackages","filter","name","push","macros","parallelogram","overarc","napprox","longdiv","texConfig","inlineMath","processEscapes","mmlConfig","parseError","error","cachedMathjax","globalMathjax","version","mathjax","MathJax","_","config","Object","assign","fontURL","htmlConfig","wrapperFactory","CHTMLWrapperFactory","defaultNodes","chtmlNodes","MathML","customMmlFactory","MmlFactory","mmlNodes","classFactory","handlers","handlesDocument","html","create","compileError","mj","math","err","typesetError","doc","sre","speech","enrichSpeech","InputJax","TeX","OutputJax","CHTML","DomStrings","HTMLDomStrings","skipHtmlTags","setMmlFactory","enrichSpeechInitialized","bootstrap","Typeset","elements","attemptRender","temporary","updatedDocument","findMath","length","compile","enrich","getMetrics","typeset","assistiveMml","attachSpeech","addMenu","updateDocument","list","next","data","mathMl","root","parsedMathMl","replaceAll","typesetRoot","e","toString","clear","handleRetriesFor","renderMath","renderOpts","customKey","isString","executeOn","body","div","createElement","innerHTML","undefined","instance","Element","arr","CHTMLmspace","styles","display","height"],"mappings":"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","sourcesContent":["import { mathjax } from 'mathjax-full/js/mathjax';\nimport { MathJax as globalMathjax } from 'mathjax-full/js/components/global';\nimport { AssistiveMmlHandler } from 'mathjax-full/js/a11y/assistive-mml';\nimport { EnrichHandler } from 'mathjax-full/js/a11y/semantic-enrich';\nimport { MenuHandler } from 'mathjax-full/js/ui/menu/MenuHandler';\nimport { FindMathML } from 'mathjax-full/js/input/mathml/FindMathML';\nimport { MathML } from 'mathjax-full/js/input/mathml';\nimport { TeX } from 'mathjax-full/js/input/tex';\n\nimport { CHTML } from 'mathjax-full/js/output/chtml';\nimport { RegisterHTMLHandler } from 'mathjax-full/js/handlers/html';\nimport { browserAdaptor } from 'mathjax-full/js/adaptors/browserAdaptor';\nimport { AllPackages } from 'mathjax-full/js/input/tex/AllPackages';\nimport { engineReady } from 'speech-rule-engine/js/common/system';\n\nif (typeof window !== 'undefined') {\n  RegisterHTMLHandler(browserAdaptor());\n}\n\nlet sreReady = false;\n\nengineReady().then(() => {\n  sreReady = true;\n});\n\n// import pkg from '../../package.json';\nimport { mmlNodes, chtmlNodes } from './mstack';\nimport debug from 'debug';\nimport { wrapMath, unWrapMath } from './normalization';\nimport { MmlFactory } from 'mathjax-full/js/core/MmlTree/MmlFactory';\nimport { SerializedMmlVisitor } from 'mathjax-full/js/core/MmlTree/SerializedMmlVisitor';\nimport { CHTMLWrapperFactory } from 'mathjax-full/js/output/chtml/WrapperFactory';\nimport { CHTMLmspace } from 'mathjax-full/js/output/chtml/Wrappers/mspace';\nimport { HTMLDomStrings } from 'mathjax-full/js/handlers/html/HTMLDomStrings';\n\nconst visitor = new SerializedMmlVisitor();\nconst toMMl = (node) => visitor.visitTree(node);\n\nconst log = debug('pie-lib:math-rendering');\n\nconst NEWLINE_BLOCK_REGEX = /\\\\embed\\{newLine\\}\\[\\]/g;\nconst NEWLINE_LATEX = '\\\\newline ';\n\nconst getGlobal = () => {\n  // TODO does it make sense to use version?\n  // const key = `${pkg.name}@${pkg.version.split('.')[0]}`;\n  // It looks like Ed made this change when he switched from mathjax3 to mathjax-full\n  // I think it was supposed to make sure version 1 (using mathjax3) is not used\n  // in combination with version 2 (using mathjax-full)\n\n  // TODO higher level wrappers use this instance of math-rendering, and if 2 different instances are used, math rendering is not working\n  //  so I will hardcode this for now until a better solution is found\n  const key = '@pie-lib/math-rendering@2';\n\n  if (typeof window !== 'undefined') {\n    if (!window[key]) {\n      window[key] = {};\n    }\n    return window[key];\n  } else {\n    return {};\n  }\n};\n\n/** Add temporary support for a global singleDollar override\n *  <code>\n *   // This will enable single dollar rendering\n *   window.pie = window.pie || {};\n *   window.pie.mathRendering =  {useSingleDollar: true };\n *  </code>\n */\nconst defaultOpts = () => getGlobal().opts || {};\n\nexport const fixMathElement = (element) => {\n  if (element.dataset.mathHandled) {\n    return;\n  }\n\n  let property = 'innerText';\n\n  if (element.textContent) {\n    property = 'textContent';\n  }\n\n  if (element[property]) {\n    element[property] = wrapMath(unWrapMath(element[property]).unwrapped);\n    // because mathquill doesn't understand line breaks, sometimes we end up with custom elements on prompts/rationale/etc.\n    // we need to replace the custom embedded elements with valid latex that Mathjax can understand\n    element[property] = element[property].replace(NEWLINE_BLOCK_REGEX, NEWLINE_LATEX);\n    element.dataset.mathHandled = true;\n  }\n};\n\nexport const fixMathElements = (el = document) => {\n  const mathElements = el.querySelectorAll('[data-latex]');\n\n  mathElements.forEach((item) => fixMathElement(item));\n};\n\nconst adjustMathMLStyle = (el = document) => {\n  const nodes = el.querySelectorAll('math');\n  nodes.forEach((node) => node.setAttribute('displaystyle', 'true'));\n};\n\nclass myFindMathML extends FindMathML {\n  processMath(set) {\n    const adaptor = this.adaptor;\n    for (const mml of Array.from(set)) {\n      if (adaptor.kind(adaptor.parent(mml)) === 'mjx-assistive-mml') {\n        set.delete(mml);\n      }\n    }\n    return super.processMath(set);\n  }\n}\n\nconst createMathMLInstance = (opts, docProvided = document) => {\n  opts = opts || defaultOpts();\n\n  if (opts.useSingleDollar) {\n    // eslint-disable-next-line\n    console.warn('[math-rendering] using $ is not advisable, please use $$..$$ or \\\\(...\\\\)');\n  }\n\n  const packages = AllPackages.filter((name) => name !== 'bussproofs'); // Bussproofs needs an output jax\n\n  // The autoload extension predefines all the macros from the extensions that haven't been loaded already\n  // so that they automatically load the needed extension when they are first used\n  packages.push('autoload');\n\n  const macros = {\n    parallelogram: '\\\\lower.2em{\\\\Huge\\\\unicode{x25B1}}',\n    overarc: '\\\\overparen',\n    napprox: '\\\\not\\\\approx',\n    longdiv: '\\\\enclose{longdiv}',\n  };\n\n  const texConfig = opts.useSingleDollar\n    ? {\n        packages,\n        macros,\n        inlineMath: [\n          ['$', '$'],\n          ['\\\\(', '\\\\)'],\n        ],\n        processEscapes: true,\n      }\n    : {\n        packages,\n        macros,\n      };\n\n  const mmlConfig = {\n    parseError: function(node) {\n      // function to process parsing errors\n      // eslint-disable-next-line no-console\n      console.log('error:', node);\n      this.error(this.adaptor.textContent(node).replace(/\\n.*/g, ''));\n    },\n    FindMathML: new myFindMathML(),\n  };\n\n  let cachedMathjax;\n\n  if (globalMathjax && globalMathjax.version !== mathjax.version) {\n    // handling other MathJax version on the page\n    // replacing it temporarily with the version we have\n    window.MathJax._ = window.MathJax._ || {};\n    window.MathJax.config = window.MathJax.config || {};\n    cachedMathjax = window.MathJax;\n    Object.assign(globalMathjax, mathjax);\n  }\n\n  const fontURL = `https://unpkg.com/mathjax-full@${mathjax.version}/ts/output/chtml/fonts/tex-woff-v2`;\n  const htmlConfig = {\n    fontURL,\n\n    wrapperFactory: new CHTMLWrapperFactory({\n      ...CHTMLWrapperFactory.defaultNodes,\n      ...chtmlNodes,\n    }),\n  };\n\n  const mml = new MathML(mmlConfig);\n\n  const customMmlFactory = new MmlFactory({\n    ...MmlFactory.defaultNodes,\n    ...mmlNodes,\n  });\n  const classFactory = EnrichHandler(\n    MenuHandler(AssistiveMmlHandler(mathjax.handlers.handlesDocument(docProvided))),\n    mml,\n  );\n\n  const html = classFactory.create(docProvided, {\n    compileError: (mj, math, err) => {\n      // eslint-disable-next-line no-console\n      console.log('bad math?:', math);\n      // eslint-disable-next-line no-console\n      console.error(err);\n    },\n    typesetError: function(doc, math, err) {\n      // eslint-disable-next-line no-console\n      console.log('typeset error');\n      // eslint-disable-next-line no-console\n      console.error(err);\n      doc.typesetError(math, err);\n    },\n\n    sre: {\n      speech: 'deep',\n    },\n    enrichSpeech: 'deep',\n\n    InputJax: [new TeX(texConfig), mml],\n    OutputJax: new CHTML(htmlConfig),\n    DomStrings: new HTMLDomStrings({\n      skipHtmlTags: [\n        'script',\n        'noscript',\n        'style',\n        'textarea',\n        'pre',\n        'code',\n        'annotation',\n        'annotation-xml',\n        'mjx-assistive-mml',\n        'mjx-container',\n      ],\n    }),\n  });\n\n  // Note: we must set this *after* mathjax.document (no idea why)\n  mml.setMmlFactory(customMmlFactory);\n\n  if (cachedMathjax) {\n    // if we have a cached version, we replace it here\n    window.MathJax = cachedMathjax;\n  }\n\n  return html;\n};\n\nlet enrichSpeechInitialized = false;\n\nconst bootstrap = (opts) => {\n  if (typeof window === 'undefined') {\n    return { Typeset: () => ({}) };\n  }\n\n  const html = createMathMLInstance(opts);\n\n  return {\n    version: mathjax.version,\n    html: html,\n    Typeset: function(...elements) {\n      const attemptRender = (temporary = false) => {\n        let updatedDocument = this.html.findMath(elements.length ? { elements } : {}).compile();\n\n        if (!temporary && sreReady) {\n          updatedDocument = updatedDocument.enrich();\n        }\n\n        updatedDocument = updatedDocument\n          .getMetrics()\n          .typeset()\n          .assistiveMml()\n          .attachSpeech()\n          .addMenu()\n          .updateDocument();\n\n        if (!enrichSpeechInitialized && typeof updatedDocument.math.list?.next?.data === 'object') {\n          enrichSpeechInitialized = true;\n        }\n\n        try {\n          const list = updatedDocument.math.list;\n\n          if (list) {\n            for (let item = list.next; typeof item.data !== 'symbol'; item = item.next) {\n              const mathMl = toMMl(item.data.root);\n              const parsedMathMl = mathMl.replaceAll('\\n', '');\n\n              item.data.typesetRoot.setAttribute('data-mathml', parsedMathMl);\n              item.data.typesetRoot.setAttribute('tabindex', '-1');\n            }\n          }\n        } catch (e) {\n          // eslint-disable-next-line no-console\n          console.error(e.toString());\n        }\n\n        updatedDocument.clear();\n      };\n\n      if (!enrichSpeechInitialized) {\n        attemptRender(true);\n      }\n\n      mathjax.handleRetriesFor(() => {\n        attemptRender();\n      });\n    },\n  };\n};\n\nconst renderMath = (el, renderOpts) => {\n  if (\n    window &&\n    window.MathJax &&\n    window.MathJax.customKey &&\n    window.MathJax.customKey == '@pie-lib/math-rendering-accessible@1'\n  ) {\n    return;\n  }\n\n  const isString = typeof el === 'string';\n  let executeOn = document.body;\n\n  if (isString) {\n    const div = document.createElement('div');\n\n    div.innerHTML = el;\n    executeOn = div;\n  }\n\n  fixMathElements(executeOn);\n  adjustMathMLStyle(executeOn);\n\n  if (isString) {\n    const html = createMathMLInstance(undefined, executeOn);\n\n    const updatedDocument = html\n      .findMath()\n      .compile()\n      .getMetrics()\n      .typeset()\n      .updateDocument();\n\n    const list = updatedDocument.math.list;\n    const item = list.next;\n\n    if (!item) {\n      return '';\n    }\n\n    const mathMl = toMMl(item.data.root);\n    const parsedMathMl = mathMl.replaceAll('\\n', '');\n\n    return parsedMathMl;\n  }\n\n  if (!getGlobal().instance) {\n    getGlobal().instance = bootstrap(renderOpts);\n  }\n\n  if (!el) {\n    log('el is undefined');\n    return;\n  }\n\n  if (el instanceof Element && getGlobal().instance?.Typeset) {\n    getGlobal().instance.Typeset(el);\n  } else if (el.length && getGlobal().instance?.Typeset) {\n    const arr = Array.from(el);\n    getGlobal().instance.Typeset(...arr);\n  }\n};\n\n/**\n * This style is added to overried default styling of mjx-mspace Mathjax tag\n * In mathjax src code \\newline latex gets parsed to <mjx-mspace></mjx-mspace>,\n * but has the default style\n * 'mjx-mspace': {\n  \"display\": 'in-line',\n  \"text-align\": 'left'\n} which prevents it from showing as a newline value\n */\nCHTMLmspace.styles = {\n  'mjx-mspace': {\n    display: 'block',\n    'text-align': 'center',\n    height: '5px',\n  },\n};\n\nexport default renderMath;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/math-rendering",
-  "version": "3.2.2-next.4+23991a09",
+  "version": "3.4.0-beta.0",
   "description": "math rendering utilities",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "pie-framework developers",
   "license": "ISC",
   "dependencies": {
+    "@pie-framework/mathml-to-latex": "1.4.4",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
-    "mathjax-full": "3.2.2",
-    "mathml-to-latex": "1.2.0"
+    "mathjax-full": "3.2.2"
   },
-  "gitHead": "23991a09b77492c24dcb5235049667cdcc211d80",
+  "gitHead": "3818c24530f62b5bb9be7a2c6aa5428f13a17e0a",
   "scripts": {}
 }

package/src/__tests__/mml-to-latex.test.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import mmlToLatex from '../mml-to-latex';
+
+
+describe('mmlToLatex', () => {
+  it('should work', () => {
+    const mml =
+      '<math xmlns="http://www.w3.org/1998/Math/MathML">  <mn>2</mn>  <mi>x</mi>  <mtext>&#xA0;</mtext>  <mo>&#x2264;</mo>  <mn>4</mn>  <mi>y</mi>  <mtext>&#xA0;</mtext>  <mo>+</mo>  <mtext>&#xA0;</mtext>  <mn>8</mn> <msqrt>    <mi>h</mi>  </msqrt></math>';
+    // todo revisit this
+    // const latex = '2x\\text{ }\\leq4y\\text{ }+\\text{ }8\\sqrt{h}';
+    const latex = '2 x \\textrm{ } \\leq 4 y \\textrm{ } + \\textrm{ } 8 \\sqrt{h}';
+
+    expect(mmlToLatex(mml)).toEqual(latex);
+  });
+});

package/src/__tests__/normalization.test.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import debug from 'debug';
+import { Data } from 'slate';
+import { BracketTypes, wrapMath, unWrapMath } from '../normalization';
+
+const log = debug('@pie-lib:math-rendering:test:normalization');
+
+describe('normalization', () => {
+  describe('unWrapMath', () => {
+    const assertUnWrap = (html, expected, wrapType) => {
+      it(`innerHTML: ${html} is unWrapped to: ${expected} with wrapType: ${wrapType}`, () => {
+        const out = unWrapMath(html);
+
+        expect(out).toEqual({
+          unwrapped: expected,
+          wrapType: wrapType,
+        });
+      });
+    };
+
+    assertUnWrap('$$<$$', '<', BracketTypes.DOLLAR);
+    assertUnWrap('$<$', '<', BracketTypes.DOLLAR);
+    assertUnWrap('\\(<\\)', '<', BracketTypes.ROUND_BRACKETS);
+    assertUnWrap('\\[<\\]', '<', BracketTypes.ROUND_BRACKETS);
+    assertUnWrap('latex', 'latex', BracketTypes.ROUND_BRACKETS);
+    assertUnWrap('\\displaystyle foo', 'foo', BracketTypes.ROUND_BRACKETS);
+  });
+
+  describe('wrapMath', () => {
+    const assertWrap = (latex, expectedHtml, wrapper) => {
+      wrapper = wrapper || BracketTypes.ROUND_BRACKETS;
+      it(`${latex} is wrapped to: ${expectedHtml}`, () => {
+        const out = wrapMath(latex, wrapper);
+
+        log('out: ', out);
+
+        expect(out).toEqual(expectedHtml);
+      });
+    };
+
+    assertWrap('latex', '\\(latex\\)', BracketTypes.ROUND_BRACKETS);
+    assertWrap('latex', '\\(latex\\)', BracketTypes.SQUARE_BRACKETS);
+    assertWrap('latex', '$latex$', BracketTypes.DOLLAR);
+    assertWrap('latex', '$latex$', BracketTypes.DOUBLE_DOLLAR);
+
+    /**
+     * Note that when this is converted to html it get's escaped - but that's an issue with the slate html-serializer.
+     */
+    assertWrap('<', '\\(<\\)');
+  });
+});

package/src/__tests__/render-math.test.js

@@ -0,0 +1,155 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import renderMath, { fixMathElement } from '../render-math';
+import _ from 'lodash';
+
+jest.mock(
+  'mathjax-full/js/mathjax',
+  () => ({
+    mathjax: {
+      document: jest.fn().mockReturnThis(),
+      findMath: jest.fn().mockReturnThis(),
+      compile: jest.fn().mockReturnThis(),
+      getMetrics: jest.fn().mockReturnThis(),
+      typeset: jest.fn().mockReturnThis(),
+      updateDocument: jest.fn().mockReturnThis(),
+      clear: jest.fn().mockReturnThis(),
+      handlers: {
+        handlesDocument: jest.fn().mockReturnThis(),
+      },
+      handleRetriesFor: jest.fn().mockImplementation((callback) => callback()),
+    },
+  }),
+  {
+    virtual: false,
+  },
+);
+
+jest.mock('mathjax-full/js/input/mathml', () => {
+  const mock = jest.fn().mockReturnThis();
+  mock.setMmlFactory = jest.fn();
+  return {
+    MathML: () => mock,
+  };
+});
+
+jest.mock('mathjax-full/js/input/tex', () => ({
+  TeX: jest.fn(),
+}));
+jest.mock('mathjax-full/js/core/MmlTree/MmlFactory', () => {
+  const instance = {
+    setMmlFactory: jest.fn(),
+    defaultNodes: {},
+  };
+  return {
+    MmlFactory: () => instance,
+  };
+});
+
+const mockMathInstance = {
+  document: jest.fn().mockReturnThis(),
+  findMath: jest.fn().mockReturnThis(),
+  compile: jest.fn().mockReturnThis(),
+  enrich: jest.fn().mockReturnThis(),
+  addMenu: jest.fn().mockReturnThis(),
+  attachSpeech: jest.fn().mockReturnThis(),
+  assistiveMml: jest.fn().mockReturnThis(),
+  getMetrics: jest.fn().mockReturnThis(),
+  typeset: jest.fn().mockReturnThis(),
+  updateDocument: jest.fn().mockReturnValue({
+    math: {
+      list: undefined,
+    },
+    clear: jest.fn().mockReturnThis(),
+  }),
+  clear: jest.fn().mockReturnThis(),
+  handlers: {
+    handlesDocument: jest.fn().mockReturnThis(),
+  },
+  handleRetriesFor: jest.fn().mockImplementation((callback) => callback()),
+};
+
+const mockHtml = {
+  findMath: jest.fn().mockReturnValue(mockMathInstance),
+};
+
+const mockEnrichHandlerInstance = {
+  create: jest.fn().mockImplementation(() => mockHtml),
+};
+
+jest.mock('mathjax-full/js/a11y/semantic-enrich', () => {
+  return {
+    EnrichHandler: () => mockEnrichHandlerInstance,
+  };
+});
+
+jest.mock('mathjax-full/js/a11y/assistive-mml', () => {
+  return {
+    AssistiveMmlHandler: () => {},
+  };
+});
+
+jest.mock('mathjax-full/js/ui/menu/MenuHandler', () => {
+  return {
+    MenuHandler: () => {},
+  };
+});
+
+jest.mock('mathjax-full/js/output/chtml', () => ({
+  CHTML: jest.fn(),
+}));
+
+jest.mock('mathjax-full/js/adaptors/browserAdaptor', () => ({
+  browserAdaptor: jest.fn(),
+}));
+
+jest.mock('mathjax-full/js/handlers/html', () => ({
+  RegisterHTMLHandler: jest.fn(),
+}));
+
+jest.mock('mathjax-full/js/core/MmlTree/SerializedMmlVisitor', () => ({
+  SerializedMmlVisitor: jest.fn(),
+}));
+
+describe('render-math', () => {
+  it('calls classFactory.create once', () => {
+    const div = document.createElement('div');
+
+    _.times(10).forEach((i) => renderMath(div));
+
+    expect(mockEnrichHandlerInstance.create).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls MathJax render', () => {
+    const div = document.createElement('div');
+
+    renderMath(div);
+    expect(mockEnrichHandlerInstance.create).toHaveBeenCalledTimes(1);
+    expect(mockHtml.findMath).toHaveBeenCalledWith({ elements: [div] });
+  });
+
+  it('call render math for an array of elements', () => {
+    const divOne = document.createElement('div');
+    const divTwo = document.createElement('div');
+
+    renderMath([divOne, divTwo]);
+
+    expect(mockEnrichHandlerInstance.create).toHaveBeenCalledTimes(1);
+    expect(mockHtml.findMath).toHaveBeenCalledWith({
+      elements: [divOne, divTwo],
+    });
+  });
+
+  it('wraps the math containing element the right way', () => {
+    const wrapper = mount(
+      <div>
+        <span data-latex="">{'420\\text{ cm}=4.2\\text{ meters}'}</span>
+      </div>,
+    );
+    const spanElem = wrapper.instance();
+
+    fixMathElement(spanElem);
+
+    expect(spanElem.textContent).toEqual('\\(420\\text{ cm}=4.2\\text{ meters}\\)');
+  });
+});

package/src/mml-to-latex.js

@@ -1,2 +1,2 @@
-import Mathml2latex from 'mathml-to-latex';
-export default (mathml) => Mathml2latex.convert(mathml);
+import { MathMLToLaTeX } from '@pie-framework/mathml-to-latex';
+export default (mathml) => MathMLToLaTeX.convert(mathml);