Fix #45: TeX option serialization regression for grouped expressions

Sources/MathJaxSwift/Options/Input/TeXInputProcessorOptions.swift

@@ -185,7 +185,7 @@ import JavaScriptCore
   public static let defaultProcessEscapes: Bool = false
   public static let defaultProcessRefs: Bool = true
   public static let defaultProcessEnvironments: Bool = true
-  public static let defaultDigits: String = "^(?:[0-9]+(?:{,}[0-9]{3})*(?:.[0-9]*)?|.[0-9]+)"
+  public static let defaultDigits: String = #"^(?:[0-9]+(?:\{,\}[0-9]{3})*(?:\.[0-9]*)?|\.[0-9]+)"#
   public static let defaultTags: Tag = Tags.none
   public static let defaultTagSide: TagSide = TagSides.right
   public static let defaultTagIndent: String = "0.8em"

Sources/MathJaxSwift/Resources/mjn/converters/chtml.js

@@ -10,9 +10,8 @@ const {AsciiMath} = require('mathjax-full/js/input/asciimath.js');
 const {MathML} = require('mathjax-full/js/input/mathml.js');
 const {TeX} = require('mathjax-full/js/input/tex.js');
 
-const {AllPackages} = require('mathjax-full/js/input/tex/AllPackages.js');
-
 const {loadDynamicFonts} = require('./dynamicFonts.js');
+const {normalizeTeXOptions} = require('./texOptions.js');
 
 /**
  * Converts TeX, MathML, and AsciiMath input to CommonHTML.
@@ -32,8 +31,7 @@ export class CommonHTMLConverter {
    * @return {string} The CommonHTML formatted string.
    */
   static tex2chtml(input, css, assistiveMml, conversionOptions, documentOptions, texOptions, chtmlOptions) {
-    texOptions.packages = AllPackages.filter((name) => (texOptions.loadPackages.includes(name) || (name === 'base')));
-    const tex = new TeX(texOptions);
+    const tex = new TeX(normalizeTeXOptions(texOptions));
     var output = [];
     for (let i = 0; i < input.length; i++) {
       output.push(CommonHTMLConverter.createCHTML(input[i], tex, css, assistiveMml, conversionOptions, documentOptions, chtmlOptions));

Sources/MathJaxSwift/Resources/mjn/converters/mml.js

@@ -8,7 +8,7 @@ const {STATE} = require('mathjax-full/js/core/MathItem.js');
 const {AsciiMath} = require('mathjax-full/js/input/asciimath.js');
 const {TeX} = require('mathjax-full/js/input/tex.js');
 
-const {AllPackages} = require('mathjax-full/js/input/tex/AllPackages.js');
+const {normalizeTeXOptions} = require('./texOptions.js');
 
 /**
  * Converts Tex and AsciiMath to MathML.
@@ -25,8 +25,7 @@ export class MathMLConverter {
    * @return {string} The MathML formatted string.
    */
   static tex2mml(input, conversionOptions, documentOptions, texOptions) {
-    texOptions.packages = AllPackages.filter((name) => (texOptions.loadPackages.includes(name) && ((name !== 'bussproofs') || (name === 'base'))));
-    const tex = new TeX(texOptions);
+    const tex = new TeX(normalizeTeXOptions(texOptions));
     var output = [];
     for (let i = 0; i < input.length; i++) {
       output.push(MathMLConverter.createMML(input[i], tex, conversionOptions, documentOptions));

Sources/MathJaxSwift/Resources/mjn/converters/svg.js

@@ -10,9 +10,8 @@ const {AsciiMath} = require('mathjax-full/js/input/asciimath.js');
 const {MathML} = require('mathjax-full/js/input/mathml.js');
 const {TeX} = require('mathjax-full/js/input/tex.js');
 
-const {AllPackages} = require('mathjax-full/js/input/tex/AllPackages.js');
-
 const {loadDynamicFonts} = require('./dynamicFonts.js');
+const {normalizeTeXOptions} = require('./texOptions.js');
 
 const CSS = [
   'svg a{fill:blue;stroke:blue}',
@@ -44,8 +43,7 @@ export class SVGConverter {
    * @return {string} The SVG formatted strings.
    */
   static tex2svg(input, css, assistiveMml, container, styles, conversionOptions, documentOptions, texOptions, svgOptions) {
-    texOptions.packages = AllPackages.filter((name) => (texOptions.loadPackages.includes(name) || (name === 'base')));
-    const tex = new TeX(texOptions);
+    const tex = new TeX(normalizeTeXOptions(texOptions));
     var output = [];
     for (let i = 0; i < input.length; i++) {
       output.push(SVGConverter.createSVG(input[i], tex, css, assistiveMml, container, styles, conversionOptions, documentOptions, svgOptions));

Sources/MathJaxSwift/Resources/mjn/converters/texOptions.js

@@ -0,0 +1,16 @@
+#! /usr/bin/env node
+
+const {AllPackages} = require('mathjax-full/js/input/tex/AllPackages.js');
+
+export function normalizeTeXOptions(texOptions) {
+  const options = {...texOptions};
+  const loadPackages = options.loadPackages || [];
+  options.packages = AllPackages.filter((name) => (loadPackages.includes(name) || (name === 'base')));
+  delete options.loadPackages;
+
+  if (typeof options.digits === 'string' && options.digits.length > 0) {
+    options.digits = new RegExp(options.digits);
+  }
+
+  return options;
+}

Tests/MathJaxSwiftTests/Conversions/TeX/Tex2CHTMLTests.swift

@@ -92,6 +92,20 @@ final class Tex2CHTMLTests: XCTestCase {
       XCTAssertEqual(error, MathJaxError.conversionError(error: MathJaxSwiftTests.texErrorOutput))
     }
   }
+
+  func testTex2CHTMLDoesNotEmitMErrorForValidGroupedExpressions() throws {
+    let inputs = [
+      "a^{10}",
+      "\\sum_{i=1}^n x_i",
+      "\\lim_{x \\to 0} \\frac{\\sin x}{x}",
+      "\\left( \\sum_{i=1}^n a_i \\right)^2"
+    ]
+
+    for input in inputs {
+      let output = try mathjax.tex2chtml(input)
+      XCTAssertFalse(output.contains("data-mjx-error="), "Expected valid TeX to render without merror for input: \(input)")
+    }
+  }
 
   func testTex2CHTMLTime() {
     measure {

Tests/MathJaxSwiftTests/Conversions/TeX/Tex2MMLTests.swift

@@ -92,6 +92,20 @@ final class Tex2MMLTests: XCTestCase {
       XCTAssertEqual(error, MathJaxError.conversionError(error: MathJaxSwiftTests.texErrorOutput))
     }
   }
+
+  func testTex2MMLDoesNotEmitMErrorForValidGroupedExpressions() throws {
+    let inputs = [
+      "a^{10}",
+      "\\sum_{i=1}^n x_i",
+      "\\lim_{x \\to 0} \\frac{\\sin x}{x}",
+      "\\left( \\sum_{i=1}^n a_i \\right)^2"
+    ]
+
+    for input in inputs {
+      let output = try mathjax.tex2mml(input)
+      XCTAssertFalse(output.contains("<merror"), "Expected valid TeX to render without merror for input: \(input)")
+    }
+  }
 
   func testTex2MMLTime() {
     measure {

Tests/MathJaxSwiftTests/Conversions/TeX/Tex2SVGTests.swift

@@ -104,6 +104,20 @@ final class Tex2SVGTests: XCTestCase {
       XCTAssertEqual(error, MathJaxError.conversionError(error: MathJaxSwiftTests.texErrorOutput))
     }
   }
+
+  func testTex2SVGDoesNotEmitMErrorForValidGroupedExpressions() throws {
+    let inputs = [
+      "a^{10}",
+      "\\sum_{i=1}^n x_i",
+      "\\lim_{x \\to 0} \\frac{\\sin x}{x}",
+      "\\left( \\sum_{i=1}^n a_i \\right)^2"
+    ]
+
+    for input in inputs {
+      let output = try mathjax.tex2svg(input)
+      XCTAssertFalse(output.contains("data-mml-node=\"merror\""), "Expected valid TeX to render without merror for input: \(input)")
+    }
+  }
 
   func testTex2SVGTime() {
     measure {