Merge branch 'hotfix-beta.4' into beta.4

Author: dpvc

components/src/input/tex-base/build.json

@@ -1,6 +1,13 @@
 {
     "component": "input/tex-base",
-    "targets": ["input/tex.ts", "input/tex"],
+    "targets": [
+        "input/tex.ts",
+        "input/tex",
+        "input/tex/base",
+        "util/entities/n.ts",
+        "util/entities/p.ts",
+        "util/entities/r.ts"
+    ],
     "exclude": ["input/tex/AllPackages.ts"],
     "excludeSubdirs": "true"
 }

components/src/input/tex-full/build.json

@@ -1,6 +1,12 @@
 {
     "component": "input/tex-full",
-    "targets": ["input/tex.ts", "input/tex"],
+    "targets": [
+        "input/tex.ts",
+        "input/tex",
+        "util/entities/n.ts",
+        "util/entities/p.ts",
+        "util/entities/r.ts"
+    ],
     "exclude": [
         "input/tex/tag_format",
         "input/tex/mhchem/mhchem_parser.d.ts"

components/src/input/tex/build.json

@@ -9,7 +9,10 @@
         "input/tex/noundefined",
         "input/tex/require",
         "input/tex/autoload",
-        "input/tex/config_macros"
+        "input/tex/config_macros",
+        "util/entities/n.ts",
+        "util/entities/p.ts",
+        "util/entities/r.ts"
     ],
     "exclude": ["input/tex/AllPackages.ts"],
     "excludeSubdirs": "true"

components/src/input/tex/extensions/all-packages/all-packages.js

@@ -1,15 +1,19 @@
 import './lib/all-packages.js';
 
 import {AllPackages} from '../../../../../../mathjax3/input/tex/AllPackages.js';
+import '../../../../../../mathjax3/input/tex/autoload/AutoloadConfiguration.js';
 import '../../../../../../mathjax3/input/tex/require/RequireConfiguration.js';
 import {insert} from '../../../../../../mathjax3/util/Options.js';
 
+if (MathJax.loader) {
+    MathJax.loader.preLoad('[tex]/autoload', '[tex]/require');
+}
 if (MathJax.startup) {
     if (!MathJax.config.tex) {
         MathJax.config.tex = {};
     }
     let packages = MathJax.config.tex.packages;
-    MathJax.config.tex.packages = ['require',...AllPackages];
+    MathJax.config.tex.packages = ['autoload', 'require', ...AllPackages];
     if (packages) {
         insert(MathJax.config.tex, {packages});
     }

components/src/input/tex/extensions/all-packages/build.json

@@ -1,5 +1,9 @@
 {
     "component": "input/tex/extensions/all-packages",
-    "targets": ["input/tex/AllPackages.ts"]
+    "targets": [
+        "input/tex/AllPackages.ts",
+        "input/tex/autoload",
+        "input/tex/require"
+    ]
 }
 

mathjax3-ts/components/startup.ts

@@ -258,9 +258,11 @@ export namespace Startup {
     export function defaultReady() {
         getComponents();
         makeMethods();
-        if (CONFIG.typeset && MathJax.TypesetPromise) {
-            promise = pagePromise.then(() => MathJax.TypesetPromise());
+        if (CONFIG.pageReady) {
+            pagePromise = pagePromise.then(CONFIG.pageReady);
         }
+        promise = (CONFIG.typeset && MathJax.TypesetPromise ?
+                   pagePromise.then(MathJax.TypesetPromise) : pagePromise);
     };
 
     /**

mathjax3-ts/input/tex/Configuration.ts

@@ -207,10 +207,14 @@ export class Configuration {
   register(config: Configuration, jax: TeX<any, any, any>, options: OptionList = {}) {
     this.append(config);
     config.init(this);
-    jax.parseOptions.handlers = new SubHandlers(this);
-    jax.parseOptions.nodeFactory.setCreators(config.nodes);
-    defaultOptions(jax.parseOptions.options, config.options);
-    userOptions(jax.parseOptions.options, options);
+    const parser = jax.parseOptions;
+    parser.handlers = new SubHandlers(this);
+    parser.nodeFactory.setCreators(config.nodes);
+    for (const kind of Object.keys(config.items)) {
+      parser.itemFactory.setNodeClass(kind, config.items[kind]);
+    }
+    defaultOptions(parser.options, config.options);
+    userOptions(parser.options, options);
     config.config(this, jax);
     for (const pre of config.preprocessors) {
       Array.isArray(pre) ? jax.preFilters.add(pre[0], pre[1]) : jax.preFilters.add(pre);

mathjax3-ts/input/tex/require/RequireConfiguration.ts

@@ -51,10 +51,10 @@ const MJCONFIG = (global.MathJax ? global.MathJax.config || {} : {});
  * @param {string} name   The name of the extension being added (e.g., '[tex]/amsCd')
  */
 function RegisterExtension(jax: TeX<any, any, any>, name: string) {
-    const required = jax.parseOptions.options.require.required;
-    if (required.indexOf(name) < 0) {
-        const extension = name.substr(6);
-        required.push(name);
+    const require = jax.parseOptions.options.require;
+    const extension = name.substr(require.prefix.length);
+    if (require.required.indexOf(extension) < 0) {
+        require.required.push(extension);
         //
         //  Register any dependencies that were loaded to handle this one
         //
@@ -122,8 +122,8 @@ export function RequireLoad(parser: TexParser, name: string) {
  */
 function config(config: Configuration, jax: TeX<any, any, any>) {
     const options = jax.parseOptions.options.require;
-    options.jax = jax;             // \require needs access to this
-    options.required = [];         // stores the names of the packages that have been added
+    options.jax = jax;                             // \require needs access to this
+    options.required = [...jax.options.packages];  // stores the names of the packages that have been added
     const prefix = options.prefix;
     if (prefix.match(/[^_a-zA-Z0-9]/)) {
         throw Error('Illegal characters used in \\require prefix');