Merge branch 'develop'

Author: dpvc

.travis.yml

@@ -3,6 +3,7 @@ node_js:
 - 17
 sudo: false
 script:
+- components/bin/version
 - npm install
 - npm run compile
 - npm run make-components

components/bin/version

@@ -0,0 +1,60 @@
+#! /usr/bin/env node
+
+/*************************************************************
+ *
+ *  Copyright (c) 2022 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * @fileoverview  Creates the version.ts file from the package version number
+ *
+ * @author [email protected] (Davide Cervone)
+ */
+
+
+const fs = require('fs');
+const path = require('path');
+
+const package = path.resolve(__dirname, '..', '..', 'package.json');
+const version = require(package).version;
+
+const lines = `/*************************************************************
+ *
+ *  Copyright (c) 2022 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * @fileoverview  The version of MathJax (used to tell what version a component
+ *                was compiled against).
+ *
+ * @author [email protected] (Davide Cervone)
+ */
+
+export const VERSION = '${version}';
+`;
+
+fs.writeFileSync(path.resolve(__dirname, '..', '..', 'ts', 'components', 'version.ts'), lines);

components/webpack.common.js

@@ -46,14 +46,12 @@ function quoteRE(string) {
 const PLUGINS = function (js, dir) {
   const mjdir = path.resolve(__dirname, '..', 'js');
   const jsdir = path.resolve(dir, js);
-  const package = path.resolve(__dirname, '..', 'package.json');
 
   //
   //  Record the js directory for the pack command
   //
   return [new webpack.DefinePlugin({
-    __JSDIR__: jsdir,
-    PACKAGE_VERSION: `'${require(package).version}'`
+    __JSDIR__: jsdir
   })];
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mathjax-full",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Beautiful and accessible math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers and in server-side node applications. This package includes the source code as well as the packaged components.",
   "license": "Apache-2.0",
   "main": "components/src/node-main/node-main.js",

ts/components/startup.ts

@@ -99,7 +99,7 @@ export interface MathJaxObject extends MJObject {
     extendHandler(extend: HandlerExtension): void;
     toMML(node: MmlNode): string;
     defaultReady(): void;
-    defaultPageReady(): void,
+    defaultPageReady(): Promise<void>;
     getComponents(): void;
     makeMethods(): void;
     makeTypesetMethods(): void;

ts/components/version.ts

@@ -1,6 +1,6 @@
 /*************************************************************
  *
- *  Copyright (c) 2018-2022 The MathJax Consortium
+ *  Copyright (c) 2022 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,23 +22,4 @@
  * @author [email protected] (Davide Cervone)
  */
 
-declare const PACKAGE_VERSION: string;  // provided by webpack via DefinePlugin
-
-export const VERSION = (
-  typeof PACKAGE_VERSION === 'undefined' ?
-    //
-    //  This will not be included in the webpack version, so only runs in node
-    //
-    (function () {
-      //
-      //  Look up the version from the package.json file
-      //
-      /* tslint:disable-next-line:no-eval */
-      const load = eval('require');
-      /* tslint:disable-next-line:no-eval */
-      const dirname = eval('__dirname');
-      const path = load('path');
-      return load(path.resolve(dirname, '..', '..', 'package.json')).version;
-    })() :
-  PACKAGE_VERSION
-);
+export const VERSION = '3.2.2';

ts/input/mathml/mml3/mml3.ts

@@ -73,9 +73,10 @@ export class Mml3<N, T, D> {
       const parsed = document.adaptor.parse(Mml3.XSLT, 'text/xml') as any as Node;
       processor.importStylesheet(parsed);
       this.transform = (node: N) => {
-        const div = document.adaptor.node('div', {}, [document.adaptor.clone(node)]);
+        const adaptor = document.adaptor;
+        const div = adaptor.node('div', {}, [adaptor.clone(node)]);
         const mml = processor.transformToDocument(div as any as Node) as any as N;
-        return document.adaptor.firstChild(mml) as N;
+        return adaptor.tags(mml, 'math')[0];
       };
     }
   }

ts/ui/lazy/LazyHandler.ts

@@ -215,6 +215,15 @@ export function LazyMathItemMixin<N, T, D, B extends Constructor<HTMLMathItem<N,
       }
     }
 
+    /**
+     * Only update the state if restore is true or false (null is used for setting lazy states)
+     * @override
+     */
+    public state(state: number = null, restore: boolean = false) {
+      if (restore !== null) super.state(state, restore);
+      return super.state();
+    }
+
     /**
      * Initially, just insert a marker for where the math will go, and
      *   track it in the lazy list.  Then, when it comes into view,
@@ -616,7 +625,7 @@ B extends MathDocumentConstructor<HTMLDocument<N, T, D>>>(
       let compile = false;
       for (const item of this.math) {
         const earlier = item as LazyMathItem<N, T, D>;
-        if (earlier === math || !earlier?.lazyCompile) {
+        if (earlier === math || !earlier?.lazyCompile || !earlier.lazyTex) {
           break;
         }
         earlier.lazyCompile = false;