Merge pull request #491 from mathjax/better-errors

General improvements to input/output errors
mathjax · Jun 16, 2020 · 8b8e9a5 · 8b8e9a5
2 parents f6c9be7 + 834f317
commit 8b8e9a5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/ts/core/MathDocument.ts b/ts/core/MathDocument.ts
@@ -736,7 +736,7 @@ export abstract class AbstractMathDocument<N, T, D> implements MathDocument<N, T
    */
   public compileError(math: MathItem<N, T, D>, err: Error) {
     math.root = this.mmlFactory.create('math', null, [
-      this.mmlFactory.create('merror', {'data-mjx-error': err.message}, [
+      this.mmlFactory.create('merror', {'data-mjx-error': err.message, title: err.message}, [
         this.mmlFactory.create('mtext', null, [
           (this.mmlFactory.create('text') as TextNode).setText('Math input error')
         ])
@@ -745,6 +745,7 @@ export abstract class AbstractMathDocument<N, T, D> implements MathDocument<N, T
     if (math.display) {
       math.root.attributes.set('display', 'block');
     }
+    math.inputData.error = err.message;
   }
 
   /**
@@ -775,10 +776,32 @@ export abstract class AbstractMathDocument<N, T, D> implements MathDocument<N, T
    * @param {Error} err      The Error object for the error
    */
   public typesetError(math: MathItem<N, T, D>, err: Error) {
-    math.typesetRoot = this.adaptor.node('span',
-                                         {'data-mjx-error': err.message},
-                                         [this.adaptor.text('Math output error')]);
-    math.isEscaped = true;
+    math.typesetRoot = this.adaptor.node('mjx-container', {
+      class: 'MathJax mjx-output-error',
+      jax: this.outputJax.name,
+    }, [
+      this.adaptor.node('span', {
+        'data-mjx-error': err.message,
+        title: err.message,
+        style: {
+          color: 'red',
+          'background-color': 'yellow',
+          'line-height': 'normal'
+        }
+      }, [
+        this.adaptor.text('Math output error')
+      ])
+    ]);
+    if (math.display) {
+      this.adaptor.setAttributes(math.typesetRoot, {
+        style: {
+          display: 'block',
+          margin: '1em 0',
+          'text-align': 'center'
+        }
+      });
+    }
+    math.outputData.error = err.message;
   }
 
   /**

diff --git a/ts/input/tex/noerrors/NoErrorsConfiguration.ts b/ts/input/tex/noerrors/NoErrorsConfiguration.ts
@@ -35,7 +35,7 @@ import {NodeFactory} from '../NodeFactory.js';
 function noErrors(factory: NodeFactory,
                   message: string, _id: string, expr: string) {
   let mtext = factory.create('token', 'mtext', {}, expr.replace(/\n/g, ' '));
-  let error = factory.create('node', 'merror', [mtext], {'data-mjx-error': message});
+  let error = factory.create('node', 'merror', [mtext], {'data-mjx-error': message, title: message});
   return error;
 }
 

diff --git a/ts/output/svg/Wrappers/merror.ts b/ts/output/svg/Wrappers/merror.ts
@@ -64,6 +64,10 @@ export class SVGmerror<N, T, D> extends SVGWrapper<N, T, D> {
       'data-background': true,
       width: this.fixed(w), height: this.fixed(h + d), y: this.fixed(-d)
     }));
+    const title = this.node.attributes.get('title') as string;
+    if (title) {
+      this.adaptor.append(this.element, this.svg('title', {}, [this.adaptor.text(title)]));
+    }
     this.addChildren(svg);
   }