Remove addEventHandlers() in favor of output jax postFilter hooks.

Author: dpvc

lib/Mml-lab.js

@@ -29,7 +29,7 @@ const Lab = window.Lab = {
     handleRetriesFor(function () {
       math.compile();
       math.typeset(doc);
-    }).then(() => Lab.Update(math.typesetRoot.outerHTML))
+    }).then(() => Lab.Update(math.typesetRoot))
       .catch(err => {console.log("Error: "+err.message); console.log(err.stack)});
   },
 
@@ -38,7 +38,8 @@ const Lab = window.Lab = {
   },
 
   Update(html) {
-    this.output.innerHTML = html;
+    this.output.innerHTML = '';
+    this.output.appendChild(html);
   },
 
   checkKey: function (textarea, event) {

lib/TeX-lab.js

@@ -29,7 +29,7 @@ const Lab = window.Lab = {
     handleRetriesFor(function () {
       math.compile();
       math.typeset(doc);
-    }).then(() => Lab.Update(math.typesetRoot.outerHTML))
+    }).then(() => Lab.Update(math.typesetRoot))
       .catch(err => {console.log("Error: "+err.message); console.log(err.stack)});
   },
 
@@ -38,7 +38,8 @@ const Lab = window.Lab = {
   },
 
   Update(html) {
-    this.output.innerHTML = html;
+    this.output.innerHTML = '';
+    this.output.appendChild(html);
   },
 
   setDisplay(checked) {

mathjax3-ts/core/MathDocument.ts

@@ -44,7 +44,6 @@ import {DOMAdaptor} from '../core/DOMAdaptor.js';
  *        .compile()
  *        .getMetrics()
  *        .typeset()
- *        .addEventHandlers()
  *        .updateDocument();
  *
  *  The MathDocument is the main interface for page authors to
@@ -129,13 +128,6 @@ export interface MathDocument<N, T, D> {
      */
     typeset(): MathDocument<N, T, D>;
 
-    /*
-     * Add any event handlers to the typeset math
-     *
-     * @return{MathDocument}  The math document instance
-     */
-    addEventHandlers(): MathDocument<N, T, D>;
-
     /*
      * Updates the document to include the typeset math
      *
@@ -198,7 +190,6 @@ export type MathProcessed = {
     compile: boolean;
     getMetrics: boolean;
     typeset: boolean;
-    addEventHandlers: boolean;
     updateDocument: boolean;
     [name: string]: boolean;
 };
@@ -289,7 +280,6 @@ export abstract class AbstractMathDocument<N, T, D> implements MathDocument<N, T
             compile: false,
             typeset: false,
             getMetrics: false,
-            addEventHandlers: false,
             updateDocument: false
         };
         this.outputJax = this.options['OutputJax'] || new DefaultOutputJax<N, T, D>();
@@ -405,14 +395,6 @@ export abstract class AbstractMathDocument<N, T, D> implements MathDocument<N, T
         return this;
     }
 
-    /*
-     * @override
-     */
-    public addEventHandlers() {
-        this.processed.addEventHandlers = true;
-        return this;
-    }
-
     /*
      * @override
      */
@@ -445,7 +427,6 @@ export abstract class AbstractMathDocument<N, T, D> implements MathDocument<N, T
         }
         if (state < STATE.TYPESET) {
             this.processed.typeset = false;
-            this.processed.addEventHandlers = false;
             this.processed.getMetrics = false;
         }
         if (state < STATE.COMPILED) {

mathjax3-ts/core/MathItem.ts

@@ -149,11 +149,6 @@ export interface MathItem<N, T, D> {
      */
     typeset(document: MathDocument<N, T, D>): void;
 
-    /*
-     * Adds any needed event handlers to the typeset output
-     */
-    addEventHandlers(): void;
-
     /*
      * Inserts the typeset version in place of the original form in the document
      *
@@ -308,11 +303,6 @@ export abstract class AbstractMathItem<N, T, D> implements MathItem<N, T, D> {
         }
     }
 
-    /*
-     * @override
-     */
-    public addEventHandlers() {}
-
     /*
      * @override
      */

mathjax3-ts/core/OutputJax.ts

@@ -25,6 +25,7 @@ import {userOptions, defaultOptions, OptionList} from '../util/Options.js';
 import {MathDocument} from './MathDocument.js';
 import {MathItem, Metrics} from './MathItem.js';
 import {DOMAdaptor} from '../core/DOMAdaptor.js';
+import {FunctionList} from '../util/FunctionList.js';
 
 /*****************************************************************/
 /*
@@ -47,6 +48,11 @@ export interface OutputJax<N, T, D> {
      */
     options: OptionList;
 
+    /*
+     * Lists of post-filters to call after typesetting the math
+     */
+    postFilters: FunctionList;
+
     /*
      * The DOM adaptor for managing HTML elements
      */
@@ -107,6 +113,7 @@ export abstract class AbstractOutputJax<N, T, D> implements OutputJax<N, T, D> {
     public static OPTIONS: OptionList = {};
 
     public options: OptionList;
+    public postFilters: FunctionList;
     public adaptor: DOMAdaptor<N, T, D> = null;  // set by the handler
 
     /*
@@ -115,6 +122,7 @@ export abstract class AbstractOutputJax<N, T, D> implements OutputJax<N, T, D> {
     constructor(options: OptionList = {}) {
         let CLASS = this.constructor as typeof AbstractOutputJax;
         this.options = userOptions(defaultOptions({}, CLASS.OPTIONS), options);
+        this.postFilters = new FunctionList();
     }
 
     /*
@@ -154,4 +162,19 @@ export abstract class AbstractOutputJax<N, T, D> implements OutputJax<N, T, D> {
         return null as N;
     }
 
+    /*
+     * Execute a set of filters, passing them the MathItem and any needed data,
+     *  and return the (possibly modified) data
+     *
+     * @param{FunctionList} filters  The list of functions to be performed
+     * @param{MathItem} math         The math item that is being processed
+     * @param{any} data              Whatever other data is needed
+     * @return{any}                  The (possibly modidied) data
+     */
+    protected executeFilters(filters: FunctionList, math: MathItem<N, T, D>, data: any) {
+        let args = {math: math, data: data};
+        filters.execute(args);
+        return args.data;
+    }
+
 }

mathjax3-ts/handlers/html/HTMLDocument.ts

@@ -183,6 +183,11 @@ export class HTMLDocument<N, T, D> extends AbstractMathDocument<N, T, D> {
         return this;
     }
 
+    /*
+     * @param{N} head     The document <head>
+     * @param{string} id  The id of the stylesheet to find
+     * @param{N|null}     The stylesheet with the given ID
+     */
     protected findSheet(head: N, id: string) {
         if (id) {
             for (const sheet of this.adaptor.tags(head, 'style')) {

mathjax3-ts/handlers/html/HTMLMathItem.ts

@@ -56,13 +56,6 @@ export class HTMLMathItem<N, T, D> extends AbstractMathItem<N, T, D> {
         super(math, jax, display, start, end);
     }
 
-    /*
-     * Not yet implemented
-     *
-     * @override
-     */
-    public addEventHandlers() {}
-
     /*
      * Insert the typeset MathItem into the document at the right location
      *   If the starting and ending nodes are the same:

mathjax3-ts/output/chtml.ts

@@ -32,6 +32,7 @@ import {FontData} from './chtml/FontData.js';
 import {TeXFont} from './chtml/fonts/tex.js';
 import {CssStyles} from './chtml/CssStyles.js';
 import {percent} from '../util/lengths.js';
+import {FunctionList} from '../util/FunctionList.js';
 import {BBox} from './chtml/BBox.js';
 
 
@@ -117,7 +118,7 @@ export class CHTML<N, T, D> extends AbstractOutputJax<N, T, D> {
         this.nodeMap = new Map<MmlNode, CHTMLWrapper<N, T, D>>();
         this.toCHTML(math.root, node);
         this.nodeMap = null;
-        return node;
+        return this.executeFilters(this.postFilters, math, node);
     }
 
     /*
@@ -148,7 +149,7 @@ export class CHTML<N, T, D> extends AbstractOutputJax<N, T, D> {
      */
     public getMetrics(html: MathDocument<N, T, D>) {
         for (const math of html.math) {
-            math.setMetrics(16, 8, 1000000, 1000000, 1);
+            math.setMetrics(16, 8, 80 * 16, 1000000, 1);
         }
     }
 

mathjax3-ts/util/Retries.ts

@@ -55,7 +55,6 @@ export interface RetryError extends Error {
  *             .compile()
  *             .getMetrics()
  *             .typeset()
- *             .addEventHandlers()
  *             .updateDocument();
  *
  *     }).catch(err => {