Merge branch 'tex_input_typescript' into alpha

Author: pkra

mathjax3-ts/input/tex/OldParser.ts

@@ -66,7 +66,6 @@ export class OldParser {
       }
     }
     this.stack = new Stack(ENV, !!env);
-    this.NewParser.setup(this.ParseMethods);
     // configurations.forEach(this.NewParser.append.bind(this.NewParser));
     this.Parse();
     this.Push(new StopItem());

mathjax3-ts/input/tex/ParseMethods.ts

@@ -24,6 +24,7 @@
 
 // import * as sitem from './StackItem.js';
 import * as sitem from './StackItem.js';
+import {NewTex} from './Translate.js';
 import {Symbol} from './Symbol.js';
 import {CharacterMap} from './SymbolMap.js';
 import {TreeHelper} from './TreeHelper.js';
@@ -1511,7 +1512,7 @@ export namespace ParseMethods {
     let T  = parser.ParseArg(name);
     let S  = parser.ParseArg(name);
     let SS = parser.ParseArg(name);
-    parser.Push(D);
+    parser.Push(NewTex.display ? D : T);
     // parser.Push(MML.TeXmathchoice(D,T,S,SS));
   }
 

mathjax3-ts/input/tex/ParserUtil.ts

@@ -26,16 +26,14 @@
 
 import {TEXCLASS, MmlNode} from '../../core/MmlTree/MmlNode.js';
 import {TreeHelper} from './TreeHelper.js';
-import TexParser from './TexParser.js';
+import {OldParser} from './OldParser.js';
 
 // A namespace for utility functions for the TeX Parser.
 //
 // Will become a Typescript namespace.
 
 export namespace ParserUtil {
 
-  export let OldParser = (x:any, {}) => x;
-  
   const emPerInch = 7.2;
   const pxPerInch = 72;
   const UNIT_CASES: {[key: string]: ((m: number) => number)}  = {
@@ -148,7 +146,7 @@ export namespace ParserUtil {
     }
     let D = '{\\bigg' + side + ' ' + fence + '}';
     let T = '{\\big' + side + ' ' + fence + '}';
-    return ParserUtil.OldParser('\\mathchoice' + D + T + T + T, {});
+    return new OldParser('\\mathchoice' + D + T + T + T, {}, {}).mml();
     // let parser = new TexParser();
     // return parser.parse('\\mathchoice' + D + T + T + T, {}).mml();
   };

mathjax3-ts/input/tex/TexParser.ts

@@ -29,6 +29,7 @@ import {HandlerType, Configuration, ParseInput, ParseResult, ParseMethod} from '
 import {BaseMappings} from './BaseMappings.js';
 import {AmsMappings} from './AmsMappings.js';
 import {AmsSymbols} from './AmsSymbols.js';
+import {ParseMethods} from './ParseMethods.js';
 
 
 /**
@@ -50,6 +51,7 @@ export default class TexParser {
     this.configure(BaseMappings.CONFIGURATION);
     this.append(AmsMappings.CONFIGURATION);
     this.append(AmsSymbols.CONFIGURATION);
+    this.setup(ParseMethods as any);
   }
 
 

mathjax3-ts/input/tex/Translate.ts

@@ -37,6 +37,8 @@ export namespace NewTex {
 
   export type Script = {type: string, innerText: string, MathJax: any};
 
+  export let display: boolean = false;
+  
   export function Compile(tex: string, display: boolean): MmlNode {
     let script = {
       type:"math/tex"+(display?"; mode=display":""),
@@ -60,7 +62,7 @@ export namespace NewTex {
     let mml: MmlNode;
     let isError = false;
     let math = script.innerText;
-    let display = (script.type.replace(/\n/g," ").match(/(;|\s|\n)mode\s*=\s*display(;|\s|\n|$)/) != null);
+    display = (script.type.replace(/\n/g," ").match(/(;|\s|\n)mode\s*=\s*display(;|\s|\n|$)/) != null);
     try {
       mml = new OldParser(math, null, ParseMethods as any).mml();
       TreeHelper.printSimple(mml.toString());