Simplied setProperties to setProperty wherever possible.

Author: zorkow

mathjax3-ts/input/tex/StackItem.ts

@@ -269,8 +269,9 @@ export interface StackItem extends NodeStack {
    * Set a property.
    * @param {string} key Property name.
    * @param {Prop} value Property value.
+   * @return {StackItem} The item for pipelining.
    */
-  setProperty(key: string, value: Prop): void;
+  setProperty(key: string, value: Prop): StackItem;
 
   /**
    * Convenience method for returning the string property "name".
@@ -379,6 +380,7 @@ export abstract class BaseItem extends MmlStack implements StackItem {
    */
   public setProperty(key: string, value: Prop) {
     this._properties[key] = value;
+    return this;
   }
 
 

mathjax3-ts/input/tex/ams/AmsMethods.ts

@@ -228,18 +228,18 @@ AmsMethods.xArrow = function(parser: TexParser, name: string,
     'mo', {stretchy: true, texClass: TEXCLASS.REL}, String.fromCharCode(chr));
   let mml = parser.create('node', 'munderover', [arrow]) as MmlMunderover;
   let mpadded = parser.create('node', 'mpadded', [first], def);
-  NodeUtil.setProperties(mpadded, {voffset: '.15em'});
+  NodeUtil.setAttribute(mpadded, 'voffset', '.15em');
   NodeUtil.setChild(mml, mml.over, mpadded);
   if (bot) {
     // @test Above Below Left Arrow, Above Below Right Arrow
     let bottom = new TexParser(bot, parser.stack.env, parser.configuration).mml();
     mpadded = parser.create('node', 'mpadded', [bottom], def);
-    NodeUtil.setProperties(mpadded, {voffset: '-.24em'});
+    NodeUtil.setAttribute(mpadded, 'voffset', '-.24em');
     NodeUtil.setChild(mml, mml.under, mpadded);
   }
   // @test Above Left Arrow, Above Right Arrow, Above Left Arrow in Context,
   //       Above Right Arrow in Context
-  NodeUtil.setProperties(mml, {subsupOK: true});
+  NodeUtil.setProperty(mml, 'subsupOK', true);
   parser.Push(mml);
 };
 
@@ -331,7 +331,7 @@ AmsMethods.Genfrac = function(parser: TexParser, name: string, left: string,
   }
   if (left || right) {
     // @test Normal Binomial, Text Binomial, Display Binomial
-    NodeUtil.setProperties(frac, {withDelims: true});
+    NodeUtil.setProperty(frac, 'withDelims', true);
     frac = ParseUtil.fixedFence(parser.configuration, left, frac, right);
   }
   if (style !== '') {

mathjax3-ts/input/tex/base/BaseItems.ts

@@ -248,15 +248,15 @@ export class SubsupItem extends BaseItem {
           NodeUtil.setChild(top, 2, this.getProperty('primes') as MmlNode);
         } else {
           // @test Prime on Prime
-          NodeUtil.setProperties(this.getProperty('primes') as MmlNode, {variantForm: true});
+          NodeUtil.setProperty(this.getProperty('primes') as MmlNode, 'variantForm', true);
           const node = this.create('node', 'mrow', [this.getProperty('primes') as MmlNode, item.First]);
           item.First = node;
         }
       }
       NodeUtil.setChild(top, position, item.First);
       if (this.getProperty('movesupsub') != null) {
         // @test Limits Subsup (currently does not work! Check again!)
-        NodeUtil.setProperties(top, {movesupsub: this.getProperty('movesupsub')} as PropertyList);
+        NodeUtil.setProperty(top, 'movesupsub', this.getProperty('movesupsub') as Property);
       }
       const result = this.factory.create('mml', top);
       return result;
@@ -320,7 +320,7 @@ export class OverItem extends BaseItem {
       }
       if (this.getProperty('open') || this.getProperty('close')) {
         // @test Choose
-        NodeUtil.setProperties(mml, {'withDelims': true});
+        NodeUtil.setProperty(mml, 'withDelims', true);
         mml = ParseUtil.fixedFence(this.factory.configuration,
                                    this.getProperty('open') as string, mml,
                                    this.getProperty('close') as string);
@@ -842,7 +842,7 @@ export class ArrayItem extends BaseItem {
         if (this.arraydef['rowlines']) {
           // @test Enclosed dashed row, Enclosed solid row,
           this.arraydef['rowlines'] =
-            (this.arraydef['rowlines'] as string).replace(/none( none) + $/, 'none');
+            (this.arraydef['rowlines'] as string).replace(/none( none)+$/, 'none');
         }
         // @test Enclosed left right
         mml = this.create('node', 'menclose', [mml],

mathjax3-ts/input/tex/base/BaseMethods.ts

@@ -302,8 +302,8 @@ BaseMethods.SetStyle = function(parser: TexParser, name: string,
   parser.stack.env['style'] = texStyle;
   parser.stack.env['level'] = level;
   parser.Push(
-    parser.itemFactory.create('style').setProperties(
-      {styles: {displaystyle: style, scriptlevel: level}}) );
+    parser.itemFactory.create('style').setProperty(
+      'styles', {displaystyle: style, scriptlevel: level}));
 };
 
 
@@ -316,7 +316,7 @@ BaseMethods.SetStyle = function(parser: TexParser, name: string,
 BaseMethods.SetSize = function(parser: TexParser, name: string, size: string) {
   parser.stack.env['size'] = size;
   parser.Push(
-    parser.itemFactory.create('style').setProperties({styles: {mathsize: size + 'em'}}) );
+    parser.itemFactory.create('style').setProperty('styles', {mathsize: size + 'em'}));
 };
 
 // TODO: Will be replaced by the color extension!
@@ -364,7 +364,7 @@ BaseMethods.LeftRight = function(parser: TexParser, name: string) {
   const first = name.substr(1);
   parser.Push(
     parser.itemFactory.create(first)
-      .setProperties({delim: parser.GetDelimiter(name)}) );
+      .setProperty('delim', parser.GetDelimiter(name)));
 };
 
 /**
@@ -455,7 +455,7 @@ BaseMethods.Limits = function(parser: TexParser, name: string, limits: string) {
     NodeUtil.copyChildren(op, node);
     op = top.Last = node;
   }
-  NodeUtil.setProperties(op, {'movesupsub': limits ? true : false});
+  NodeUtil.setProperty(op, 'movesupsub', limits ? true : false);
   NodeUtil.setProperties(NodeUtil.getCoreMO(op), {'movablelimits': false});
   if (NodeUtil.getAttribute(op, 'movablelimits') ||
       NodeUtil.getProperty(op, 'movablelimits')) {
@@ -473,7 +473,7 @@ BaseMethods.Limits = function(parser: TexParser, name: string, limits: string) {
  */
 BaseMethods.Over = function(parser: TexParser, name: string, open: string, close: string) {
   // @test Over
-  const mml = parser.itemFactory.create('over').setProperties({name: parser.currentCS}) ;
+  const mml = parser.itemFactory.create('over').setProperty('name', parser.currentCS) ;
   if (open || close) {
     // @test Choose
     mml.setProperty('open', open);
@@ -672,7 +672,7 @@ BaseMethods.UnderOver = function(parser: TexParser, name: string, c: string, sta
     node = parser.create('node', 'TeXAtom', [mml],
                                                    {texClass: TEXCLASS.OP, movesupsub: true});
   }
-  NodeUtil.setProperties(node, {subsupOK: true});
+  NodeUtil.setProperty(node, 'subsupOK', true);
   parser.Push(node);
 };
 
@@ -1109,7 +1109,7 @@ BaseMethods.Matrix = function(parser: TexParser, name: string,
     parser.i = 0;
   }
   // @test Matrix Braces, Matrix Columns, Matrix Rows.
-  const array = parser.itemFactory.create('array').setProperties({requireClose: true});
+  const array = parser.itemFactory.create('array').setProperty('requireClose', true);
   array.arraydef = {
     rowspacing: (vspacing || '4pt'),
     columnspacing: (spacing || '1em')
@@ -1148,7 +1148,7 @@ BaseMethods.Matrix = function(parser: TexParser, name: string,
 BaseMethods.Entry = function(parser: TexParser, name: string) {
   // @test Label, Array, Cross Product Formula
   parser.Push(
-    parser.itemFactory.create('cell').setProperties({isEntry: true, name: name}) );
+    parser.itemFactory.create('cell').setProperties({isEntry: true, name: name}));
   if (parser.stack.Top().getProperty('isCases')) {
     //
     //  Make second column be in \text{...} (unless it is already
@@ -1232,7 +1232,7 @@ BaseMethods.Entry = function(parser: TexParser, name: string) {
 BaseMethods.Cr = function(parser: TexParser, name: string) {
   // @test Cr Linebreak, Misplaced Cr
   parser.Push(
-    parser.itemFactory.create('cell').setProperties({isCR: true, name: name}) );
+    parser.itemFactory.create('cell').setProperties({isCR: true, name: name}));
 };
 
 
@@ -1356,7 +1356,7 @@ BaseMethods.BeginEnd = function(parser: TexParser, name: string) {
     // environment. Otherwise we have a standard LaTeX environment that is
     // handled with begin and end items.
     if (!macro.args[0]) {
-      const mml = parser.itemFactory.create('end').setProperties({name: env});
+      const mml = parser.itemFactory.create('end').setProperty('name', env);
       parser.Push(mml);
       return;
     }
@@ -1469,7 +1469,7 @@ BaseMethods.Equation = function (parser: TexParser, begin: StackItem, numbered:
   parser.Push(begin);
   ParseUtil.checkEqnEnv(parser);
   return parser.itemFactory.create('equation', numbered).
-    setProperties({name: begin.getName()});
+    setProperty('name', begin.getName());
 };
 
 

mathjax3-ts/input/tex/boldsymbol/BoldsymbolConfiguration.ts

@@ -94,10 +94,10 @@ export function rewriteBoldTokens(arg: {data: ParseOptions}) {
     if (NodeUtil.getProperty(node, 'fixBold')) {
       let variant = NodeUtil.getAttribute(node, 'mathvariant') as string;
       if (variant == null) {
-        NodeUtil.setProperties(node, {mathvariant: TexConstant.Variant.BOLD});
+        NodeUtil.setAttribute(node, 'mathvariant', TexConstant.Variant.BOLD);
       } else {
-        NodeUtil.setProperties(node,
-                               {mathvariant: BOLDVARIANT[variant] || variant});
+        NodeUtil.setAttribute(node,
+                              'mathvariant', BOLDVARIANT[variant] || variant);
       }
       NodeUtil.removeProperties(node, 'fixBold');
     }

mathjax3-ts/input/tex/newcommand/NewcommandMethods.ts

@@ -247,7 +247,7 @@ NewcommandMethods.BeginEnv = function(parser: TexParser, begin: StackItem,
     parser.string = rest;
     parser.i = 0;
     // Close this environment.
-    return parser.itemFactory.create('end').setProperties({name: begin.getName()});
+    return parser.itemFactory.create('end').setProperty('name', begin.getName());
   }
   if (n) {
     // @test Newenvironment Optional, Newenvironment Arg Optional
@@ -267,7 +267,7 @@ NewcommandMethods.BeginEnv = function(parser: TexParser, begin: StackItem,
   parser.string = ParseUtil.addArgs(parser, bdef,
                                     parser.string.slice(parser.i));
   parser.i = 0;
-  return parser.itemFactory.create('beginEnv').setProperties({name: begin.getName()});
+  return parser.itemFactory.create('beginEnv').setProperty('name', begin.getName());
 };
 
 NewcommandMethods.Macro = BaseMethods.Macro;