Merge remote-tracking branch 'origin/tex_input_typescript' into beta.2

Author: dpvc

mathjax3-ts/input/tex.ts

@@ -124,7 +124,7 @@ export class TeX<N, T, D> extends AbstractInputJax<N, T, D> {
                                         [TeX.OPTIONS, TagsFactory.OPTIONS, {'packages': packages}]);
     let [tex, find, rest] = separateOptions(options, FindTeX.OPTIONS, parseOptions.options);
     super(tex);
-    userOptions(parseOptions.options, options);
+    userOptions(parseOptions.options, rest);
     TeX.tags(parseOptions, configuration);
     this.parseOptions = parseOptions;
     this.configuration = configuration;

mathjax3-ts/input/tex/ParseOptions.ts

@@ -150,6 +150,7 @@ export default class ParseOptions {
     this.root = null;
     this.nodeLists = {};
     this.error = false;
+    this.tags.resetTag();
   }
 
 

mathjax3-ts/input/tex/Tags.ts

@@ -162,11 +162,16 @@ export interface Tags {
   clearTag(): void;
 
   /**
-   * Resets the tag structure.
+   * Resets the tag structure after an expression has been typeset.
+   */
+  resetTag(): void;
+
+  /**
+   * Fully resets the tag structure, in particular all the tagging and label
+   * history.
    * @param {number} offset A new offset value to start counting ids from.
-   * @param {boolean} keep If sets, keep all previous labels and ids at reset.
    */
-  reset(offset: number, keep: boolean): void;
+  reset(offset?: number): void;
 
   /**
    * Finalizes tag creation.
@@ -405,13 +410,19 @@ export class AbstractTags implements Tags {
   /**
    * @override
    */
-  public reset(n: number, keepLabels: boolean) {
-    this.offset = (n || 0);
+  public resetTag() {
     this.history = [];
-    if (!keepLabels) {
-      this.labels = {};
-      this.ids = {};
-    }
+    this.clearTag();
+  }
+
+  /**
+   * @override
+   */
+  public reset(offset: number = 0) {
+    this.resetTag();
+    this.offset = offset;
+    this.labels = {};
+    this.ids = {};
   }
 
   /**
@@ -464,7 +475,8 @@ export class AbstractTags implements Tags {
     }
     let mml = new TexParser('\\text{' + this.currentTag.tagFormat + '}', {},
                             this.configuration).mml();
-    return this.configuration.nodeFactory.create('node', 'mtd', [mml], {id: this.currentTag.tagId});
+    return this.configuration.nodeFactory.create('node', 'mtd', [mml],
+                                                 {id: this.currentTag.tagId});
   }
 
 };

mathjax3-ts/input/tex/TexParser.ts

@@ -76,7 +76,8 @@ export default class TexParser {
    */
   constructor(private _string: string, env: EnvList,
               public configuration: ParseOptions) {
-    const inner = env['isInner'] as boolean;
+    const inner = env.hasOwnProperty('isInner');
+    const isInner = env['isInner'] as boolean;
     delete env['isInner'];
     let ENV: EnvList;
     if (env) {
@@ -86,7 +87,7 @@ export default class TexParser {
       }
     }
     this.configuration.pushParser(this);
-    this.stack = new Stack(this.itemFactory, ENV, inner);
+    this.stack = new Stack(this.itemFactory, ENV, inner ? isInner : true);
     this.Parse();
     this.Push(this.itemFactory.create('stop'));
   }