Merge pull request #679 from mathjax/sre-errors

Add support for trapping and reporting sre errors.

Author: dpvc

ts/a11y/explorer.ts

@@ -643,8 +643,11 @@ let csSelectionBox = function(menu: MJContextMenu, locale: string) {
 let csMenu = function(menu: MJContextMenu, sub: Submenu) {
   let locale = menu.pool.lookup('locale').getValue() as string;
   const box = csSelectionBox(menu, locale);
-  const items = sre.ClearspeakPreferences.smartPreferences(
-    menu.mathItem, locale);
+  let items: Object[] = [];
+  try {
+    items = sre.ClearspeakPreferences.smartPreferences(
+      menu.mathItem, locale);
+  } catch (e) {}
   if (box) {
     items.splice(2, 0, box);
   }

ts/a11y/semantic-enrich.ts

@@ -136,11 +136,16 @@ export function EnrichedMathItemMixin<N, T, D, B extends Constructor<AbstractMat
           currentSpeech = document.options.sre.speech;
         }
         const math = new document.options.MathItem('', MmlJax);
-        math.math = this.serializeMml(SRE.toEnriched(toMathML(this.root)));
-        math.display = this.display;
-        math.compile(document);
-        this.root = math.root;
-        this.inputData.originalMml = math.math;
+        try {
+          const mml = this.inputData.originalMml = toMathML(this.root);
+          math.math = this.serializeMml(SRE.toEnriched(mml));
+          math.display = this.display;
+          math.compile(document);
+          this.root = math.root;
+          this.inputData.enrichedMml = math.math;
+        } catch (err) {
+          document.options.enrichError(document, this, err);
+        }
       }
       this.state(STATE.ENRICHED);
     }
@@ -213,6 +218,13 @@ export interface EnrichedMathDocument<N, T, D> extends AbstractMathDocument<N, T
    * @return {EnrichedMathDocument}   The MathDocument (so calls can be chained)
    */
   attachSpeech(): EnrichedMathDocument<N, T, D>;
+
+  /**
+   * @param {EnrichedMathDocument} doc   The MathDocument for the error
+   * @paarm {EnrichedMathItem} math      The MathItem causing the error
+   * @param {Error} err                  The error being processed
+   */
+  enrichError(doc: EnrichedMathDocument<N, T, D>, math: EnrichedMathItem<N, T, D>, err: Error): void;
 }
 
 /**
@@ -240,6 +252,9 @@ export function EnrichedMathDocumentMixin<N, T, D, B extends MathDocumentConstru
     public static OPTIONS: OptionList = {
       ...BaseDocument.OPTIONS,
       enableEnrichment: true,
+      enrichError: (doc: EnrichedMathDocument<N, T, D>,
+                    math: EnrichedMathItem<N, T, D>,
+                    err: Error) => doc.enrichError(doc, math, err),
       renderActions: expandable({
         ...BaseDocument.OPTIONS.renderActions,
         enrich:       [STATE.ENRICHED],
@@ -305,6 +320,12 @@ export function EnrichedMathDocumentMixin<N, T, D, B extends MathDocumentConstru
       return this;
     }
 
+    /**
+     */
+    public enrichError(_doc: EnrichedMathDocument<N, T, D>, _math: EnrichedMathItem<N, T, D>, err: Error) {
+      console.warn('Enrichment error:', err);
+    }
+
     /**
      * @override
      */