Merge branch 'develop' into textcomp_package

Author: zorkow

components/src/dependencies.js

@@ -21,6 +21,7 @@ export const dependencies = {
   '[tex]/enclose': ['input/tex-base'],
   '[tex]/extpfeil': ['input/tex-base', '[tex]/newcommand', '[tex]/ams'],
   '[tex]/html': ['input/tex-base'],
+  '[tex]/mathtools': ['input/tex-base', '[tex]/newcommand', '[tex]/ams'],
   '[tex]/mhchem': ['input/tex-base', '[tex]/ams'],
   '[tex]/newcommand': ['input/tex-base'],
   '[tex]/noerrors': ['input/tex-base'],
@@ -57,6 +58,7 @@ const allPackages = [
   '[tex]/enclose',
   '[tex]/extpfeil',
   '[tex]/html',
+  '[tex]/mathtools',
   '[tex]/mhchem',
   '[tex]/newcommand',
   '[tex]/noerrors',

components/src/input/tex/extensions/mathtools/build.json

@@ -0,0 +1,4 @@
+{
+  "component": "input/tex/extensions/mathtools",
+  "targets": ["input/tex/mathtools"]
+}

components/src/input/tex/extensions/mathtools/mathtools.js

@@ -0,0 +1 @@
+import './lib/mathtools.js';

components/src/input/tex/extensions/mathtools/webpack.config.js

@@ -0,0 +1,13 @@
+const PACKAGE = require('../../../../../webpack.common.js');
+
+module.exports = PACKAGE(
+  'input/tex/extensions/mathtools',   // the package to build
+  '../../../../../../js',             // location of the MathJax js library
+  [                                   // packages to link to
+    'components/src/input/tex/extensions/ams/lib',
+    'components/src/input/tex/extensions/newcommand/lib',
+    'components/src/input/tex-base/lib',
+    'components/src/core/lib'
+  ],
+  __dirname                           // our directory
+);

components/src/source.js

@@ -23,6 +23,7 @@ export const source = {
   '[tex]/enclose': `${src}/input/tex/extensions/enclose/enclose.js`,
   '[tex]/extpfeil': `${src}/input/tex/extensions/extpfeil/extpfeil.js`,
   '[tex]/html': `${src}/input/tex/extensions/html/html.js`,
+  '[tex]/mathtools': `${src}/input/tex/extensions/mathtools/mathtools.js`,
   '[tex]/mhchem': `${src}/input/tex/extensions/mhchem/mhchem.js`,
   '[tex]/newcommand': `${src}/input/tex/extensions/newcommand/newcommand.js`,
   '[tex]/noerrors': `${src}/input/tex/extensions/noerrors/noerrors.js`,

ts/components/loader.ts

@@ -42,7 +42,7 @@ declare var document: Document;
  * Function used to determine path to a given package.
  */
 export type PathFilterFunction = (data: {name: string, original: string, addExtension: boolean}) => boolean;
-export type PathFilterList = {[name: string]: PathFilterFunction};
+export type PathFilterList = (PathFilterFunction | [PathFilterFunction, number])[];
 
 /**
  * Update the configuration structure to include the loader configuration
@@ -57,6 +57,7 @@ export interface MathJaxConfig extends MJConfig {
     ready?: PackageReady;                      // A function to call when MathJax is ready
     failed?: PackageFailed;                    // A function to call when MathJax fails to load
     require?: (url: string) => any;            // A function for loading URLs
+    pathFilters?: PathFilterList;              // List of path filters (and optional priorities) to add
     [name: string]: any;                       // Other configuration blocks
   };
 }
@@ -73,7 +74,7 @@ export interface MathJaxObject extends MJObject {
     preLoad: (...names: string[]) => void;            // Indicate that packages are already loaded by hand
     defaultReady: () => void;                         // The function performed when all packages are loaded
     getRoot: () => string;                            // Find the root URL for the MathJax files
-    pathFilters: PathFilterList;                      // the filters to use for looking for package paths
+    pathFilters: FunctionList;                        // the filters to use for looking for package paths
   };
   startup?: any;
 }
@@ -117,6 +118,7 @@ export const PathFilters: {[name: string]: PathFilterFunction} = {
     }
     return true;
   }
+
 };
 
 
@@ -216,9 +218,9 @@ export namespace Loader {
   /**
    * The default filters to use.
    */
-  pathFilters.add(PathFilters.source, 1);
-  pathFilters.add(PathFilters.normalize, 2);
-  pathFilters.add(PathFilters.prefix, 5);
+  pathFilters.add(PathFilters.source, 0);
+  pathFilters.add(PathFilters.normalize, 10);
+  pathFilters.add(PathFilters.prefix, 20);
 }
 
 /**
@@ -229,6 +231,7 @@ export const MathJax = MJGlobal as MathJaxObject;
 /*
  * If the loader hasn't been added to the MathJax variable,
  *   Add the loader configuration, library, and data objects.
+ *   Add any path filters from the configuration.
  */
 if (typeof MathJax.loader === 'undefined') {
 
@@ -242,12 +245,23 @@ if (typeof MathJax.loader === 'undefined') {
     load: [],
     ready: Loader.defaultReady.bind(Loader),
     failed: (error: PackageError) => console.log(`MathJax(${error.package || '?'}): ${error.message}`),
-    require: null
+    require: null,
+    pathFilters: [],
   });
   combineWithMathJax({
     loader: Loader
   });
 
+  //
+  // Add any path filters from the configuration
+  //
+  for (const filter of MathJax.config.loader.pathFilters) {
+    if (Array.isArray(filter)) {
+      Loader.pathFilters.add(filter[0], filter[1]);
+    } else {
+      Loader.pathFilters.add(filter);
+    }
+  }
 }
 
 /**

ts/components/startup.ts

@@ -35,7 +35,7 @@ import {OutputJax} from '../core/OutputJax.js';
 import {CommonOutputJax} from '../output/common/OutputJax.js';
 import {DOMAdaptor} from '../core/DOMAdaptor.js';
 import {PrioritizedList} from '../util/PrioritizedList.js';
-import {OptionList} from '../util/Options.js';
+import {OptionList, OPTIONS} from '../util/Options.js';
 
 import {TeX} from '../input/tex.js';
 
@@ -54,6 +54,8 @@ export interface MathJaxConfig extends MJConfig {
     typeset?: boolean;       // Perform initial typeset?
     ready?: () => void;      // Function to perform when components are ready
     pageReady?: () => void;  // Function to perform when page is ready
+    invalidOption?: 'fatal' | 'warn'; // Do invalid options produce a warning, or throw an error?
+    optionError?: (message: string, key: string) => void,  // Function to report invalid options
     [name: string]: any;     // Other configuration blocks
   };
 }
@@ -534,8 +536,8 @@ export const MathJax = MJGlobal as MathJaxObject;
 
 /*
  * If the startup module hasn't been added to the MathJax variable,
- *   Add the startup configuration and data objects, and create
- *   the initial typeset and conversion calls.
+ *   Add the startup configuration and data objects, and
+ *   set the method for handling invalid options, if provided.
  */
 if (typeof MathJax._.startup === 'undefined') {
 
@@ -555,6 +557,13 @@ if (typeof MathJax._.startup === 'undefined') {
     options: {}
   });
 
+  if (MathJax.config.startup.invalidOption) {
+    OPTIONS.invalidOption = MathJax.config.startup.invalidOption;
+  }
+  if (MathJax.config.startup.optionError) {
+    OPTIONS.optionError = MathJax.config.startup.optionError;
+  }
+
 }
 
 /**

ts/core/MmlTree/MmlNodes/mo.ts

@@ -289,18 +289,6 @@ export class MmlMo extends AbstractMmlTokenNode {
         this.texClass = TEXCLASS.CLOSE;
       }
     }
-    if (this.getText() === '\u2061') {
-      //
-      //  Force previous node to be TEXCLASS.OP and skip this node
-      //
-      if (prev && prev.getProperty('texClass') === undefined &&
-          prev.attributes.get('mathvariant') !== 'italic') {
-        prev.texClass = TEXCLASS.OP;
-        prev.setProperty('fnOP', true);
-      }
-      this.texClass = this.prevClass = TEXCLASS.NONE;
-      return prev;
-    }
     return this.adjustTeXclass(prev);
   }
   /**

ts/core/MmlTree/MmlNodes/mstyle.ts

@@ -75,10 +75,16 @@ export class MmlMstyle extends AbstractMmlLayoutNode {
       } else {
         level = parseInt(scriptlevel);
       }
+      prime = false;  // style change resets tex prime style
     }
     let displaystyle = this.attributes.getExplicit('displaystyle') as boolean;
     if (displaystyle != null) {
       display = (displaystyle === true);
+      prime = false;  // style change resets tex prime style
+    }
+    const cramped = this.attributes.getExplicit('data-cramped') as boolean;  // manual control of tex prime style
+    if (cramped != null) {
+      prime = cramped;
     }
     attributes = this.addInheritedAttributes(attributes, this.attributes.getAllAttributes());
     this.childNodes[0].setInheritedAttributes(attributes, display, level, prime);

ts/core/MmlTree/MmlNodes/mtable.ts

@@ -106,10 +106,11 @@ export class MmlMtable extends AbstractMmlNode {
   /**
    * Make sure all children are mtr or mlabeledtr nodes
    * Inherit the table attributes, and set the display attribute based on the table's displaystyle attribute
+   * Reset the prime value to false
    *
    * @override
    */
-  protected setChildInheritedAttributes(attributes: AttributeList, display: boolean, level: number, prime: boolean) {
+  protected setChildInheritedAttributes(attributes: AttributeList, display: boolean, level: number, _prime: boolean) {
     for (const child of this.childNodes) {
       if (!child.isKind('mtr')) {
         this.replaceChild(this.factory.create('mtr'), child)
@@ -122,10 +123,11 @@ export class MmlMtable extends AbstractMmlNode {
       columnalign: this.attributes.get('columnalign'),
       rowalign: 'center'
     });
+    const cramped = this.attributes.getExplicit('data-cramped') as boolean;
     const ralign = split(this.attributes.get('rowalign') as string);
     for (const child of this.childNodes) {
       attributes.rowalign[1] = ralign.shift() || attributes.rowalign[1];
-      child.setInheritedAttributes(attributes, display, level, prime);
+      child.setInheritedAttributes(attributes, display, level, !!cramped);
     }
   }