fix: fixed test failures

arnog · Jan 29, 2025 · 9651695 · 9651695
1 parent 72394d1
commit 9651695
Show file tree

Hide file tree

Showing 9 changed files with 2,679 additions and 2,691 deletions.
diff --git a/src/api.md b/src/api.md
diff --git a/src/core/atom-class.ts b/src/core/atom-class.ts
@@ -160,7 +160,7 @@ export class Atom<T extends (Argument | null)[] = (Argument | null)[]> {
     this.command = options.command ?? this.value ?? '';
     this.mode = options.mode ?? 'math';
     if (options.isFunction) this.isFunction = true;
-    if (options.isRoot) this.isRoot = true;
+    if (options.isRoot || this.type === 'root') this.isRoot = true;
     if (options.limits) this.subsupPlacement = options.limits;
     this.style = { ...(options.style ?? {}) };
     this.displayContainsHighlight = options.displayContainsHighlight ?? false;

diff --git a/src/editor-mathfield/mathfield-private.ts b/src/editor-mathfield/mathfield-private.ts
@@ -288,7 +288,7 @@ export class _Mathfield implements Mathfield, KeyboardDelegateInterface {
     const body = parseLatex(elementText, { context: this.context });
     let root: Atom;
     if (body.length === 1 && body[0].isRoot) root = body[0];
-    else root = new Atom({ type: 'root', mode, body, isRoot: true });
+    else root = new Atom({ type: 'root', mode, body });
 
     this.model = new _Model(this, mode, root);
 
@@ -1756,7 +1756,7 @@ If you are using Vue, this may be because you are using the runtime-only build o
 
   onCompositionStart(_composition: string): void {
     // Clear the selection if there is one
-    this.model.deleteAtoms(range(this.model.selection));
+    deleteRange(this.model, range(this.model.selection), 'insertText');
     const caretPoint = getCaretPoint(this.field!);
     if (!caretPoint) return;
     requestAnimationFrame(() => {

diff --git a/src/editor-model/model-private.ts b/src/editor-model/model-private.ts
@@ -316,18 +316,18 @@ export class _Model implements Model {
    * Note that an atom with children is included in the result only if
    * all its children are in range.
    */
-  getAtoms(arg: Selection, options?: GetAtomOptions): Readonly<Atom[]>;
-  getAtoms(arg: Range, options?: GetAtomOptions): Readonly<Atom[]>;
+  getAtoms(arg: Selection, options?: GetAtomOptions): ReadonlyArray<Atom>;
+  getAtoms(arg: Range, options?: GetAtomOptions): ReadonlyArray<Atom>;
   getAtoms(
     from: Offset,
     to?: Offset,
     options?: GetAtomOptions
-  ): Readonly<Atom[]>;
+  ): ReadonlyArray<Atom>;
   getAtoms(
     arg1: Selection | Range | Offset,
     arg2?: Offset | GetAtomOptions,
     arg3?: GetAtomOptions
-  ): Readonly<Atom[]> {
+  ): ReadonlyArray<Atom> {
     let options = arg3 ?? {};
     if (isSelection(arg1)) {
       options = (arg2 as GetAtomOptions) ?? {};

diff --git a/src/latex-commands/definitions-utils.ts b/src/latex-commands/definitions-utils.ts
@@ -253,7 +253,7 @@ const DEFAULT_MACROS: MacroDictionary = {
   'iff': {
     primitive: true,
     captureSelection: true,
-    def: '\\;\\char"27FA\\;', // >2,000 Note: additional spaces around the arrows
+    def: '\\;\\Longleftrightarrow\\;}', // >2,000 Note: additional spaces around the arrows, as per AMSMATH package definition
   },
   'nicefrac': '^{#1}\\!\\!/\\!_{#2}',
 

diff --git a/src/public/mathlive-ssr.ts b/src/public/mathlive-ssr.ts
@@ -107,7 +107,6 @@ export function convertLatexToMarkup(
   //
   const root = new Atom({
     type: 'root',
-    isRoot: true,
     mode: parseMode,
     body: parseLatex(text, { context: effectiveContext, parseMode, mathstyle }),
   });
@@ -237,7 +236,6 @@ export function convertLatexToAsciiMath(
   return atomToAsciiMath(
     new Atom({
       type: 'root',
-      isRoot: true,
       body: parseLatex(latex, { parseMode }),
     })
   );

diff --git a/src/virtual-keyboard/utils.ts b/src/virtual-keyboard/utils.ts
@@ -47,7 +47,6 @@ function latexToMarkup(latex: string): string {
   const root = new Atom({
     mode: 'math',
     type: 'root',
-    isRoot: true,
     body: parseLatex(latex, {
       context,
       args: (arg) =>

diff --git a/test/math-ascii.test.ts b/test/math-ascii.test.ts
@@ -56,7 +56,7 @@ describe('ASCII MATH', function () {
   equalASCIIMath('\\Gamma +1', 'Gamma+1');
   equalASCIIMath('\\frac{\\pi }{2\\pi }', '(pi)/(2pi)');
 
-  equalASCIIMath('x\\in \\R ', 'x in RR');
+  equalASCIIMath('x\\in \\mathbb{R} ', 'x in RR');
 
   // Avoid collisions with digits
   expect(convertLatexToAsciiMath('1^2 3^4')).toBe('1^2 3^4');
@@ -81,7 +81,7 @@ describe('ASCII MATH', function () {
   equalASCIIMath('\\left\\lbrack1,1\\right\\rbrack', '[1,1]');
   equalASCIIMath('\\left\\lbrace1,1\\right\\rbrace', '{1,1}');
   equalASCIIMath('\\left(1,1\\right)', '(1,1)');
-  
+
   expect(convertAsciiMathToLatex('1/2')).toBe('\\frac{1}{2}');
   expect(convertAsciiMathToLatex('(1/2)')).toBe('\\left(\\frac{1}{2}\\right)');
   expect(convertAsciiMathToLatex('1/2sin x')).toBe('\\frac{1}{2}\\sin x');

diff --git a/test/smoke/index.html b/test/smoke/index.html
@@ -612,7 +612,7 @@ <h2>MathML</h2>
     };
 
     mf.addEventListener('mount', () => {
-      setupMathfield(mf);
+      // setupMathfield(mf);
       mf.addEventListener("input", (ev) => updateContent(mf));