Merge branch 'mathml-spacing' into alpha

Author: dpvc

mathjax3-ts/core/MmlTree/MmlNodes/mo.ts

@@ -25,7 +25,7 @@ import {PropertyList} from '../../Tree/Node.js';
 import {AbstractMmlTokenNode, MmlNode, AttributeList, TEXCLASS} from '../MmlNode.js';
 import {MmlMrow} from './mrow.js';
 import {MmlMover, MmlMunder, MmlMunderover} from './munderover.js';
-import {OperatorList, OPTABLE, RangeDef, RANGES} from '../OperatorDictionary.js';
+import {OperatorList, OPTABLE, RangeDef, RANGES, MMLSPACING} from '../OperatorDictionary.js';
 
 /*****************************************************************/
 /*
@@ -60,9 +60,10 @@ export class MmlMo extends AbstractMmlTokenNode {
     };
 
     /*
-     * Unicode ranges and their default TeX classes
+     * Unicode ranges and their default TeX classes and MathML spacing
      */
-    public static RANGES: RangeDef[] = RANGES;
+    public static RANGES = RANGES;
+    public static MMLSPACING = MMLSPACING;
 
     /*
      * The Operator Dictionary.
@@ -164,8 +165,7 @@ export class MmlMo extends AbstractMmlTokenNode {
      * @override
      */
     public hasSpacingAttributes() {
-        return !!this.attributes.getExplicit('form') ||
-               this.attributes.isSet('lspace') ||
+        return this.attributes.isSet('lspace') ||
                this.attributes.isSet('rspace');
     }
 
@@ -177,10 +177,6 @@ export class MmlMo extends AbstractMmlTokenNode {
     public setTeXclass(prev: MmlNode): MmlNode {
         let {form, lspace, rspace, fence} = this.attributes.getList('form', 'lspace', 'rspace', 'fence') as
                                              {form: string, lspace: string, rspace: string, fence: string};
-        if (this.hasSpacingAttributes()) {
-            this.texClass = TEXCLASS.NONE;
-            return this;
-        }
         if (fence && this.texClass === TEXCLASS.REL) {
             if (form === 'prefix') {
                 this.texClass = TEXCLASS.OPEN;
@@ -276,8 +272,9 @@ export class MmlMo extends AbstractMmlTokenNode {
             let range = this.getRange(mo);
             if (range) {
                 this.texClass = range[2];
-                this.lspace = (def[0] + 1) / 18;
-                this.rspace = (def[1] + 1) / 18;
+                const spacing = (this.constructor as typeof MmlMo).MMLSPACING[range[2]];
+                this.lspace = (spacing[0] + 1) / 18;
+                this.rspace = (spacing[1] + 1) / 18;
             }
         }
     }

mathjax3-ts/core/MmlTree/OperatorDictionary.ts

@@ -102,6 +102,19 @@ export const RANGES: RangeDef[] = [
     [0x1D400, 0x1D7FF, TEXCLASS.ORD, 'MathAlphabets']
 ];
 
+/*
+ * The default MathML spacing for the various TeX classes.
+ */
+export const MMLSPACING = [
+    [0, 0],  // ORD
+    [1, 2],  // OP
+    [3, 3],  // BIN
+    [4, 4],  // REL
+    [0, 0],  // OPEN
+    [0, 0],  // CLOSE
+    [0, 3]   // PUNCT
+];
+
 /*
  *  The operator dictionary, with sections for the three forms:  prefix, postfix, and infix
  */

mathjax3-ts/output/chtml/Wrapper.ts

@@ -516,7 +516,6 @@ export class CHTMLWrapper<N, T, D> extends AbstractWrapper<MmlNode, CHTMLWrapper
         const isTop = this.isTopEmbellished();
         const hasSpacing = this.node.hasSpacingAttributes();
         if (this.CHTML.options.mathmlSpacing || hasSpacing) {
-            console.log(this.node.attributes);
             isTop && this.getMathMLSpacing();
         } else {
             this.getTeXSpacing(isTop, hasSpacing);

mathjax3-ts/util/lengths.ts

@@ -79,19 +79,21 @@ export const MATHSPACE: {[name: string]: number} = {
 
 
 /*
- * @param{Property} length  A dimension (giving number and units) to be converted to ems
- * @param{number} size      The default size of the dimension (for percentage values)
- * @param{number} scale     The current scaling factor (to handle absolute units)
- * @return{number}          The dimension converted to ems
+ * @param{string|number} length  A dimension (giving number and units) to be converted to ems
+ * @param{number} size           The default size of the dimension (for percentage values)
+ * @param{number} scale          The current scaling factor (to handle absolute units)
+ * @return{number}               The dimension converted to ems
  */
-export function length2em(length: string, size: number = 0, scale: number = 1, em: number = 16) {
+export function length2em(length: string | number, size: number = 0, scale: number = 1, em: number = 16) {
+    if (typeof length !== 'string') {
+        length = String(length);
+    }
     if (length === '' || length == null) {
         return size;
     }
     if (MATHSPACE[length]) {
         return MATHSPACE[length];
     }
-
     let match = length.match(/^\s*([-+]?(?:\.\d+|\d+(?:\.\d*)?))?(pt|em|ex|mu|px|pc|in|mm|cm|%)?/);
     if (!match) {
         return size;