From 5d7c396cdb0e19f07356af4b0ea1f99c2ef66d06 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 23 Dec 2025 10:01:41 -0500 Subject: [PATCH 01/95] Initial implementation of Locale framework, with updates to asyncLoad to handle json files, and updates to testsuite. --- components/json.cjs | 2 + components/mjs/core/core.js | 17 +- components/mjs/core/locale.js | 4 + .../mjs/input/tex/extensions/bbox/config.json | 5 + components/mjs/node-main/node-main.js | 31 ++- components/mjs/require/config.json | 3 +- package.json | 5 +- testsuite/lib/AsyncLoad.child.json | 3 + testsuite/lib/component/locales/en.json | 3 + testsuite/lib/component/locales/test.json | 8 + testsuite/src/node-main.d.ts | 3 + testsuite/src/setupTex.ts | 4 + testsuite/src/source.d.ts | 3 + testsuite/tests/input/tex/Bbox.test.ts | 7 +- testsuite/tests/input/tex/Require.test.ts | 2 +- testsuite/tests/util/AsyncLoad.test.ts | 27 +- testsuite/tests/util/Locale.test.js | 15 + testsuite/tests/util/Locale.test.ts | 74 +++++ testsuite/tests/util/asyncLoad/esm.test.ts | 40 ++- testsuite/tests/util/asyncLoad/node.test.ts | 49 ++-- ts/components/loader.ts | 26 +- ts/components/startup.ts | 14 +- ts/input/tex/bbox/BboxConfiguration.ts | 50 ++-- ts/input/tex/bbox/locales/en.json | 4 + ts/input/tex/require/RequireConfiguration.ts | 7 +- ts/mathjax.ts | 8 + ts/util/AsyncLoad.ts | 29 ++ ts/util/Locale.ts | 257 ++++++++++++++++++ ts/util/asyncLoad/esm.ts | 17 +- ts/util/asyncLoad/fs.d.ts | 3 + ts/util/asyncLoad/node-import.cjs | 15 +- ts/util/asyncLoad/node.ts | 15 +- ts/util/asyncLoad/system.ts | 9 +- 33 files changed, 631 insertions(+), 128 deletions(-) create mode 100644 components/json.cjs create mode 100644 components/mjs/core/locale.js create mode 100644 testsuite/lib/AsyncLoad.child.json create mode 100644 testsuite/lib/component/locales/en.json create mode 100644 testsuite/lib/component/locales/test.json create mode 100644 testsuite/src/node-main.d.ts create mode 100644 testsuite/src/source.d.ts create mode 100644 testsuite/tests/util/Locale.test.js create mode 100644 testsuite/tests/util/Locale.test.ts create mode 100644 ts/input/tex/bbox/locales/en.json create mode 100644 ts/util/Locale.ts create mode 100644 ts/util/asyncLoad/fs.d.ts diff --git a/components/json.cjs b/components/json.cjs new file mode 100644 index 000000000..d1ebf1f4c --- /dev/null +++ b/components/json.cjs @@ -0,0 +1,2 @@ +module.exports.json = async function (file) {return require(file)}; +module.exports.require = require; diff --git a/components/mjs/core/core.js b/components/mjs/core/core.js index 82dcdbd23..f8ca8ecef 100644 --- a/components/mjs/core/core.js +++ b/components/mjs/core/core.js @@ -1,7 +1,9 @@ +import './locale.js'; import './lib/core.js'; import {HTMLHandler} from '#js/handlers/html/HTMLHandler.js'; import {browserAdaptor} from '#js/adaptors/browserAdaptor.js'; +import {Package} from '#js/components/package.js'; if (MathJax.startup) { MathJax.startup.registerConstructor('HTMLHandler', HTMLHandler); @@ -11,9 +13,16 @@ if (MathJax.startup) { } if (MathJax.loader) { const config = MathJax.config.loader; - MathJax._.mathjax.mathjax.asyncLoad = ( - (name) => name.substring(0, 5) === 'node:' + const {mathjax} = MathJax._.mathjax; + mathjax.asyncLoad = (name => { + if (name.match(/\.json$/)) { + if (name.charAt(0) === '[') { + name = Package.resolvePath(name); + } + return (config.json || mathjax.json)(name).then((data) => data.default ?? data); + } + return name.substring(0, 5) === 'node:' ? config.require(name) - : MathJax.loader.load(name).then(result => result[0]) - ); + : MathJax.loader.load(name).then(result => result[0]); + }); } diff --git a/components/mjs/core/locale.js b/components/mjs/core/locale.js new file mode 100644 index 000000000..6009400c7 --- /dev/null +++ b/components/mjs/core/locale.js @@ -0,0 +1,4 @@ +import {Locale} from '#js/util/Locale.js'; + +Locale.isComponent = true; + diff --git a/components/mjs/input/tex/extensions/bbox/config.json b/components/mjs/input/tex/extensions/bbox/config.json index 3c233eb2b..992885a51 100644 --- a/components/mjs/input/tex/extensions/bbox/config.json +++ b/components/mjs/input/tex/extensions/bbox/config.json @@ -4,6 +4,11 @@ "component": "input/tex/extensions/bbox", "targets": ["input/tex/bbox"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/bbox", + "from": "[ts]/input/tex/bbox", + "copy": ["locales"] + }, "webpack": { "name": "input/tex/extensions/bbox", "libs": [ diff --git a/components/mjs/node-main/node-main.js b/components/mjs/node-main/node-main.js index f49b70e18..025e243a4 100644 --- a/components/mjs/node-main/node-main.js +++ b/components/mjs/node-main/node-main.js @@ -21,16 +21,16 @@ import '../startup/init.js'; import {Loader, CONFIG} from '#js/components/loader.js'; -import {Package} from '#js/components/package.js'; -import {combineDefaults, combineConfig} from '#js/components/global.js'; +import {MathJax, combineDefaults, combineConfig} from '#js/components/global.js'; +import {resolvePath} from '#js/util/AsyncLoad.js'; import {context} from '#js/util/context.js'; import '../core/core.js'; import '../adaptors/liteDOM/liteDOM.js'; import {source} from '../source.js'; -const MathJax = global.MathJax; - -const path = eval('require("path")'); // get path from node, not webpack +const REQUIRE = eval('require'); // get require from node, not webpack +const path = REQUIRE("path"); +const fs = REQUIRE("fs").promises; const dir = context.path(MathJax.config.__dirname); // set up by node-main.mjs or node-main.cjs /* @@ -48,23 +48,26 @@ combineDefaults(MathJax.config, 'output', {font: 'mathjax-newcm'}); */ Loader.preLoaded('loader', 'startup', 'core', 'adaptors/liteDOM'); +/* + * Set the paths. + */ if (path.basename(dir) === 'node-main') { CONFIG.paths.esm = CONFIG.paths.mathjax; CONFIG.paths.sre = '[esm]/sre'; - CONFIG.paths.mathjax = path.dirname(dir); + CONFIG.paths.mathjax = path.resolve(dir, '..', '..', '..', 'bundle'); combineDefaults(CONFIG, 'source', source); } else { CONFIG.paths.mathjax = dir; } -// -// Set the asynchronous loader to use the js directory, so we can load -// other files like entity definitions -// -const ROOT = path.resolve(dir, '..', '..', '..', path.basename(path.dirname(dir))); -const REQUIRE = MathJax.config.loader.require; + +/* + * Set the asynchronous loader to handle json files + */ MathJax._.mathjax.mathjax.asyncLoad = function (name) { - return REQUIRE(name.charAt(0) === '.' ? path.resolve(ROOT, name) : - name.charAt(0) === '[' ? Package.resolvePath(name) : name); + const file = resolvePath(name, (name) => path.resolve(CONFIG.paths.mathjax, name)); + return file.match(/\.json$/) + ? fs.readFile(REQUIRE.resolve(file)).then((json) => JSON.parse(json)) + : REQUIRE(file); }; /* diff --git a/components/mjs/require/config.json b/components/mjs/require/config.json index 7e23a1374..bbe1ea8c0 100644 --- a/components/mjs/require/config.json +++ b/components/mjs/require/config.json @@ -3,7 +3,8 @@ "to": "[bundle]", "from": "../..", "copy": [ - "require.mjs" + "require.mjs", + "json.cjs" ] } } diff --git a/package.json b/package.json index 1c39dd754..31149dd07 100644 --- a/package.json +++ b/package.json @@ -80,10 +80,11 @@ "clean:lib": "clean() { pnpm -s log:single \"Cleaning $1 component libs\"; pnpm rimraf -g components/$1'/**/lib'; }; clean", "clean:mod": "clean() { pnpm -s log:comp \"Cleaning $1 module\"; pnpm -s clean:dir $1 && pnpm -s clean:lib $1; }; clean", "=============================================================================== copy": "", - "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy", + "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:locales $1 && pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", + "copy:locales": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 3 'ts/input/tex/*/locales/*.json' $1/input/tex/extensions; }; copy", "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy", - "copy:mml3": "copy() { pnpm -s log:single 'Copying legacy code MathML3'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy", + "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy", "copy:pkg": "copy() { pnpm -s log:single \"Copying package.json to $1\"; pnpm copyfiles -u 2 components/bin/package.json $1; }; copy", "=============================================================================== log": "", "log:comp": "log() { echo \u001b[32m$1\u001b[0m; }; log", diff --git a/testsuite/lib/AsyncLoad.child.json b/testsuite/lib/AsyncLoad.child.json new file mode 100644 index 000000000..e5bb1c70c --- /dev/null +++ b/testsuite/lib/AsyncLoad.child.json @@ -0,0 +1,3 @@ +{ + "json": true +} diff --git a/testsuite/lib/component/locales/en.json b/testsuite/lib/component/locales/en.json new file mode 100644 index 000000000..1a72bb940 --- /dev/null +++ b/testsuite/lib/component/locales/en.json @@ -0,0 +1,3 @@ +{ + "Id1": "Test of %1 in %2" +} diff --git a/testsuite/lib/component/locales/test.json b/testsuite/lib/component/locales/test.json new file mode 100644 index 000000000..42743ede7 --- /dev/null +++ b/testsuite/lib/component/locales/test.json @@ -0,0 +1,8 @@ +{ + "test1": "Has %% percent", + "test2": "Has %1 one", + "test3": "Order %2 %1 reversed", + "test4": "Skip %1 %3", + "test5": "Named %{hello} %world", + "error": "Error in %1" +} diff --git a/testsuite/src/node-main.d.ts b/testsuite/src/node-main.d.ts new file mode 100644 index 000000000..5fadad0d7 --- /dev/null +++ b/testsuite/src/node-main.d.ts @@ -0,0 +1,3 @@ +declare module '#source/node-main/node-main.mjs' { + export function init(config: any): any; +} diff --git a/testsuite/src/setupTex.ts b/testsuite/src/setupTex.ts index 6f65ce8b0..0ac621791 100644 --- a/testsuite/src/setupTex.ts +++ b/testsuite/src/setupTex.ts @@ -24,6 +24,7 @@ import { expect } from '@jest/globals'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import { source } from '#source/source.js'; +import {Locale} from '#js/util/Locale.js'; declare const MathJax: any; type MATHITEM = MathItem; @@ -196,6 +197,7 @@ export function setupTex( const html = new HTMLDocument('', adaptor, { InputJax: tex }); convert = (expr: string, display: boolean) => toMathML(html.convert(expr, { display: display, end: STATE.CONVERT })); + return Locale.setLocale(); } /** @@ -223,6 +225,7 @@ export function setupTexRender( html.findMath().compile(); return toMathML((Array.from(html.math)[0] as MATHITEM).root); }; + return Locale.setLocale(); } /** @@ -307,6 +310,7 @@ export function setupTexWithOutput( const toMathML = (node: MmlNode) => visitor.visitTree(node); convert = (expr: string, display: boolean) => toMathML(html.convert(expr, { display: display, end: STATE.CONVERT })); + return Locale.setLocale(); } /*********************************************************************/ diff --git a/testsuite/src/source.d.ts b/testsuite/src/source.d.ts new file mode 100644 index 000000000..d96c04162 --- /dev/null +++ b/testsuite/src/source.d.ts @@ -0,0 +1,3 @@ +declare module '#source/source.js' { + export const source: {[name: string]: string}; +} diff --git a/testsuite/tests/input/tex/Bbox.test.ts b/testsuite/tests/input/tex/Bbox.test.ts index 90f8d072b..c30194dc0 100644 --- a/testsuite/tests/input/tex/Bbox.test.ts +++ b/testsuite/tests/input/tex/Bbox.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeEach, describe, expect, it } from '@jest/globals'; import { getTokens, setupTex, tex2mml, expectTexError } from '#helpers'; import '#js/input/tex/bbox/BboxConfiguration'; -beforeEach(() => setupTex(['base', 'bbox'])); +beforeEach(async () => setupTex(['base', 'bbox'])); /**********************************************************************************/ @@ -52,9 +52,8 @@ describe('Bbox', () => { }); it('Bbox-General-Error', () => { - expectTexError('\\bbox[22-11=color]{a}').toBe( - `"22-11=color" doesn't look like a color, a padding dimension, or a style` - ); + expectTexError('\\bbox[22-11=color]{a}') + .toBe(`'22-11=color' doesn't look like a color, a padding dimension, or a style`); }); }); diff --git a/testsuite/tests/input/tex/Require.test.ts b/testsuite/tests/input/tex/Require.test.ts index ec383f255..d78f3dc03 100644 --- a/testsuite/tests/input/tex/Require.test.ts +++ b/testsuite/tests/input/tex/Require.test.ts @@ -17,7 +17,7 @@ setupComponents({ loader: { load: ['input/tex-base', '[tex]/require'], source: { - '[tex]/error': '../../testsuite/lib/error.js', + '[tex]/error': '../testsuite/lib/error.js' }, dependencies: { '[tex]/upgreek': ['input/tex-base', '[tex]/error'], diff --git a/testsuite/tests/util/AsyncLoad.test.ts b/testsuite/tests/util/AsyncLoad.test.ts index 93c1395fc..8f51a6701 100644 --- a/testsuite/tests/util/AsyncLoad.test.ts +++ b/testsuite/tests/util/AsyncLoad.test.ts @@ -1,5 +1,5 @@ import { describe, test, expect } from '@jest/globals'; -import { asyncLoad } from '#js/util/AsyncLoad.js'; +import { asyncLoad, resolvePath } from '#js/util/AsyncLoad.js'; import { mathjax } from '#js/mathjax.js'; describe('asyncLoad()', () => { @@ -43,4 +43,29 @@ describe('asyncLoad()', () => { }); await expect(asyncLoad('x.js')).rejects.toBe('fail'); }); + + test('resolvePath', () => { + // + // Test resolvePath woth Pacakge path resolution + // + (global as any).MathJax = { + _: { + components: { + package: { + Package: { + resolvePath: (file: string) => 'test:' + file, + } + } + } + } + }; + expect(resolvePath('[x]/y.js', (file) => file)).toBe('test:[x]/y.js'); + + // + // Remove MathJax._ and test relative and absolute paths + // + (global as any).MathJax = {} + expect(resolvePath('./x.js', (file) => `rel:${file.substring(2)}`, (file) => `abs:${file}`)).toBe('rel:x.js'); + expect(resolvePath('x.js', (file) => `rel:${file.substring(2)}`, (file) => `abs:${file}`)).toBe('abs:x.js'); + }); }); diff --git a/testsuite/tests/util/Locale.test.js b/testsuite/tests/util/Locale.test.js new file mode 100644 index 000000000..445de284c --- /dev/null +++ b/testsuite/tests/util/Locale.test.js @@ -0,0 +1,15 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var globals_1 = require("@jest/globals"); +var Locale = new Locale(); +/**********************************************************************************/ +/**********************************************************************************/ +(0, globals_1.describe)('Locale', function () { + /********************************************************************************/ + (0, globals_1.test)('registerLocaleFiles', function () { + Locale.registerLocaleFiles('test'); + (0, globals_1.expect)(Local.locations.text).toEqual({}); + }); +}); +/**********************************************************************************/ +/**********************************************************************************/ diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts new file mode 100644 index 000000000..a0a3d15ba --- /dev/null +++ b/testsuite/tests/util/Locale.test.ts @@ -0,0 +1,74 @@ +import { describe, test, expect } from '@jest/globals'; +import {Locale} from '#js/util/Locale.js'; +import '#js/util/asyncLoad/esm.js'; + +/**********************************************************************************/ +/**********************************************************************************/ + +describe('Locale', () => { + + /********************************************************************************/ + + test('Set locale', async () => { + expect(Locale.current).toBe('en'); + await Locale.setLocale(); + expect(Locale.current).toBe('en'); + await Locale.setLocale('de'); + expect(Locale.current).toBe('de'); + await Locale.setLocale('en'); + expect(Locale.current).toBe('en'); + }); + + /********************************************************************************/ + + test('Register a component', async () => { + const locale = Locale as any; + Locale.registerLocaleFiles('component', '../testsuite/lib/component'); + expect(locale.locations.component).toEqual(['../testsuite/lib/component/locales', new Set()]); + const error = console.error; + console.error = (message) => {throw message}; + await expect(Locale.setLocale('de')).rejects + .toMatch("MathJax(component): Can't load 'de.json': ENOENT: no such file or directory"); + console.error = error; + await Locale.setLocale('en'); + expect(locale.data.component).toEqual({en: {Id1: 'Test of %1 in %2'}}); + expect(Locale.message('component', 'Id1', 'message', 'Locale')).toBe('Test of message in Locale'); + }); + + /********************************************************************************/ + + test('Messages', async () => { + Locale.registerLocaleFiles('component', '../testsuite/lib/component'); + await Locale.setLocale('en'); // load English backups + await Locale.setLocale('test'); + expect(Locale.message('component', 'test1')).toBe('Has % percent'); + expect(Locale.message('component', 'test2', 'x')).toBe('Has x one'); + expect(Locale.message('component', 'test3', 'a', 'b')).toBe('Order b a reversed'); + expect(Locale.message('component', 'test4', 'a', 'b', 'c')).toBe('Skip a c'); + expect(Locale.message('component', 'test4')).toBe('Skip '); + expect(Locale.message('component', 'test5', {hello: 'HELLO', world: 'WORLD'})).toBe('Named HELLO WORLD'); + expect(Locale.message('component', 'Id1', 'a', 'b')).toBe('Test of a in b'); + expect(Locale.message('component', 'Id2')) + .toBe("No localized or default version for message with id 'Id2' from 'component'"); + expect(Locale.message('undefined', 'Id1')) + .toBe("No localized or default version for message with id 'Id1' from 'undefined'"); + expect(() => Locale.error('component', 'error', 'x')).toThrow('Error in x'); + }); + + /********************************************************************************/ + + test('isComponent', async () => { + Locale.isComponent = true; + Locale.registerLocaleFiles('../testsuite/lib/component', 'notfound'); + await Locale.setLocale('test'); + expect(Locale.message('component', 'test1')).toBe('Has % percent'); + Locale.isComponent = false; + }); + + /********************************************************************************/ + +}); + + +/**********************************************************************************/ +/**********************************************************************************/ diff --git a/testsuite/tests/util/asyncLoad/esm.test.ts b/testsuite/tests/util/asyncLoad/esm.test.ts index 7a1c36616..4ad9b8ce6 100644 --- a/testsuite/tests/util/asyncLoad/esm.test.ts +++ b/testsuite/tests/util/asyncLoad/esm.test.ts @@ -11,33 +11,29 @@ describe('asyncLoad() for esm', () => { test('asyncLoad()', async () => { const cjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.cjs'); const mjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.mjs'); - const relUnknown = path.join( - '..', - 'testsuite', - 'lib', - 'AsyncLoad.unknown.cjs' - ); + const jsonFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.json'); + const relUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.cjs'); + const jsonUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.json'); const absFile = path.join(root, cjsFile); + const absJson = path.join(root, jsonFile); const absUnknown = path.join(root, relUnknown); - await expect(asyncLoad(cjsFile)).resolves.toEqual({ loaded: true }); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found - await expect(asyncLoad(absFile)).resolves.toEqual({ loaded: true }); // absolute file found - await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found + await expect(asyncLoad(cjsFile)).resolves.toEqual({loaded: true}); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(absFile)).resolves.toEqual({loaded: true}); // absolute file found + await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found + + await expect(asyncLoad(jsonFile)).resolves.toEqual({json: true}); // relative json file found + await expect(asyncLoad(absJson)).resolves.toEqual({json: true}); // absolute json file found + await expect(asyncLoad(jsonUnknown).catch(() => true)).resolves.toBe(true); // unknown file not found - await expect( - asyncLoad('#js/components/version.js') // load using package exports - .then((result: any) => result.VERSION) - ).resolves.toBe(mathjax.version); - await expect( - asyncLoad('@mathjax/src/js/components/version.js') // load from module - .then((result: any) => result.VERSION) - ).resolves.toBe(mathjax.version); + await expect(asyncLoad('#js/components/version.js') // load using package exports + .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); + await expect(asyncLoad('@mathjax/src/js/components/version.js') // load from module + .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); - await expect( - asyncLoad(mjsFile).then((result: any) => result.loaded) - ).resolves.toBe(true); // mjs file loads - expect(mathjax.asyncIsSynchronous).toBe(false); // esm.js is asynchronous + await expect(asyncLoad(mjsFile).then((result: any) => result.loaded)).resolves.toBe(true); // mjs file loads + expect(mathjax.asyncIsSynchronous).toBe(false); // esm.js is asynchronous }); test('setBaseURL() for esm', async () => { diff --git a/testsuite/tests/util/asyncLoad/node.test.ts b/testsuite/tests/util/asyncLoad/node.test.ts index 08d995929..0f477a0ae 100644 --- a/testsuite/tests/util/asyncLoad/node.test.ts +++ b/testsuite/tests/util/asyncLoad/node.test.ts @@ -13,31 +13,36 @@ describe('asyncLoad() for node', () => { test('asyncLoad()', async () => { const cjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.cjs'); const mjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.mjs'); - const relUnknown = path.join( - '..', - 'testsuite', - 'lib', - 'AsyncLoad.unknown.cjs' - ); + const jsonFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.json'); + const relUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.cjs'); + const jsonUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.json'); const absFile = path.join(root, cjsFile); + const absJson = path.join(root, jsonFile); const absUnknown = path.join(root, relUnknown); - await expect(asyncLoad(cjsFile)).resolves.toEqual({ loaded: true }); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found - await expect(asyncLoad(absFile)).resolves.toEqual({ loaded: true }); // absolute file found - await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found - - await expect( - asyncLoad('#js/../cjs/components/version.js') // load using package exports - .then((result: any) => result.VERSION) - ).resolves.toBe(mathjax.version); - await expect( - asyncLoad('@mathjax/src/js/components/version.js') // load from module - .then((result: any) => result.VERSION) - ).resolves.toBe(mathjax.version); - - await expect(asyncLoad(mjsFile).catch(() => true)).resolves.toBe(true); // mjs file fails - expect(mathjax.asyncIsSynchronous).toBe(true); // node.js is synchronous + await expect(asyncLoad(cjsFile)).resolves.toEqual({loaded: true}); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(absFile)).resolves.toEqual({loaded: true}); // absolute file found + await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found + + await expect(asyncLoad(jsonFile)).resolves.toEqual({json: true}); // relative json file found + await expect(asyncLoad(absJson)).resolves.toEqual({json: true}); // absolute json file found + await expect(asyncLoad(jsonUnknown).catch(() => true)).resolves.toBe(true); // unknown file not found + + await expect(asyncLoad('#js/../cjs/components/version.js') // load using package exports + .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); + await expect(asyncLoad('@mathjax/src/js/components/version.js') // load from module + .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); + + await expect(asyncLoad(mjsFile).catch(() => true)).resolves.toBe(true); // mjs file fails + expect(mathjax.asyncIsSynchronous).toBe(true); // node.js is synchronous + + // + // Test mathjax.json separately, as asyncLoad doesn't call it. + // + await expect(mathjax.json(jsonFile)).resolves.toEqual({json: true}); + await expect(mathjax.json(absJson)).resolves.toEqual({json: true}); + await expect(mathjax.json(jsonUnknown).catch(() => true)).resolves.toBe(true); }); test('setBaseURL() for node', async () => { diff --git a/ts/components/loader.ts b/ts/components/loader.ts index 713b3947c..4ebd2ef48 100644 --- a/ts/components/loader.ts +++ b/ts/components/loader.ts @@ -45,11 +45,12 @@ import { context } from '../util/context.js'; /** * Function used to determine path to a given package. */ -export type PathFilterFunction = (data: { +export type PathFilterData = { name: string; original: string; addExtension: boolean; -}) => boolean; +}; +export type PathFilterFunction = (data: PathFilterData) => boolean; export type PathFilterList = ( | PathFilterFunction | [PathFilterFunction, number] @@ -99,11 +100,8 @@ export interface MathJaxObject extends MJObject { * Functions used to filter the path to a package */ export const PathFilters: { [name: string]: PathFilterFunction } = { - /** + /* * Look up the path in the configuration's source list - * - * @param {PathFilterFunction} data The data object containing the filter functions - * @returns {boolean} True */ source: (data) => { if (Object.hasOwn(CONFIG.source, data.name)) { @@ -112,11 +110,8 @@ export const PathFilters: { [name: string]: PathFilterFunction } = { return true; }, - /** + /* * Add [mathjax] before any relative path - * - * @param {PathFilterFunction} data The data object containing the filter functions - * @returns {boolean} True */ normalize: (data) => { const name = data.name; @@ -126,11 +121,8 @@ export const PathFilters: { [name: string]: PathFilterFunction } = { return true; }, - /** + /* * Recursively replace path prefixes (e.g., [mathjax], [tex], etc.) - * - * @param {PathFilterFunction} data The data object containing the filter functions - * @returns {boolean} True */ prefix: (data) => { let match; @@ -141,11 +133,8 @@ export const PathFilters: { [name: string]: PathFilterFunction } = { return true; }, - /** + /* * Add .js, if missing - * - * @param {PathFilterFunction} data The data object containing the filter functions - * @returns {boolean} True */ addExtension: (data) => { if (data.addExtension && !data.name.match(/\.[^/]+$/)) { @@ -411,6 +400,7 @@ if (typeof MathJax.loader === 'undefined') { failed: (error: PackageError) => console.log(`MathJax(${error.package || '?'}): ${error.message}`), require: null, + json: null, pathFilters: [], versionWarnings: true, }); diff --git a/ts/components/startup.ts b/ts/components/startup.ts index b3656b0d0..7bcd89a07 100644 --- a/ts/components/startup.ts +++ b/ts/components/startup.ts @@ -43,6 +43,7 @@ import { DOMAdaptor } from '../core/DOMAdaptor.js'; import { PrioritizedList } from '../util/PrioritizedList.js'; import { OptionList, OPTIONS } from '../util/Options.js'; import { context } from '../util/context.js'; +import { Locale } from '../util/Locale.js'; import { TeX } from '../input/tex.js'; @@ -117,6 +118,7 @@ export interface MathJaxObject extends MJObject { defaultReady(): void; defaultPageReady(): Promise; defaultOptionError(message: string, key: string): void; + setLocale(): Promise; getComponents(): void; makeMethods(): void; makeTypesetMethods(): void; @@ -306,7 +308,8 @@ export abstract class Startup { public static defaultReady() { Startup.getComponents(); Startup.makeMethods(); - Startup.pagePromise + Startup.setLocale() + .then(() => Startup.pagePromise) .then(() => CONFIG.pageReady()) // usually the initial typesetting call .then(() => Startup.promiseResolve()) .catch((err) => Startup.promiseReject(err)); @@ -336,6 +339,15 @@ export abstract class Startup { .then(() => Startup.promiseResolve()); } + /** + * Set the locale and load any needed locale data files. + * + * @returns {Promise} A promise for when the locale is loaded and ready. + */ + public static setLocale(): Promise { + return Locale.setLocale(MathJax.config.locale || 'en'); + } + /** * The default OptionError function */ diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index 37838302e..bbc86a7a5 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -27,6 +27,29 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; +import { Locale } from '../../../util/Locale.js'; + +/** + * The component name + */ +export const COMPONENT = '[tex]/bbox'; + +/** + * Register the locales + */ +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); + +/** + * Throw a TexError for this component (eventually, TexError will handle the message directly). + * + * @param {string} id The ID of the error message + * @param {string[]} args The values to substitute into the message + */ +function bboxError(id: string, ...args: string[]) { + const error = new TexError('', ''); + error.message = Locale.message(COMPONENT, id, ...args); + throw error; +} // Namespace const BboxMethods: { [key: string]: ParseMethod } = { @@ -50,12 +73,7 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Padding if (def) { // @test Bbox-Padding-Error - throw new TexError( - 'MultipleBBoxProperty', - '%1 specified twice in %2', - 'Padding', - name - ); + bboxError('MultipleBBoxProperty', 'Padding', name); } const pad = BBoxPadding(match[1] + match[3]); if (pad) { @@ -71,33 +89,19 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Background if (background) { // @test Bbox-Background-Error - throw new TexError( - 'MultipleBBoxProperty', - '%1 specified twice in %2', - 'Background', - name - ); + bboxError('MultipleBBoxProperty', 'Background', name); } background = part; } else if (part.match(/^[-a-z]+:/i)) { // @test Bbox-Frame if (style) { // @test Bbox-Frame-Error - throw new TexError( - 'MultipleBBoxProperty', - '%1 specified twice in %2', - 'Style', - name - ); + bboxError('MultipleBBoxProperty', 'Style', name); } style = BBoxStyle(part); } else if (part !== '') { // @test Bbox-General-Error - throw new TexError( - 'InvalidBBoxProperty', - '"%1" doesn\'t look like a color, a padding dimension, or a style', - part - ); + bboxError('InvalidBBoxProperty', part); } } if (def) { diff --git a/ts/input/tex/bbox/locales/en.json b/ts/input/tex/bbox/locales/en.json new file mode 100644 index 000000000..e06b8dfba --- /dev/null +++ b/ts/input/tex/bbox/locales/en.json @@ -0,0 +1,4 @@ +{ + "MultipleBBoxProperty": "%1 specified twice in %2", + "InvalidBBoxProperty": "'%1' doesn't look like a color, a padding dimension, or a style" +} diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 1a7408fba..384ee7616 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -39,6 +39,7 @@ import { Loader, CONFIG as LOADERCONFIG } from '../../../components/loader.js'; import { mathjax } from '../../../mathjax.js'; import { expandable } from '../../../util/Options.js'; import { MenuMathDocument } from '../../../ui/menu/MenuHandler.js'; +import { Locale } from '../../../util/Locale.js'; /** * The MathJax configuration block (for looking up user-defined package options) @@ -176,7 +177,11 @@ export function RequireLoad(parser: TexParser, name: string) { } const data = Package.packages.get(extension); if (!data) { - mathjax.retryAfter(Loader.load(extension).catch((_) => {})); + mathjax.retryAfter( + Loader.load(extension) + .then(() => Locale.setLocale()) + .catch((_) => {}) + ); } if (data.hasFailed) { throw new TexError('RequireFail', 'Extension "%1" failed to load', name); diff --git a/ts/mathjax.ts b/ts/mathjax.ts index f57974a4b..17b439666 100644 --- a/ts/mathjax.ts +++ b/ts/mathjax.ts @@ -77,4 +77,12 @@ export const mathjax = { * When asyncLoad uses require(), it actually operates synchronously and this is true */ asyncIsSynchronous: false, + + /** + * function to use for loading json files in components + * + * @param {string} file The name of the JSON file to load + * @returns {Promise} A promise resolving to the JSON data + */ + json: (file: string) => fetch(file).then((data) => data.json()), }; diff --git a/ts/util/AsyncLoad.ts b/ts/util/AsyncLoad.ts index 2d4c26166..958ba70c5 100644 --- a/ts/util/AsyncLoad.ts +++ b/ts/util/AsyncLoad.ts @@ -44,3 +44,32 @@ export function asyncLoad(name: string): Promise { } }); } + +/** + * Used to look up Package object, if it is in use + */ +declare const MathJax: any; + +/** + * Resolve a file name to a full path or URL + * + * @param {string} name The file name to resolve + * @param {(string)=>string} relative Function to get absolute path from relative one + * @param {(string)=>string} absolute Function to fix up absolute path + * @returns {string} The full path name + */ +export function resolvePath( + name: string, + relative: (name: string) => string, + absolute: (name: string) => string = (name) => name +): string { + const Package = + typeof MathJax === 'undefined' + ? null + : MathJax._?.components?.package?.Package; + return name.charAt(0) === '[' && Package + ? Package.resolvePath(name) + : name.charAt(0) === '.' + ? relative(name) + : absolute(name); +} diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts new file mode 100644 index 000000000..bb5a3b381 --- /dev/null +++ b/ts/util/Locale.ts @@ -0,0 +1,257 @@ +/************************************************************* + * + * Copyright (c) 2024 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Implements the locale framework + * + * @author dpvc@mathjax.org (Davide Cervone) + */ + +import { asyncLoad } from './AsyncLoad.js'; + +/** + * The various object map types + */ +export type messageData = { [id: string]: string }; +export type localeData = { [locale: string]: messageData }; +export type componentData = { [component: string]: localeData }; +export type namedData = { [name: string | number]: string }; + +/** + * The Locale class for handling localized messages + */ +export class Locale { + /** + * The current locale + */ + public static current: string = 'en'; + + /** + * The default locale for when a message has no current localization + */ + public static default: string = 'en'; + + /** + * True when the core component has been loaded (and so the Package path resolution is available) + */ + public static isComponent: boolean = false; + + /** + * The localized message strings, per component and locale, + * with the default message for localeError() below. + */ + protected static data: componentData = { + locale: { + en: { + LocaleJsonError: "MathJax(%1): Can't load '%2': %3", + }, + }, + }; + + /** + * The locale files to load for each locale (as registered by the components) + */ + protected static locations: { [component: string]: [string, Set] } = + {}; + + /** + * Registers a given component's locale directory + * + * @param {string} component The component's name (e.g., [tex]/bbox) + * @param {string} prefix The directory where the locales are located + */ + public static registerLocaleFiles( + component: string, + prefix: string = component + ) { + this.locations[component] = [ + `${this.isComponent ? component : prefix}/locales`, + new Set(), + ]; + } + + /** + * Register a set of messages for a given component and locale (called when the localization + * files are loaded). + * + * @param {string} component The component's name (e.g., [tex]/bbox) + * @param {string} locale The locale for the messages + * @param {messageData} data The messages indexed byu their IDs + */ + public static registerMessages( + component: string, + locale: string, + data: messageData + ) { + if (!this.data[component]) { + this.data[component] = {}; + } + const cdata = this.data[component]; + if (!cdata[locale]) { + cdata[locale] = {}; + } + Object.assign(cdata[locale], data); + } + + /** + * Get a message string and insert any arguments. The arguments can be positional, or a + * mapping of names to values. E.g. + * + * Locale.message('[my]/test', 'Hello', {name: 'World'})); + * Locale.message('[my]/test', 'FooBar', 'Foo')); + * + * @param {string} component The component whose message is requested + * @param {string} id The id of the message + * @param {string|namedData} data The first argument or the object of names arguments + * @param {string[]} args Any additional string arguments (if data is a string) + * @returns {string} The localized message with arguments substituted in + */ + public static message( + component: string, + id: string, + data: string | namedData = {}, + ...args: string[] + ): string { + const message = this.lookupMessage(component, id); + if (typeof data === 'string') { + data = { 1: data }; + for (let i = 0; i < args.length; i++) { + data[i + 2] = args[i]; + } + } + data['%'] = '%'; + return this.substituteArguments(message, data); + } + + /** + * Find a localized message string, or use the default if not available + * + * @param {string} component The component for this message + * @param {string} id The id of the message + * @returns {string} The message string to use + */ + public static lookupMessage(component: string, id: string): string { + return ( + this.data[component]?.[this.current]?.[id] || + this.data[component]?.[this.default]?.[id] || + `No localized or default version for message with id '${id}' from '${component}'` + ); + } + + /** + * Substitue arguments into a message string + * + * @param {string} message The original message string + * @param {namedData} data The mapping of markers to values + * @returns {string} The final string with substitutions made + */ + protected static substituteArguments( + message: string, + data: namedData + ): string { + const parts = message.split(/%(%|\d+|[a-z]+|\{.*?\})/); + for (let i = 1; i < parts.length; i += 2) { + const id = parts[i].replace(/^\{(.*)\}$/, '$1'); + parts[i] = data[id] ?? ''; + } + return parts.join(''); + } + + /** + * Throw an error with a given string substituting the given parameters + * + * @param {string} component The component whose message is requested + * @param {string} id The id of the message + * @param {string|namedData} data The first argument or the object of names arguments + * @param {string[]} args Any additional string arguments (if data is a string) + */ + public static error( + component: string, + id: string, + data: string | namedData, + ...args: string[] + ) { + throw Error(this.message(component, id, data, ...args)); + } + + /** + * Set the locale to the given one (or use the current one), and load + * any needed files (or newly registered files for the current locale). + * + * @param {string} locale The local to use (or use the current one) + * @returns {Promise} A promise that resolves when the locale files have been loaded + */ + public static async setLocale( + locale: string = this.current + ): Promise { + this.current = locale; + const promises = []; + for (const [component, [directory, loaded]] of Object.entries( + this.locations + )) { + if (!loaded.has(locale)) { + loaded.add(locale); + promises.push( + this.getLocaleData(component, locale, `${directory}/${locale}.json`) + ); + } + } + return Promise.all(promises); + } + + /** + * Load a localization file and register its contents + * + * @param {string} component The component whose localization is being loaded + * @param {string} locale The locale being loaded + * @param {string} file The file to load for that localization + * @returns {Promise} A promise that resolves when the file is loaded and registered + */ + protected static async getLocaleData( + component: string, + locale: string, + file: string + ): Promise { + return asyncLoad(file) + .then((data: messageData) => + this.registerMessages(component, locale, data) + ) + .catch((error) => this.localeError(component, locale, error)); + } + + /** + * Report an error thrown when loading a component's locale file + * + * @param {string} component The component whose localization is being loaded + * @param {string} locale The locale being loaded + * @param {Error} error The Error object causing the issue + */ + protected static localeError( + component: string, + locale: string, + error: Error + ) { + const message = this.message( + 'locale', + 'LocaleJsonError', + component, + `${locale}.json`, + error.message + ); + console.error(message); + } +} diff --git a/ts/util/asyncLoad/esm.ts b/ts/util/asyncLoad/esm.ts index 0fe350353..529cf7330 100644 --- a/ts/util/asyncLoad/esm.ts +++ b/ts/util/asyncLoad/esm.ts @@ -23,15 +23,28 @@ import { mathjax } from '../../mathjax.js'; import { context } from '../context.js'; +import { resolvePath } from '../AsyncLoad.js'; + +import { readFileSync } from 'node:fs'; +const { resolve } = import.meta as any as { resolve: (file: string) => string }; +const RESOLVE = resolve || ((file: string) => file); let root = context .path(new URL(import.meta.url, 'file://').href) .replace(/\/util\/asyncLoad\/esm.js$/, '/'); +mathjax.json = async (name: string) => { + return JSON.parse( + String(readFileSync(new URL(RESOLVE(name), 'file://').pathname)) + ); +}; + if (!mathjax.asyncLoad) { mathjax.asyncLoad = async (name: string) => { - const file = name.charAt(0) === '.' ? new URL(name, root).href : name; - return import(file).then((result) => result.default ?? result); + const file = resolvePath(name, (name) => new URL(name, root).pathname); + return (file.match(/\.json$/) ? mathjax.json(file) : import(file)).then( + (result) => result.default ?? result + ); }; } diff --git a/ts/util/asyncLoad/fs.d.ts b/ts/util/asyncLoad/fs.d.ts new file mode 100644 index 000000000..5f5691725 --- /dev/null +++ b/ts/util/asyncLoad/fs.d.ts @@ -0,0 +1,3 @@ +declare module 'node:fs' { + export function readFileSync(file: string): any; +} diff --git a/ts/util/asyncLoad/node-import.cjs b/ts/util/asyncLoad/node-import.cjs index 9c7d5a44c..7e2f6ee18 100644 --- a/ts/util/asyncLoad/node-import.cjs +++ b/ts/util/asyncLoad/node-import.cjs @@ -22,15 +22,22 @@ */ const { mathjax } = require('../../mathjax.js'); +const { resolvePath } = require('../AsyncLoad.js'); const path = require('path'); const { dirname } = require('#source/source.cjs'); let root = path.resolve(dirname, '..', '..', 'cjs'); +mathjax.json = async function readJsonFile(name) { + return require(name); +}; + if (!mathjax.asyncLoad) { - mathjax.asyncLoad = async (name) => { - const file = name.charAt(0) === '.' ? path.resolve(root, name) : name; - return import(file).then((result) => result?.default || result); + mathjax.asyncLoad = (name) => { + const file = resolvePath(name, (name) => path.resolve(root, name)); + return (file.match(/\.json$/) ? mathjax.json(file) : import(file)).then( + (result) => result?.default ?? result + ); }; } @@ -42,4 +49,4 @@ exports.setBaseURL = function (URL) { if (!root.match(/\/$/)) { root += '/'; } -} +}; diff --git a/ts/util/asyncLoad/node.ts b/ts/util/asyncLoad/node.ts index c185eb209..70abee6a2 100644 --- a/ts/util/asyncLoad/node.ts +++ b/ts/util/asyncLoad/node.ts @@ -22,6 +22,7 @@ */ import { mathjax } from '../../mathjax.js'; +import { resolvePath } from '../AsyncLoad.js'; import * as path from 'path'; import { dirname } from '#source/source.cjs'; @@ -29,11 +30,15 @@ declare const require: (name: string) => any; let root = path.resolve(dirname, '..', '..', 'cjs'); -if (!mathjax.asyncLoad && typeof require !== 'undefined') { - mathjax.asyncLoad = (name: string) => { - return require(name.charAt(0) === '.' ? path.resolve(root, name) : name); - }; - mathjax.asyncIsSynchronous = true; +if (typeof require !== 'undefined') { + mathjax.json = async (name: string) => require(name); + + if (!mathjax.asyncLoad) { + mathjax.asyncLoad = (name: string) => { + return require(resolvePath(name, (name) => path.resolve(root, name))); + }; + mathjax.asyncIsSynchronous = true; + } } /** diff --git a/ts/util/asyncLoad/system.ts b/ts/util/asyncLoad/system.ts index 1cb1d327a..d4dbef053 100644 --- a/ts/util/asyncLoad/system.ts +++ b/ts/util/asyncLoad/system.ts @@ -23,6 +23,7 @@ import { mathjax } from '../../mathjax.js'; import { context } from '../context.js'; +import { resolvePath } from '../AsyncLoad.js'; declare const System: { import: (name: string, url?: string) => any }; declare const __dirname: string; @@ -36,9 +37,11 @@ let root = if (!mathjax.asyncLoad && typeof System !== 'undefined' && System.import) { mathjax.asyncLoad = (name: string) => { - const file = ( - name.charAt(0) === '.' ? new URL(name, root) : new URL(name, 'file://') - ).href; + const file = resolvePath( + name, + (name) => new URL(name, root).href, + (name) => new URL(name, 'file://').href + ); return System.import(file).then((result: any) => result.default ?? result); }; } From 8b4913a0b086ff0bb4ebbadf26000440af0e613f Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 31 Dec 2025 16:37:22 -0500 Subject: [PATCH 02/95] Remove unneeded Locale.test.js file --- testsuite/tests/util/Locale.test.js | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 testsuite/tests/util/Locale.test.js diff --git a/testsuite/tests/util/Locale.test.js b/testsuite/tests/util/Locale.test.js deleted file mode 100644 index 445de284c..000000000 --- a/testsuite/tests/util/Locale.test.js +++ /dev/null @@ -1,15 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var globals_1 = require("@jest/globals"); -var Locale = new Locale(); -/**********************************************************************************/ -/**********************************************************************************/ -(0, globals_1.describe)('Locale', function () { - /********************************************************************************/ - (0, globals_1.test)('registerLocaleFiles', function () { - Locale.registerLocaleFiles('test'); - (0, globals_1.expect)(Local.locations.text).toEqual({}); - }); -}); -/**********************************************************************************/ -/**********************************************************************************/ From 42f772e5a313c876bcaaa43bdf11030d677a652a Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 16 Jan 2026 15:24:44 -0500 Subject: [PATCH 03/95] Update test framework to copy locale and other assets --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c8d6a72e..f65357899 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,10 +36,12 @@ jobs: - name: Compile MathJax run: | pnpm -s mjs:compile - components/bin/makeAll --mjs --terse --build components/mjs + pnpm -s copy:assets mjs + components/bin/makeAll --mjs --terse --build --copy components/mjs pnpm -s cjs:compile pnpm -s cjs:components:src:build - components/bin/makeAll --cjs --terse --build components/cjs + pnpm -s copy:assets cjs + components/bin/makeAll --cjs --terse --build --copy components/cjs pnpm -s copy:pkg cjs - name: Build tests From 32eb9fca683740a93f4e0257fdb0c82bf3aeefe8 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sun, 29 Mar 2026 14:24:43 -0400 Subject: [PATCH 04/95] Fix prettier issues (now that we are doing that in tests) --- testsuite/src/setupTex.ts | 2 +- testsuite/src/source.d.ts | 2 +- testsuite/tests/input/tex/Bbox.test.ts | 5 +- testsuite/tests/input/tex/Newcommand.test.ts | 2 +- testsuite/tests/input/tex/Require.test.ts | 2 +- testsuite/tests/util/AsyncLoad.test.ts | 26 +++++--- testsuite/tests/util/Locale.test.ts | 49 +++++++++------ testsuite/tests/util/Styles.test.ts | 2 +- testsuite/tests/util/asyncLoad/esm.test.ts | 57 +++++++++++------ testsuite/tests/util/asyncLoad/node.test.ts | 63 ++++++++++++------- testsuite/tests/util/asyncLoad/system.test.ts | 22 +++---- 11 files changed, 150 insertions(+), 82 deletions(-) diff --git a/testsuite/src/setupTex.ts b/testsuite/src/setupTex.ts index 0ac621791..e65ed2bf5 100644 --- a/testsuite/src/setupTex.ts +++ b/testsuite/src/setupTex.ts @@ -24,7 +24,7 @@ import { expect } from '@jest/globals'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import { source } from '#source/source.js'; -import {Locale} from '#js/util/Locale.js'; +import { Locale } from '#js/util/Locale.js'; declare const MathJax: any; type MATHITEM = MathItem; diff --git a/testsuite/src/source.d.ts b/testsuite/src/source.d.ts index d96c04162..8d8744e5f 100644 --- a/testsuite/src/source.d.ts +++ b/testsuite/src/source.d.ts @@ -1,3 +1,3 @@ declare module '#source/source.js' { - export const source: {[name: string]: string}; + export const source: { [name: string]: string }; } diff --git a/testsuite/tests/input/tex/Bbox.test.ts b/testsuite/tests/input/tex/Bbox.test.ts index c30194dc0..51f5f138d 100644 --- a/testsuite/tests/input/tex/Bbox.test.ts +++ b/testsuite/tests/input/tex/Bbox.test.ts @@ -52,8 +52,9 @@ describe('Bbox', () => { }); it('Bbox-General-Error', () => { - expectTexError('\\bbox[22-11=color]{a}') - .toBe(`'22-11=color' doesn't look like a color, a padding dimension, or a style`); + expectTexError('\\bbox[22-11=color]{a}').toBe( + `'22-11=color' doesn't look like a color, a padding dimension, or a style` + ); }); }); diff --git a/testsuite/tests/input/tex/Newcommand.test.ts b/testsuite/tests/input/tex/Newcommand.test.ts index 9347b0ac2..79316245c 100644 --- a/testsuite/tests/input/tex/Newcommand.test.ts +++ b/testsuite/tests/input/tex/Newcommand.test.ts @@ -646,4 +646,4 @@ describe('Nested Environments', () => { /**********************************************************************************/ - afterAll(() => getTokens('newcommand')); +afterAll(() => getTokens('newcommand')); diff --git a/testsuite/tests/input/tex/Require.test.ts b/testsuite/tests/input/tex/Require.test.ts index d78f3dc03..4cedb40ac 100644 --- a/testsuite/tests/input/tex/Require.test.ts +++ b/testsuite/tests/input/tex/Require.test.ts @@ -17,7 +17,7 @@ setupComponents({ loader: { load: ['input/tex-base', '[tex]/require'], source: { - '[tex]/error': '../testsuite/lib/error.js' + '[tex]/error': '../testsuite/lib/error.js', }, dependencies: { '[tex]/upgreek': ['input/tex-base', '[tex]/error'], diff --git a/testsuite/tests/util/AsyncLoad.test.ts b/testsuite/tests/util/AsyncLoad.test.ts index 8f51a6701..e9937663c 100644 --- a/testsuite/tests/util/AsyncLoad.test.ts +++ b/testsuite/tests/util/AsyncLoad.test.ts @@ -54,18 +54,30 @@ describe('asyncLoad()', () => { package: { Package: { resolvePath: (file: string) => 'test:' + file, - } - } - } - } + }, + }, + }, + }, }; expect(resolvePath('[x]/y.js', (file) => file)).toBe('test:[x]/y.js'); // // Remove MathJax._ and test relative and absolute paths // - (global as any).MathJax = {} - expect(resolvePath('./x.js', (file) => `rel:${file.substring(2)}`, (file) => `abs:${file}`)).toBe('rel:x.js'); - expect(resolvePath('x.js', (file) => `rel:${file.substring(2)}`, (file) => `abs:${file}`)).toBe('abs:x.js'); + (global as any).MathJax = {}; + expect( + resolvePath( + './x.js', + (file) => `rel:${file.substring(2)}`, + (file) => `abs:${file}` + ) + ).toBe('rel:x.js'); + expect( + resolvePath( + 'x.js', + (file) => `rel:${file.substring(2)}`, + (file) => `abs:${file}` + ) + ).toBe('abs:x.js'); }); }); diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index a0a3d15ba..6e88ef721 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -1,12 +1,11 @@ import { describe, test, expect } from '@jest/globals'; -import {Locale} from '#js/util/Locale.js'; +import { Locale } from '#js/util/Locale.js'; import '#js/util/asyncLoad/esm.js'; /**********************************************************************************/ /**********************************************************************************/ describe('Locale', () => { - /********************************************************************************/ test('Set locale', async () => { @@ -24,34 +23,50 @@ describe('Locale', () => { test('Register a component', async () => { const locale = Locale as any; Locale.registerLocaleFiles('component', '../testsuite/lib/component'); - expect(locale.locations.component).toEqual(['../testsuite/lib/component/locales', new Set()]); + expect(locale.locations.component).toEqual([ + '../testsuite/lib/component/locales', + new Set(), + ]); const error = console.error; - console.error = (message) => {throw message}; - await expect(Locale.setLocale('de')).rejects - .toMatch("MathJax(component): Can't load 'de.json': ENOENT: no such file or directory"); + console.error = (message) => { + throw message; + }; + await expect(Locale.setLocale('de')).rejects.toMatch( + "MathJax(component): Can't load 'de.json': ENOENT: no such file or directory" + ); console.error = error; await Locale.setLocale('en'); - expect(locale.data.component).toEqual({en: {Id1: 'Test of %1 in %2'}}); - expect(Locale.message('component', 'Id1', 'message', 'Locale')).toBe('Test of message in Locale'); + expect(locale.data.component).toEqual({ en: { Id1: 'Test of %1 in %2' } }); + expect(Locale.message('component', 'Id1', 'message', 'Locale')).toBe( + 'Test of message in Locale' + ); }); /********************************************************************************/ test('Messages', async () => { Locale.registerLocaleFiles('component', '../testsuite/lib/component'); - await Locale.setLocale('en'); // load English backups + await Locale.setLocale('en'); // load English backups await Locale.setLocale('test'); expect(Locale.message('component', 'test1')).toBe('Has % percent'); expect(Locale.message('component', 'test2', 'x')).toBe('Has x one'); - expect(Locale.message('component', 'test3', 'a', 'b')).toBe('Order b a reversed'); - expect(Locale.message('component', 'test4', 'a', 'b', 'c')).toBe('Skip a c'); + expect(Locale.message('component', 'test3', 'a', 'b')).toBe( + 'Order b a reversed' + ); + expect(Locale.message('component', 'test4', 'a', 'b', 'c')).toBe( + 'Skip a c' + ); expect(Locale.message('component', 'test4')).toBe('Skip '); - expect(Locale.message('component', 'test5', {hello: 'HELLO', world: 'WORLD'})).toBe('Named HELLO WORLD'); + expect( + Locale.message('component', 'test5', { hello: 'HELLO', world: 'WORLD' }) + ).toBe('Named HELLO WORLD'); expect(Locale.message('component', 'Id1', 'a', 'b')).toBe('Test of a in b'); - expect(Locale.message('component', 'Id2')) - .toBe("No localized or default version for message with id 'Id2' from 'component'"); - expect(Locale.message('undefined', 'Id1')) - .toBe("No localized or default version for message with id 'Id1' from 'undefined'"); + expect(Locale.message('component', 'Id2')).toBe( + "No localized or default version for message with id 'Id2' from 'component'" + ); + expect(Locale.message('undefined', 'Id1')).toBe( + "No localized or default version for message with id 'Id1' from 'undefined'" + ); expect(() => Locale.error('component', 'error', 'x')).toThrow('Error in x'); }); @@ -66,9 +81,7 @@ describe('Locale', () => { }); /********************************************************************************/ - }); - /**********************************************************************************/ /**********************************************************************************/ diff --git a/testsuite/tests/util/Styles.test.ts b/testsuite/tests/util/Styles.test.ts index 85b8094d6..ff1df632a 100644 --- a/testsuite/tests/util/Styles.test.ts +++ b/testsuite/tests/util/Styles.test.ts @@ -204,7 +204,7 @@ describe('CssStyles object', () => { 'margin: 0;' ); cssTest('margin:', {}, ''); - }) + }); test('border', () => { cssTest('border: 3px solid red', { diff --git a/testsuite/tests/util/asyncLoad/esm.test.ts b/testsuite/tests/util/asyncLoad/esm.test.ts index 4ad9b8ce6..2dea7c86e 100644 --- a/testsuite/tests/util/asyncLoad/esm.test.ts +++ b/testsuite/tests/util/asyncLoad/esm.test.ts @@ -11,36 +11,57 @@ describe('asyncLoad() for esm', () => { test('asyncLoad()', async () => { const cjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.cjs'); const mjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.mjs'); - const jsonFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.json'); - const relUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.cjs'); - const jsonUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.json'); + const jsonFile = path.join( + '..', + 'testsuite', + 'lib', + 'AsyncLoad.child.json' + ); + const relUnknown = path.join( + '..', + 'testsuite', + 'lib', + 'AsyncLoad.unknown.cjs' + ); + const jsonUnknown = path.join( + '..', + 'testsuite', + 'lib', + 'AsyncLoad.unknown.json' + ); const absFile = path.join(root, cjsFile); const absJson = path.join(root, jsonFile); const absUnknown = path.join(root, relUnknown); - await expect(asyncLoad(cjsFile)).resolves.toEqual({loaded: true}); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found - await expect(asyncLoad(absFile)).resolves.toEqual({loaded: true}); // absolute file found - await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found + await expect(asyncLoad(cjsFile)).resolves.toEqual({ loaded: true }); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(absFile)).resolves.toEqual({ loaded: true }); // absolute file found + await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found - await expect(asyncLoad(jsonFile)).resolves.toEqual({json: true}); // relative json file found - await expect(asyncLoad(absJson)).resolves.toEqual({json: true}); // absolute json file found - await expect(asyncLoad(jsonUnknown).catch(() => true)).resolves.toBe(true); // unknown file not found + await expect(asyncLoad(jsonFile)).resolves.toEqual({ json: true }); // relative json file found + await expect(asyncLoad(absJson)).resolves.toEqual({ json: true }); // absolute json file found + await expect(asyncLoad(jsonUnknown).catch(() => true)).resolves.toBe(true); // unknown file not found - await expect(asyncLoad('#js/components/version.js') // load using package exports - .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); - await expect(asyncLoad('@mathjax/src/js/components/version.js') // load from module - .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); + await expect( + asyncLoad('#js/components/version.js') // load using package exports + .then((result: any) => result.VERSION) + ).resolves.toBe(mathjax.version); + await expect( + asyncLoad('@mathjax/src/js/components/version.js') // load from module + .then((result: any) => result.VERSION) + ).resolves.toBe(mathjax.version); - await expect(asyncLoad(mjsFile).then((result: any) => result.loaded)).resolves.toBe(true); // mjs file loads - expect(mathjax.asyncIsSynchronous).toBe(false); // esm.js is asynchronous + await expect( + asyncLoad(mjsFile).then((result: any) => result.loaded) // mjs file loads + ).resolves.toBe(true); + expect(mathjax.asyncIsSynchronous).toBe(false); // esm.js is asynchronous }); test('setBaseURL() for esm', async () => { setBaseURL(lib); const relFile = './AsyncLoad.child.cjs'; const relUnknown = './AsyncLoad.unknown.cjs'; - await expect(asyncLoad(relFile)).resolves.toEqual({ loaded: true }); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(relFile)).resolves.toEqual({ loaded: true }); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found }); }); diff --git a/testsuite/tests/util/asyncLoad/node.test.ts b/testsuite/tests/util/asyncLoad/node.test.ts index 0f477a0ae..b28ccb56b 100644 --- a/testsuite/tests/util/asyncLoad/node.test.ts +++ b/testsuite/tests/util/asyncLoad/node.test.ts @@ -13,43 +13,64 @@ describe('asyncLoad() for node', () => { test('asyncLoad()', async () => { const cjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.cjs'); const mjsFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.mjs'); - const jsonFile = path.join('..', 'testsuite', 'lib', 'AsyncLoad.child.json'); - const relUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.cjs'); - const jsonUnknown = path.join('..', 'testsuite', 'lib', 'AsyncLoad.unknown.json'); + const jsonFile = path.join( + '..', + 'testsuite', + 'lib', + 'AsyncLoad.child.json' + ); + const relUnknown = path.join( + '..', + 'testsuite', + 'lib', + 'AsyncLoad.unknown.cjs' + ); + const jsonUnknown = path.join( + '..', + 'testsuite', + 'lib', + 'AsyncLoad.unknown.json' + ); const absFile = path.join(root, cjsFile); const absJson = path.join(root, jsonFile); const absUnknown = path.join(root, relUnknown); - await expect(asyncLoad(cjsFile)).resolves.toEqual({loaded: true}); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found - await expect(asyncLoad(absFile)).resolves.toEqual({loaded: true}); // absolute file found - await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found + await expect(asyncLoad(cjsFile)).resolves.toEqual({ loaded: true }); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(absFile)).resolves.toEqual({ loaded: true }); // absolute file found + await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found - await expect(asyncLoad(jsonFile)).resolves.toEqual({json: true}); // relative json file found - await expect(asyncLoad(absJson)).resolves.toEqual({json: true}); // absolute json file found - await expect(asyncLoad(jsonUnknown).catch(() => true)).resolves.toBe(true); // unknown file not found + await expect(asyncLoad(jsonFile)).resolves.toEqual({ json: true }); // relative json file found + await expect(asyncLoad(absJson)).resolves.toEqual({ json: true }); // absolute json file found + await expect(asyncLoad(jsonUnknown).catch(() => true)).resolves.toBe(true); // unknown file not found - await expect(asyncLoad('#js/../cjs/components/version.js') // load using package exports - .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); - await expect(asyncLoad('@mathjax/src/js/components/version.js') // load from module - .then((result: any) => result.VERSION)).resolves.toBe(mathjax.version); + await expect( + asyncLoad('#js/../cjs/components/version.js') // load using package exports + .then((result: any) => result.VERSION) + ).resolves.toBe(mathjax.version); + await expect( + asyncLoad('@mathjax/src/js/components/version.js') // load from module + .then((result: any) => result.VERSION) + ).resolves.toBe(mathjax.version); - await expect(asyncLoad(mjsFile).catch(() => true)).resolves.toBe(true); // mjs file fails - expect(mathjax.asyncIsSynchronous).toBe(true); // node.js is synchronous + await expect(asyncLoad(mjsFile).catch(() => true)).resolves.toBe(true); // mjs file fails + expect(mathjax.asyncIsSynchronous).toBe(true); // node.js is synchronous // // Test mathjax.json separately, as asyncLoad doesn't call it. // - await expect(mathjax.json(jsonFile)).resolves.toEqual({json: true}); - await expect(mathjax.json(absJson)).resolves.toEqual({json: true}); - await expect(mathjax.json(jsonUnknown).catch(() => true)).resolves.toBe(true); + await expect(mathjax.json(jsonFile)).resolves.toEqual({ json: true }); + await expect(mathjax.json(absJson)).resolves.toEqual({ json: true }); + await expect(mathjax.json(jsonUnknown).catch(() => true)).resolves.toBe( + true + ); }); test('setBaseURL() for node', async () => { setBaseURL(lib); const relFile = './AsyncLoad.child.cjs'; const relUnknown = './AsyncLoad.unknown.cjs'; - await expect(asyncLoad(relFile)).resolves.toEqual({ loaded: true }); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(relFile)).resolves.toEqual({ loaded: true }); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found }); }); diff --git a/testsuite/tests/util/asyncLoad/system.test.ts b/testsuite/tests/util/asyncLoad/system.test.ts index 160b876a5..2e906fe0f 100644 --- a/testsuite/tests/util/asyncLoad/system.test.ts +++ b/testsuite/tests/util/asyncLoad/system.test.ts @@ -22,31 +22,31 @@ describe('asyncLoad() for node', () => { const absFile = path.join(root, cjsFile); const absUnknown = path.join(root, relUnknown); - await expect(asyncLoad(cjsFile)).resolves.toEqual({ loaded: true }); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found - await expect(asyncLoad(absFile)).resolves.toEqual({ loaded: true }); // absolute file found - await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found + await expect(asyncLoad(cjsFile)).resolves.toEqual({ loaded: true }); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(absFile)).resolves.toEqual({ loaded: true }); // absolute file found + await expect(asyncLoad(absUnknown).catch(() => true)).resolves.toBe(true); // absolute file not found await expect( - asyncLoad('#js/components/version.js') // can't load using package exports + asyncLoad('#js/components/version.js') // can't load using package exports .catch(() => true) ).resolves.toBe(true); await expect( - asyncLoad('mathjax-full/js/components/version.js') // can't load from module + asyncLoad('mathjax-full/js/components/version.js') // can't load from module .catch(() => true) ).resolves.toBe(true); await expect( - asyncLoad(mjsFile).then((result: any) => result.loaded) - ).resolves.toBe(true); // mjs file loads - expect(mathjax.asyncIsSynchronous).toBe(false); // system.js is asynchronous + asyncLoad(mjsFile).then((result: any) => result.loaded) // mjs file loads + ).resolves.toBe(true); + expect(mathjax.asyncIsSynchronous).toBe(false); // system.js is asynchronous }); test('setBaseURL() for node', async () => { setBaseURL(lib); const relFile = './AsyncLoad.child.cjs'; const relUnknown = './AsyncLoad.unknown.cjs'; - await expect(asyncLoad(relFile)).resolves.toEqual({ loaded: true }); // relative file found - await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found + await expect(asyncLoad(relFile)).resolves.toEqual({ loaded: true }); // relative file found + await expect(asyncLoad(relUnknown).catch(() => true)).resolves.toBe(true); // relative file not found }); }); From 15d8eb236a6e7e89a61de7ea8796dd829c781756 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 15 May 2026 10:27:51 -0400 Subject: [PATCH 05/95] Rebase refactor/l10n_texerrors as single commit --- ts/input/tex/ColumnParser.ts | 29 +-- ts/input/tex/Error.json | 41 ++++ ts/input/tex/HandlerTypes.ts | 1 + ts/input/tex/ParseUtil.ts | 59 ++---- ts/input/tex/StackItem.ts | 24 ++- ts/input/tex/TexParser.ts | 79 ++++---- ts/input/tex/ams/AmsItems.ts | 11 +- ts/input/tex/ams/AmsMethods.ts | 48 +---- ts/input/tex/ams/locales/en.json | 12 ++ ts/input/tex/base/BaseConfiguration.ts | 8 +- ts/input/tex/base/BaseItems.ts | 41 ++-- ts/input/tex/base/BaseMethods.ts | 185 ++++-------------- ts/input/tex/base/locales/en.json | 45 +++++ ts/input/tex/bbox/Error.json | 6 + ts/input/tex/braket/BraketMethods.ts | 20 +- ts/input/tex/braket/locales/en.json | 3 + ts/input/tex/bussproofs/BussproofsItems.ts | 2 +- ts/input/tex/bussproofs/BussproofsMethods.ts | 56 ++---- ts/input/tex/bussproofs/locales/en.json | 14 ++ ts/input/tex/cases/CasesConfiguration.ts | 5 +- ts/input/tex/cases/locales/en.json | 3 + ts/input/tex/color/ColorUtil.ts | 49 +---- ts/input/tex/color/locales/en.json | 11 ++ .../tex/colortbl/ColortblConfiguration.ts | 18 +- ts/input/tex/colortbl/locales/en.json | 5 + ts/input/tex/empheq/EmpheqConfiguration.ts | 7 +- ts/input/tex/empheq/locales/en.json | 3 + .../tex/extpfeil/ExtpfeilConfiguration.ts | 18 +- ts/input/tex/extpfeil/locales/en.json | 5 + ts/input/tex/html/HtmlMethods.ts | 6 +- ts/input/tex/html/locales/en.json | 3 + ts/input/tex/mathtools/MathtoolsMethods.ts | 40 +--- ts/input/tex/mathtools/MathtoolsTags.ts | 6 +- ts/input/tex/mathtools/MathtoolsUtil.ts | 8 +- ts/input/tex/mathtools/locales/en.json | 13 ++ ts/input/tex/newcommand/NewcommandItems.ts | 9 +- ts/input/tex/newcommand/NewcommandMethods.ts | 6 +- ts/input/tex/newcommand/NewcommandUtil.ts | 44 ++--- ts/input/tex/newcommand/locales/en.json | 12 ++ ts/input/tex/physics/PhysicsMethods.ts | 39 +--- ts/input/tex/physics/locales/en.json | 8 + ts/input/tex/require/RequireConfiguration.ts | 12 +- ts/input/tex/require/locales/en.json | 4 + .../tex/setoptions/SetOptionsConfiguration.ts | 46 +---- ts/input/tex/setoptions/locales/en.json | 7 + ts/input/tex/texhtml/TexHtmlConfiguration.ts | 7 +- ts/input/tex/texhtml/locales/en.json | 3 + ts/input/tex/unicode/UnicodeConfiguration.ts | 39 ++-- ts/input/tex/unicode/locales/en.json | 8 + ts/input/tex/verb/VerbConfiguration.ts | 63 +++--- ts/input/tex/verb/locales/en.json | 4 + 51 files changed, 475 insertions(+), 720 deletions(-) create mode 100644 ts/input/tex/Error.json create mode 100644 ts/input/tex/ams/locales/en.json create mode 100644 ts/input/tex/base/locales/en.json create mode 100644 ts/input/tex/bbox/Error.json create mode 100644 ts/input/tex/braket/locales/en.json create mode 100644 ts/input/tex/bussproofs/locales/en.json create mode 100644 ts/input/tex/cases/locales/en.json create mode 100644 ts/input/tex/color/locales/en.json create mode 100644 ts/input/tex/colortbl/locales/en.json create mode 100644 ts/input/tex/empheq/locales/en.json create mode 100644 ts/input/tex/extpfeil/locales/en.json create mode 100644 ts/input/tex/html/locales/en.json create mode 100644 ts/input/tex/mathtools/locales/en.json create mode 100644 ts/input/tex/newcommand/locales/en.json create mode 100644 ts/input/tex/physics/locales/en.json create mode 100644 ts/input/tex/require/locales/en.json create mode 100644 ts/input/tex/setoptions/locales/en.json create mode 100644 ts/input/tex/texhtml/locales/en.json create mode 100644 ts/input/tex/unicode/locales/en.json create mode 100644 ts/input/tex/verb/locales/en.json diff --git a/ts/input/tex/ColumnParser.ts b/ts/input/tex/ColumnParser.ts index a0beec563..995af5cf4 100644 --- a/ts/input/tex/ColumnParser.ts +++ b/ts/input/tex/ColumnParser.ts @@ -133,16 +133,13 @@ export class ColumnParser { let n = 0; while (state.i < state.template.length) { if (n++ > this.MAXCOLUMNS) { - throw new TexError( - 'MaxColumns', - 'Too many column specifiers (perhaps looping column definitions?)' - ); + throw new TexError('MaxColumns'); } const code = state.template.codePointAt(state.i); const c = (state.c = String.fromCodePoint(code)); state.i += c.length; if (!Object.hasOwn(this.columnHandler, c)) { - throw new TexError('BadPreamToken', 'Illegal pream-token (%1)', c); + throw new TexError('BadPreamToken', c); } this.columnHandler[c](state); } @@ -264,11 +261,7 @@ export class ColumnParser { public getDimen(state: ColumnState): string { const dim = this.getBraces(state); if (!UnitUtil.matchDimen(dim)[0]) { - throw new TexError( - 'MissingColumnDimOrUnits', - 'Missing dimension or its units for %1 column declaration', - state.c - ); + throw new TexError('MissingColumnDimOrUnits', state.c); } return dim; } @@ -298,12 +291,8 @@ export class ColumnParser { */ public getBraces(state: ColumnState): string { while (state.template[state.i] === ' ') state.i++; - if (state.i >= state.template.length) { - throw new TexError( - 'MissingArgForColumn', - 'Missing argument for %1 column declaration', - state.c - ); + if (state.i > state.template.length) { + throw new TexError('MissingArgForColumn', state.c); } if (state.template[state.i] !== '{') { return state.template[state.i++]; @@ -325,7 +314,7 @@ export class ColumnParser { break; } } - throw new TexError('MissingCloseBrace', 'Missing close brace'); + throw new TexError('MissingCloseBrace'); } /** @@ -410,11 +399,7 @@ export class ColumnParser { const cols = this.getBraces(state); const n = parseInt(num); if (String(n) !== num) { - throw new TexError( - 'ColArgNotNum', - 'First argument to %1 column specifier must be a number', - '*' - ); + throw new TexError('ColArgNotNum', '*'); } state.template = new Array(n).fill(cols).join('') + state.template.substring(state.i); diff --git a/ts/input/tex/Error.json b/ts/input/tex/Error.json new file mode 100644 index 000000000..3dcbd6c95 --- /dev/null +++ b/ts/input/tex/Error.json @@ -0,0 +1,41 @@ +{ + "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "ExtraOpenMissingClose": "Extra open brace or missing close brace", + "MathNotTerminated": "Math mode is not properly terminated", + "IllegalMacroParam": "Illegal macro parameter reference", + "MaxBufferSize": "MathJax internal buffer size exceeded; is there a recursive macro call?", + "MaxMacroSub1": "MathJax maximum macro substitution count exceeded; is here a recursive macro call?", + "MaxMacroSub2": "MathJax maximum substitution count exceeded; is there a recursive latex environment?", + "InvalidValue": "Value for key '%1' is not of the expected type", + "InvalidOption": "Invalid option: %1", + "ErroneousNestingEq": "Erroneous nesting of equation structures", + "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", + "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "MissingLeftExtraRight": "Missing \\left or extra \\right", + "ExtraMiddle": "Extra \\middle", + "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", + "TokenNotFoundForCommand": "Could not find %1 for %2", + "ExtraCloseLooking": "Extra close brace while looking for %1", + "MissingDimOrUnits": "Missing dimension or its units for %1", + "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", + "MissingCloseBracket": "Could not find closing ']' for argument to %1", + "ExtraCloseLooking": "Extra close brace while looking for %1", + "MissingCloseBrace": "Missing close brace", + "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "MissingArgFor": "Missing argument for %1", + "ColArgNotNum": "First argument to %1 column specifier must be a number", + "MissingCloseBrace": "Missing close brace", + "MissingArgForColumn": "Missing argument for %1 column declaration", + "MissingColumnDimOrUnits": "Missing dimension or its units for %1 column declaration", + "BadPreamToken": "Illegal pream-token (%1)", + "MaxColumns": "Too many column specifiers (perhaps looping column definitions?)", + "MaxMacroSub2": "MathJax maximum substitution count exceeded; ", + "MaxMacroSub1": "MathJax maximum macro substitution count exceeded; ", + "MaxBufferSize": "MathJax internal buffer size exceeded; is there a", + "IllegalMacroParam": "Illegal macro parameter reference", + "MathNotTerminated": "Math mode is not properly terminated", + "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", + "ExtraOpenMissingClose": "Extra open brace or missing close brace", + "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "Misplaced": "Misplaced %1" +} diff --git a/ts/input/tex/HandlerTypes.ts b/ts/input/tex/HandlerTypes.ts index ec2f6f003..0ed0db4c0 100644 --- a/ts/input/tex/HandlerTypes.ts +++ b/ts/input/tex/HandlerTypes.ts @@ -34,6 +34,7 @@ export enum ConfigurationType { CONFIG = 'config', PRIORITY = 'priority', PARSER = 'parser', + ERRORS = 'errors', } export enum HandlerType { diff --git a/ts/input/tex/ParseUtil.ts b/ts/input/tex/ParseUtil.ts index 191254e9b..9ec8bb8a7 100644 --- a/ts/input/tex/ParseUtil.ts +++ b/ts/input/tex/ParseUtil.ts @@ -184,11 +184,8 @@ function readValue( break; // Closing braces. case '}': - if (!braces) { - throw new TexError( - 'ExtraCloseMissingOpen', - 'Extra close brace or missing open brace' - ); + if (!braces) { // Closing braces. + throw new TexError('ExtraCloseMissingOpen'); } braces--; countBraces = false; // Stop counting start left braces. @@ -211,10 +208,7 @@ function readValue( value += c; } if (braces) { - throw new TexError( - 'ExtraOpenMissingClose', - 'Extra open brace or missing close brace' - ); + throw new TexError('ExtraOpenMissingClose'); } return dropBrace && start ? ['', '', removeBraces(value, 1)] @@ -546,11 +540,7 @@ export const ParseUtil = { .substring(i) .match(/^\s*(?:([0-9A-F])|\{\s*([0-9A-F]+)\s*\})/); if (!arg) { - throw new TexError( - 'BadRawUnicode', - 'Argument to %1 must a hexadecimal number with 1 to 6 digits', - '\\U' - ); + throw new TexError('BadRawUnicode', '\\U'); } // Replace \U{...} with specified character const c = String.fromCodePoint(parseInt(arg[1] || arg[2], 16)); @@ -565,10 +555,7 @@ export const ParseUtil = { } if (match !== '') { // @test Internal Math Error - throw new TexError( - 'MathNotTerminated', - 'Math mode is not properly terminated' - ); + throw new TexError('MathNotTerminated'); } } if (k < text.length) { @@ -733,10 +720,7 @@ export const ParseUtil = { text += c; } else { if (!c.match(/[1-9]/) || parseInt(c, 10) > args.length) { - throw new TexError( - 'IllegalMacroParam', - 'Illegal macro parameter reference' - ); + throw new TexError('IllegalMacroParam'); } newstring = ParseUtil.addArgs( parser, @@ -767,11 +751,7 @@ export const ParseUtil = { s1 += ' '; } if (s1.length + s2.length > parser.configuration.options['maxBuffer']) { - throw new TexError( - 'MaxBufferSize', - 'MathJax internal buffer size exceeded; is there a' + - ' recursive macro call?' - ); + throw new TexError('MaxBufferSize'); } return s1 + s2; }, @@ -787,17 +767,9 @@ export const ParseUtil = { return; } if (isMacro) { - throw new TexError( - 'MaxMacroSub1', - 'MathJax maximum macro substitution count exceeded; ' + - 'is here a recursive macro call?' - ); + throw new TexError('MaxMacroSub1'); } else { - throw new TexError( - 'MaxMacroSub2', - 'MathJax maximum substitution count exceeded; ' + - 'is there a recursive latex environment?' - ); + throw new TexError('MaxMacroSub2'); } }, @@ -820,10 +792,7 @@ export const ParseUtil = { return; } if (!top.isKind('start') || first) { - throw new TexError( - 'ErroneousNestingEq', - 'Erroneous nesting of equation structures' - ); + throw new TexError('ErroneousNestingEq'); } }, @@ -902,17 +871,13 @@ export const ParseUtil = { const type = allowed[key] as KeyValueDef; const value = String(def[key]); if (!type.verify(value)) { - throw new TexError( - 'InvalidValue', - "Value for key '%1' is not of the expected type", - key - ); + throw new TexError('InvalidValue', key); } def[key] = type.convert(value); } } else { if (error) { - throw new TexError('InvalidOption', 'Invalid option: %1', key); + throw new TexError('InvalidOption', key); } delete def[key]; } diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index 95b84ccba..c1d1bc352 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -387,17 +387,16 @@ export abstract class BaseItem extends MmlStack implements StackItem { /** * A list of basic errors. - * - * @type {{[key: string]: string[]}} + * @type {{[key: string]: string}} */ - protected static errors: { [key: string]: string[] } = { + protected static errors: {[key: string]: string} = { // @test ExtraOpenMissingClose - end: ['MissingBeginExtraEnd', 'Missing \\begin{%1} or extra \\end{%1}'], + end: 'MissingBeginExtraEnd', // @test ExtraCloseMissingOpen - close: ['ExtraCloseMissingOpen', 'Extra close brace or missing open brace'], + close: 'ExtraCloseMissingOpen', // @test MissingLeftExtraRight - right: ['MissingLeftExtraRight', 'Missing \\left or extra \\right'], - middle: ['ExtraMiddle', 'Extra \\middle'], + right: 'MissingLeftExtraRight', + middle: 'ExtraMiddle', }; /** @@ -514,13 +513,12 @@ export abstract class BaseItem extends MmlStack implements StackItem { return BaseItem.fail; } // @test Ampersand-error - throw new TexError('Misplaced', 'Misplaced %1', item.getName()); + throw new TexError('Misplaced', item.getName()); } if (item.isClose && this.getErrors(item.kind)) { // @test ExtraOpenMissingClose, ExtraCloseMissingOpen, // MissingLeftExtraRight, MissingBeginExtraEnd - const [id, message] = this.getErrors(item.kind); - throw new TexError(id, message, item.getName()); + throw new TexError(this.getErrors(item.kind), item.getName()); } if (!item.isFinal) { return BaseItem.success; @@ -568,9 +566,9 @@ export abstract class BaseItem extends MmlStack implements StackItem { * @param {string} kind The stack item type. * @returns {string[]} The list of arguments for the TeXError. */ - public getErrors(kind: string): string[] { - const CLASS = this.constructor as typeof BaseItem; - return CLASS.errors[kind] || BaseItem.errors[kind]; + public getErrors(kind: string): string { + const CLASS = (this.constructor as typeof BaseItem); + return (CLASS.errors || {})[kind] || BaseItem.errors[kind]; } /** diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index 8e4b1603b..7fba36f7b 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -327,14 +327,32 @@ export default class TexParser { */ public GetArgument(_name: string, noneOK: boolean = false): string { switch (this.GetNext()) { - case '': - if (!noneOK) { - // @test MissingArgFor - throw new TexError( - 'MissingArgFor', - 'Missing argument for %1', - this.currentCS - ); + case '': + if (!noneOK) { + // @test MissingArgFor + throw new TexError('MissingArgFor', this.currentCS); + } + return null; + case '}': + if (!noneOK) { + // @test ExtraCloseMissingOpen + throw new TexError('ExtraCloseMissingOpen'); + } + return null; + case '\\': + this.i++; + return '\\' + this.GetCS(); + case '{': + let j = ++this.i, parens = 1; + while (this.i < this.string.length) { + switch (this.string.charAt(this.i++)) { + case '\\': this.i++; break; + case '{': parens++; break; + case '}': + if (--parens === 0) { + return this.string.slice(j, this.i - 1); + } + break; } return null; case '}': @@ -368,7 +386,7 @@ export default class TexParser { } } // @test MissingCloseBrace - throw new TexError('MissingCloseBrace', 'Missing close brace'); + throw new TexError('MissingCloseBrace'); } } const c = this.getCodePoint(); @@ -406,11 +424,7 @@ export default class TexParser { case '}': if (braces-- <= 0) { // @test ExtraCloseLooking1 - throw new TexError( - 'ExtraCloseLooking', - 'Extra close brace while looking for %1', - "']'" - ); + throw new TexError('ExtraCloseLooking', '\']\''); } break; case '[': @@ -427,11 +441,7 @@ export default class TexParser { } } // @test MissingCloseBracket - throw new TexError( - 'MissingCloseBracket', - "Could not find closing ']' for argument to %1", - this.currentCS - ); + throw new TexError('MissingCloseBracket', this.currentCS); } /** @@ -456,11 +466,7 @@ export default class TexParser { } } // @test MissingOrUnrecognizedDelim1, MissingOrUnrecognizedDelim2 - throw new TexError( - 'MissingOrUnrecognizedDelim', - 'Missing or unrecognized delimiter for %1', - this.currentCS - ); + throw new TexError('MissingOrUnrecognizedDelim', this.currentCS); } /** @@ -487,11 +493,7 @@ export default class TexParser { } } // @test MissingDimOrUnits - throw new TexError( - 'MissingDimOrUnits', - 'Missing dimension or its units for %1', - this.currentCS - ); + throw new TexError('MissingDimOrUnits', this.currentCS); } /** @@ -521,11 +523,7 @@ export default class TexParser { case '}': if (braces === 0) { // @test ExtraCloseLooking2 - throw new TexError( - 'ExtraCloseLooking', - 'Extra close brace while looking for %1', - token - ); + throw new TexError('ExtraCloseLooking', token); } braces--; break; @@ -535,12 +533,7 @@ export default class TexParser { } } // @test TokenNotFoundForCommand - throw new TexError( - 'TokenNotFoundForCommand', - 'Could not find %1 for %2', - token, - this.currentCS - ); + throw new TexError('TokenNotFoundForCommand', token, this.currentCS); } /** @@ -587,11 +580,7 @@ export default class TexParser { return c; } // @test MissingOrUnrecognizedDelim - throw new TexError( - 'MissingOrUnrecognizedDelim', - 'Missing or unrecognized delimiter for %1', - this.currentCS - ); + throw new TexError('MissingOrUnrecognizedDelim', this.currentCS); } /** diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts index 6368b47d2..2d0c6b7e7 100644 --- a/ts/input/tex/ams/AmsItems.ts +++ b/ts/input/tex/ams/AmsItems.ts @@ -79,9 +79,7 @@ export class MultlineItem extends ArrayItem { // @test MultlineRowsOneCol throw new TexError( 'MultlineRowsOneCol', - 'The rows within the %1 environment must have exactly one column', - 'multline' - ); + 'multline'); } const row = this.create('node', 'mtr', this.row); this.table.push(row); @@ -173,12 +171,7 @@ export class FlalignItem extends EqnArrayItem { const n = this.getProperty('xalignat') as number; if (!n) return; if (this.row.length > n) { - throw new TexError( - 'XalignOverflow', - 'Extra %1 in row of %2', - '&', - this.name - ); + throw new TexError('XalignOverflow', this.name); } } diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index 976a0ed45..3ea2c9af3 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -147,11 +147,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const n = parser.GetArgument('\\begin{' + name + '}'); if (n.match(/[^0-9]/)) { // @test PositiveIntegerArg - throw new TexError( - 'PositiveIntegerArg', - 'Argument to %1 must be a positive integer', - '\\begin{' + name + '}' - ); + throw new TexError('PositiveIntegerArg'); } let count = parseInt(n, 10); while (count > 0) { @@ -240,11 +236,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { ): ParseResult { const n = parser.GetArgument('\\begin{' + begin.getName() + '}'); if (n.match(/[^0-9]/)) { - throw new TexError( - 'PositiveIntegerArg', - 'Argument to %1 must be a positive integer', - '\\begin{' + begin.getName() + '}' - ); + throw new TexError('PositiveIntegerArg'); } const align = padded ? 'crl' : 'rlc'; const balign = padded ? 'mbt' : 'btm'; @@ -619,20 +611,12 @@ export const AmsMethods: { [key: string]: ParseMethod } = { // @test Shove (Left|Right) (Top|Middle|Bottom) if (top.kind !== 'multline') { // @test Shove Error Environment - throw new TexError( - 'CommandOnlyAllowedInEnv', - '%1 only allowed in %2 environment', - parser.currentCS, - 'multline' - ); + throw new TexError('CommandOnlyAllowedInEnv', + parser.currentCS); } if (top.Size()) { // @test Shove Error (Top|Middle|Bottom) - throw new TexError( - 'CommandAtTheBeginingOfLine', - '%1 must come at the beginning of the line', - parser.currentCS - ); + throw new TexError('CommandAtTheBeginingOfLine'); } top.setProperty('shove', shove); }, @@ -666,11 +650,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { lr = lrMap[lr]; if (lr == null) { // @test Center Fraction Error - throw new TexError( - 'IllegalAlign', - 'Illegal alignment specified in %1', - parser.currentCS - ); + throw new TexError('IllegalAlign', parser.currentCS); } if (lr) { // @test Right Fraction, Left Fraction @@ -731,11 +711,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const styleAlpha = ['D', 'T', 'S', 'SS'][styleDigit]; if (styleAlpha == null) { // @test Genfrac Error - throw new TexError( - 'BadMathStyleFor', - 'Bad math style for %1', - parser.currentCS - ); + throw new TexError('BadMathStyleFor', parser.currentCS); } frac = parser.create('node', 'mstyle', [frac]); if (styleAlpha === 'D') { @@ -764,16 +740,12 @@ export const AmsMethods: { [key: string]: ParseMethod } = { HandleTag(parser: TexParser, name: string) { if (!parser.tags.currentTag.taggable && parser.tags.env) { // @test Illegal Tag Error - throw new TexError( - 'CommandNotAllowedInEnv', - '%1 not allowed in %2 environment', - parser.currentCS, - parser.tags.env - ); + throw new TexError('CommandNotAllowedInEnv', + parser.currentCS); } if (parser.tags.currentTag.tag) { // @test Double Tag Error - throw new TexError('MultipleCommand', 'Multiple %1', parser.currentCS); + throw new TexError('MultipleCommand', parser.currentCS); } const star = parser.GetStar(); const tagId = UnitUtil.trimSpaces(parser.GetArgument(name)); diff --git a/ts/input/tex/ams/locales/en.json b/ts/input/tex/ams/locales/en.json new file mode 100644 index 000000000..40263efab --- /dev/null +++ b/ts/input/tex/ams/locales/en.json @@ -0,0 +1,12 @@ +{ + "XalignOverflow": "Extra %1 in row of %2", '&", + "MultlineRowsOneCol": "The rows within the %1 environment must have exactly one column", + "MultipleCommand": "Multiple %1", + "CommandNotAllowedInEnv": "%1 not allowed in %2 environment", + "BadMathStyleFor": "Bad math style for %1", + "IllegalAlign": "Illegal alignment specified in %1", + "CommandAtTheBeginingOfLine": "%1 must come at the beginning of the line", + "CommandOnlyAllowedInEnv": "%1 only allowed in %2 environment", + "PositiveIntegerArg": "Argument to %1 must be a positive integer", + "PositiveIntegerArg": "Argument to %1 must be a positive integer" +} diff --git a/ts/input/tex/base/BaseConfiguration.ts b/ts/input/tex/base/BaseConfiguration.ts index 30eab1ed0..02edcde1a 100644 --- a/ts/input/tex/base/BaseConfiguration.ts +++ b/ts/input/tex/base/BaseConfiguration.ts @@ -89,11 +89,7 @@ export function Other(parser: TexParser, char: string) { */ function csUndefined(_parser: TexParser, name: string) { // @test Undefined-CS - throw new TexError( - 'UndefinedControlSequence', - 'Undefined control sequence %1', - '\\' + name - ); + throw new TexError('UndefinedControlSequence', '\\' + name); } /** @@ -104,7 +100,7 @@ function csUndefined(_parser: TexParser, name: string) { */ function envUndefined(_parser: TexParser, env: string) { // @test Undefined-Env - throw new TexError('UnknownEnv', "Unknown environment '%1'", env); + throw new TexError('UnknownEnv', env); } /** diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index 4704a6b57..d2fb49401 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -111,7 +111,7 @@ export class OpenItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test ExtraOpenMissingClose - stop: ['ExtraOpenMissingClose', 'Extra open brace or missing close brace'], + 'stop': 'ExtraOpenMissingClose' }); /** @@ -222,11 +222,11 @@ export class SubsupItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test MissingScript Sub, MissingScript Sup - stop: ['MissingScript', 'Missing superscript or subscript argument'], + 'stop': 'MissingScript', // @test MissingOpenForSup - sup: ['MissingOpenForSup', 'Missing open brace for superscript'], + 'sup': 'MissingOpenForSup', // @test MissingOpenForSub - sub: ['MissingOpenForSub', 'Missing open brace for subscript'], + 'sub': 'MissingOpenForSub' }); /** @@ -276,10 +276,12 @@ export class SubsupItem extends BaseItem { const result = this.factory.create('mml', top); return [[result], true]; } - super.checkItem(item); - // @test Brace Superscript Error, MissingOpenForSup, MissingOpenForSub - const error = this.getErrors(['', 'sub', 'sup'][position]); - throw new TexError(error[0], error[1], ...error.splice(2)); + if (super.checkItem(item)[1]) { + // @test Brace Superscript Error, MissingOpenForSup, MissingOpenForSub + const error = this.getErrors(['', 'sub', 'sup'][position]); + throw new TexError(error); + } + return null; } } @@ -316,10 +318,7 @@ export class OverItem extends BaseItem { if (item.isKind('over')) { // @test Double Over throw new TexError( - 'AmbiguousUseOf', - 'Ambiguous use of %1', - item.getName() - ); + 'AmbiguousUseOf', item.getName()); } if (item.isClose) { // @test Over @@ -373,7 +372,7 @@ export class LeftItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test ExtraLeftMissingRight - stop: ['ExtraLeftMissingRight', 'Extra \\left or missing \\right'], + 'stop': 'ExtraLeftMissingRight' }); /** @@ -586,12 +585,8 @@ export class BeginItem extends BaseItem { if (item.isKind('end')) { if (item.getName() !== this.getName()) { // @test EnvBadEnd - throw new TexError( - 'EnvBadEnd', - '\\begin{%1} ended with \\end{%2}', - this.getName(), - item.getName() - ); + throw new TexError('EnvBadEnd', + this.getName(), item.getName()); } // @test Hfill const node = this.toMml(); @@ -600,7 +595,7 @@ export class BeginItem extends BaseItem { } if (item.isKind('stop')) { // @test EnvMissingEnd Array - throw new TexError('EnvMissingEnd', 'Missing \\end{%1}', this.getName()); + throw new TexError('EnvMissingEnd', this.getName()); } return super.checkItem(item); } @@ -673,7 +668,7 @@ export class PositionItem extends BaseItem { public checkItem(item: StackItem): CheckType { if (item.isClose) { // @test MissingBoxFor - throw new TexError('MissingBoxFor', 'Missing box for %1', this.getName()); + throw new TexError('MissingBoxFor', this.getName()); } if (item.isFinal) { let mml = item.toMml(); @@ -1083,7 +1078,7 @@ export class ArrayItem extends BaseItem { return [[newItem], true]; } // @test MissingCloseBrace2 - throw new TexError('MissingCloseBrace', 'Missing close brace'); + throw new TexError('MissingCloseBrace'); } return [[newItem, item], true]; } @@ -1648,7 +1643,7 @@ export class EquationItem extends BaseItem { } if (item.isKind('stop')) { // @test EnvMissingEnd Equation - throw new TexError('EnvMissingEnd', 'Missing \\end{%1}', this.getName()); + throw new TexError('EnvMissingEnd', this.getName()); } return super.checkItem(item); } diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index dc371a34d..a2c43aff5 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -63,27 +63,16 @@ const MmlTokenAllow: { [key: string]: number } = { * @param {number} n The number of expected alignment characters * @returns {string} String with space separated alignment characters */ -export function splitAlignArray(align: string, n: number = Infinity): string { - const list = align - .replace(/\s+/g, '') - .split('') - .map((s: string) => { - const name = { t: 'top', b: 'bottom', m: 'middle', c: 'center' }[s]; - if (!name) { - throw new TexError( - 'BadBreakAlign', - 'Invalid alignment character: %1', - s - ); - } - return name; - }); +export function splitAlignArray(align: string, n: number = Infinity) { + const list = align.replace(/\s+/g, '').split('').map((s: string) => { + const name = {t: 'top', b: 'bottom', m: 'middle', c: 'center'}[s]; + if (!name) { + throw new TexError('BadBreakAlign', s); + } + return name; + }); if (list.length > n) { - throw new TexError( - 'TooManyAligns', - 'Too many alignment characters: %1', - align - ); + throw new TexError('TooManyAligns', align); } return n === 1 ? list[0] : list.join(' '); } @@ -224,10 +213,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double-super-error, Double-over-error - throw new TexError( - 'DoubleExponent', - 'Double exponent: use braces to clarify' - ); + throw new TexError('DoubleExponent'); } if (!NodeUtil.isType(base, 'msubsup') || NodeUtil.isType(base, 'msup')) { if (movesupsub) { @@ -299,10 +285,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double-sub-error, Double-under-error - throw new TexError( - 'DoubleSubscripts', - 'Double subscripts: use braces to clarify' - ); + throw new TexError('DoubleSubscripts'); } if (!NodeUtil.isType(base, 'msubsup') || NodeUtil.isType(base, 'msup')) { if (movesupsub) { @@ -356,10 +339,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double Prime Error - throw new TexError( - 'DoubleExponentPrime', - 'Prime causes double exponent: use braces to clarify' - ); + throw new TexError('DoubleExponentPrime'); } let sup = ''; parser.i--; @@ -397,10 +377,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { */ Hash(_parser: TexParser, _c: string) { // @test Hash Error - throw new TexError( - 'CantUseHash1', - "You can't use 'macro parameter character #' in math mode" - ); + throw new TexError('CantUseHash1'); }, /** @@ -633,11 +610,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { NodeUtil.getProperty(op, 'movesupsub') == null) ) { // @test Limits Error - throw new TexError( - 'MisplacedLimits', - '%1 is allowed only on operators', - parser.currentCS - ); + throw new TexError('MisplacedLimits', parser.currentCS); } const top = parser.stack.Top(); let node; @@ -760,28 +733,16 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Tweaked Root if (!parser.stack.env['inRoot']) { // @test Misplaced Move Root - throw new TexError( - 'MisplacedMoveRoot', - '%1 can appear only within a root', - parser.currentCS - ); + throw new TexError('MisplacedMoveRoot', parser.currentCS); } if (parser.stack.global[id]) { // @test Multiple Move Root - throw new TexError( - 'MultipleMoveRoot', - 'Multiple use of %1', - parser.currentCS - ); + throw new TexError('MultipleMoveRoot', parser.currentCS); } let n = parser.GetArgument(name); if (!n.match(/-?[0-9]+/)) { // @test Incorrect Move Root - throw new TexError( - 'IntegerArg', - 'The argument to %1 must be an integer', - parser.currentCS - ); + throw new TexError('IntegerArg', parser.currentCS); } n = parseInt(n, 10) / 15 + 'em'; if (n.substring(0, 1) !== '-') { @@ -1017,50 +978,30 @@ const BaseMethods: { [key: string]: ParseMethod } = { BreakAlign(parser: TexParser, name: string) { const top = parser.stack.Top() as sitem.ArrayItem; if (!(top instanceof sitem.ArrayItem)) { - throw new TexError( - 'BreakNotInArray', - '%1 must be used in an alignment environment', - parser.currentCS - ); + throw new TexError('BreakNotInArray', parser.currentCS); } const type = parser.GetArgument(name).trim(); switch (type) { case 'c': if (top.First) { - throw new TexError( - 'BreakFirstInEntry', - '%1 must be at the beginning of an alignment entry', - parser.currentCS + '{c}' - ); + throw new TexError('BreakFirstInEntry', parser.currentCS + '{t}'); } top.breakAlign.cell = splitAlignArray(parser.GetArgument(name), 1); break; case 'r': if (top.row.length || top.First) { - throw new TexError( - 'BreakFirstInRow', - '%1 must be at the beginning of an alignment row', - parser.currentCS + '{r}' - ); + throw new TexError('BreakFirstInRow', parser.currentCS +'{r}'); } top.breakAlign.row = splitAlignArray(parser.GetArgument(name)); break; case 't': if (top.table.length || top.row.length || top.First) { - throw new TexError( - 'BreakFirstInTable', - '%1 must be at the beginning of an alignment', - parser.currentCS + '{t}' - ); + throw new TexError('BreakFirstInTable', parser.currentCS +'{c}'); } top.breakAlign.table = splitAlignArray(parser.GetArgument(name)); break; default: - throw new TexError( - 'BreakType', - 'First argument to %1 must be one of c, r, or t', - parser.currentCS - ); + throw new TexError('BreakType', parser.currentCS); } }, @@ -1085,7 +1026,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { } if (!node || !node.isToken) { // @test Token Illegal Type, Token Wrong Type - throw new TexError('NotMathMLToken', '%1 is not a token element', kind); + throw new TexError('NotMathMLToken', kind); } while (attr !== '') { const match = attr.match( @@ -1093,20 +1034,11 @@ const BaseMethods: { [key: string]: ParseMethod } = { ); if (!match) { // @test Token Invalid Attribute - throw new TexError( - 'InvalidMathMLAttr', - 'Invalid MathML attribute: %1', - attr.split(/[\s\n=]/)[0] - ); + throw new TexError('InvalidMathMLAttr', attr); } if (!node.attributes.hasDefault(match[1]) && !MmlTokenAllow[match[1]]) { // @test Token Unknown Attribute, Token Wrong Attribute - throw new TexError( - 'UnknownAttrForElement', - '%1 is not a recognized attribute for %2', - match[1], - kind - ); + throw new TexError('UnknownAttrForElement', match[1], kind); } let value: string | boolean = ParseUtil.mmlFilterAttribute( parser, @@ -1559,11 +1491,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const c = parser.GetNext(); if (c === '') { // @test Matrix Error - throw new TexError( - 'MissingArgFor', - 'Missing argument for %1', - parser.currentCS - ); + throw new TexError('MissingArgFor', parser.currentCS); } if (c === '{') { // @test Matrix Braces, Matrix Columns, Matrix Rows. @@ -1673,10 +1601,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // Extra alignment tabs are not allowed in cases // // @test ExtraAlignTab - throw new TexError( - 'ExtraAlignTab', - 'Extra alignment tab in \\cases text' - ); + throw new TexError('ExtraAlignTab'); } else if (c === '\\') { // // If the macro is \cr or \\, end the search, otherwise skip the macro @@ -1756,11 +1681,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Custom Linebreak if (dim && !value) { // @test Dimension Error - throw new TexError( - 'BracketMustBeDimension', - 'Bracket argument to %1 must be a dimension', - parser.currentCS - ); + throw new TexError('BracketMustBeDimension', name); } n = value + unit; } @@ -1804,7 +1725,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); if (!(top instanceof sitem.ArrayItem) || top.Size()) { // @test Misplaced hline - throw new TexError('Misplaced', 'Misplaced %1', parser.currentCS); + throw new TexError('Misplaced', parser.currentCS); } if (!top.table.length) { // @test Enclosed top, Enclosed top bottom @@ -1835,11 +1756,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { top.hfill.push(top.Size()); } else { // @test UnsupportedHFill - throw new TexError( - 'UnsupportedHFill', - 'Unsupported use of %1', - parser.currentCS - ); + throw new TexError('UnsupportedHFill', parser.currentCS); } }, @@ -1854,18 +1771,10 @@ const BaseMethods: { [key: string]: ParseMethod } = { const n = parser.GetBrackets(name, '0'); const macro = parser.GetArgument(name); if (c.length !== 1) { - throw new TexError( - 'BadColumnName', - 'Column specifier must be exactly one character: %1', - c - ); + throw new TexError('BadColumnName', c); } if (!n.match(/^\d+$/)) { - throw new TexError( - 'PositiveIntegerArg', - 'Argument to %1 must be a positive integer', - n - ); + throw new TexError('PositiveIntegerArg', n); } const cparser = parser.configuration.columnParser; cparser.columnHandler[c] = (state: ColumnState) => @@ -1888,7 +1797,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const env = parser.GetArgument(name); if (env.match(/\\/)) { // @test InvalidEnv - throw new TexError('InvalidEnv', "Invalid environment name '%1'", env); + throw new TexError('InvalidEnv', env); } const macro = parser.configuration.handlers .get(HandlerType.ENVIRONMENT) @@ -2023,29 +1932,15 @@ const BaseMethods: { [key: string]: ParseMethod } = { if ( (first && !UnitUtil.matchDimen(first)[0]) || (shift && !UnitUtil.matchDimen(shift)[0]) || - (last && !UnitUtil.matchDimen(last)[0]) - ) { - throw new TexError( - 'BracketMustBeDimension', - 'Bracket argument to %1 must be a dimension', - name - ); + (last && !UnitUtil.matchDimen(last)[0])) { + throw new TexError('BracketMustBeDimension', name); } // // Get the indentalign values, if any // const lcr = parser.GetArgument(name); if (lcr && !lcr.match(/^([lcr]{1,3})?$/)) { - throw new TexError( - 'BadAlignment', - 'Alignment must be one to three copies of l, c, or r' - ); - } - const align = [...lcr].map( - (c) => ({ l: 'left', c: 'center', r: 'right' })[c] - ); - if (align.length === 1) { - align.push(align[0]); + throw new TexError('BadAlignment'); } // // Set the properties for the mstyle @@ -2181,7 +2076,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Label, Ref, Ref Unknown if (parser.tags.label) { // @test Double Label Error - throw new TexError('MultipleCommand', 'Multiple %1', parser.currentCS); + throw new TexError('MultipleCommand', parser.currentCS); } parser.tags.label = label; if ( @@ -2189,11 +2084,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !parser.options['ignoreDuplicateLabels'] ) { // @ Duplicate Label Error - throw new TexError( - 'MultipleLabel', - "Label '%1' multiply defined", - label - ); + throw new TexError('MultipleLabel', label); } // TODO: This should be set in the tags structure! parser.tags.labels[label] = new Label(); // will be replaced by tag value later diff --git a/ts/input/tex/base/locales/en.json b/ts/input/tex/base/locales/en.json new file mode 100644 index 000000000..0432bbac5 --- /dev/null +++ b/ts/input/tex/base/locales/en.json @@ -0,0 +1,45 @@ +{ + "ExtraLeftMissingRight": "Extra \\left or missing \\right", + "ExtraOpenMissingClose": "Extra open brace or missing close brace", + "MissingScript": "Missing superscript or subscript argument", + "MissingOpenForSup": "Missing open brace for superscript", + "MissingOpenForSub": "Missing open brace for subscript", + "UnknownEnv": "Unknown environment '%1'", + "UndefinedControlSequence": "Undefined control sequence %1", + "EnvMissingEnd": "Missing \\end{%1}", + "MissingCloseBrace": "Missing close brace", + "MissingBoxFor": "Missing box for %1", + "EnvMissingEnd": "Missing \\end{%1}", + "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", + "AmbiguousUseOf": "Ambiguous use of %1", + "MultipleLabel": "Label '%1' multiply defined", + "MultipleCommand": "Multiple %1", + "BadAlignment": "Alignment must be one to three copies of l, c, or r", + "BracketMustBeDimension": "Bracket argument to %1 must be a dimension", + "InvalidEnv": "Invalid environment name '%1'", + "PositiveIntegerArg": "Argument to %1 must be a positive integer", + "BadColumnName": "Column specifier must be exactly one character: %1", + "UnsupportedHFill": "Unsupported use of %1", + "Misplaced": "Misplaced %1", + "BracketMustBeDimension": "Bracket argument to %1 must be a dimension", + "ExtraAlignTab": "Extra alignment tab in \\cases text", + "MissingArgFor": "Missing argument for %1", + "UnknownAttrForElement": "%1 is not a recognized attribute for %2", + "InvalidMathMLAttr": "Invalid MathML attribute: %1", + "NotMathMLToken": "%1 is not a token element", + "BreakType": "First argument to %1 must be one of c, r, or t", + "BreakFirstInTable": "%1 must be at the beginning of an alignment", + "BreakFirstInRow": "%1 must be at the beginning of an alignment row", + "BreakFirstInEntry": "%1 must be at the beginning of an alignment entry", + "BreakNotInArray": "%1 must be used in an alignment environment", + "IntegerArg": "The argument to %1 must be an integer", + "MultipleMoveRoot": "Multiple use of %1", + "MisplacedMoveRoot": "%1 can appear only within a root", + "MisplacedLimits": "%1 is allowed only on operators", + "CantUseHash1": "You can't use 'macro parameter character #' in math mode", + "DoubleExponentPrime": "Prime causes double exponent: use braces to clarify", + "DoubleSubscripts": "Double subscripts: use braces to clarify", + "DoubleExponent": "Double exponent: use braces to clarify", + "TooManyAligns": "Too many alignment characters: %1", + "BadBreakAlign": "Invalid alignment character: %1" +} diff --git a/ts/input/tex/bbox/Error.json b/ts/input/tex/bbox/Error.json new file mode 100644 index 000000000..88693ce9c --- /dev/null +++ b/ts/input/tex/bbox/Error.json @@ -0,0 +1,6 @@ +{ + "InvalidBBoxProperty": ""%1" doesn't look like a color, a padding dimension, or a style", + "MultipleBBoxProperty": "%1 specified twice in %2", + "MultipleBBoxProperty": "%1 specified twice in %2", + "MultipleBBoxProperty": "%1 specified twice in %2" +} diff --git a/ts/input/tex/braket/BraketMethods.ts b/ts/input/tex/braket/BraketMethods.ts index 784f005c7..f6087a4a9 100644 --- a/ts/input/tex/braket/BraketMethods.ts +++ b/ts/input/tex/braket/BraketMethods.ts @@ -39,19 +39,13 @@ const BraketMethods: { [key: string]: ParseMethod } = { * @param {number} barmax Maximum number of bars allowed. * @param {boolean} space True to add space inside the delimiters */ - Braket( - parser: TexParser, - name: string, - open: string, - close: string, - stretchy: boolean, - barmax: number, - space: boolean = false - ) { - const i = parser.i; - parser.GetArgument(name); // Error if there isn't a proper argument - parser.i = i; - const next = parser.GetNext(); + Braket(parser: TexParser, _name: string, + open: string, close: string, + stretchy: boolean, barmax: number, space: boolean = false) { + let next = parser.GetNext(); + if (next === '') { + throw new TexError('MissingArgFor', parser.currentCS); + } let single = true; if (next === '{') { parser.i++; diff --git a/ts/input/tex/braket/locales/en.json b/ts/input/tex/braket/locales/en.json new file mode 100644 index 000000000..c6b6e3436 --- /dev/null +++ b/ts/input/tex/braket/locales/en.json @@ -0,0 +1,3 @@ +{ + "MissingArgFor": "Missing argument for %1", +} diff --git a/ts/input/tex/bussproofs/BussproofsItems.ts b/ts/input/tex/bussproofs/BussproofsItems.ts index a9a4f51ad..45cbabdef 100644 --- a/ts/input/tex/bussproofs/BussproofsItems.ts +++ b/ts/input/tex/bussproofs/BussproofsItems.ts @@ -61,7 +61,7 @@ export class ProofTreeItem extends BaseItem { return [[this.factory.create('mml', node), item], true]; } if (item.isKind('stop')) { - throw new TexError('EnvMissingEnd', 'Missing \\end{%1}', this.getName()); + throw new TexError('EnvMissingEnd', this.getName()); } this.innerStack.Push(item); return BaseItem.fail; diff --git a/ts/input/tex/bussproofs/BussproofsMethods.ts b/ts/input/tex/bussproofs/BussproofsMethods.ts index d3f5803b2..797fae8d2 100644 --- a/ts/input/tex/bussproofs/BussproofsMethods.ts +++ b/ts/input/tex/bussproofs/BussproofsMethods.ts @@ -136,21 +136,12 @@ function createRule( function parseFCenterLine(parser: TexParser, name: string): MmlNode { const dollar = parser.GetNext(); if (dollar !== '$') { - throw new TexError( - 'IllegalUseOfCommand', - 'Use of %1 does not match its definition.', - name - ); + throw new TexError('IllegalUseOfCommand', name); } parser.i++; - const axiom = parser.GetUpTo(name, '$'); - if (!axiom.includes('\\fCenter')) { - throw new TexError( - 'MissingProofCommand', - 'Missing %1 in %2.', - '\\fCenter', - name - ); + let axiom = parser.GetUpTo(name, '$'); + if (axiom.indexOf('\\fCenter') === -1) { + throw new TexError('MissingProofCommand', '\\fCenter', name); } // Check for fCenter and throw error? const [prem, conc] = axiom.split('\\fCenter'); @@ -216,10 +207,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // TODO: Label error if (top.kind !== 'proofTree') { - throw new TexError( - 'IllegalProofCommand', - 'Proof commands only allowed in prooftree environment.' - ); + throw new TexError('IllegalProofCommand'); } const content = paddedContent(parser, parser.GetArgument(name)); BussproofsUtil.setProperty(content, 'axiom', true); @@ -236,13 +224,10 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { Inference(parser: TexParser, name: string, n: number) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError( - 'IllegalProofCommand', - 'Proof commands only allowed in prooftree environment.' - ); + throw new TexError('IllegalProofCommand'); } if (top.Size() < n) { - throw new TexError('BadProofTree', 'Proof tree badly specified.'); + throw new TexError('BadProofTree'); } const rootAtTop = top.getProperty('rootAtTop') as boolean; const childCount = n === 1 && !top.Peek()[0].childNodes.length ? 0 : n; @@ -294,10 +279,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // Label error if (top.kind !== 'proofTree') { - throw new TexError( - 'IllegalProofCommand', - 'Proof commands only allowed in prooftree environment.' - ); + throw new TexError('IllegalProofCommand'); } const content = ParseUtil.internalMath(parser, parser.GetArgument(name), 0); const label = @@ -319,10 +301,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // Label error if (top.kind !== 'proofTree') { - throw new TexError( - 'IllegalProofCommand', - 'Proof commands only allowed in prooftree environment.' - ); + throw new TexError('IllegalProofCommand'); } top.setProperty('currentLine', style); if (always) { @@ -340,10 +319,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { RootAtTop(parser: TexParser, _name: string, where: boolean) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError( - 'IllegalProofCommand', - 'Proof commands only allowed in prooftree environment.' - ); + throw new TexError('IllegalProofCommand'); } top.setProperty('rootAtTop', where); }, @@ -357,10 +333,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { AxiomF(parser: TexParser, name: string) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError( - 'IllegalProofCommand', - 'Proof commands only allowed in prooftree environment.' - ); + throw new TexError('IllegalProofCommand'); } const line = parseFCenterLine(parser, name); BussproofsUtil.setProperty(line, 'axiom', true); @@ -385,13 +358,10 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { InferenceF(parser: TexParser, name: string, n: number) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError( - 'IllegalProofCommand', - 'Proof commands only allowed in prooftree environment.' - ); + throw new TexError('IllegalProofCommand'); } if (top.Size() < n) { - throw new TexError('BadProofTree', 'Proof tree badly specified.'); + throw new TexError('BadProofTree'); } const rootAtTop = top.getProperty('rootAtTop') as boolean; const childCount = n === 1 && !top.Peek()[0].childNodes.length ? 0 : n; diff --git a/ts/input/tex/bussproofs/locales/en.json b/ts/input/tex/bussproofs/locales/en.json new file mode 100644 index 000000000..50e5b27f7 --- /dev/null +++ b/ts/input/tex/bussproofs/locales/en.json @@ -0,0 +1,14 @@ +{ + "BadProofTree": "Proof tree badly specified.", + "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", + "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", + "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", + "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", + "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", + "BadProofTree": "Proof tree badly specified.", + "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", + "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", + "MissingProofCommand": "Missing %1 in %2.", + "IllegalUseOfCommand": "Use of %1 does not match its definition.", + "EnvMissingEnd": "Missing \\end{%1}" +} diff --git a/ts/input/tex/cases/CasesConfiguration.ts b/ts/input/tex/cases/CasesConfiguration.ts index 6ffdd8695..2bea4089e 100644 --- a/ts/input/tex/cases/CasesConfiguration.ts +++ b/ts/input/tex/cases/CasesConfiguration.ts @@ -181,10 +181,7 @@ export const CasesMethods = { // // Extra alignment tabs are not allowed in cases // - throw new TexError( - 'ExtraCasesAlignTab', - 'Extra alignment tab in text for numcase environment' - ); + throw new TexError('ExtraCasesAlignTab'); } else if (c === '\\' && braces === 0) { // // If the macro is \cr or \\, end the search, otherwise skip the macro diff --git a/ts/input/tex/cases/locales/en.json b/ts/input/tex/cases/locales/en.json new file mode 100644 index 000000000..85a34fac9 --- /dev/null +++ b/ts/input/tex/cases/locales/en.json @@ -0,0 +1,3 @@ +{ + "ExtraCasesAlignTab": "Extra alignment tab in text for numcase environment" +} diff --git a/ts/input/tex/color/ColorUtil.ts b/ts/input/tex/color/ColorUtil.ts index be289c801..25779dc33 100644 --- a/ts/input/tex/color/ColorUtil.ts +++ b/ts/input/tex/color/ColorUtil.ts @@ -58,11 +58,8 @@ export class ColorModel { const modelProcessor = ColorModelProcessors.get(model); return modelProcessor(def); } - throw new TexError( - 'UndefinedColorModel', - "Color model '%1' not defined", - model - ); + + throw new TexError('UndefinedColorModel', model); } /** @@ -132,27 +129,17 @@ ColorModelProcessors.set('rgb', function (rgb: string): string { let RGB: string = '#'; if (rgbParts.length !== 3) { - throw new TexError( - 'ModelArg1', - 'Color values for the %1 model require 3 numbers', - 'rgb' - ); + throw new TexError('ModelArg1', 'rgb'); } for (const rgbPart of rgbParts) { if (!rgbPart.match(/^(\d+(\.\d*)?|\.\d+)$/)) { - throw new TexError('InvalidDecimalNumber', 'Invalid decimal number'); + throw new TexError('InvalidDecimalNumber'); } const n = parseFloat(rgbPart); if (n < 0 || n > 1) { - throw new TexError( - 'ModelArg2', - 'Color values for the %1 model must be between %2 and %3', - 'rgb', - '0', - '1' - ); + throw new TexError('ModelArg2', 'rgb', '0', '1'); } let pn = Math.floor(n * 255).toString(16); @@ -177,27 +164,17 @@ ColorModelProcessors.set('RGB', function (rgb: string): string { let RGB = '#'; if (rgbParts.length !== 3) { - throw new TexError( - 'ModelArg1', - 'Color values for the %1 model require 3 numbers', - 'RGB' - ); + throw new TexError('ModelArg1', 'RGB'); } for (const rgbPart of rgbParts) { if (!rgbPart.match(/^\d+$/)) { - throw new TexError('InvalidNumber', 'Invalid number'); + throw new TexError('InvalidNumber'); } const n = parseInt(rgbPart); if (n > 255) { - throw new TexError( - 'ModelArg2', - 'Color values for the %1 model must be between %2 and %3', - 'RGB', - '0', - '255' - ); + throw new TexError('ModelArg2', 'RGB', '0', '255'); } let pn = n.toString(16); @@ -217,18 +194,12 @@ ColorModelProcessors.set('RGB', function (rgb: string): string { */ ColorModelProcessors.set('gray', function (gray: string): string { if (!gray.match(/^\s*(\d+(\.\d*)?|\.\d+)\s*$/)) { - throw new TexError('InvalidDecimalNumber', 'Invalid decimal number'); + throw new TexError('InvalidDecimalNumber'); } const n: number = parseFloat(gray); if (n < 0 || n > 1) { - throw new TexError( - 'ModelArg2', - 'Color values for the %1 model must be between %2 and %3', - 'gray', - '0', - '1' - ); + throw new TexError('ModelArg2', 'gray', '0', '1'); } let pn = Math.floor(n * 255).toString(16); if (pn.length < 2) { diff --git a/ts/input/tex/color/locales/en.json b/ts/input/tex/color/locales/en.json new file mode 100644 index 000000000..9aa7a1a75 --- /dev/null +++ b/ts/input/tex/color/locales/en.json @@ -0,0 +1,11 @@ +{ + "ModelArg2": "Color values for the %1 model must be between %2 and %3", + "InvalidDecimalNumber": "Invalid decimal number", + "ModelArg2": "Color values for the %1 model must be between %2 and %3", + "InvalidNumber": "Invalid number", + "ModelArg1": "Color values for the %1 model require 3 numbers", + "ModelArg2": "Color values for the %1 model must be between %2 and %3", + "InvalidDecimalNumber": "Invalid decimal number", + "ModelArg1": "Color values for the %1 model require 3 numbers", + "UndefinedColorModel": "Color model '%1' not defined" +} diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts index 67496ffcf..1ef22aff5 100644 --- a/ts/input/tex/colortbl/ColortblConfiguration.ts +++ b/ts/input/tex/colortbl/ColortblConfiguration.ts @@ -130,22 +130,14 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) { // const top = parser.stack.Top() as ColorArrayItem; if (!(top instanceof ColorArrayItem)) { - throw new TexError( - 'UnsupportedTableColor', - 'Unsupported use of %1', - parser.currentCS - ); + throw new TexError('UnsupportedTableColor', parser.currentCS); } // // Check the position of the macro and save the color. // if (type === 'col') { if (top.table.length && top.color.col[top.row.length] !== color) { - throw new TexError( - 'ColumnColorNotTop', - '%1 must be in the top row or preamble', - name - ); + throw new TexError('ColumnColorNotTop', name); } top.color.col[top.row.length] = color; // @@ -157,11 +149,7 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) { } else { top.color[type] = color; if (type === 'row' && (top.Size() || top.row.length)) { - throw new TexError( - 'RowColorNotFirst', - '%1 must be at the beginning of a row', - name - ); + throw new TexError('RowColorNotFirst', name); } } } diff --git a/ts/input/tex/colortbl/locales/en.json b/ts/input/tex/colortbl/locales/en.json new file mode 100644 index 000000000..b8b941761 --- /dev/null +++ b/ts/input/tex/colortbl/locales/en.json @@ -0,0 +1,5 @@ +{ + "RowColorNotFirst": "%1 must be at the beginning of a row", + "ColumnColorNotTop": "%1 must be in the top row or preamble", + "UnsupportedTableColor": "Unsupported use of %1" +} diff --git a/ts/input/tex/empheq/EmpheqConfiguration.ts b/ts/input/tex/empheq/EmpheqConfiguration.ts index a4f6f7fb9..656a9f3e3 100644 --- a/ts/input/tex/empheq/EmpheqConfiguration.ts +++ b/ts/input/tex/empheq/EmpheqConfiguration.ts @@ -62,12 +62,7 @@ export const EmpheqMethods = { .GetArgument('\\begin{' + begin.getName() + '}') .split(/=/); if (!EmpheqUtil.checkEnv(env)) { - throw new TexError( - 'EmpheqInvalidEnv', - 'Invalid environment "%1" for %2', - env, - begin.getName() - ); + throw new TexError('UnknownEnv', env); } begin.setProperty('nestStart', true); if (opts) { diff --git a/ts/input/tex/empheq/locales/en.json b/ts/input/tex/empheq/locales/en.json new file mode 100644 index 000000000..2b41321e1 --- /dev/null +++ b/ts/input/tex/empheq/locales/en.json @@ -0,0 +1,3 @@ +{ + "UnknownEnv": "Unknown environment "%1"" +} diff --git a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts index aa313ba1e..4e6725452 100644 --- a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts +++ b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts @@ -45,25 +45,13 @@ const ExtpfeilMethods: { [key: string]: ParseMethod } = { const space = parser.GetArgument(name); const chr = parser.GetArgument(name); if (!cs.match(/^\\([a-z]+|.)$/i)) { - throw new TexError( - 'NewextarrowArg1', - 'First argument to %1 must be a control sequence name', - name - ); + throw new TexError('NewextarrowArg1', name); } if (!space.match(/^(\d+),(\d+)$/)) { - throw new TexError( - 'NewextarrowArg2', - 'Second argument to %1 must be two integers separated by a comma', - name - ); + throw new TexError('NewextarrowArg2', name); } if (!chr.match(/^(\d+|0x[0-9A-F]+)$/i)) { - throw new TexError( - 'NewextarrowArg3', - 'Third argument to %1 must be a unicode character number', - name - ); + throw new TexError('NewextarrowArg3', name); } cs = cs.substring(1); const spaces = space.split(','); diff --git a/ts/input/tex/extpfeil/locales/en.json b/ts/input/tex/extpfeil/locales/en.json new file mode 100644 index 000000000..0f4121064 --- /dev/null +++ b/ts/input/tex/extpfeil/locales/en.json @@ -0,0 +1,5 @@ +{ + "NewextarrowArg3": "Third argument to %1 must be a unicode character number", + "NewextarrowArg2": "Second argument to %1 must be two integers separated by a comma", + "NewextarrowArg1": "First argument to %1 must be a control sequence name" +} diff --git a/ts/input/tex/html/HtmlMethods.ts b/ts/input/tex/html/HtmlMethods.ts index 9aa89f19e..533555d44 100644 --- a/ts/input/tex/html/HtmlMethods.ts +++ b/ts/input/tex/html/HtmlMethods.ts @@ -63,11 +63,7 @@ const HtmlMethods: { [key: string]: ParseMethod } = { for (const key in data) { // remove illegal attribute names if (!isLegalAttributeName(key)) { - throw new TexError( - 'InvalidHTMLAttr', - 'Invalid HTML attribute: %1', - `data-${key}` - ); + throw new TexError('InvalidHTMLAttr', `data-${key}`); } NodeUtil.setAttribute(arg, `data-${key}`, data[key]); } diff --git a/ts/input/tex/html/locales/en.json b/ts/input/tex/html/locales/en.json new file mode 100644 index 000000000..1dc90b7cf --- /dev/null +++ b/ts/input/tex/html/locales/en.json @@ -0,0 +1,3 @@ +{ + "InvalidHTMLAttr": "Invalid HTML attribute: %1" +} diff --git a/ts/input/tex/mathtools/MathtoolsMethods.ts b/ts/input/tex/mathtools/MathtoolsMethods.ts index ae04f2ec1..68ff76cce 100644 --- a/ts/input/tex/mathtools/MathtoolsMethods.ts +++ b/ts/input/tex/mathtools/MathtoolsMethods.ts @@ -135,11 +135,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { width = arg; } if (width && !UnitUtil.matchDimen(width)[0]) { - throw new TexError( - 'BadWidth', - 'Width for %1 must be a dimension', - name - ); + throw new TexError('BadWidth', name); } } parser.Push(begin); @@ -167,18 +163,10 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { HandleShove(parser: TexParser, name: string, shove: string) { const top = parser.stack.Top(); if (top.kind !== 'multline' && top.kind !== 'multlined') { - throw new TexError( - 'CommandInMultlined', - '%1 can only appear within the multline or multlined environments', - name - ); + throw new TexError('CommandInMultlined', name); } if (top.Size()) { - throw new TexError( - 'CommandAtTheBeginingOfLine', - '%1 must come at the beginning of the line', - name - ); + throw new TexError('CommandAtTheBeginingOfLine', name); } top.setProperty('shove', shove); const shift = parser.GetBrackets(name); @@ -486,7 +474,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { ArrowBetweenLines(parser: TexParser, name: string) { const top = MathtoolsUtil.checkAlignment(parser, name); if (top.Size() || top.row.length) { - throw new TexError('BetweenLines', '%1 must be on a row by itself', name); + throw new TexError('BetweenLines', name); } const star = parser.GetStar(); const symbol = parser.GetBrackets(name, '\\Updownarrow'); @@ -936,21 +924,17 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { NewTagForm(parser: TexParser, name: string, renew: boolean = false) { const tags = parser.tags as MathtoolsTags; if (!('mtFormats' in tags)) { - throw new TexError( - 'TagsNotMT', - '%1 can only be used with ams or mathtools tags', - name - ); + throw new TexError('TagsNotMT', name); } const id = parser.GetArgument(name).trim(); if (!id) { - throw new TexError('InvalidTagFormID', "Tag form name can't be empty"); + throw new TexError('InvalidTagFormID'); } const format = parser.GetBrackets(name, ''); const left = parser.GetArgument(name); const right = parser.GetArgument(name); if (!renew && tags.mtFormats.has(id)) { - throw new TexError('DuplicateTagForm', 'Duplicate tag form: %1', id); + throw new TexError('DuplicateTagForm', id); } tags.mtFormats.set(id, [left, right, format]); parser.Push(parser.itemFactory.create('null')); @@ -965,11 +949,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { UseTagForm(parser: TexParser, name: string) { const tags = parser.tags as MathtoolsTags; if (!('mtFormats' in tags)) { - throw new TexError( - 'TagsNotMT', - '%1 can only be used with ams or mathtools tags', - name - ); + throw new TexError('TagsNotMT', name); } const id = parser.GetArgument(name).trim(); if (!id) { @@ -978,7 +958,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { return; } if (!tags.mtFormats.has(id)) { - throw new TexError('UndefinedTagForm', 'Undefined tag form: %1', id); + throw new TexError('UndefinedTagForm', id); } tags.mtCurrent = tags.mtFormats.get(id); parser.Push(parser.itemFactory.create('null')); @@ -993,7 +973,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { SetOptions(parser: TexParser, name: string) { const options = parser.options.mathtools; if (!options['allow-mathtoolsset']) { - throw new TexError('ForbiddenMathtoolsSet', '%1 is disabled', name); + throw new TexError('ForbiddenMathtoolsSet', name); } const allowed = {} as { [id: string]: number }; Object.keys(options).forEach((id) => { diff --git a/ts/input/tex/mathtools/MathtoolsTags.ts b/ts/input/tex/mathtools/MathtoolsTags.ts index 187273f9e..d1c9820ba 100644 --- a/ts/input/tex/mathtools/MathtoolsTags.ts +++ b/ts/input/tex/mathtools/MathtoolsTags.ts @@ -88,11 +88,7 @@ export function MathtoolsTagFormat( const forms = jax.parseOptions.options.mathtools.tagforms; for (const form of Object.keys(forms)) { if (!Array.isArray(forms[form]) || forms[form].length !== 3) { - throw new TexError( - 'InvalidTagFormDef', - 'The tag form definition for "%1" should be an array of three strings', - form - ); + throw new TexError('InvalidTagFormDef', form); } this.mtFormats.set(form, forms[form] as [string, string, string]); } diff --git a/ts/input/tex/mathtools/MathtoolsUtil.ts b/ts/input/tex/mathtools/MathtoolsUtil.ts index fef511b62..cb01ccdf0 100644 --- a/ts/input/tex/mathtools/MathtoolsUtil.ts +++ b/ts/input/tex/mathtools/MathtoolsUtil.ts @@ -69,11 +69,7 @@ export const MathtoolsUtil = { checkAlignment(parser: TexParser, name: string): EqnArrayItem { const top = parser.stack.Top() as EqnArrayItem; if (top.kind !== EqnArrayItem.prototype.kind) { - throw new TexError( - 'NotInAlignment', - '%1 can only be used in aligment environments', - name - ); + throw new TexError('NotInAlignment', name); } return top; }, @@ -131,7 +127,7 @@ export const MathtoolsUtil = { plusOrMinus(name: string, n: string): string { n = n.trim(); if (!n.match(/^[-+]?(?:\d+(?:\.\d*)?|\.\d+)$/)) { - throw new TexError('NotANumber', 'Argument to %1 is not a number', name); + throw new TexError('NotANumber', name); } return n.match(/^[-+]/) ? n : '+' + n; }, diff --git a/ts/input/tex/mathtools/locales/en.json b/ts/input/tex/mathtools/locales/en.json new file mode 100644 index 000000000..766727ad0 --- /dev/null +++ b/ts/input/tex/mathtools/locales/en.json @@ -0,0 +1,13 @@ +'InvalidTagFormDef': 'The tag form definition for "%1" should be an array fo three strings', +'ForbiddenMathtoolsSet': '%1 is disabled', +'UndefinedTagForm': 'Undefined tag form: %1', +'TagsNotMT': '%1 can only be used with ams or mathtools tags', +'DuplicateTagForm': 'Duplicate tag form: %1', +'InvalidTagFormID': 'Tag form name can't be empty', +'TagsNotMT': '%1 can only be used with ams or mathtools tags', +'BetweenLines': '%1 must be on a row by itself', +'CommandAtTheBeginingOfLine': '%1 must come at the beginning of the line', +'CommandInMultlined': '%1 can only appear within the multline or multlined environments', +'BadWidth': 'Width for %1 must be a dimension', +'NotANumber': 'Argument to %1 is not a number', +'NotInAlignment': '%1 can only be used in aligment environments', diff --git a/ts/input/tex/newcommand/NewcommandItems.ts b/ts/input/tex/newcommand/NewcommandItems.ts index dac92392b..854b680d1 100644 --- a/ts/input/tex/newcommand/NewcommandItems.ts +++ b/ts/input/tex/newcommand/NewcommandItems.ts @@ -52,18 +52,13 @@ export class BeginEnvItem extends BaseItem { // @test Newenvironment Empty, Newenvironment Align if (item.getName() !== this.getName()) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc\end{equation} - throw new TexError( - 'EnvBadEnd', - '\\begin{%1} ended with \\end{%2}', - this.getName(), - item.getName() - ); + throw new TexError('EnvBadEnd', this.getName(), item.getName()); } return [[this.factory.create('mml', this.toMml())], true]; } if (item.isKind('stop')) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc - throw new TexError('EnvMissingEnd', 'Missing \\end{%1}', this.getName()); + throw new TexError('EnvMissingEnd', this.getName()); } // @test Newenvironment Empty, Newenvironment Align return super.checkItem(item); diff --git a/ts/input/tex/newcommand/NewcommandMethods.ts b/ts/input/tex/newcommand/NewcommandMethods.ts index 545c0f6d9..4693b54ce 100644 --- a/ts/input/tex/newcommand/NewcommandMethods.ts +++ b/ts/input/tex/newcommand/NewcommandMethods.ts @@ -215,11 +215,7 @@ const NewcommandMethods: { [key: string]: ParseMethod } = { parser.GetNext(); if (params[0] && !NewcommandUtil.MatchParam(parser, params[0])) { // @test Missing Arguments - throw new TexError( - 'MismatchUseDef', - "Use of %1 doesn't match its definition", - name - ); + throw new TexError('MismatchUseDef', name); } if (argCount) { for (let i = 0; i < argCount; i++) { diff --git a/ts/input/tex/newcommand/NewcommandUtil.ts b/ts/input/tex/newcommand/NewcommandUtil.ts index c1ade5834..a026f8b94 100644 --- a/ts/input/tex/newcommand/NewcommandUtil.ts +++ b/ts/input/tex/newcommand/NewcommandUtil.ts @@ -57,11 +57,7 @@ export const NewcommandUtil = { const c = parser.GetNext(); if (c !== '\\') { // @test No CS - throw new TexError( - 'MissingCS', - '%1 must be followed by a control sequence', - cmd - ); + throw new TexError('MissingCS', cmd); } const cs = UnitUtil.trimSpaces(parser.GetArgument(cmd)).substring(1); this.checkProtectedMacros(parser, cs); @@ -83,11 +79,7 @@ export const NewcommandUtil = { } if (!cs.match(/^(.|[a-z]+)$/i)) { // @test Illegal CS - throw new TexError( - 'IllegalControlSequenceName', - 'Illegal control sequence name for %1', - name - ); + throw new TexError('IllegalControlSequenceName', name); } this.checkProtectedMacros(parser, cs); return cs; @@ -108,11 +100,7 @@ export const NewcommandUtil = { n = UnitUtil.trimSpaces(n); if (!n.match(/^[0-9]+$/)) { // @test Illegal Argument Number - throw new TexError( - 'IllegalParamNumber', - 'Illegal number of parameters specified in %1', - name - ); + throw new TexError('IllegalParamNumber', name); } } return n; @@ -145,19 +133,11 @@ export const NewcommandUtil = { c = parser.string.charAt(++parser.i); if (!c.match(/^[1-9]$/)) { // @test Illegal Hash - throw new TexError( - 'CantUseHash2', - 'Illegal use of # in template for %1', - cs - ); + throw new TexError('CantUseHash2', cs); } if (parseInt(c) !== ++n) { // @test No Sequence - throw new TexError( - 'SequentialParam', - 'Parameters for %1 must be numbered sequentially', - cs - ); + throw new TexError('SequentialParam', cs); } i = parser.i + 1; } else if (c === '{') { @@ -184,12 +164,9 @@ export const NewcommandUtil = { parser.i++; } // @test No Replacement - throw new TexError( - 'MissingReplacementString', - 'Missing replacement string for definition of %1', - cmd - ); - }, + throw new TexError('MissingReplacementString', cmd); + } + /** * Find a single parameter delimited by a trailing template. @@ -242,8 +219,9 @@ export const NewcommandUtil = { } } // @test Runaway Argument - throw new TexError('RunawayArgument', 'Runaway argument for %1?', name); - }, + throw new TexError('RunawayArgument', name); + } + /** * Check if a template is at the current location. diff --git a/ts/input/tex/newcommand/locales/en.json b/ts/input/tex/newcommand/locales/en.json new file mode 100644 index 000000000..3a9685475 --- /dev/null +++ b/ts/input/tex/newcommand/locales/en.json @@ -0,0 +1,12 @@ +{ + "MismatchUseDef": "Use of %1 doesn't match its definition", + "EnvMissingEnd": "Missing \\end{%1}", + "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", + "RunawayArgument": "Runaway argument for %1?", + "MissingReplacementString": "Missing replacement string for definition of %1", + "SequentialParam": "Parameters for %1 must be numbered sequentially", + "CantUseHash2": "Illegal use of # in template for %1", + "IllegalParamNumber": "Illegal number of parameters specified in %1", + "IllegalControlSequenceName": "Illegal control sequence name for %1", + "MissingCS": "%1 must be followed by a control sequence" +} diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index f53c10041..51255fe4c 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -243,11 +243,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { } let right = pairs[next]; if (arg && next !== '{') { - throw new TexError( - 'MissingArgFor', - 'Missing argument for %1', - parser.currentCS - ); + throw new TexError('MissingArgFor', parser.currentCS); } if (!right) { const empty = parser.create('node', 'mrow'); @@ -312,15 +308,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { ); return; } - let replace = '\\left.\\vphantom{\\int}\\right|'; - if (next === '{') { - const arg = parser.GetArgument(name); - replace = `\\left.${star ? `\\smash{${arg}}` : arg}\\vphantom{\\int}\\right|`; - } - parser.string = - parser.string.substring(0, parser.i) + - replace + - parser.string.slice(parser.i); + throw new TexError('MissingArgFor', parser.currentCS); }, /** @@ -345,20 +333,12 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { big = parser.GetCS(); if (!big.match(biggs)) { // Actually a commutator error arg1 error. - throw new TexError( - 'MissingArgFor', - 'Missing argument for %1', - parser.currentCS - ); + throw new TexError('MissingArgFor', parser.currentCS); } next = parser.GetNext(); } if (next !== '{') { - throw new TexError( - 'MissingArgFor', - 'Missing argument for %1', - parser.currentCS - ); + throw new TexError('MissingArgFor', parser.currentCS); } const arg1 = parser.GetArgument(name); const arg2 = parser.GetArgument(name); @@ -888,7 +868,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { const arg = parser.GetArgument(name); const size = parseInt(arg, 10); if (isNaN(size)) { - throw new TexError('InvalidNumber', 'Invalid number'); + throw new TexError('InvalidNumber'); } if (size <= 1) { parser.string = '1' + parser.string.slice(parser.i); @@ -919,13 +899,8 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { const arg3 = parser.GetArgument(name); let n = parseInt(arg2, 10); let m = parseInt(arg3, 10); - if ( - isNaN(n) || - isNaN(m) || - m.toString() !== arg3 || - n.toString() !== arg2 - ) { - throw new TexError('InvalidNumber', 'Invalid number'); + if (isNaN(n) || isNaN(m) || m.toString() !== arg3 || n.toString() !== arg2) { + throw new TexError('InvalidNumber'); } n = n < 1 ? 1 : n; m = m < 1 ? 1 : m; diff --git a/ts/input/tex/physics/locales/en.json b/ts/input/tex/physics/locales/en.json new file mode 100644 index 000000000..a9940e6a2 --- /dev/null +++ b/ts/input/tex/physics/locales/en.json @@ -0,0 +1,8 @@ +{ + "InvalidNumber": "Invalid number", + "InvalidNumber": "Invalid number", + "MissingArgFor": "Missing argument for %1", + "MissingArgFor": "Missing argument for %1", + "MissingArgFor": "Missing argument for %1", + "MissingArgFor": "Missing argument for %1" +} diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 384ee7616..5e4f44d35 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -169,11 +169,7 @@ export function RequireLoad(parser: TexParser, name: string) { ? allow[name] : options.defaultAllow; if (!allowed) { - throw new TexError( - 'BadRequire', - 'Extension "%1" is not allowed to be loaded', - extension - ); + throw new TexError('BadRequire', extension); } const data = Package.packages.get(extension); if (!data) { @@ -234,11 +230,7 @@ export const RequireMethods: { [key: string]: ParseMethod } = { Require(parser: TexParser, name: string) { const required = parser.GetArgument(name); if (required.match(/[^_a-zA-Z0-9]/) || required === '') { - throw new TexError( - 'BadPackageName', - 'Argument for %1 is not a valid package name', - name - ); + throw new TexError('BadPackageName', name); } RequireLoad(parser, required); parser.Push(parser.itemFactory.create('null')); diff --git a/ts/input/tex/require/locales/en.json b/ts/input/tex/require/locales/en.json new file mode 100644 index 000000000..4c2a960eb --- /dev/null +++ b/ts/input/tex/require/locales/en.json @@ -0,0 +1,4 @@ +{ + "BadPackageName": "Argument for %1 is not a valid package name", + "BadRequire": "Extension "%1" is not allowed to be loaded" +} diff --git a/ts/input/tex/setoptions/SetOptionsConfiguration.ts b/ts/input/tex/setoptions/SetOptionsConfiguration.ts index 33e4e2f71..4d3d84f19 100644 --- a/ts/input/tex/setoptions/SetOptionsConfiguration.ts +++ b/ts/input/tex/setoptions/SetOptionsConfiguration.ts @@ -47,19 +47,12 @@ export const SetOptionsUtil = { */ filterPackage(parser: TexParser, extension: string): boolean { if (extension !== 'tex' && !ConfigurationHandler.get(extension)) { - throw new TexError('NotAPackage', 'Not a defined package: %1', extension); + throw new TexError('NotAPackage', extension); } const config = parser.options.setoptions; const options = config.allowOptions[extension]; - if ( - (options === undefined && !config.allowPackageDefault) || - options === false - ) { - throw new TexError( - 'PackageNotSettable', - 'Options can\'t be set for package "%1"', - extension - ); + if ((options === undefined && !config.allowPackageDefault) || options === false) { + throw new TexError('PackageNotSettable', extension); } return true; }, @@ -81,36 +74,13 @@ export const SetOptionsUtil = { ? options[option] : null; if (allow === false || (allow === null && !config.allowOptionsDefault)) { - if (isTex) { - throw new TexError( - 'TeXOptionNotSettable', - 'Option "%1" is not allowed to be set', - option - ); - } else { - throw new TexError( - 'OptionNotSettable', - 'Option "%1" is not allowed to be set for package %2', - option, - extension - ); - } + throw new TexError('OptionNotSettable', option); } - const extOptions = isTex ? parser.options : parser.options[extension]; - if (!extOptions || !Object.hasOwn(extOptions, option)) { - if (isTex) { - throw new TexError( - 'InvalidTexOption', - 'Invalid TeX option "%1"', - option - ); + if (!(extension === 'tex' ? parser.options : parser.options[extension])?.hasOwnProperty(option)) { + if (extension === 'tex') { + throw new TexError('InvalidTexOption', option); } else { - throw new TexError( - 'InvalidOptionKey', - 'Invalid option "%1" for package "%2"', - option, - extension - ); + throw new TexError('InvalidOptionKey', option, extension); } } return true; diff --git a/ts/input/tex/setoptions/locales/en.json b/ts/input/tex/setoptions/locales/en.json new file mode 100644 index 000000000..16d826784 --- /dev/null +++ b/ts/input/tex/setoptions/locales/en.json @@ -0,0 +1,7 @@ +{ + "InvalidOptionKey": "Invalid option "%1" for package "%2"", + "InvalidTexOption": "Invalid TeX option "%1"", + "OptionNotSettable": "Option "%1" is not allowed to be set", + "PackageNotSettable": "Options can't be set for package "%1"", + "NotAPackage": "Not a defined package: %1" +} diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 58d157ea8..7c8577033 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -59,12 +59,7 @@ export const HtmlNodeMethods: { [key: string]: ParseMethod } = { const end = (match[1] ? `` : '') + ''; const i = parser.string.slice(parser.i).indexOf(end); if (i < 0) { - throw new TexError( - 'TokenNotFoundForCommand', - 'Could not find %1 for %2', - end, - '<' + match[0] - ); + throw new TexError('TokenNotFoundForCommand', end, '<' + match[0]); } const html = parser.string.substring(parser.i, parser.i + i).trim(); parser.i += i + 11 + (match[1] ? 3 + match[1].length : 0); diff --git a/ts/input/tex/texhtml/locales/en.json b/ts/input/tex/texhtml/locales/en.json new file mode 100644 index 000000000..7028aec43 --- /dev/null +++ b/ts/input/tex/texhtml/locales/en.json @@ -0,0 +1,3 @@ +{ + "TokenNotFoundForCommand": "Could not find %1 for %2", +} diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index 03833292a..00b91240f 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -58,19 +58,11 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } } if (font.match(/;/)) { - throw new TexError( - 'BadFont', - "Font name for %1 can't contain semicolons", - parser.currentCS - ); + throw new TexError('BadFont', parser.currentCS); } const n = UnitUtil.trimSpaces(parser.GetArgument(name)).replace(/^0x/, 'x'); if (!n.match(/^(x[0-9A-Fa-f]+|[0-9]+)$/)) { - throw new TexError( - 'BadUnicode', - 'Argument to %1 must be a number', - parser.currentCS - ); + throw new TexError('BadUnicode', parser.currentCS); } const N = parseInt(n.match(/^x/) ? '0' + n : n); if (!UnicodeCache[N]) { @@ -111,11 +103,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { RawUnicode(parser: TexParser, name: string) { const hex = parser.GetArgument(name).trim(); if (!hex.match(/^[0-9A-F]{1,6}$/)) { - throw new TexError( - 'BadRawUnicode', - 'Argument to %1 must a hexadecimal number with 1 to 6 digits', - parser.currentCS - ); + throw new TexError('BadRawUnicode', parser.currentCS); } const n = parseInt(hex, 16); parser.string = String.fromCodePoint(n) + parser.string.substring(parser.i); @@ -138,7 +126,20 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { // @ts-ignore match = text.match(/^'([0-7]{1,7}) ?/u); if (match) { - c = String.fromCodePoint(parseInt(match[1], 8)); + if (match[1]) { + c = String.fromCodePoint(parseInt(match[1], 8)); + } else if (match[3]) { + c = match[3]; + } else { + parser.i += 2; + const cs = [...parser.GetCS()]; + if (cs.length > 1) { + throw new TexError('InvalidAlphanumeric', parser.currentCS); + } + c = cs[0]; + match = ['']; + + } } } else if (next === '"') { match = text.match(/^"([0-9A-F]{1,6}) ?/); @@ -173,11 +174,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } } if (!c) { - throw new TexError( - 'MissingNumber', - 'Missing numeric constant for %1', - parser.currentCS - ); + throw new TexError('MissingNumber', parser.currentCS); } parser.i += match[0].length; if (c >= '0' && c <= '9') { diff --git a/ts/input/tex/unicode/locales/en.json b/ts/input/tex/unicode/locales/en.json new file mode 100644 index 000000000..775d4248d --- /dev/null +++ b/ts/input/tex/unicode/locales/en.json @@ -0,0 +1,8 @@ +{ + "MissingNumber": "Missing numeric constant for %1", + "InvalidAlphanumeric": "Invalid alphanumeric constant for %1", + "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", + "BadUnicode": "Argument to %1 must be a number", + "BadFont": "Font name for %1 can't contain semicolons", + "BadFont": "Font name for %1 can't contain semicolons" +} diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 645aab45c..3662fd20e 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -30,43 +30,34 @@ import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; // Namespace -const VerbMethods: { [key: string]: ParseMethod } = { - /** - * Implements the verbatim notation \verb|...|. - * - * @param {TexParser} parser The current tex parser. - * @param {string} name The name of the calling macro. - */ - Verb(parser: TexParser, name: string) { - const c = parser.GetNext(); - const start = ++parser.i; - if (c === '') { - throw new TexError('MissingArgFor', 'Missing argument for %1', name); - } - while ( - parser.i < parser.string.length && - parser.string.charAt(parser.i) !== c - ) { - parser.i++; - } - if (parser.i === parser.string.length) { - throw new TexError( - 'NoClosingDelim', - "Can't find closing delimiter for %1", - parser.currentCS - ); - } - const text = parser.string.slice(start, parser.i).replace(/ /g, '\u00A0'); +const VerbMethods: {[key: string]: ParseMethod} = { + + +/** + * Implements the verbatim notation \verb|...|. + * @param {TexParser} parser The current tex parser. + * @param {string} name The name of the calling macro. + */ +Verb(parser: TexParser, name: string) { + const c = parser.GetNext(); + const start = ++parser.i; + if (c === '' ) { + throw new TexError('MissingArgFor', name); + } + while (parser.i < parser.string.length && + parser.string.charAt(parser.i) !== c) { parser.i++; - parser.Push( - parser.create( - 'token', - 'mtext', - { mathvariant: TexConstant.Variant.MONOSPACE }, - text - ) - ); - }, + } + if (parser.i === parser.string.length) { + throw new TexError('NoClosingDelim', parser.currentCS); + } + const text = parser.string.slice(start, parser.i).replace(/ /g, '\u00A0'); + parser.i++; + parser.Push(parser.create('token', 'mtext', + {mathvariant: TexConstant.Variant.MONOSPACE}, + text)); +}, + }; new CommandMap('verb', { verb: VerbMethods.Verb }); diff --git a/ts/input/tex/verb/locales/en.json b/ts/input/tex/verb/locales/en.json new file mode 100644 index 000000000..bf0337507 --- /dev/null +++ b/ts/input/tex/verb/locales/en.json @@ -0,0 +1,4 @@ +{ + "NoClosingDelim": "Can't find closing delimiter for %1", + "MissingArgFor": "Missing argument for %1" +} From 73ade9b73d88ed94ae654207c1d65c13993f35af Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 3 May 2026 20:02:20 +0200 Subject: [PATCH 06/95] move all error files --- ts/input/tex/bbox/Error.json | 6 ------ ts/input/tex/{Error.json => locales/en.json} | 0 2 files changed, 6 deletions(-) delete mode 100644 ts/input/tex/bbox/Error.json rename ts/input/tex/{Error.json => locales/en.json} (100%) diff --git a/ts/input/tex/bbox/Error.json b/ts/input/tex/bbox/Error.json deleted file mode 100644 index 88693ce9c..000000000 --- a/ts/input/tex/bbox/Error.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "InvalidBBoxProperty": ""%1" doesn't look like a color, a padding dimension, or a style", - "MultipleBBoxProperty": "%1 specified twice in %2", - "MultipleBBoxProperty": "%1 specified twice in %2", - "MultipleBBoxProperty": "%1 specified twice in %2" -} diff --git a/ts/input/tex/Error.json b/ts/input/tex/locales/en.json similarity index 100% rename from ts/input/tex/Error.json rename to ts/input/tex/locales/en.json From 1cc0857cfa1cdb367a5e865eb2c1f4f1607b2274 Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 3 May 2026 20:12:36 +0200 Subject: [PATCH 07/95] merge error fixes --- ts/input/tex/TexParser.ts | 37 ++++------------------- ts/input/tex/newcommand/NewcommandUtil.ts | 4 +-- 2 files changed, 8 insertions(+), 33 deletions(-) diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index 7fba36f7b..db4631b8e 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -327,41 +327,16 @@ export default class TexParser { */ public GetArgument(_name: string, noneOK: boolean = false): string { switch (this.GetNext()) { - case '': - if (!noneOK) { - // @test MissingArgFor - throw new TexError('MissingArgFor', this.currentCS); - } - return null; - case '}': - if (!noneOK) { - // @test ExtraCloseMissingOpen - throw new TexError('ExtraCloseMissingOpen'); - } - return null; - case '\\': - this.i++; - return '\\' + this.GetCS(); - case '{': - let j = ++this.i, parens = 1; - while (this.i < this.string.length) { - switch (this.string.charAt(this.i++)) { - case '\\': this.i++; break; - case '{': parens++; break; - case '}': - if (--parens === 0) { - return this.string.slice(j, this.i - 1); - } - break; + case '': + if (!noneOK) { + // @test MissingArgFor + throw new TexError('MissingArgFor', this.currentCS); } return null; case '}': if (!noneOK) { // @test ExtraCloseMissingOpen - throw new TexError( - 'ExtraCloseMissingOpen', - 'Extra close brace or missing open brace' - ); + throw new TexError('ExtraCloseMissingOpen'); } return null; case '\\': @@ -424,7 +399,7 @@ export default class TexParser { case '}': if (braces-- <= 0) { // @test ExtraCloseLooking1 - throw new TexError('ExtraCloseLooking', '\']\''); + throw new TexError('ExtraCloseLooking', "']'"); } break; case '[': diff --git a/ts/input/tex/newcommand/NewcommandUtil.ts b/ts/input/tex/newcommand/NewcommandUtil.ts index a026f8b94..7c0330a94 100644 --- a/ts/input/tex/newcommand/NewcommandUtil.ts +++ b/ts/input/tex/newcommand/NewcommandUtil.ts @@ -165,7 +165,7 @@ export const NewcommandUtil = { } // @test No Replacement throw new TexError('MissingReplacementString', cmd); - } + }, /** @@ -220,7 +220,7 @@ export const NewcommandUtil = { } // @test Runaway Argument throw new TexError('RunawayArgument', name); - } + }, /** From 4820791d1b991cc5385fc5c2734ce54ef9db07a0 Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 3 May 2026 20:20:34 +0200 Subject: [PATCH 08/95] fix style issues --- ts/input/tex/ParseUtil.ts | 3 +- ts/input/tex/StackItem.ts | 4 +- ts/input/tex/ams/AmsItems.ts | 4 +- ts/input/tex/ams/AmsMethods.ts | 6 +- ts/input/tex/base/BaseItems.ts | 16 +++-- ts/input/tex/base/BaseMethods.ts | 24 ++++---- ts/input/tex/braket/BraketMethods.ts | 12 +++- .../tex/colortbl/ColortblConfiguration.ts | 4 +- ts/input/tex/newcommand/NewcommandUtil.ts | 2 - ts/input/tex/physics/PhysicsMethods.ts | 7 ++- .../tex/setoptions/SetOptionsConfiguration.ts | 16 +++-- ts/input/tex/unicode/UnicodeConfiguration.ts | 3 +- ts/input/tex/verb/VerbConfiguration.ts | 58 ++++++++++--------- 13 files changed, 89 insertions(+), 70 deletions(-) diff --git a/ts/input/tex/ParseUtil.ts b/ts/input/tex/ParseUtil.ts index 9ec8bb8a7..2efe3c1f9 100644 --- a/ts/input/tex/ParseUtil.ts +++ b/ts/input/tex/ParseUtil.ts @@ -184,7 +184,8 @@ function readValue( break; // Closing braces. case '}': - if (!braces) { // Closing braces. + if (!braces) { + // Closing braces. throw new TexError('ExtraCloseMissingOpen'); } braces--; diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index c1d1bc352..a72ccd81f 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -389,7 +389,7 @@ export abstract class BaseItem extends MmlStack implements StackItem { * A list of basic errors. * @type {{[key: string]: string}} */ - protected static errors: {[key: string]: string} = { + protected static errors: { [key: string]: string } = { // @test ExtraOpenMissingClose end: 'MissingBeginExtraEnd', // @test ExtraCloseMissingOpen @@ -567,7 +567,7 @@ export abstract class BaseItem extends MmlStack implements StackItem { * @returns {string[]} The list of arguments for the TeXError. */ public getErrors(kind: string): string { - const CLASS = (this.constructor as typeof BaseItem); + const CLASS = this.constructor as typeof BaseItem; return (CLASS.errors || {})[kind] || BaseItem.errors[kind]; } diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts index 2d0c6b7e7..fc103cd50 100644 --- a/ts/input/tex/ams/AmsItems.ts +++ b/ts/input/tex/ams/AmsItems.ts @@ -77,9 +77,7 @@ export class MultlineItem extends ArrayItem { public EndRow() { if (this.row.length !== 1) { // @test MultlineRowsOneCol - throw new TexError( - 'MultlineRowsOneCol', - 'multline'); + throw new TexError('MultlineRowsOneCol', 'multline'); } const row = this.create('node', 'mtr', this.row); this.table.push(row); diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index 3ea2c9af3..9fba87081 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -611,8 +611,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { // @test Shove (Left|Right) (Top|Middle|Bottom) if (top.kind !== 'multline') { // @test Shove Error Environment - throw new TexError('CommandOnlyAllowedInEnv', - parser.currentCS); + throw new TexError('CommandOnlyAllowedInEnv', parser.currentCS); } if (top.Size()) { // @test Shove Error (Top|Middle|Bottom) @@ -740,8 +739,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { HandleTag(parser: TexParser, name: string) { if (!parser.tags.currentTag.taggable && parser.tags.env) { // @test Illegal Tag Error - throw new TexError('CommandNotAllowedInEnv', - parser.currentCS); + throw new TexError('CommandNotAllowedInEnv', parser.currentCS); } if (parser.tags.currentTag.tag) { // @test Double Tag Error diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index d2fb49401..a22dc1906 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -111,7 +111,7 @@ export class OpenItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test ExtraOpenMissingClose - 'stop': 'ExtraOpenMissingClose' + stop: 'ExtraOpenMissingClose', }); /** @@ -222,11 +222,11 @@ export class SubsupItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test MissingScript Sub, MissingScript Sup - 'stop': 'MissingScript', + stop: 'MissingScript', // @test MissingOpenForSup - 'sup': 'MissingOpenForSup', + sup: 'MissingOpenForSup', // @test MissingOpenForSub - 'sub': 'MissingOpenForSub' + sub: 'MissingOpenForSub', }); /** @@ -317,8 +317,7 @@ export class OverItem extends BaseItem { public checkItem(item: StackItem): CheckType { if (item.isKind('over')) { // @test Double Over - throw new TexError( - 'AmbiguousUseOf', item.getName()); + throw new TexError('AmbiguousUseOf', item.getName()); } if (item.isClose) { // @test Over @@ -372,7 +371,7 @@ export class LeftItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test ExtraLeftMissingRight - 'stop': 'ExtraLeftMissingRight' + stop: 'ExtraLeftMissingRight', }); /** @@ -585,8 +584,7 @@ export class BeginItem extends BaseItem { if (item.isKind('end')) { if (item.getName() !== this.getName()) { // @test EnvBadEnd - throw new TexError('EnvBadEnd', - this.getName(), item.getName()); + throw new TexError('EnvBadEnd', this.getName(), item.getName()); } // @test Hfill const node = this.toMml(); diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index a2c43aff5..624a1f763 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -64,13 +64,16 @@ const MmlTokenAllow: { [key: string]: number } = { * @returns {string} String with space separated alignment characters */ export function splitAlignArray(align: string, n: number = Infinity) { - const list = align.replace(/\s+/g, '').split('').map((s: string) => { - const name = {t: 'top', b: 'bottom', m: 'middle', c: 'center'}[s]; - if (!name) { - throw new TexError('BadBreakAlign', s); - } - return name; - }); + const list = align + .replace(/\s+/g, '') + .split('') + .map((s: string) => { + const name = { t: 'top', b: 'bottom', m: 'middle', c: 'center' }[s]; + if (!name) { + throw new TexError('BadBreakAlign', s); + } + return name; + }); if (list.length > n) { throw new TexError('TooManyAligns', align); } @@ -990,13 +993,13 @@ const BaseMethods: { [key: string]: ParseMethod } = { break; case 'r': if (top.row.length || top.First) { - throw new TexError('BreakFirstInRow', parser.currentCS +'{r}'); + throw new TexError('BreakFirstInRow', parser.currentCS + '{r}'); } top.breakAlign.row = splitAlignArray(parser.GetArgument(name)); break; case 't': if (top.table.length || top.row.length || top.First) { - throw new TexError('BreakFirstInTable', parser.currentCS +'{c}'); + throw new TexError('BreakFirstInTable', parser.currentCS + '{c}'); } top.breakAlign.table = splitAlignArray(parser.GetArgument(name)); break; @@ -1932,7 +1935,8 @@ const BaseMethods: { [key: string]: ParseMethod } = { if ( (first && !UnitUtil.matchDimen(first)[0]) || (shift && !UnitUtil.matchDimen(shift)[0]) || - (last && !UnitUtil.matchDimen(last)[0])) { + (last && !UnitUtil.matchDimen(last)[0]) + ) { throw new TexError('BracketMustBeDimension', name); } // diff --git a/ts/input/tex/braket/BraketMethods.ts b/ts/input/tex/braket/BraketMethods.ts index f6087a4a9..a1ff638e2 100644 --- a/ts/input/tex/braket/BraketMethods.ts +++ b/ts/input/tex/braket/BraketMethods.ts @@ -39,9 +39,15 @@ const BraketMethods: { [key: string]: ParseMethod } = { * @param {number} barmax Maximum number of bars allowed. * @param {boolean} space True to add space inside the delimiters */ - Braket(parser: TexParser, _name: string, - open: string, close: string, - stretchy: boolean, barmax: number, space: boolean = false) { + Braket( + parser: TexParser, + _name: string, + open: string, + close: string, + stretchy: boolean, + barmax: number, + space: boolean = false + ) { let next = parser.GetNext(); if (next === '') { throw new TexError('MissingArgFor', parser.currentCS); diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts index 1ef22aff5..a8201adfc 100644 --- a/ts/input/tex/colortbl/ColortblConfiguration.ts +++ b/ts/input/tex/colortbl/ColortblConfiguration.ts @@ -130,14 +130,14 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) { // const top = parser.stack.Top() as ColorArrayItem; if (!(top instanceof ColorArrayItem)) { - throw new TexError('UnsupportedTableColor', parser.currentCS); + throw new TexError('UnsupportedTableColor', parser.currentCS); } // // Check the position of the macro and save the color. // if (type === 'col') { if (top.table.length && top.color.col[top.row.length] !== color) { - throw new TexError('ColumnColorNotTop', name); + throw new TexError('ColumnColorNotTop', name); } top.color.col[top.row.length] = color; // diff --git a/ts/input/tex/newcommand/NewcommandUtil.ts b/ts/input/tex/newcommand/NewcommandUtil.ts index 7c0330a94..e74c7c65d 100644 --- a/ts/input/tex/newcommand/NewcommandUtil.ts +++ b/ts/input/tex/newcommand/NewcommandUtil.ts @@ -167,7 +167,6 @@ export const NewcommandUtil = { throw new TexError('MissingReplacementString', cmd); }, - /** * Find a single parameter delimited by a trailing template. * @@ -222,7 +221,6 @@ export const NewcommandUtil = { throw new TexError('RunawayArgument', name); }, - /** * Check if a template is at the current location. * (The match must be exact, with no spacing differences. TeX is diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index 51255fe4c..c464a2e5d 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -899,7 +899,12 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { const arg3 = parser.GetArgument(name); let n = parseInt(arg2, 10); let m = parseInt(arg3, 10); - if (isNaN(n) || isNaN(m) || m.toString() !== arg3 || n.toString() !== arg2) { + if ( + isNaN(n) || + isNaN(m) || + m.toString() !== arg3 || + n.toString() !== arg2 + ) { throw new TexError('InvalidNumber'); } n = n < 1 ? 1 : n; diff --git a/ts/input/tex/setoptions/SetOptionsConfiguration.ts b/ts/input/tex/setoptions/SetOptionsConfiguration.ts index 4d3d84f19..586c9ffbe 100644 --- a/ts/input/tex/setoptions/SetOptionsConfiguration.ts +++ b/ts/input/tex/setoptions/SetOptionsConfiguration.ts @@ -51,7 +51,10 @@ export const SetOptionsUtil = { } const config = parser.options.setoptions; const options = config.allowOptions[extension]; - if ((options === undefined && !config.allowPackageDefault) || options === false) { + if ( + (options === undefined && !config.allowPackageDefault) || + options === false + ) { throw new TexError('PackageNotSettable', extension); } return true; @@ -74,10 +77,15 @@ export const SetOptionsUtil = { ? options[option] : null; if (allow === false || (allow === null && !config.allowOptionsDefault)) { - throw new TexError('OptionNotSettable', option); + if (isTex) { + throw new TexError('TeXOptionNotSettable', option); + } else { + throw new TexError('OptionNotSettable', option, extension); + } } - if (!(extension === 'tex' ? parser.options : parser.options[extension])?.hasOwnProperty(option)) { - if (extension === 'tex') { + const extOptions = isTex ? parser.options : parser.options[extension]; + if (!extOptions || !Object.hasOwn(extOptions, option)) { + if (isTex) { throw new TexError('InvalidTexOption', option); } else { throw new TexError('InvalidOptionKey', option, extension); diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index 00b91240f..4d927a97f 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -58,7 +58,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } } if (font.match(/;/)) { - throw new TexError('BadFont', parser.currentCS); + throw new TexError('BadFont', parser.currentCS); } const n = UnitUtil.trimSpaces(parser.GetArgument(name)).replace(/^0x/, 'x'); if (!n.match(/^(x[0-9A-Fa-f]+|[0-9]+)$/)) { @@ -138,7 +138,6 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } c = cs[0]; match = ['']; - } } } else if (next === '"') { diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 3662fd20e..6684dc10a 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -30,34 +30,38 @@ import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; // Namespace -const VerbMethods: {[key: string]: ParseMethod} = { - - -/** - * Implements the verbatim notation \verb|...|. - * @param {TexParser} parser The current tex parser. - * @param {string} name The name of the calling macro. - */ -Verb(parser: TexParser, name: string) { - const c = parser.GetNext(); - const start = ++parser.i; - if (c === '' ) { - throw new TexError('MissingArgFor', name); - } - while (parser.i < parser.string.length && - parser.string.charAt(parser.i) !== c) { +const VerbMethods: { [key: string]: ParseMethod } = { + /** + * Implements the verbatim notation \verb|...|. + * @param {TexParser} parser The current tex parser. + * @param {string} name The name of the calling macro. + */ + Verb(parser: TexParser, name: string) { + const c = parser.GetNext(); + const start = ++parser.i; + if (c === '') { + throw new TexError('MissingArgFor', name); + } + while ( + parser.i < parser.string.length && + parser.string.charAt(parser.i) !== c + ) { + parser.i++; + } + if (parser.i === parser.string.length) { + throw new TexError('NoClosingDelim', parser.currentCS); + } + const text = parser.string.slice(start, parser.i).replace(/ /g, '\u00A0'); parser.i++; - } - if (parser.i === parser.string.length) { - throw new TexError('NoClosingDelim', parser.currentCS); - } - const text = parser.string.slice(start, parser.i).replace(/ /g, '\u00A0'); - parser.i++; - parser.Push(parser.create('token', 'mtext', - {mathvariant: TexConstant.Variant.MONOSPACE}, - text)); -}, - + parser.Push( + parser.create( + 'token', + 'mtext', + { mathvariant: TexConstant.Variant.MONOSPACE }, + text + ) + ); + }, }; new CommandMap('verb', { verb: VerbMethods.Verb }); From da89b40338e02fbafcaa1137a8b3570e0e349ea7 Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 3 May 2026 20:23:12 +0200 Subject: [PATCH 09/95] missing error --- ts/input/tex/setoptions/locales/en.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ts/input/tex/setoptions/locales/en.json b/ts/input/tex/setoptions/locales/en.json index 16d826784..bced78f6c 100644 --- a/ts/input/tex/setoptions/locales/en.json +++ b/ts/input/tex/setoptions/locales/en.json @@ -3,5 +3,6 @@ "InvalidTexOption": "Invalid TeX option "%1"", "OptionNotSettable": "Option "%1" is not allowed to be set", "PackageNotSettable": "Options can't be set for package "%1"", - "NotAPackage": "Not a defined package: %1" + "NotAPackage": "Not a defined package: %1", + "TeXOptionNotSettable": "Option "%1" is not allowed to be set" } From c093fc99e2b55ffd49074121b9cac196ded7d504 Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 3 May 2026 23:02:32 +0200 Subject: [PATCH 10/95] fix up json files --- ts/input/tex/ams/locales/en.json | 3 +-- ts/input/tex/base/locales/en.json | 2 -- ts/input/tex/braket/locales/en.json | 2 +- ts/input/tex/bussproofs/locales/en.json | 7 ------- ts/input/tex/color/locales/en.json | 6 +----- ts/input/tex/empheq/locales/en.json | 2 +- ts/input/tex/locales/en.json | 14 +------------ ts/input/tex/mathtools/locales/en.json | 27 +++++++++++++------------ ts/input/tex/physics/locales/en.json | 4 ---- ts/input/tex/require/locales/en.json | 2 +- ts/input/tex/setoptions/locales/en.json | 10 ++++----- ts/input/tex/texhtml/locales/en.json | 2 +- ts/input/tex/unicode/locales/en.json | 1 - ts/input/tex/verb/locales/en.json | 4 ++-- 14 files changed, 28 insertions(+), 58 deletions(-) diff --git a/ts/input/tex/ams/locales/en.json b/ts/input/tex/ams/locales/en.json index 40263efab..ef908d07f 100644 --- a/ts/input/tex/ams/locales/en.json +++ b/ts/input/tex/ams/locales/en.json @@ -1,5 +1,5 @@ { - "XalignOverflow": "Extra %1 in row of %2", '&", + "XalignOverflow": "Extra %1 in row of %2", "MultlineRowsOneCol": "The rows within the %1 environment must have exactly one column", "MultipleCommand": "Multiple %1", "CommandNotAllowedInEnv": "%1 not allowed in %2 environment", @@ -7,6 +7,5 @@ "IllegalAlign": "Illegal alignment specified in %1", "CommandAtTheBeginingOfLine": "%1 must come at the beginning of the line", "CommandOnlyAllowedInEnv": "%1 only allowed in %2 environment", - "PositiveIntegerArg": "Argument to %1 must be a positive integer", "PositiveIntegerArg": "Argument to %1 must be a positive integer" } diff --git a/ts/input/tex/base/locales/en.json b/ts/input/tex/base/locales/en.json index 0432bbac5..64938bd23 100644 --- a/ts/input/tex/base/locales/en.json +++ b/ts/input/tex/base/locales/en.json @@ -9,7 +9,6 @@ "EnvMissingEnd": "Missing \\end{%1}", "MissingCloseBrace": "Missing close brace", "MissingBoxFor": "Missing box for %1", - "EnvMissingEnd": "Missing \\end{%1}", "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", "AmbiguousUseOf": "Ambiguous use of %1", "MultipleLabel": "Label '%1' multiply defined", @@ -21,7 +20,6 @@ "BadColumnName": "Column specifier must be exactly one character: %1", "UnsupportedHFill": "Unsupported use of %1", "Misplaced": "Misplaced %1", - "BracketMustBeDimension": "Bracket argument to %1 must be a dimension", "ExtraAlignTab": "Extra alignment tab in \\cases text", "MissingArgFor": "Missing argument for %1", "UnknownAttrForElement": "%1 is not a recognized attribute for %2", diff --git a/ts/input/tex/braket/locales/en.json b/ts/input/tex/braket/locales/en.json index c6b6e3436..0e8f6ed04 100644 --- a/ts/input/tex/braket/locales/en.json +++ b/ts/input/tex/braket/locales/en.json @@ -1,3 +1,3 @@ { - "MissingArgFor": "Missing argument for %1", + "MissingArgFor": "Missing argument for %1" } diff --git a/ts/input/tex/bussproofs/locales/en.json b/ts/input/tex/bussproofs/locales/en.json index 50e5b27f7..93280edaa 100644 --- a/ts/input/tex/bussproofs/locales/en.json +++ b/ts/input/tex/bussproofs/locales/en.json @@ -1,13 +1,6 @@ { "BadProofTree": "Proof tree badly specified.", "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", - "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", - "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", - "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", - "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", - "BadProofTree": "Proof tree badly specified.", - "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", - "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", "MissingProofCommand": "Missing %1 in %2.", "IllegalUseOfCommand": "Use of %1 does not match its definition.", "EnvMissingEnd": "Missing \\end{%1}" diff --git a/ts/input/tex/color/locales/en.json b/ts/input/tex/color/locales/en.json index 9aa7a1a75..b82552a10 100644 --- a/ts/input/tex/color/locales/en.json +++ b/ts/input/tex/color/locales/en.json @@ -1,11 +1,7 @@ { - "ModelArg2": "Color values for the %1 model must be between %2 and %3", - "InvalidDecimalNumber": "Invalid decimal number", - "ModelArg2": "Color values for the %1 model must be between %2 and %3", - "InvalidNumber": "Invalid number", "ModelArg1": "Color values for the %1 model require 3 numbers", "ModelArg2": "Color values for the %1 model must be between %2 and %3", "InvalidDecimalNumber": "Invalid decimal number", - "ModelArg1": "Color values for the %1 model require 3 numbers", + "InvalidNumber": "Invalid number", "UndefinedColorModel": "Color model '%1' not defined" } diff --git a/ts/input/tex/empheq/locales/en.json b/ts/input/tex/empheq/locales/en.json index 2b41321e1..f82517b07 100644 --- a/ts/input/tex/empheq/locales/en.json +++ b/ts/input/tex/empheq/locales/en.json @@ -1,3 +1,3 @@ { - "UnknownEnv": "Unknown environment "%1"" + "UnknownEnv": "Unknown environment %1" } diff --git a/ts/input/tex/locales/en.json b/ts/input/tex/locales/en.json index 3dcbd6c95..10444cfe1 100644 --- a/ts/input/tex/locales/en.json +++ b/ts/input/tex/locales/en.json @@ -4,38 +4,26 @@ "MathNotTerminated": "Math mode is not properly terminated", "IllegalMacroParam": "Illegal macro parameter reference", "MaxBufferSize": "MathJax internal buffer size exceeded; is there a recursive macro call?", - "MaxMacroSub1": "MathJax maximum macro substitution count exceeded; is here a recursive macro call?", + "MaxMacroSub1": "MathJax maximum macro substitution count exceeded; is there a recursive macro call?", "MaxMacroSub2": "MathJax maximum substitution count exceeded; is there a recursive latex environment?", "InvalidValue": "Value for key '%1' is not of the expected type", "InvalidOption": "Invalid option: %1", "ErroneousNestingEq": "Erroneous nesting of equation structures", "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", - "ExtraCloseMissingOpen": "Extra close brace or missing open brace", "MissingLeftExtraRight": "Missing \\left or extra \\right", "ExtraMiddle": "Extra \\middle", "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", "TokenNotFoundForCommand": "Could not find %1 for %2", "ExtraCloseLooking": "Extra close brace while looking for %1", "MissingDimOrUnits": "Missing dimension or its units for %1", - "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", "MissingCloseBracket": "Could not find closing ']' for argument to %1", - "ExtraCloseLooking": "Extra close brace while looking for %1", "MissingCloseBrace": "Missing close brace", - "ExtraCloseMissingOpen": "Extra close brace or missing open brace", "MissingArgFor": "Missing argument for %1", "ColArgNotNum": "First argument to %1 column specifier must be a number", - "MissingCloseBrace": "Missing close brace", "MissingArgForColumn": "Missing argument for %1 column declaration", "MissingColumnDimOrUnits": "Missing dimension or its units for %1 column declaration", "BadPreamToken": "Illegal pream-token (%1)", "MaxColumns": "Too many column specifiers (perhaps looping column definitions?)", - "MaxMacroSub2": "MathJax maximum substitution count exceeded; ", - "MaxMacroSub1": "MathJax maximum macro substitution count exceeded; ", - "MaxBufferSize": "MathJax internal buffer size exceeded; is there a", - "IllegalMacroParam": "Illegal macro parameter reference", - "MathNotTerminated": "Math mode is not properly terminated", "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", - "ExtraOpenMissingClose": "Extra open brace or missing close brace", - "ExtraCloseMissingOpen": "Extra close brace or missing open brace", "Misplaced": "Misplaced %1" } diff --git a/ts/input/tex/mathtools/locales/en.json b/ts/input/tex/mathtools/locales/en.json index 766727ad0..a34d43fc8 100644 --- a/ts/input/tex/mathtools/locales/en.json +++ b/ts/input/tex/mathtools/locales/en.json @@ -1,13 +1,14 @@ -'InvalidTagFormDef': 'The tag form definition for "%1" should be an array fo three strings', -'ForbiddenMathtoolsSet': '%1 is disabled', -'UndefinedTagForm': 'Undefined tag form: %1', -'TagsNotMT': '%1 can only be used with ams or mathtools tags', -'DuplicateTagForm': 'Duplicate tag form: %1', -'InvalidTagFormID': 'Tag form name can't be empty', -'TagsNotMT': '%1 can only be used with ams or mathtools tags', -'BetweenLines': '%1 must be on a row by itself', -'CommandAtTheBeginingOfLine': '%1 must come at the beginning of the line', -'CommandInMultlined': '%1 can only appear within the multline or multlined environments', -'BadWidth': 'Width for %1 must be a dimension', -'NotANumber': 'Argument to %1 is not a number', -'NotInAlignment': '%1 can only be used in aligment environments', +{ + "InvalidTagFormDef": "The tag form definition for %1 should be an array of three strings", + "ForbiddenMathtoolsSet": "%1 is disabled", + "UndefinedTagForm": "Undefined tag form: %1", + "TagsNotMT": "%1 can only be used with ams or mathtools tags", + "DuplicateTagForm": "Duplicate tag form: %1", + "InvalidTagFormID": "Tag form name can't be empty", + "BetweenLines": "%1 must be on a row by itself", + "CommandAtTheBeginingOfLine": "%1 must come at the beginning of the line", + "CommandInMultlined": "%1 can only appear within the multline or multlined environments", + "BadWidth": "Width for %1 must be a dimension", + "NotANumber": "Argument to %1 is not a number", + "NotInAlignment": "%1 can only be used in alignment environments" +} diff --git a/ts/input/tex/physics/locales/en.json b/ts/input/tex/physics/locales/en.json index a9940e6a2..5725a464c 100644 --- a/ts/input/tex/physics/locales/en.json +++ b/ts/input/tex/physics/locales/en.json @@ -1,8 +1,4 @@ { "InvalidNumber": "Invalid number", - "InvalidNumber": "Invalid number", - "MissingArgFor": "Missing argument for %1", - "MissingArgFor": "Missing argument for %1", - "MissingArgFor": "Missing argument for %1", "MissingArgFor": "Missing argument for %1" } diff --git a/ts/input/tex/require/locales/en.json b/ts/input/tex/require/locales/en.json index 4c2a960eb..87e61c69e 100644 --- a/ts/input/tex/require/locales/en.json +++ b/ts/input/tex/require/locales/en.json @@ -1,4 +1,4 @@ { "BadPackageName": "Argument for %1 is not a valid package name", - "BadRequire": "Extension "%1" is not allowed to be loaded" + "BadRequire": "Extension %1 is not allowed to be loaded" } diff --git a/ts/input/tex/setoptions/locales/en.json b/ts/input/tex/setoptions/locales/en.json index bced78f6c..2e41f1343 100644 --- a/ts/input/tex/setoptions/locales/en.json +++ b/ts/input/tex/setoptions/locales/en.json @@ -1,8 +1,8 @@ { - "InvalidOptionKey": "Invalid option "%1" for package "%2"", - "InvalidTexOption": "Invalid TeX option "%1"", - "OptionNotSettable": "Option "%1" is not allowed to be set", - "PackageNotSettable": "Options can't be set for package "%1"", + "InvalidOptionKey": "Invalid option %1 for package %2", + "InvalidTexOption": "Invalid TeX option %1", + "OptionNotSettable": "Option %1 is not allowed to be set", + "PackageNotSettable": "Options can't be set for package %1", "NotAPackage": "Not a defined package: %1", - "TeXOptionNotSettable": "Option "%1" is not allowed to be set" + "TeXOptionNotSettable": "Option %1 is not allowed to be set" } diff --git a/ts/input/tex/texhtml/locales/en.json b/ts/input/tex/texhtml/locales/en.json index 7028aec43..ec234afaf 100644 --- a/ts/input/tex/texhtml/locales/en.json +++ b/ts/input/tex/texhtml/locales/en.json @@ -1,3 +1,3 @@ { - "TokenNotFoundForCommand": "Could not find %1 for %2", + "TokenNotFoundForCommand": "Could not find %1 for %2" } diff --git a/ts/input/tex/unicode/locales/en.json b/ts/input/tex/unicode/locales/en.json index 775d4248d..b136e16f8 100644 --- a/ts/input/tex/unicode/locales/en.json +++ b/ts/input/tex/unicode/locales/en.json @@ -3,6 +3,5 @@ "InvalidAlphanumeric": "Invalid alphanumeric constant for %1", "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", "BadUnicode": "Argument to %1 must be a number", - "BadFont": "Font name for %1 can't contain semicolons", "BadFont": "Font name for %1 can't contain semicolons" } diff --git a/ts/input/tex/verb/locales/en.json b/ts/input/tex/verb/locales/en.json index bf0337507..b9a311cf5 100644 --- a/ts/input/tex/verb/locales/en.json +++ b/ts/input/tex/verb/locales/en.json @@ -1,4 +1,4 @@ { - "NoClosingDelim": "Can't find closing delimiter for %1", - "MissingArgFor": "Missing argument for %1" + "NoClosingDelim": "Can't find closing delimiter for %1", + "MissingArgFor": "Missing argument for %1" } From b41d2027eefba0bc329cc15b69c6de21a9be0318 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 00:36:07 +0200 Subject: [PATCH 11/95] get all tests working for majority of packages --- testsuite/tests/input/tex/Verb.test.ts | 2 +- ts/input/tex/ColumnParser.ts | 14 ++-- ts/input/tex/Configuration.ts | 4 ++ ts/input/tex/ParseUtil.ts | 24 ++++--- ts/input/tex/StackItem.ts | 6 +- ts/input/tex/TexError.ts | 70 +++---------------- ts/input/tex/TexParser.ts | 22 +++--- ts/input/tex/ams/AmsConfiguration.ts | 4 ++ ts/input/tex/ams/AmsItems.ts | 6 +- ts/input/tex/ams/AmsMethods.ts | 18 ++--- ts/input/tex/base/BaseConfiguration.ts | 8 ++- ts/input/tex/base/BaseItems.ts | 22 +++--- ts/input/tex/base/BaseMethods.ts | 68 ++++++++++-------- ts/input/tex/base/locales/en.json | 3 +- ts/input/tex/bbox/BboxConfiguration.ts | 20 ++---- .../tex/begingroup/BegingroupConfiguration.ts | 4 ++ ts/input/tex/begingroup/BegingroupMethods.ts | 8 +-- ts/input/tex/begingroup/BegingroupStack.ts | 7 +- ts/input/tex/braket/BraketConfiguration.ts | 4 ++ ts/input/tex/braket/BraketMethods.ts | 5 +- .../tex/bussproofs/BussproofsConfiguration.ts | 4 ++ ts/input/tex/bussproofs/BussproofsItems.ts | 4 +- ts/input/tex/bussproofs/BussproofsMethods.ts | 24 ++++--- ts/input/tex/cases/CasesConfiguration.ts | 6 +- ts/input/tex/color/ColorConfiguration.ts | 4 ++ ts/input/tex/color/ColorUtil.ts | 24 ++++--- ts/input/tex/color/locales/en.json | 3 +- .../tex/colortbl/ColortblConfiguration.ts | 10 ++- ts/input/tex/empheq/EmpheqConfiguration.ts | 6 +- .../tex/extpfeil/ExtpfeilConfiguration.ts | 10 ++- ts/input/tex/html/HtmlConfiguration.ts | 4 ++ ts/input/tex/html/HtmlMethods.ts | 4 +- .../tex/mathtools/MathtoolsConfiguration.ts | 4 ++ ts/input/tex/mathtools/MathtoolsMethods.ts | 24 ++++--- ts/input/tex/mathtools/MathtoolsTags.ts | 4 +- ts/input/tex/mathtools/MathtoolsUtil.ts | 12 ++-- ts/input/tex/mathtools/locales/en.json | 4 +- .../tex/newcommand/NewcommandConfiguration.ts | 4 ++ ts/input/tex/newcommand/NewcommandItems.ts | 6 +- ts/input/tex/newcommand/NewcommandMethods.ts | 4 +- ts/input/tex/newcommand/NewcommandUtil.ts | 22 +++--- ts/input/tex/newcommand/locales/en.json | 3 +- ts/input/tex/physics/PhysicsConfiguration.ts | 4 ++ ts/input/tex/physics/PhysicsMethods.ts | 16 +++-- ts/input/tex/require/RequireConfiguration.ts | 9 ++- ts/input/tex/require/locales/en.json | 3 +- .../tex/setoptions/SetOptionsConfiguration.ts | 16 +++-- ts/input/tex/texhtml/TexHtmlConfiguration.ts | 6 +- .../tex/textmacros/TextMacrosConfiguration.ts | 10 +-- ts/input/tex/textmacros/TextMacrosMethods.ts | 18 ++--- ts/input/tex/textmacros/TextParser.ts | 10 +-- ts/input/tex/unicode/UnicodeConfiguration.ts | 20 +++--- ts/input/tex/verb/VerbConfiguration.ts | 8 ++- 53 files changed, 336 insertions(+), 293 deletions(-) diff --git a/testsuite/tests/input/tex/Verb.test.ts b/testsuite/tests/input/tex/Verb.test.ts index e1e00a168..1380689fc 100644 --- a/testsuite/tests/input/tex/Verb.test.ts +++ b/testsuite/tests/input/tex/Verb.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeEach, describe, expect, it } from '@jest/globals'; import { getTokens, setupTex, tex2mml, expectTexError } from '#helpers'; import '#js/input/tex/verb/VerbConfiguration'; -beforeEach(() => setupTex(['base', 'verb'])); +beforeEach(async () => setupTex(['base', 'verb'])); /**********************************************************************************/ diff --git a/ts/input/tex/ColumnParser.ts b/ts/input/tex/ColumnParser.ts index 995af5cf4..f939fc37d 100644 --- a/ts/input/tex/ColumnParser.ts +++ b/ts/input/tex/ColumnParser.ts @@ -28,6 +28,8 @@ import { lookup } from '../../util/Options.js'; import { ParseUtil } from './ParseUtil.js'; import { UnitUtil } from './UnitUtil.js'; +const COMPONENT = '[tex]'; + /***********************************************************************/ /** @@ -133,13 +135,13 @@ export class ColumnParser { let n = 0; while (state.i < state.template.length) { if (n++ > this.MAXCOLUMNS) { - throw new TexError('MaxColumns'); + throw new TexError(COMPONENT, 'MaxColumns'); } const code = state.template.codePointAt(state.i); const c = (state.c = String.fromCodePoint(code)); state.i += c.length; if (!Object.hasOwn(this.columnHandler, c)) { - throw new TexError('BadPreamToken', c); + throw new TexError(COMPONENT, 'BadPreamToken', c); } this.columnHandler[c](state); } @@ -261,7 +263,7 @@ export class ColumnParser { public getDimen(state: ColumnState): string { const dim = this.getBraces(state); if (!UnitUtil.matchDimen(dim)[0]) { - throw new TexError('MissingColumnDimOrUnits', state.c); + throw new TexError(COMPONENT, 'MissingColumnDimOrUnits', state.c); } return dim; } @@ -292,7 +294,7 @@ export class ColumnParser { public getBraces(state: ColumnState): string { while (state.template[state.i] === ' ') state.i++; if (state.i > state.template.length) { - throw new TexError('MissingArgForColumn', state.c); + throw new TexError(COMPONENT, 'MissingArgForColumn', state.c); } if (state.template[state.i] !== '{') { return state.template[state.i++]; @@ -314,7 +316,7 @@ export class ColumnParser { break; } } - throw new TexError('MissingCloseBrace'); + throw new TexError(COMPONENT, 'MissingCloseBrace'); } /** @@ -399,7 +401,7 @@ export class ColumnParser { const cols = this.getBraces(state); const n = parseInt(num); if (String(n) !== num) { - throw new TexError('ColArgNotNum', '*'); + throw new TexError(COMPONENT, 'ColArgNotNum', '*'); } state.template = new Array(n).fill(cols).join('') + state.template.substring(state.i); diff --git a/ts/input/tex/Configuration.ts b/ts/input/tex/Configuration.ts index 6306dafe2..a1e70de05 100644 --- a/ts/input/tex/Configuration.ts +++ b/ts/input/tex/Configuration.ts @@ -31,6 +31,10 @@ import { FunctionList } from '../../util/FunctionList.js'; import { TeX } from '../tex.js'; import { PrioritizedList } from '../../util/PrioritizedList.js'; import { TagsFactory } from './Tags.js'; +import { Locale } from '../../util/Locale.js'; + +export const COMPONENT = '[tex]'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex'); export type StackItemConfig = { [kind: string]: StackItemClass }; export type TagsConfig = { [kind: string]: TagsClass }; diff --git a/ts/input/tex/ParseUtil.ts b/ts/input/tex/ParseUtil.ts index 2efe3c1f9..dd9b7253e 100644 --- a/ts/input/tex/ParseUtil.ts +++ b/ts/input/tex/ParseUtil.ts @@ -32,6 +32,8 @@ import { entities } from '../../util/Entities.js'; import { MmlMunderover } from '../../core/MmlTree/MmlNodes/munderover.js'; import { UnitUtil } from './UnitUtil.js'; +const COMPONENT = '[tex]'; + /** * The data needed for checking the value of a key-value pair. */ @@ -186,7 +188,7 @@ function readValue( case '}': if (!braces) { // Closing braces. - throw new TexError('ExtraCloseMissingOpen'); + throw new TexError(COMPONENT, 'ExtraCloseMissingOpen'); } braces--; countBraces = false; // Stop counting start left braces. @@ -209,7 +211,7 @@ function readValue( value += c; } if (braces) { - throw new TexError('ExtraOpenMissingClose'); + throw new TexError(COMPONENT, 'ExtraOpenMissingClose'); } return dropBrace && start ? ['', '', removeBraces(value, 1)] @@ -541,7 +543,7 @@ export const ParseUtil = { .substring(i) .match(/^\s*(?:([0-9A-F])|\{\s*([0-9A-F]+)\s*\})/); if (!arg) { - throw new TexError('BadRawUnicode', '\\U'); + throw new TexError(COMPONENT, 'BadRawUnicode', '\\U'); } // Replace \U{...} with specified character const c = String.fromCodePoint(parseInt(arg[1] || arg[2], 16)); @@ -556,7 +558,7 @@ export const ParseUtil = { } if (match !== '') { // @test Internal Math Error - throw new TexError('MathNotTerminated'); + throw new TexError(COMPONENT, 'MathNotTerminated'); } } if (k < text.length) { @@ -721,7 +723,7 @@ export const ParseUtil = { text += c; } else { if (!c.match(/[1-9]/) || parseInt(c, 10) > args.length) { - throw new TexError('IllegalMacroParam'); + throw new TexError(COMPONENT, 'IllegalMacroParam'); } newstring = ParseUtil.addArgs( parser, @@ -752,7 +754,7 @@ export const ParseUtil = { s1 += ' '; } if (s1.length + s2.length > parser.configuration.options['maxBuffer']) { - throw new TexError('MaxBufferSize'); + throw new TexError(COMPONENT, 'MaxBufferSize'); } return s1 + s2; }, @@ -768,9 +770,9 @@ export const ParseUtil = { return; } if (isMacro) { - throw new TexError('MaxMacroSub1'); + throw new TexError(COMPONENT, 'MaxMacroSub1'); } else { - throw new TexError('MaxMacroSub2'); + throw new TexError(COMPONENT, 'MaxMacroSub2'); } }, @@ -793,7 +795,7 @@ export const ParseUtil = { return; } if (!top.isKind('start') || first) { - throw new TexError('ErroneousNestingEq'); + throw new TexError(COMPONENT, 'ErroneousNestingEq'); } }, @@ -872,13 +874,13 @@ export const ParseUtil = { const type = allowed[key] as KeyValueDef; const value = String(def[key]); if (!type.verify(value)) { - throw new TexError('InvalidValue', key); + throw new TexError(COMPONENT, 'InvalidValue', key); } def[key] = type.convert(value); } } else { if (error) { - throw new TexError('InvalidOption', key); + throw new TexError(COMPONENT, 'InvalidOption', key); } delete def[key]; } diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index a72ccd81f..82430e492 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -27,6 +27,8 @@ import TexError from './TexError.js'; import StackItemFactory from './StackItemFactory.js'; import { TexConstant } from './TexConstants.js'; +const COMPONENT = '[tex]/base'; + // Union types for abbreviation. export type EnvProp = string | number | boolean; @@ -513,12 +515,12 @@ export abstract class BaseItem extends MmlStack implements StackItem { return BaseItem.fail; } // @test Ampersand-error - throw new TexError('Misplaced', item.getName()); + throw new TexError(COMPONENT, 'Misplaced', item.getName()); } if (item.isClose && this.getErrors(item.kind)) { // @test ExtraOpenMissingClose, ExtraCloseMissingOpen, // MissingLeftExtraRight, MissingBeginExtraEnd - throw new TexError(this.getErrors(item.kind), item.getName()); + throw new TexError(COMPONENT, this.getErrors(item.kind), item.getName()); } if (!item.isFinal) { return BaseItem.success; diff --git a/ts/input/tex/TexError.ts b/ts/input/tex/TexError.ts index 793d69f6c..330c2a005 100644 --- a/ts/input/tex/TexError.ts +++ b/ts/input/tex/TexError.ts @@ -21,75 +21,21 @@ * @author v.sorge@mathjax.org (Volker Sorge) */ -export default class TexError { - private static pattern = - /%(\d+|\{\d+\}|\{[a-z]+:%\d+(?:\|(?:%\{\d+\}|%.|[^}])*)+\}|.)/g; +import { Locale } from '../../util/Locale.js'; - /** - * Default error message. - * - * @type {string} - */ +export default class TexError { public message: string; /** - * The old MathJax processing function. - * - * @param {string} str The basic error message. - * @param {string[]} args The arguments to be replaced in the error message. - * @returns {string} The processed error string. - */ - private static processString(str: string, args: string[]): string { - const parts = str.split(TexError.pattern); - for (let i = 1, m = parts.length; i < m; i += 2) { - let c = parts[i].charAt(0); // first char will be { or \d or a char to be - // kept literally - if (c >= '0' && c <= '9') { - // %n - parts[i] = args[parseInt(parts[i], 10) - 1]; - if (typeof parts[i] === 'number') { - parts[i] = parts[i].toString(); - } - } else if (c === '{') { - // %{n} or %{plural:%n|...} - c = parts[i].substring(1); - if (c >= '0' && c <= '9') { - // %{n} - parts[i] = - args[ - parseInt( - // parts[i] = %{n} - parts[i].substring(1, parts[i].length - 1), - 10 - ) - 1 - ]; - if (typeof parts[i] === 'number') { - parts[i] = parts[i].toString(); - } - } else { - // %{plural:%n|...} - const match = parts[i].match(/^\{([a-z]+):%(\d+)\|(.*)\}$/); - if (match) { - // Removed plural here. - parts[i] = '%' + parts[i]; - } - } - } - } - return parts.join(''); - } - - /** - * @class - * @param {string} id message id (for localization) - * @param {string} message text of English message - * @param {string[]=} rest any substitution arguments + * @param {string} component locale component (e.g. '[tex]/base') + * @param {string} id message id + * @param {string[]} args substitution arguments */ constructor( + public component: string, public id: string, - message: string, - ...rest: string[] + ...args: string[] ) { - this.message = TexError.processString(message, rest); + this.message = Locale.message(component, id, ...args); } } diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index db4631b8e..ad2047dd1 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -36,6 +36,8 @@ import { Token } from './Token.js'; import { OptionList } from '../../util/Options.js'; import { TexConstant } from './TexConstants.js'; +const COMPONENT = '[tex]'; + /** * The main Tex Parser class. */ @@ -330,13 +332,13 @@ export default class TexParser { case '': if (!noneOK) { // @test MissingArgFor - throw new TexError('MissingArgFor', this.currentCS); + throw new TexError(COMPONENT, 'MissingArgFor', this.currentCS); } return null; case '}': if (!noneOK) { // @test ExtraCloseMissingOpen - throw new TexError('ExtraCloseMissingOpen'); + throw new TexError(COMPONENT, 'ExtraCloseMissingOpen'); } return null; case '\\': @@ -361,7 +363,7 @@ export default class TexParser { } } // @test MissingCloseBrace - throw new TexError('MissingCloseBrace'); + throw new TexError(COMPONENT, 'MissingCloseBrace'); } } const c = this.getCodePoint(); @@ -399,7 +401,7 @@ export default class TexParser { case '}': if (braces-- <= 0) { // @test ExtraCloseLooking1 - throw new TexError('ExtraCloseLooking', "']'"); + throw new TexError(COMPONENT, 'ExtraCloseLooking', "']'"); } break; case '[': @@ -416,7 +418,7 @@ export default class TexParser { } } // @test MissingCloseBracket - throw new TexError('MissingCloseBracket', this.currentCS); + throw new TexError(COMPONENT, 'MissingCloseBracket', this.currentCS); } /** @@ -441,7 +443,7 @@ export default class TexParser { } } // @test MissingOrUnrecognizedDelim1, MissingOrUnrecognizedDelim2 - throw new TexError('MissingOrUnrecognizedDelim', this.currentCS); + throw new TexError(COMPONENT, 'MissingOrUnrecognizedDelim', this.currentCS); } /** @@ -468,7 +470,7 @@ export default class TexParser { } } // @test MissingDimOrUnits - throw new TexError('MissingDimOrUnits', this.currentCS); + throw new TexError(COMPONENT, 'MissingDimOrUnits', this.currentCS); } /** @@ -498,7 +500,7 @@ export default class TexParser { case '}': if (braces === 0) { // @test ExtraCloseLooking2 - throw new TexError('ExtraCloseLooking', token); + throw new TexError(COMPONENT, 'ExtraCloseLooking', token); } braces--; break; @@ -508,7 +510,7 @@ export default class TexParser { } } // @test TokenNotFoundForCommand - throw new TexError('TokenNotFoundForCommand', token, this.currentCS); + throw new TexError(COMPONENT, 'TokenNotFoundForCommand', token, this.currentCS); } /** @@ -555,7 +557,7 @@ export default class TexParser { return c; } // @test MissingOrUnrecognizedDelim - throw new TexError('MissingOrUnrecognizedDelim', this.currentCS); + throw new TexError(COMPONENT, 'MissingOrUnrecognizedDelim', this.currentCS); } /** diff --git a/ts/input/tex/ams/AmsConfiguration.ts b/ts/input/tex/ams/AmsConfiguration.ts index 519c1435c..2c658c0a5 100644 --- a/ts/input/tex/ams/AmsConfiguration.ts +++ b/ts/input/tex/ams/AmsConfiguration.ts @@ -27,6 +27,10 @@ import { MultlineItem, FlalignItem } from './AmsItems.js'; import { AbstractTags } from '../Tags.js'; import './AmsMappings.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/ams'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/ams'); /** * Standard AMS style tagging. diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts index fc103cd50..b2696e0b1 100644 --- a/ts/input/tex/ams/AmsItems.ts +++ b/ts/input/tex/ams/AmsItems.ts @@ -29,6 +29,8 @@ import { TexConstant } from '../TexConstants.js'; import StackItemFactory from '../StackItemFactory.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; +const COMPONENT = '[tex]/ams'; + /** * Item dealing with multiline environments as a special case of arrays. Note, * that all other AMS equation environments (e.g., align, split) can be handled @@ -77,7 +79,7 @@ export class MultlineItem extends ArrayItem { public EndRow() { if (this.row.length !== 1) { // @test MultlineRowsOneCol - throw new TexError('MultlineRowsOneCol', 'multline'); + throw new TexError(COMPONENT, 'MultlineRowsOneCol', 'multline'); } const row = this.create('node', 'mtr', this.row); this.table.push(row); @@ -169,7 +171,7 @@ export class FlalignItem extends EqnArrayItem { const n = this.getProperty('xalignat') as number; if (!n) return; if (this.row.length > n) { - throw new TexError('XalignOverflow', this.name); + throw new TexError(COMPONENT, 'XalignOverflow', this.name); } } diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index 9fba87081..ee637a4b7 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -42,6 +42,8 @@ import { } from '../../../core/MmlTree/MmlNode.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; +const COMPONENT = '[tex]/ams'; + /** * Utility for breaking the \sideset scripts from any other material. * @@ -147,7 +149,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const n = parser.GetArgument('\\begin{' + name + '}'); if (n.match(/[^0-9]/)) { // @test PositiveIntegerArg - throw new TexError('PositiveIntegerArg'); + throw new TexError(COMPONENT, 'PositiveIntegerArg'); } let count = parseInt(n, 10); while (count > 0) { @@ -236,7 +238,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { ): ParseResult { const n = parser.GetArgument('\\begin{' + begin.getName() + '}'); if (n.match(/[^0-9]/)) { - throw new TexError('PositiveIntegerArg'); + throw new TexError(COMPONENT, 'PositiveIntegerArg'); } const align = padded ? 'crl' : 'rlc'; const balign = padded ? 'mbt' : 'btm'; @@ -611,11 +613,11 @@ export const AmsMethods: { [key: string]: ParseMethod } = { // @test Shove (Left|Right) (Top|Middle|Bottom) if (top.kind !== 'multline') { // @test Shove Error Environment - throw new TexError('CommandOnlyAllowedInEnv', parser.currentCS); + throw new TexError(COMPONENT, 'CommandOnlyAllowedInEnv', parser.currentCS); } if (top.Size()) { // @test Shove Error (Top|Middle|Bottom) - throw new TexError('CommandAtTheBeginingOfLine'); + throw new TexError(COMPONENT, 'CommandAtTheBeginingOfLine'); } top.setProperty('shove', shove); }, @@ -649,7 +651,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { lr = lrMap[lr]; if (lr == null) { // @test Center Fraction Error - throw new TexError('IllegalAlign', parser.currentCS); + throw new TexError(COMPONENT, 'IllegalAlign', parser.currentCS); } if (lr) { // @test Right Fraction, Left Fraction @@ -710,7 +712,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const styleAlpha = ['D', 'T', 'S', 'SS'][styleDigit]; if (styleAlpha == null) { // @test Genfrac Error - throw new TexError('BadMathStyleFor', parser.currentCS); + throw new TexError(COMPONENT, 'BadMathStyleFor', parser.currentCS); } frac = parser.create('node', 'mstyle', [frac]); if (styleAlpha === 'D') { @@ -739,11 +741,11 @@ export const AmsMethods: { [key: string]: ParseMethod } = { HandleTag(parser: TexParser, name: string) { if (!parser.tags.currentTag.taggable && parser.tags.env) { // @test Illegal Tag Error - throw new TexError('CommandNotAllowedInEnv', parser.currentCS); + throw new TexError(COMPONENT, 'CommandNotAllowedInEnv', parser.currentCS); } if (parser.tags.currentTag.tag) { // @test Double Tag Error - throw new TexError('MultipleCommand', parser.currentCS); + throw new TexError(COMPONENT, 'MultipleCommand', parser.currentCS); } const star = parser.GetStar(); const tagId = UnitUtil.trimSpaces(parser.GetArgument(name)); diff --git a/ts/input/tex/base/BaseConfiguration.ts b/ts/input/tex/base/BaseConfiguration.ts index 02edcde1a..262c91164 100644 --- a/ts/input/tex/base/BaseConfiguration.ts +++ b/ts/input/tex/base/BaseConfiguration.ts @@ -37,6 +37,10 @@ import ParseMethods from '../ParseMethods.js'; import { ParseUtil } from '../ParseUtil.js'; import { TexConstant } from '../TexConstants.js'; import { context } from '../../../util/context.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/base'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/base'); const MATHVARIANT = TexConstant.Variant; @@ -89,7 +93,7 @@ export function Other(parser: TexParser, char: string) { */ function csUndefined(_parser: TexParser, name: string) { // @test Undefined-CS - throw new TexError('UndefinedControlSequence', '\\' + name); + throw new TexError(COMPONENT, 'UndefinedControlSequence', '\\' + name); } /** @@ -100,7 +104,7 @@ function csUndefined(_parser: TexParser, name: string) { */ function envUndefined(_parser: TexParser, env: string) { // @test Undefined-Env - throw new TexError('UnknownEnv', env); + throw new TexError(COMPONENT, 'UnknownEnv', env); } /** diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index a22dc1906..f0a4ef4ef 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -39,6 +39,8 @@ import { CheckType, BaseItem, StackItem, EnvList } from '../StackItem.js'; import { TRBL } from '../../../util/Styles.js'; import { TexConstant } from '../TexConstants.js'; +const COMPONENT = '[tex]/base'; + /** * Initial item on the stack. It's pushed when parsing begins. */ @@ -279,7 +281,7 @@ export class SubsupItem extends BaseItem { if (super.checkItem(item)[1]) { // @test Brace Superscript Error, MissingOpenForSup, MissingOpenForSub const error = this.getErrors(['', 'sub', 'sup'][position]); - throw new TexError(error); + throw new TexError(COMPONENT, error); } return null; } @@ -317,7 +319,7 @@ export class OverItem extends BaseItem { public checkItem(item: StackItem): CheckType { if (item.isKind('over')) { // @test Double Over - throw new TexError('AmbiguousUseOf', item.getName()); + throw new TexError(COMPONENT, 'AmbiguousUseOf', item.getName()); } if (item.isClose) { // @test Over @@ -584,7 +586,7 @@ export class BeginItem extends BaseItem { if (item.isKind('end')) { if (item.getName() !== this.getName()) { // @test EnvBadEnd - throw new TexError('EnvBadEnd', this.getName(), item.getName()); + throw new TexError(COMPONENT, 'EnvBadEnd', this.getName(), item.getName()); } // @test Hfill const node = this.toMml(); @@ -593,7 +595,7 @@ export class BeginItem extends BaseItem { } if (item.isKind('stop')) { // @test EnvMissingEnd Array - throw new TexError('EnvMissingEnd', this.getName()); + throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); } return super.checkItem(item); } @@ -666,7 +668,7 @@ export class PositionItem extends BaseItem { public checkItem(item: StackItem): CheckType { if (item.isClose) { // @test MissingBoxFor - throw new TexError('MissingBoxFor', this.getName()); + throw new TexError(COMPONENT, 'MissingBoxFor', this.getName()); } if (item.isFinal) { let mml = item.toMml(); @@ -1076,7 +1078,7 @@ export class ArrayItem extends BaseItem { return [[newItem], true]; } // @test MissingCloseBrace2 - throw new TexError('MissingCloseBrace'); + throw new TexError(COMPONENT, 'MissingCloseBrace'); } return [[newItem, item], true]; } @@ -1218,11 +1220,7 @@ export class ArrayItem extends BaseItem { ++this.templateSubs > parser.configuration.options.maxTemplateSubtitutions ) { - throw new TexError( - 'MaxTemplateSubs', - 'Maximum template substitutions exceeded; ' + - 'is there an invalid use of \\\\ in the template?' - ); + throw new TexError(COMPONENT, 'MaxTemplateSubs'); } } } @@ -1641,7 +1639,7 @@ export class EquationItem extends BaseItem { } if (item.isKind('stop')) { // @test EnvMissingEnd Equation - throw new TexError('EnvMissingEnd', this.getName()); + throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); } return super.checkItem(item); } diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index 624a1f763..df70e3835 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -44,6 +44,8 @@ import { lookup } from '../../../util/Options.js'; import { ColumnState } from '../ColumnParser.js'; import { replaceUnicode } from '../../../util/string.js'; +const COMPONENT = '[tex]/base'; + const P_HEIGHT = 1.2 / 0.85; // cmex10 height plus depth over .85 const MmlTokenAllow: { [key: string]: number } = { fontfamily: 1, @@ -70,12 +72,12 @@ export function splitAlignArray(align: string, n: number = Infinity) { .map((s: string) => { const name = { t: 'top', b: 'bottom', m: 'middle', c: 'center' }[s]; if (!name) { - throw new TexError('BadBreakAlign', s); + throw new TexError(COMPONENT, 'BadBreakAlign', s); } return name; }); if (list.length > n) { - throw new TexError('TooManyAligns', align); + throw new TexError(COMPONENT, 'TooManyAligns', align); } return n === 1 ? list[0] : list.join(' '); } @@ -216,7 +218,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double-super-error, Double-over-error - throw new TexError('DoubleExponent'); + throw new TexError(COMPONENT, 'DoubleExponent'); } if (!NodeUtil.isType(base, 'msubsup') || NodeUtil.isType(base, 'msup')) { if (movesupsub) { @@ -288,7 +290,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double-sub-error, Double-under-error - throw new TexError('DoubleSubscripts'); + throw new TexError(COMPONENT, 'DoubleSubscripts'); } if (!NodeUtil.isType(base, 'msubsup') || NodeUtil.isType(base, 'msup')) { if (movesupsub) { @@ -342,7 +344,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double Prime Error - throw new TexError('DoubleExponentPrime'); + throw new TexError(COMPONENT, 'DoubleExponentPrime'); } let sup = ''; parser.i--; @@ -380,7 +382,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { */ Hash(_parser: TexParser, _c: string) { // @test Hash Error - throw new TexError('CantUseHash1'); + throw new TexError(COMPONENT, 'CantUseHash1'); }, /** @@ -613,7 +615,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { NodeUtil.getProperty(op, 'movesupsub') == null) ) { // @test Limits Error - throw new TexError('MisplacedLimits', parser.currentCS); + throw new TexError(COMPONENT, 'MisplacedLimits', parser.currentCS); } const top = parser.stack.Top(); let node; @@ -736,16 +738,16 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Tweaked Root if (!parser.stack.env['inRoot']) { // @test Misplaced Move Root - throw new TexError('MisplacedMoveRoot', parser.currentCS); + throw new TexError(COMPONENT, 'MisplacedMoveRoot', parser.currentCS); } if (parser.stack.global[id]) { // @test Multiple Move Root - throw new TexError('MultipleMoveRoot', parser.currentCS); + throw new TexError(COMPONENT, 'MultipleMoveRoot', parser.currentCS); } let n = parser.GetArgument(name); if (!n.match(/-?[0-9]+/)) { // @test Incorrect Move Root - throw new TexError('IntegerArg', parser.currentCS); + throw new TexError(COMPONENT, 'IntegerArg', parser.currentCS); } n = parseInt(n, 10) / 15 + 'em'; if (n.substring(0, 1) !== '-') { @@ -981,30 +983,30 @@ const BaseMethods: { [key: string]: ParseMethod } = { BreakAlign(parser: TexParser, name: string) { const top = parser.stack.Top() as sitem.ArrayItem; if (!(top instanceof sitem.ArrayItem)) { - throw new TexError('BreakNotInArray', parser.currentCS); + throw new TexError(COMPONENT, 'BreakNotInArray', parser.currentCS); } const type = parser.GetArgument(name).trim(); switch (type) { case 'c': if (top.First) { - throw new TexError('BreakFirstInEntry', parser.currentCS + '{t}'); + throw new TexError(COMPONENT, 'BreakFirstInEntry', parser.currentCS + '{t}'); } top.breakAlign.cell = splitAlignArray(parser.GetArgument(name), 1); break; case 'r': if (top.row.length || top.First) { - throw new TexError('BreakFirstInRow', parser.currentCS + '{r}'); + throw new TexError(COMPONENT, 'BreakFirstInRow', parser.currentCS + '{r}'); } top.breakAlign.row = splitAlignArray(parser.GetArgument(name)); break; case 't': if (top.table.length || top.row.length || top.First) { - throw new TexError('BreakFirstInTable', parser.currentCS + '{c}'); + throw new TexError(COMPONENT, 'BreakFirstInTable', parser.currentCS + '{c}'); } top.breakAlign.table = splitAlignArray(parser.GetArgument(name)); break; default: - throw new TexError('BreakType', parser.currentCS); + throw new TexError(COMPONENT, 'BreakType', parser.currentCS); } }, @@ -1029,7 +1031,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { } if (!node || !node.isToken) { // @test Token Illegal Type, Token Wrong Type - throw new TexError('NotMathMLToken', kind); + throw new TexError(COMPONENT, 'NotMathMLToken', kind); } while (attr !== '') { const match = attr.match( @@ -1037,11 +1039,11 @@ const BaseMethods: { [key: string]: ParseMethod } = { ); if (!match) { // @test Token Invalid Attribute - throw new TexError('InvalidMathMLAttr', attr); + throw new TexError(COMPONENT, 'InvalidMathMLAttr', attr); } if (!node.attributes.hasDefault(match[1]) && !MmlTokenAllow[match[1]]) { // @test Token Unknown Attribute, Token Wrong Attribute - throw new TexError('UnknownAttrForElement', match[1], kind); + throw new TexError(COMPONENT, 'UnknownAttrForElement', match[1], kind); } let value: string | boolean = ParseUtil.mmlFilterAttribute( parser, @@ -1494,7 +1496,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const c = parser.GetNext(); if (c === '') { // @test Matrix Error - throw new TexError('MissingArgFor', parser.currentCS); + throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); } if (c === '{') { // @test Matrix Braces, Matrix Columns, Matrix Rows. @@ -1604,7 +1606,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // Extra alignment tabs are not allowed in cases // // @test ExtraAlignTab - throw new TexError('ExtraAlignTab'); + throw new TexError(COMPONENT, 'ExtraAlignTab'); } else if (c === '\\') { // // If the macro is \cr or \\, end the search, otherwise skip the macro @@ -1684,7 +1686,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Custom Linebreak if (dim && !value) { // @test Dimension Error - throw new TexError('BracketMustBeDimension', name); + throw new TexError(COMPONENT, 'BracketMustBeDimension', name); } n = value + unit; } @@ -1728,7 +1730,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); if (!(top instanceof sitem.ArrayItem) || top.Size()) { // @test Misplaced hline - throw new TexError('Misplaced', parser.currentCS); + throw new TexError(COMPONENT, 'Misplaced', parser.currentCS); } if (!top.table.length) { // @test Enclosed top, Enclosed top bottom @@ -1759,7 +1761,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { top.hfill.push(top.Size()); } else { // @test UnsupportedHFill - throw new TexError('UnsupportedHFill', parser.currentCS); + throw new TexError(COMPONENT, 'UnsupportedHFill', parser.currentCS); } }, @@ -1774,10 +1776,10 @@ const BaseMethods: { [key: string]: ParseMethod } = { const n = parser.GetBrackets(name, '0'); const macro = parser.GetArgument(name); if (c.length !== 1) { - throw new TexError('BadColumnName', c); + throw new TexError(COMPONENT, 'BadColumnName', c); } if (!n.match(/^\d+$/)) { - throw new TexError('PositiveIntegerArg', n); + throw new TexError(COMPONENT, 'PositiveIntegerArg', n); } const cparser = parser.configuration.columnParser; cparser.columnHandler[c] = (state: ColumnState) => @@ -1800,7 +1802,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const env = parser.GetArgument(name); if (env.match(/\\/)) { // @test InvalidEnv - throw new TexError('InvalidEnv', env); + throw new TexError(COMPONENT, 'InvalidEnv', env); } const macro = parser.configuration.handlers .get(HandlerType.ENVIRONMENT) @@ -1937,14 +1939,20 @@ const BaseMethods: { [key: string]: ParseMethod } = { (shift && !UnitUtil.matchDimen(shift)[0]) || (last && !UnitUtil.matchDimen(last)[0]) ) { - throw new TexError('BracketMustBeDimension', name); + throw new TexError(COMPONENT, 'BracketMustBeDimension', name); } // // Get the indentalign values, if any // const lcr = parser.GetArgument(name); if (lcr && !lcr.match(/^([lcr]{1,3})?$/)) { - throw new TexError('BadAlignment'); + throw new TexError(COMPONENT, 'BadAlignment'); + } + const align = [...lcr].map( + (c) => ({ l: 'left', c: 'center', r: 'right' })[c] + ); + if (align.length === 1) { + align.push(align[0]); } // // Set the properties for the mstyle @@ -2080,7 +2088,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Label, Ref, Ref Unknown if (parser.tags.label) { // @test Double Label Error - throw new TexError('MultipleCommand', parser.currentCS); + throw new TexError(COMPONENT, 'MultipleCommand', parser.currentCS); } parser.tags.label = label; if ( @@ -2088,7 +2096,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !parser.options['ignoreDuplicateLabels'] ) { // @ Duplicate Label Error - throw new TexError('MultipleLabel', label); + throw new TexError(COMPONENT, 'MultipleLabel', label); } // TODO: This should be set in the tags structure! parser.tags.labels[label] = new Label(); // will be replaced by tag value later diff --git a/ts/input/tex/base/locales/en.json b/ts/input/tex/base/locales/en.json index 64938bd23..ccb7169c1 100644 --- a/ts/input/tex/base/locales/en.json +++ b/ts/input/tex/base/locales/en.json @@ -39,5 +39,6 @@ "DoubleSubscripts": "Double subscripts: use braces to clarify", "DoubleExponent": "Double exponent: use braces to clarify", "TooManyAligns": "Too many alignment characters: %1", - "BadBreakAlign": "Invalid alignment character: %1" + "BadBreakAlign": "Invalid alignment character: %1", + "MaxTemplateSubs": "Maximum template substitutions exceeded; is there an invalid use of \\\\ in the template?" } diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index bbc86a7a5..a41dfaf9a 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -39,18 +39,6 @@ export const COMPONENT = '[tex]/bbox'; */ Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); -/** - * Throw a TexError for this component (eventually, TexError will handle the message directly). - * - * @param {string} id The ID of the error message - * @param {string[]} args The values to substitute into the message - */ -function bboxError(id: string, ...args: string[]) { - const error = new TexError('', ''); - error.message = Locale.message(COMPONENT, id, ...args); - throw error; -} - // Namespace const BboxMethods: { [key: string]: ParseMethod } = { /** @@ -73,7 +61,7 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Padding if (def) { // @test Bbox-Padding-Error - bboxError('MultipleBBoxProperty', 'Padding', name); + throw new TexError(COMPONENT, 'MultipleBBoxProperty', 'Padding', name); } const pad = BBoxPadding(match[1] + match[3]); if (pad) { @@ -89,19 +77,19 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Background if (background) { // @test Bbox-Background-Error - bboxError('MultipleBBoxProperty', 'Background', name); + throw new TexError(COMPONENT, 'MultipleBBoxProperty', 'Background', name); } background = part; } else if (part.match(/^[-a-z]+:/i)) { // @test Bbox-Frame if (style) { // @test Bbox-Frame-Error - bboxError('MultipleBBoxProperty', 'Style', name); + throw new TexError(COMPONENT, 'MultipleBBoxProperty', 'Style', name); } style = BBoxStyle(part); } else if (part !== '') { // @test Bbox-General-Error - bboxError('InvalidBBoxProperty', part); + throw new TexError(COMPONENT, 'InvalidBBoxProperty', part); } } if (def) { diff --git a/ts/input/tex/begingroup/BegingroupConfiguration.ts b/ts/input/tex/begingroup/BegingroupConfiguration.ts index f509f990b..d29eaed54 100644 --- a/ts/input/tex/begingroup/BegingroupConfiguration.ts +++ b/ts/input/tex/begingroup/BegingroupConfiguration.ts @@ -26,6 +26,10 @@ import { Configuration } from '../Configuration.js'; import { CommandMap } from '../TokenMap.js'; import { BegingroupStack, begingroupStack } from './BegingroupStack.js'; import { BegingroupMethods } from './BegingroupMethods.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/begingroup'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/begingroup'); /** * Create the begingroup command map. diff --git a/ts/input/tex/begingroup/BegingroupMethods.ts b/ts/input/tex/begingroup/BegingroupMethods.ts index fcaab96b5..bad8bc931 100644 --- a/ts/input/tex/begingroup/BegingroupMethods.ts +++ b/ts/input/tex/begingroup/BegingroupMethods.ts @@ -24,6 +24,8 @@ import { CommandMap } from '../TokenMap.js'; import TexParser from '../TexParser.js'; import TexError from '../TexError.js'; + +const COMPONENT = '[tex]/begingroup'; import BaseMethods from '../base/BaseMethods.js'; import { begingroupStack } from './BegingroupStack.js'; @@ -83,11 +85,7 @@ export const BegingroupMethods = { // Check that \global can be used with the following CS // if (!parser.options.begingroup.allowGlobal.includes(cs)) { - throw new TexError( - 'IllegalGlobal', - 'Invalid use of %1', - parser.currentCS - ); + throw new TexError(COMPONENT, 'IllegalGlobal', parser.currentCS); } parser.stack.env.isGlobal = true; }, diff --git a/ts/input/tex/begingroup/BegingroupStack.ts b/ts/input/tex/begingroup/BegingroupStack.ts index 6de5e618d..c0fcb2bb3 100644 --- a/ts/input/tex/begingroup/BegingroupStack.ts +++ b/ts/input/tex/begingroup/BegingroupStack.ts @@ -32,6 +32,8 @@ import { import { Token } from '../Token.js'; import { MapHandler, SubHandlers } from '../MapHandler.js'; import TexError from '../TexError.js'; + +const COMPONENT = '[tex]/begingroup'; import { NewcommandTables as NT, NewcommandPriority, @@ -170,10 +172,7 @@ export class BegingroupStack { */ public pop() { if (this.i === this.base) { - throw new TexError( - 'MissingBegingroup', - 'Missing \\begingroup or extra \\endgroup' - ); + throw new TexError(COMPONENT, 'MissingBegingroup'); } this.handlers.remove(BegingroupStack.handlerConfig, {}); // diff --git a/ts/input/tex/braket/BraketConfiguration.ts b/ts/input/tex/braket/BraketConfiguration.ts index 344e88e52..6000ab23e 100644 --- a/ts/input/tex/braket/BraketConfiguration.ts +++ b/ts/input/tex/braket/BraketConfiguration.ts @@ -25,6 +25,10 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { BraketItem } from './BraketItems.js'; import './BraketMappings.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/braket'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/braket'); export const BraketConfiguration = Configuration.create('braket', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/braket/BraketMethods.ts b/ts/input/tex/braket/BraketMethods.ts index a1ff638e2..53678477b 100644 --- a/ts/input/tex/braket/BraketMethods.ts +++ b/ts/input/tex/braket/BraketMethods.ts @@ -23,10 +23,13 @@ import { ParseMethod, ParseResult } from '../Types.js'; import BaseMethods from '../base/BaseMethods.js'; +import TexError from '../TexError.js'; import TexParser from '../TexParser.js'; import { TEXCLASS } from '../../../core/MmlTree/MmlNode.js'; import { BraketItem } from './BraketItems.js'; +const COMPONENT = '[tex]/braket'; + const BraketMethods: { [key: string]: ParseMethod } = { /** * Generate a bra-ket expression. @@ -50,7 +53,7 @@ const BraketMethods: { [key: string]: ParseMethod } = { ) { let next = parser.GetNext(); if (next === '') { - throw new TexError('MissingArgFor', parser.currentCS); + throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); } let single = true; if (next === '{') { diff --git a/ts/input/tex/bussproofs/BussproofsConfiguration.ts b/ts/input/tex/bussproofs/BussproofsConfiguration.ts index d7bfc192b..4dcb8f994 100644 --- a/ts/input/tex/bussproofs/BussproofsConfiguration.ts +++ b/ts/input/tex/bussproofs/BussproofsConfiguration.ts @@ -31,6 +31,10 @@ import { makeBsprAttributes, } from './BussproofsUtil.js'; import './BussproofsMappings.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/bussproofs'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bussproofs'); export const BussproofsConfiguration = Configuration.create('bussproofs', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/bussproofs/BussproofsItems.ts b/ts/input/tex/bussproofs/BussproofsItems.ts index 45cbabdef..e3d868e8f 100644 --- a/ts/input/tex/bussproofs/BussproofsItems.ts +++ b/ts/input/tex/bussproofs/BussproofsItems.ts @@ -27,6 +27,8 @@ import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import Stack from '../Stack.js'; import * as BussproofsUtil from './BussproofsUtil.js'; +const COMPONENT = '[tex]/bussproofs'; + export class ProofTreeItem extends BaseItem { /** * The current left label. @@ -61,7 +63,7 @@ export class ProofTreeItem extends BaseItem { return [[this.factory.create('mml', node), item], true]; } if (item.isKind('stop')) { - throw new TexError('EnvMissingEnd', this.getName()); + throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); } this.innerStack.Push(item); return BaseItem.fail; diff --git a/ts/input/tex/bussproofs/BussproofsMethods.ts b/ts/input/tex/bussproofs/BussproofsMethods.ts index 797fae8d2..db22fb891 100644 --- a/ts/input/tex/bussproofs/BussproofsMethods.ts +++ b/ts/input/tex/bussproofs/BussproofsMethods.ts @@ -30,6 +30,8 @@ import { StackItem } from '../StackItem.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import * as BussproofsUtil from './BussproofsUtil.js'; +const COMPONENT = '[tex]/bussproofs'; + /** * Pads content of an inference rule. * @@ -136,12 +138,12 @@ function createRule( function parseFCenterLine(parser: TexParser, name: string): MmlNode { const dollar = parser.GetNext(); if (dollar !== '$') { - throw new TexError('IllegalUseOfCommand', name); + throw new TexError(COMPONENT, 'IllegalUseOfCommand', name); } parser.i++; let axiom = parser.GetUpTo(name, '$'); if (axiom.indexOf('\\fCenter') === -1) { - throw new TexError('MissingProofCommand', '\\fCenter', name); + throw new TexError(COMPONENT, 'MissingProofCommand', '\\fCenter', name); } // Check for fCenter and throw error? const [prem, conc] = axiom.split('\\fCenter'); @@ -207,7 +209,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // TODO: Label error if (top.kind !== 'proofTree') { - throw new TexError('IllegalProofCommand'); + throw new TexError(COMPONENT, 'IllegalProofCommand'); } const content = paddedContent(parser, parser.GetArgument(name)); BussproofsUtil.setProperty(content, 'axiom', true); @@ -224,10 +226,10 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { Inference(parser: TexParser, name: string, n: number) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError('IllegalProofCommand'); + throw new TexError(COMPONENT, 'IllegalProofCommand'); } if (top.Size() < n) { - throw new TexError('BadProofTree'); + throw new TexError(COMPONENT, 'BadProofTree'); } const rootAtTop = top.getProperty('rootAtTop') as boolean; const childCount = n === 1 && !top.Peek()[0].childNodes.length ? 0 : n; @@ -279,7 +281,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // Label error if (top.kind !== 'proofTree') { - throw new TexError('IllegalProofCommand'); + throw new TexError(COMPONENT, 'IllegalProofCommand'); } const content = ParseUtil.internalMath(parser, parser.GetArgument(name), 0); const label = @@ -301,7 +303,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // Label error if (top.kind !== 'proofTree') { - throw new TexError('IllegalProofCommand'); + throw new TexError(COMPONENT, 'IllegalProofCommand'); } top.setProperty('currentLine', style); if (always) { @@ -319,7 +321,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { RootAtTop(parser: TexParser, _name: string, where: boolean) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError('IllegalProofCommand'); + throw new TexError(COMPONENT, 'IllegalProofCommand'); } top.setProperty('rootAtTop', where); }, @@ -333,7 +335,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { AxiomF(parser: TexParser, name: string) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError('IllegalProofCommand'); + throw new TexError(COMPONENT, 'IllegalProofCommand'); } const line = parseFCenterLine(parser, name); BussproofsUtil.setProperty(line, 'axiom', true); @@ -358,10 +360,10 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { InferenceF(parser: TexParser, name: string, n: number) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError('IllegalProofCommand'); + throw new TexError(COMPONENT, 'IllegalProofCommand'); } if (top.Size() < n) { - throw new TexError('BadProofTree'); + throw new TexError(COMPONENT, 'BadProofTree'); } const rootAtTop = top.getProperty('rootAtTop') as boolean; const childCount = n === 1 && !top.Peek()[0].childNodes.length ? 0 : n; diff --git a/ts/input/tex/cases/CasesConfiguration.ts b/ts/input/tex/cases/CasesConfiguration.ts index 2bea4089e..fdfa9ccf3 100644 --- a/ts/input/tex/cases/CasesConfiguration.ts +++ b/ts/input/tex/cases/CasesConfiguration.ts @@ -11,6 +11,10 @@ import { AmsTags } from '../ams/AmsConfiguration.js'; import { StackItem, CheckType } from '../StackItem.js'; import { MmlMtable } from '../../../core/MmlTree/MmlNodes/mtable.js'; import { EmpheqUtil } from '../empheq/EmpheqUtil.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/cases'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/cases'); /** * The StackItem for the numcases environment. @@ -181,7 +185,7 @@ export const CasesMethods = { // // Extra alignment tabs are not allowed in cases // - throw new TexError('ExtraCasesAlignTab'); + throw new TexError(COMPONENT, 'ExtraCasesAlignTab'); } else if (c === '\\' && braces === 0) { // // If the macro is \cr or \\, end the search, otherwise skip the macro diff --git a/ts/input/tex/color/ColorConfiguration.ts b/ts/input/tex/color/ColorConfiguration.ts index 524f5d079..b3f2220c5 100644 --- a/ts/input/tex/color/ColorConfiguration.ts +++ b/ts/input/tex/color/ColorConfiguration.ts @@ -27,6 +27,10 @@ import { Configuration, ParserConfiguration } from '../Configuration.js'; import { ColorMethods } from './ColorMethods.js'; import { ColorModel } from './ColorUtil.js'; import { TeX } from '../../tex.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/color'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/color'); /** * The color macros diff --git a/ts/input/tex/color/ColorUtil.ts b/ts/input/tex/color/ColorUtil.ts index 25779dc33..759064caf 100644 --- a/ts/input/tex/color/ColorUtil.ts +++ b/ts/input/tex/color/ColorUtil.ts @@ -24,6 +24,8 @@ import TexError from '../TexError.js'; import { COLORS } from './ColorConstants.js'; +const COMPONENT = '[tex]/color'; + type ColorModelProcessor = (def: string) => string; const ColorModelProcessors: Map = new Map< string, @@ -49,7 +51,7 @@ export class ColorModel { private normalizeColor(model: string, def: string): string { if (!model || model === 'named') { if (def.match(/;/)) { - throw new TexError('BadColorValue', 'Invalid color value'); + throw new TexError(COMPONENT, 'BadColorValue'); } // Allow to define colors directly by using the CSS format e.g. `#888` return def; @@ -59,7 +61,7 @@ export class ColorModel { return modelProcessor(def); } - throw new TexError('UndefinedColorModel', model); + throw new TexError(COMPONENT, 'UndefinedColorModel', model); } /** @@ -97,7 +99,7 @@ export class ColorModel { return COLORS.get(name); } if (name.match(/;/)) { - throw new TexError('BadColorValue', 'Invalid color value'); + throw new TexError(COMPONENT, 'BadColorValue', 'Invalid color value'); } // Pass the color name as-is to CSS return name; @@ -129,17 +131,17 @@ ColorModelProcessors.set('rgb', function (rgb: string): string { let RGB: string = '#'; if (rgbParts.length !== 3) { - throw new TexError('ModelArg1', 'rgb'); + throw new TexError(COMPONENT, 'ModelArg1', 'rgb'); } for (const rgbPart of rgbParts) { if (!rgbPart.match(/^(\d+(\.\d*)?|\.\d+)$/)) { - throw new TexError('InvalidDecimalNumber'); + throw new TexError(COMPONENT, 'InvalidDecimalNumber'); } const n = parseFloat(rgbPart); if (n < 0 || n > 1) { - throw new TexError('ModelArg2', 'rgb', '0', '1'); + throw new TexError(COMPONENT, 'ModelArg2', 'rgb', '0', '1'); } let pn = Math.floor(n * 255).toString(16); @@ -164,17 +166,17 @@ ColorModelProcessors.set('RGB', function (rgb: string): string { let RGB = '#'; if (rgbParts.length !== 3) { - throw new TexError('ModelArg1', 'RGB'); + throw new TexError(COMPONENT, 'ModelArg1', 'RGB'); } for (const rgbPart of rgbParts) { if (!rgbPart.match(/^\d+$/)) { - throw new TexError('InvalidNumber'); + throw new TexError(COMPONENT, 'InvalidNumber'); } const n = parseInt(rgbPart); if (n > 255) { - throw new TexError('ModelArg2', 'RGB', '0', '255'); + throw new TexError(COMPONENT, 'ModelArg2', 'RGB', '0', '255'); } let pn = n.toString(16); @@ -194,12 +196,12 @@ ColorModelProcessors.set('RGB', function (rgb: string): string { */ ColorModelProcessors.set('gray', function (gray: string): string { if (!gray.match(/^\s*(\d+(\.\d*)?|\.\d+)\s*$/)) { - throw new TexError('InvalidDecimalNumber'); + throw new TexError(COMPONENT, 'InvalidDecimalNumber'); } const n: number = parseFloat(gray); if (n < 0 || n > 1) { - throw new TexError('ModelArg2', 'gray', '0', '1'); + throw new TexError(COMPONENT, 'ModelArg2', 'gray', '0', '1'); } let pn = Math.floor(n * 255).toString(16); if (pn.length < 2) { diff --git a/ts/input/tex/color/locales/en.json b/ts/input/tex/color/locales/en.json index b82552a10..c9873885e 100644 --- a/ts/input/tex/color/locales/en.json +++ b/ts/input/tex/color/locales/en.json @@ -3,5 +3,6 @@ "ModelArg2": "Color values for the %1 model must be between %2 and %3", "InvalidDecimalNumber": "Invalid decimal number", "InvalidNumber": "Invalid number", - "UndefinedColorModel": "Color model '%1' not defined" + "UndefinedColorModel": "Color model '%1' not defined", + "BadColorValue": "Invalid color value" } diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts index a8201adfc..af05d8500 100644 --- a/ts/input/tex/colortbl/ColortblConfiguration.ts +++ b/ts/input/tex/colortbl/ColortblConfiguration.ts @@ -33,6 +33,10 @@ import TexParser from '../TexParser.js'; import TexError from '../TexError.js'; import { TeX } from '../../tex.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/colortbl'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/colortbl'); /** * Information about table colors. @@ -130,14 +134,14 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) { // const top = parser.stack.Top() as ColorArrayItem; if (!(top instanceof ColorArrayItem)) { - throw new TexError('UnsupportedTableColor', parser.currentCS); + throw new TexError(COMPONENT, 'UnsupportedTableColor', parser.currentCS); } // // Check the position of the macro and save the color. // if (type === 'col') { if (top.table.length && top.color.col[top.row.length] !== color) { - throw new TexError('ColumnColorNotTop', name); + throw new TexError(COMPONENT, 'ColumnColorNotTop', name); } top.color.col[top.row.length] = color; // @@ -149,7 +153,7 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) { } else { top.color[type] = color; if (type === 'row' && (top.Size() || top.row.length)) { - throw new TexError('RowColorNotFirst', name); + throw new TexError(COMPONENT, 'RowColorNotFirst', name); } } } diff --git a/ts/input/tex/empheq/EmpheqConfiguration.ts b/ts/input/tex/empheq/EmpheqConfiguration.ts index 656a9f3e3..d9f8e313d 100644 --- a/ts/input/tex/empheq/EmpheqConfiguration.ts +++ b/ts/input/tex/empheq/EmpheqConfiguration.ts @@ -30,6 +30,10 @@ import TexError from '../TexError.js'; import { BeginItem } from '../base/BaseItems.js'; import { EmpheqUtil } from './EmpheqUtil.js'; import ParseMethods from '../ParseMethods.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/empheq'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/empheq'); /** * The methods that implement the empheq package. @@ -62,7 +66,7 @@ export const EmpheqMethods = { .GetArgument('\\begin{' + begin.getName() + '}') .split(/=/); if (!EmpheqUtil.checkEnv(env)) { - throw new TexError('UnknownEnv', env); + throw new TexError(COMPONENT, 'UnknownEnv', env); } begin.setProperty('nestStart', true); if (opts) { diff --git a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts index 4e6725452..2c17a3fda 100644 --- a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts +++ b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts @@ -31,6 +31,10 @@ import { AmsMethods } from '../ams/AmsMethods.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; import TexError from '../TexError.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/extpfeil'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/extpfeil'); // Namespace const ExtpfeilMethods: { [key: string]: ParseMethod } = { @@ -45,13 +49,13 @@ const ExtpfeilMethods: { [key: string]: ParseMethod } = { const space = parser.GetArgument(name); const chr = parser.GetArgument(name); if (!cs.match(/^\\([a-z]+|.)$/i)) { - throw new TexError('NewextarrowArg1', name); + throw new TexError(COMPONENT, 'NewextarrowArg1', name); } if (!space.match(/^(\d+),(\d+)$/)) { - throw new TexError('NewextarrowArg2', name); + throw new TexError(COMPONENT, 'NewextarrowArg2', name); } if (!chr.match(/^(\d+|0x[0-9A-F]+)$/i)) { - throw new TexError('NewextarrowArg3', name); + throw new TexError(COMPONENT, 'NewextarrowArg3', name); } cs = cs.substring(1); const spaces = space.split(','); diff --git a/ts/input/tex/html/HtmlConfiguration.ts b/ts/input/tex/html/HtmlConfiguration.ts index 918118a18..282d2816c 100644 --- a/ts/input/tex/html/HtmlConfiguration.ts +++ b/ts/input/tex/html/HtmlConfiguration.ts @@ -25,6 +25,10 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { CommandMap } from '../TokenMap.js'; import HtmlMethods from './HtmlMethods.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/html'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/html'); new CommandMap('html_macros', { data: HtmlMethods.Data, diff --git a/ts/input/tex/html/HtmlMethods.ts b/ts/input/tex/html/HtmlMethods.ts index 533555d44..c5056967b 100644 --- a/ts/input/tex/html/HtmlMethods.ts +++ b/ts/input/tex/html/HtmlMethods.ts @@ -28,6 +28,8 @@ import { ParseUtil } from '../ParseUtil.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import TexError from '../TexError.js'; +const COMPONENT = '[tex]/html'; + /** Regexp for matching non-characters as specified by {@link https://infra.spec.whatwg.org/#noncharacter}. */ const nonCharacterRegexp = // eslint-disable-next-line @typescript-eslint/ban-ts-comment @@ -63,7 +65,7 @@ const HtmlMethods: { [key: string]: ParseMethod } = { for (const key in data) { // remove illegal attribute names if (!isLegalAttributeName(key)) { - throw new TexError('InvalidHTMLAttr', `data-${key}`); + throw new TexError(COMPONENT, 'InvalidHTMLAttr', `data-${key}`); } NodeUtil.setAttribute(arg, `data-${key}`, data[key]); } diff --git a/ts/input/tex/mathtools/MathtoolsConfiguration.ts b/ts/input/tex/mathtools/MathtoolsConfiguration.ts index aaa1c5583..84720de49 100644 --- a/ts/input/tex/mathtools/MathtoolsConfiguration.ts +++ b/ts/input/tex/mathtools/MathtoolsConfiguration.ts @@ -42,6 +42,10 @@ import { } from './MathtoolsMethods.js'; import { MathtoolsTagFormat } from './MathtoolsTags.js'; import { MultlinedItem } from './MathtoolsItems.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/mathtools'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mathtools'); /** * Add any pre-defined paired delimiters, and subclass the configured tag format. diff --git a/ts/input/tex/mathtools/MathtoolsMethods.ts b/ts/input/tex/mathtools/MathtoolsMethods.ts index 68ff76cce..fe99bd69a 100644 --- a/ts/input/tex/mathtools/MathtoolsMethods.ts +++ b/ts/input/tex/mathtools/MathtoolsMethods.ts @@ -47,6 +47,8 @@ import { PrioritizedList } from '../../../util/PrioritizedList.js'; import { MathtoolsTags } from './MathtoolsTags.js'; import { MathtoolsUtil } from './MathtoolsUtil.js'; +const COMPONENT = '[tex]/mathtools'; + export const LEGACYCONFIG = { [HandlerType.MACRO]: ['mathtools-legacycolonsymbols'], }; @@ -135,7 +137,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { width = arg; } if (width && !UnitUtil.matchDimen(width)[0]) { - throw new TexError('BadWidth', name); + throw new TexError(COMPONENT, 'BadWidth', name); } } parser.Push(begin); @@ -163,10 +165,10 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { HandleShove(parser: TexParser, name: string, shove: string) { const top = parser.stack.Top(); if (top.kind !== 'multline' && top.kind !== 'multlined') { - throw new TexError('CommandInMultlined', name); + throw new TexError(COMPONENT, 'CommandInMultlined', name); } if (top.Size()) { - throw new TexError('CommandAtTheBeginingOfLine', name); + throw new TexError(COMPONENT, 'CommandAtTheBeginingOfLine', name); } top.setProperty('shove', shove); const shift = parser.GetBrackets(name); @@ -456,7 +458,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { const box = NewcommandUtil.GetCSname(parser, name + '\\' + cs); const handlers = parser.configuration.handlers; if (handlers.get(HandlerType.MACRO).lookup(cs)) { - throw new TexError('AlreadyDefined', '%1 is already defined', '\\' + cs); + throw new TexError(COMPONENT, 'AlreadyDefined', '\\' + cs); } const handler = handlers.retrieve( NewcommandTables.NEW_COMMAND @@ -474,7 +476,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { ArrowBetweenLines(parser: TexParser, name: string) { const top = MathtoolsUtil.checkAlignment(parser, name); if (top.Size() || top.row.length) { - throw new TexError('BetweenLines', name); + throw new TexError(COMPONENT, 'BetweenLines', name); } const star = parser.GetStar(); const symbol = parser.GetBrackets(name, '\\Updownarrow'); @@ -924,17 +926,17 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { NewTagForm(parser: TexParser, name: string, renew: boolean = false) { const tags = parser.tags as MathtoolsTags; if (!('mtFormats' in tags)) { - throw new TexError('TagsNotMT', name); + throw new TexError(COMPONENT, 'TagsNotMT', name); } const id = parser.GetArgument(name).trim(); if (!id) { - throw new TexError('InvalidTagFormID'); + throw new TexError(COMPONENT, 'InvalidTagFormID'); } const format = parser.GetBrackets(name, ''); const left = parser.GetArgument(name); const right = parser.GetArgument(name); if (!renew && tags.mtFormats.has(id)) { - throw new TexError('DuplicateTagForm', id); + throw new TexError(COMPONENT, 'DuplicateTagForm', id); } tags.mtFormats.set(id, [left, right, format]); parser.Push(parser.itemFactory.create('null')); @@ -949,7 +951,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { UseTagForm(parser: TexParser, name: string) { const tags = parser.tags as MathtoolsTags; if (!('mtFormats' in tags)) { - throw new TexError('TagsNotMT', name); + throw new TexError(COMPONENT, 'TagsNotMT', name); } const id = parser.GetArgument(name).trim(); if (!id) { @@ -958,7 +960,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { return; } if (!tags.mtFormats.has(id)) { - throw new TexError('UndefinedTagForm', id); + throw new TexError(COMPONENT, 'UndefinedTagForm', id); } tags.mtCurrent = tags.mtFormats.get(id); parser.Push(parser.itemFactory.create('null')); @@ -973,7 +975,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { SetOptions(parser: TexParser, name: string) { const options = parser.options.mathtools; if (!options['allow-mathtoolsset']) { - throw new TexError('ForbiddenMathtoolsSet', name); + throw new TexError(COMPONENT, 'ForbiddenMathtoolsSet', name); } const allowed = {} as { [id: string]: number }; Object.keys(options).forEach((id) => { diff --git a/ts/input/tex/mathtools/MathtoolsTags.ts b/ts/input/tex/mathtools/MathtoolsTags.ts index d1c9820ba..e7eab5ddd 100644 --- a/ts/input/tex/mathtools/MathtoolsTags.ts +++ b/ts/input/tex/mathtools/MathtoolsTags.ts @@ -25,6 +25,8 @@ import { ParserConfiguration } from '../Configuration.js'; import { TeX } from '../../tex.js'; import { AbstractTags, TagsFactory } from '../Tags.js'; +const COMPONENT = '[tex]/mathtools'; + /** * The type for the Mathtools tags (including their data). */ @@ -88,7 +90,7 @@ export function MathtoolsTagFormat( const forms = jax.parseOptions.options.mathtools.tagforms; for (const form of Object.keys(forms)) { if (!Array.isArray(forms[form]) || forms[form].length !== 3) { - throw new TexError('InvalidTagFormDef', form); + throw new TexError(COMPONENT, 'InvalidTagFormDef', form); } this.mtFormats.set(form, forms[form] as [string, string, string]); } diff --git a/ts/input/tex/mathtools/MathtoolsUtil.ts b/ts/input/tex/mathtools/MathtoolsUtil.ts index cb01ccdf0..3f51fb86f 100644 --- a/ts/input/tex/mathtools/MathtoolsUtil.ts +++ b/ts/input/tex/mathtools/MathtoolsUtil.ts @@ -31,6 +31,8 @@ import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { MathtoolsMethods } from './MathtoolsMethods.js'; +const COMPONENT = '[tex]/mathtools'; + /** * Utility functions for the Mathtools package. */ @@ -69,7 +71,7 @@ export const MathtoolsUtil = { checkAlignment(parser: TexParser, name: string): EqnArrayItem { const top = parser.stack.Top() as EqnArrayItem; if (top.kind !== EqnArrayItem.prototype.kind) { - throw new TexError('NotInAlignment', name); + throw new TexError(COMPONENT, 'NotInAlignment', name); } return top; }, @@ -86,11 +88,7 @@ export const MathtoolsUtil = { */ addPairedDelims(parser: TexParser, cs: string, args: string[]) { if (parser.configuration.handlers.get(HandlerType.MACRO).contains(cs)) { - throw new TexError( - 'CommadExists', - 'Command %1 already defined', - `\\${cs}` - ); + throw new TexError(COMPONENT, 'CommadExists', `\\${cs}`); } NewcommandUtil.addMacro( parser, @@ -127,7 +125,7 @@ export const MathtoolsUtil = { plusOrMinus(name: string, n: string): string { n = n.trim(); if (!n.match(/^[-+]?(?:\d+(?:\.\d*)?|\.\d+)$/)) { - throw new TexError('NotANumber', name); + throw new TexError(COMPONENT, 'NotANumber', name); } return n.match(/^[-+]/) ? n : '+' + n; }, diff --git a/ts/input/tex/mathtools/locales/en.json b/ts/input/tex/mathtools/locales/en.json index a34d43fc8..d84d6b9aa 100644 --- a/ts/input/tex/mathtools/locales/en.json +++ b/ts/input/tex/mathtools/locales/en.json @@ -10,5 +10,7 @@ "CommandInMultlined": "%1 can only appear within the multline or multlined environments", "BadWidth": "Width for %1 must be a dimension", "NotANumber": "Argument to %1 is not a number", - "NotInAlignment": "%1 can only be used in alignment environments" + "NotInAlignment": "%1 can only be used in alignment environments", + "AlreadyDefined": "%1 is already defined", + "CommadExists": "Command %1 already defined" } diff --git a/ts/input/tex/newcommand/NewcommandConfiguration.ts b/ts/input/tex/newcommand/NewcommandConfiguration.ts index 3b1048d32..3a05ea9ea 100644 --- a/ts/input/tex/newcommand/NewcommandConfiguration.ts +++ b/ts/input/tex/newcommand/NewcommandConfiguration.ts @@ -29,6 +29,10 @@ import { NewcommandTables, NewcommandPriority } from './NewcommandUtil.js'; import './NewcommandMappings.js'; import ParseMethods from '../ParseMethods.js'; import * as sm from '../TokenMap.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/newcommand'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/newcommand'); /** * Initialize the newcommand maps for delimiters, commands, and environments, diff --git a/ts/input/tex/newcommand/NewcommandItems.ts b/ts/input/tex/newcommand/NewcommandItems.ts index 854b680d1..7515499d7 100644 --- a/ts/input/tex/newcommand/NewcommandItems.ts +++ b/ts/input/tex/newcommand/NewcommandItems.ts @@ -24,6 +24,8 @@ import TexError from '../TexError.js'; import { CheckType, BaseItem, StackItem } from '../StackItem.js'; +const COMPONENT = '[tex]/newcommand'; + /** * Opening Item dealing with definitions of new environments. It's pushed onto * the stack whenever a user defined environment is encountered and remains @@ -52,13 +54,13 @@ export class BeginEnvItem extends BaseItem { // @test Newenvironment Empty, Newenvironment Align if (item.getName() !== this.getName()) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc\end{equation} - throw new TexError('EnvBadEnd', this.getName(), item.getName()); + throw new TexError(COMPONENT, 'EnvBadEnd', this.getName(), item.getName()); } return [[this.factory.create('mml', this.toMml())], true]; } if (item.isKind('stop')) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc - throw new TexError('EnvMissingEnd', this.getName()); + throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); } // @test Newenvironment Empty, Newenvironment Align return super.checkItem(item); diff --git a/ts/input/tex/newcommand/NewcommandMethods.ts b/ts/input/tex/newcommand/NewcommandMethods.ts index 4693b54ce..1f25e9095 100644 --- a/ts/input/tex/newcommand/NewcommandMethods.ts +++ b/ts/input/tex/newcommand/NewcommandMethods.ts @@ -33,6 +33,8 @@ import { UnitUtil } from '../UnitUtil.js'; import { StackItem } from '../StackItem.js'; import { NewcommandUtil } from './NewcommandUtil.js'; +const COMPONENT = '[tex]/newcommand'; + // Namespace const NewcommandMethods: { [key: string]: ParseMethod } = { /** @@ -215,7 +217,7 @@ const NewcommandMethods: { [key: string]: ParseMethod } = { parser.GetNext(); if (params[0] && !NewcommandUtil.MatchParam(parser, params[0])) { // @test Missing Arguments - throw new TexError('MismatchUseDef', name); + throw new TexError(COMPONENT, 'MismatchUseDef', name); } if (argCount) { for (let i = 0; i < argCount; i++) { diff --git a/ts/input/tex/newcommand/NewcommandUtil.ts b/ts/input/tex/newcommand/NewcommandUtil.ts index e74c7c65d..eaaba8339 100644 --- a/ts/input/tex/newcommand/NewcommandUtil.ts +++ b/ts/input/tex/newcommand/NewcommandUtil.ts @@ -30,6 +30,8 @@ import { Macro, Token } from '../Token.js'; import { Args, Attributes, ParseMethod } from '../Types.js'; import * as tm from '../TokenMap.js'; +const COMPONENT = '[tex]/newcommand'; + /** * Naming constants for the extension mappings. */ @@ -57,7 +59,7 @@ export const NewcommandUtil = { const c = parser.GetNext(); if (c !== '\\') { // @test No CS - throw new TexError('MissingCS', cmd); + throw new TexError(COMPONENT, 'MissingCS', cmd); } const cs = UnitUtil.trimSpaces(parser.GetArgument(cmd)).substring(1); this.checkProtectedMacros(parser, cs); @@ -79,7 +81,7 @@ export const NewcommandUtil = { } if (!cs.match(/^(.|[a-z]+)$/i)) { // @test Illegal CS - throw new TexError('IllegalControlSequenceName', name); + throw new TexError(COMPONENT, 'IllegalControlSequenceName', name); } this.checkProtectedMacros(parser, cs); return cs; @@ -100,7 +102,7 @@ export const NewcommandUtil = { n = UnitUtil.trimSpaces(n); if (!n.match(/^[0-9]+$/)) { // @test Illegal Argument Number - throw new TexError('IllegalParamNumber', name); + throw new TexError(COMPONENT, 'IllegalParamNumber', name); } } return n; @@ -133,11 +135,11 @@ export const NewcommandUtil = { c = parser.string.charAt(++parser.i); if (!c.match(/^[1-9]$/)) { // @test Illegal Hash - throw new TexError('CantUseHash2', cs); + throw new TexError(COMPONENT, 'CantUseHash2', cs); } if (parseInt(c) !== ++n) { // @test No Sequence - throw new TexError('SequentialParam', cs); + throw new TexError(COMPONENT, 'SequentialParam', cs); } i = parser.i + 1; } else if (c === '{') { @@ -164,7 +166,7 @@ export const NewcommandUtil = { parser.i++; } // @test No Replacement - throw new TexError('MissingReplacementString', cmd); + throw new TexError(COMPONENT, 'MissingReplacementString', cmd); }, /** @@ -218,7 +220,7 @@ export const NewcommandUtil = { } } // @test Runaway Argument - throw new TexError('RunawayArgument', name); + throw new TexError(COMPONENT, 'RunawayArgument', name); }, /** @@ -282,11 +284,7 @@ export const NewcommandUtil = { */ checkProtectedMacros(parser: TexParser, cs: string) { if (parser.options.protectedMacros?.includes(cs)) { - throw new TexError( - 'ProtectedMacro', - "The control sequence %1 can't be redefined", - `\\${cs}` - ); + throw new TexError(COMPONENT, 'ProtectedMacro', `\\${cs}`); } }, diff --git a/ts/input/tex/newcommand/locales/en.json b/ts/input/tex/newcommand/locales/en.json index 3a9685475..c865ef91e 100644 --- a/ts/input/tex/newcommand/locales/en.json +++ b/ts/input/tex/newcommand/locales/en.json @@ -8,5 +8,6 @@ "CantUseHash2": "Illegal use of # in template for %1", "IllegalParamNumber": "Illegal number of parameters specified in %1", "IllegalControlSequenceName": "Illegal control sequence name for %1", - "MissingCS": "%1 must be followed by a control sequence" + "MissingCS": "%1 must be followed by a control sequence", + "ProtectedMacro": "The control sequence %1 can't be redefined" } diff --git a/ts/input/tex/physics/PhysicsConfiguration.ts b/ts/input/tex/physics/PhysicsConfiguration.ts index e11e6767c..cde9fba46 100644 --- a/ts/input/tex/physics/PhysicsConfiguration.ts +++ b/ts/input/tex/physics/PhysicsConfiguration.ts @@ -25,6 +25,10 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { AutoOpen } from './PhysicsItems.js'; import './PhysicsMappings.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/physics'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/physics'); export const PhysicsConfiguration = Configuration.create('physics', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index c464a2e5d..3369a515e 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -33,6 +33,8 @@ import { NodeFactory } from '../NodeFactory.js'; import { Macro } from '../Token.js'; import { AutoOpen } from './PhysicsItems.js'; +const COMPONENT = '[tex]/physics'; + /** * Pairs open and closed fences. * @@ -243,7 +245,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { } let right = pairs[next]; if (arg && next !== '{') { - throw new TexError('MissingArgFor', parser.currentCS); + throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); } if (!right) { const empty = parser.create('node', 'mrow'); @@ -293,7 +295,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { * @param {TexParser} parser The calling parser. * @param {string} name The macro name. */ - Eval(parser: TexParser, name: string) { + Eval(parser: TexParser, _name: string) { const star = parser.GetStar(); const next = parser.GetNext(); if (next === '(' || next === '[') { @@ -308,7 +310,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { ); return; } - throw new TexError('MissingArgFor', parser.currentCS); + throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); }, /** @@ -333,12 +335,12 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { big = parser.GetCS(); if (!big.match(biggs)) { // Actually a commutator error arg1 error. - throw new TexError('MissingArgFor', parser.currentCS); + throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); } next = parser.GetNext(); } if (next !== '{') { - throw new TexError('MissingArgFor', parser.currentCS); + throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); } const arg1 = parser.GetArgument(name); const arg2 = parser.GetArgument(name); @@ -868,7 +870,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { const arg = parser.GetArgument(name); const size = parseInt(arg, 10); if (isNaN(size)) { - throw new TexError('InvalidNumber'); + throw new TexError(COMPONENT, 'InvalidNumber'); } if (size <= 1) { parser.string = '1' + parser.string.slice(parser.i); @@ -905,7 +907,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { m.toString() !== arg3 || n.toString() !== arg2 ) { - throw new TexError('InvalidNumber'); + throw new TexError(COMPONENT, 'InvalidNumber'); } n = n < 1 ? 1 : n; m = m < 1 ? 1 : m; diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 5e4f44d35..5eb166cab 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -41,6 +41,9 @@ import { expandable } from '../../../util/Options.js'; import { MenuMathDocument } from '../../../ui/menu/MenuHandler.js'; import { Locale } from '../../../util/Locale.js'; +export const COMPONENT = '[tex]/require'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/require'); + /** * The MathJax configuration block (for looking up user-defined package options) */ @@ -169,7 +172,7 @@ export function RequireLoad(parser: TexParser, name: string) { ? allow[name] : options.defaultAllow; if (!allowed) { - throw new TexError('BadRequire', extension); + throw new TexError(COMPONENT, 'BadRequire', extension); } const data = Package.packages.get(extension); if (!data) { @@ -180,7 +183,7 @@ export function RequireLoad(parser: TexParser, name: string) { ); } if (data.hasFailed) { - throw new TexError('RequireFail', 'Extension "%1" failed to load', name); + throw new TexError(COMPONENT, 'RequireFail', name); } const require = LOADERCONFIG[extension]?.rendererExtensions; const menu = (MathJax.startup.document as MenuMathDocument)?.menu; @@ -230,7 +233,7 @@ export const RequireMethods: { [key: string]: ParseMethod } = { Require(parser: TexParser, name: string) { const required = parser.GetArgument(name); if (required.match(/[^_a-zA-Z0-9]/) || required === '') { - throw new TexError('BadPackageName', name); + throw new TexError(COMPONENT, 'BadPackageName', name); } RequireLoad(parser, required); parser.Push(parser.itemFactory.create('null')); diff --git a/ts/input/tex/require/locales/en.json b/ts/input/tex/require/locales/en.json index 87e61c69e..887d8b1db 100644 --- a/ts/input/tex/require/locales/en.json +++ b/ts/input/tex/require/locales/en.json @@ -1,4 +1,5 @@ { "BadPackageName": "Argument for %1 is not a valid package name", - "BadRequire": "Extension %1 is not allowed to be loaded" + "BadRequire": "Extension %1 is not allowed to be loaded", + "RequireFail": "Extension \"%1\" failed to load" } diff --git a/ts/input/tex/setoptions/SetOptionsConfiguration.ts b/ts/input/tex/setoptions/SetOptionsConfiguration.ts index 586c9ffbe..121034bf2 100644 --- a/ts/input/tex/setoptions/SetOptionsConfiguration.ts +++ b/ts/input/tex/setoptions/SetOptionsConfiguration.ts @@ -36,6 +36,10 @@ import { Macro } from '../Token.js'; import BaseMethods from '../base/BaseMethods.js'; import { expandable, isObject } from '../../../util/Options.js'; import { PrioritizedList } from '../../../util/PrioritizedList.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/setoptions'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/setoptions'); export const SetOptionsUtil = { /** @@ -47,7 +51,7 @@ export const SetOptionsUtil = { */ filterPackage(parser: TexParser, extension: string): boolean { if (extension !== 'tex' && !ConfigurationHandler.get(extension)) { - throw new TexError('NotAPackage', extension); + throw new TexError(COMPONENT, 'NotAPackage', extension); } const config = parser.options.setoptions; const options = config.allowOptions[extension]; @@ -55,7 +59,7 @@ export const SetOptionsUtil = { (options === undefined && !config.allowPackageDefault) || options === false ) { - throw new TexError('PackageNotSettable', extension); + throw new TexError(COMPONENT, 'PackageNotSettable', extension); } return true; }, @@ -78,17 +82,17 @@ export const SetOptionsUtil = { : null; if (allow === false || (allow === null && !config.allowOptionsDefault)) { if (isTex) { - throw new TexError('TeXOptionNotSettable', option); + throw new TexError(COMPONENT, 'TeXOptionNotSettable', option); } else { - throw new TexError('OptionNotSettable', option, extension); + throw new TexError(COMPONENT, 'OptionNotSettable', option, extension); } } const extOptions = isTex ? parser.options : parser.options[extension]; if (!extOptions || !Object.hasOwn(extOptions, option)) { if (isTex) { - throw new TexError('InvalidTexOption', option); + throw new TexError(COMPONENT, 'InvalidTexOption', option); } else { - throw new TexError('InvalidOptionKey', option, extension); + throw new TexError(COMPONENT, 'InvalidOptionKey', option, extension); } } return true; diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 7c8577033..556a073cc 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -32,6 +32,10 @@ import { HTMLDocument } from '../../../handlers/html/HTMLDocument.js'; import { HtmlNode } from '../../../core/MmlTree/MmlNodes/HtmlNode.js'; import { HTMLDomStrings } from '../../../handlers/html/HTMLDomStrings.js'; import { DOMAdaptor } from '../../../core/DOMAdaptor.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/texhtml'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/texhtml'); export const HtmlNodeMethods: { [key: string]: ParseMethod } = { /** @@ -59,7 +63,7 @@ export const HtmlNodeMethods: { [key: string]: ParseMethod } = { const end = (match[1] ? `` : '') + ''; const i = parser.string.slice(parser.i).indexOf(end); if (i < 0) { - throw new TexError('TokenNotFoundForCommand', end, '<' + match[0]); + throw new TexError(COMPONENT, 'TokenNotFoundForCommand', end, '<' + match[0]); } const html = parser.string.substring(parser.i, parser.i + i).trim(); parser.i += i + 11 + (match[1] ? 3 + match[1].length : 0); diff --git a/ts/input/tex/textmacros/TextMacrosConfiguration.ts b/ts/input/tex/textmacros/TextMacrosConfiguration.ts index 981362af7..a8d606566 100644 --- a/ts/input/tex/textmacros/TextMacrosConfiguration.ts +++ b/ts/input/tex/textmacros/TextMacrosConfiguration.ts @@ -31,6 +31,10 @@ import { StartItem, StopItem, MmlItem, StyleItem } from '../base/BaseItems.js'; import { TextParser } from './TextParser.js'; import { TextMacrosMethods } from './TextMacrosMethods.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/textmacros'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/textmacros'); import './TextMacrosMappings.js'; @@ -62,11 +66,7 @@ export const TextBaseConfiguration = Configuration.create('text-base', { const texParser = parser.texParser; const macro = texParser.lookup(HandlerType.MACRO, name); if (macro && macro._func !== TextMacrosMethods.Macro) { - parser.Error( - 'MathMacro', - '%1 is only supported in math mode', - '\\' + name - ); + parser.Error(COMPONENT, 'MathMacro', '\\' + name); } texParser.parse(HandlerType.MACRO, [parser, name]); }, diff --git a/ts/input/tex/textmacros/TextMacrosMethods.ts b/ts/input/tex/textmacros/TextMacrosMethods.ts index f26a3bd0d..b89d9a006 100644 --- a/ts/input/tex/textmacros/TextMacrosMethods.ts +++ b/ts/input/tex/textmacros/TextMacrosMethods.ts @@ -27,6 +27,8 @@ import { retryAfter } from '../../../util/Retries.js'; import { TextParser } from './TextParser.js'; import BaseMethods from '../base/BaseMethods.js'; +const COMPONENT = '[tex]/textmacros'; + /** * The methods used to implement the text-mode macros */ @@ -89,16 +91,13 @@ export const TextMacrosMethods = { case '}': if (braces === 0) { - parser.Error( - 'ExtraCloseMissingOpen', - 'Extra close brace or missing open brace' - ); + parser.Error(COMPONENT, 'ExtraCloseMissingOpen'); } braces--; break; } } - parser.Error('MathNotTerminated', 'Math mode is not properly terminated'); + parser.Error(COMPONENT, 'MathNotTerminated'); }, /** @@ -106,7 +105,7 @@ export const TextMacrosMethods = { * @param {string} c The character that called this function */ MathModeOnly(parser: TextParser, c: string) { - parser.Error('MathModeOnly', "'%1' allowed only in math mode", c); + parser.Error(COMPONENT, 'MathModeOnly', c); }, /** @@ -114,7 +113,7 @@ export const TextMacrosMethods = { * @param {string} c The character that called this function */ Misplaced(parser: TextParser, c: string) { - parser.Error('Misplaced', "Misplaced '%1'", c); + parser.Error(COMPONENT, 'Misplaced', c); }, /** @@ -143,10 +142,7 @@ export const TextMacrosMethods = { parser.saveText(); parser.stack.env = parser.envStack.pop(); } else { - parser.Error( - 'ExtraCloseMissingOpen', - 'Extra close brace or missing open brace' - ); + parser.Error(COMPONENT, 'ExtraCloseMissingOpen'); } }, diff --git a/ts/input/tex/textmacros/TextParser.ts b/ts/input/tex/textmacros/TextParser.ts index b7031d3f5..339fd5eb9 100644 --- a/ts/input/tex/textmacros/TextParser.ts +++ b/ts/input/tex/textmacros/TextParser.ts @@ -232,11 +232,11 @@ export class TextParser extends TexParser { /** * Throw an error * - * @param {string} id The id for the message string - * @param {string} message The English version of the message - * @param {string[]} args Any substitution args for the message + * @param {string} component The locale component + * @param {string} id The id for the message string + * @param {string[]} args Any substitution args for the message */ - public Error(id: string, message: string, ...args: string[]) { - throw new TexError(id, message, ...args); + public Error(component: string, id: string, ...args: string[]) { + throw new TexError(component, id, ...args); } } diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index 4d927a97f..74e9ac089 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -32,6 +32,10 @@ import { UnitUtil } from '../UnitUtil.js'; import NodeUtil from '../NodeUtil.js'; import { numeric } from '../../../util/Entities.js'; import { Other } from '../base/BaseConfiguration.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/unicode'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/unicode'); const UnicodeCache: { [key: number]: [number, number, string, number] } = {}; @@ -58,11 +62,11 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } } if (font.match(/;/)) { - throw new TexError('BadFont', parser.currentCS); + throw new TexError(COMPONENT, 'BadFont', parser.currentCS); } const n = UnitUtil.trimSpaces(parser.GetArgument(name)).replace(/^0x/, 'x'); if (!n.match(/^(x[0-9A-Fa-f]+|[0-9]+)$/)) { - throw new TexError('BadUnicode', parser.currentCS); + throw new TexError(COMPONENT, 'BadUnicode', parser.currentCS); } const N = parseInt(n.match(/^x/) ? '0' + n : n); if (!UnicodeCache[N]) { @@ -103,7 +107,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { RawUnicode(parser: TexParser, name: string) { const hex = parser.GetArgument(name).trim(); if (!hex.match(/^[0-9A-F]{1,6}$/)) { - throw new TexError('BadRawUnicode', parser.currentCS); + throw new TexError(COMPONENT, 'BadRawUnicode', parser.currentCS); } const n = parseInt(hex, 16); parser.string = String.fromCodePoint(n) + parser.string.substring(parser.i); @@ -134,7 +138,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { parser.i += 2; const cs = [...parser.GetCS()]; if (cs.length > 1) { - throw new TexError('InvalidAlphanumeric', parser.currentCS); + throw new TexError(COMPONENT, 'InvalidAlphanumeric', parser.currentCS); } c = cs[0]; match = ['']; @@ -156,11 +160,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { parser.i += 2; const cs = [...parser.GetCS()]; if (cs.length > 1) { - throw new TexError( - 'InvalidAlphanumeric', - 'Invalid alphanumeric constant for %1', - parser.currentCS - ); + throw new TexError(COMPONENT, 'InvalidAlphanumeric', parser.currentCS); } c = cs[0]; match = ['']; @@ -173,7 +173,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } } if (!c) { - throw new TexError('MissingNumber', parser.currentCS); + throw new TexError(COMPONENT, 'MissingNumber', parser.currentCS); } parser.i += match[0].length; if (c >= '0' && c <= '9') { diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 6684dc10a..5fab39b1b 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -28,6 +28,10 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = '[tex]/verb'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/verb'); // Namespace const VerbMethods: { [key: string]: ParseMethod } = { @@ -40,7 +44,7 @@ const VerbMethods: { [key: string]: ParseMethod } = { const c = parser.GetNext(); const start = ++parser.i; if (c === '') { - throw new TexError('MissingArgFor', name); + throw new TexError(COMPONENT, 'MissingArgFor', name); } while ( parser.i < parser.string.length && @@ -49,7 +53,7 @@ const VerbMethods: { [key: string]: ParseMethod } = { parser.i++; } if (parser.i === parser.string.length) { - throw new TexError('NoClosingDelim', parser.currentCS); + throw new TexError(COMPONENT, 'NoClosingDelim', parser.currentCS); } const text = parser.string.slice(start, parser.i).replace(/ /g, '\u00A0'); parser.i++; From f6a6557dda6635814760fb4098f1f4c68875eb7d Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 00:59:33 +0200 Subject: [PATCH 12/95] fix ams problems --- ts/input/tex/ams/AmsItems.ts | 2 +- ts/input/tex/ams/AmsMethods.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts index b2696e0b1..a4b2a5f16 100644 --- a/ts/input/tex/ams/AmsItems.ts +++ b/ts/input/tex/ams/AmsItems.ts @@ -171,7 +171,7 @@ export class FlalignItem extends EqnArrayItem { const n = this.getProperty('xalignat') as number; if (!n) return; if (this.row.length > n) { - throw new TexError(COMPONENT, 'XalignOverflow', this.name); + throw new TexError(COMPONENT, 'XalignOverflow', '&', this.name); } } diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index ee637a4b7..93e26bee5 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -149,7 +149,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const n = parser.GetArgument('\\begin{' + name + '}'); if (n.match(/[^0-9]/)) { // @test PositiveIntegerArg - throw new TexError(COMPONENT, 'PositiveIntegerArg'); + throw new TexError(COMPONENT, 'PositiveIntegerArg', '\\begin{' + name + '}'); } let count = parseInt(n, 10); while (count > 0) { @@ -238,7 +238,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { ): ParseResult { const n = parser.GetArgument('\\begin{' + begin.getName() + '}'); if (n.match(/[^0-9]/)) { - throw new TexError(COMPONENT, 'PositiveIntegerArg'); + throw new TexError(COMPONENT, 'PositiveIntegerArg', '\\begin{' + begin.getName() + '}'); } const align = padded ? 'crl' : 'rlc'; const balign = padded ? 'mbt' : 'btm'; @@ -613,11 +613,11 @@ export const AmsMethods: { [key: string]: ParseMethod } = { // @test Shove (Left|Right) (Top|Middle|Bottom) if (top.kind !== 'multline') { // @test Shove Error Environment - throw new TexError(COMPONENT, 'CommandOnlyAllowedInEnv', parser.currentCS); + throw new TexError(COMPONENT, 'CommandOnlyAllowedInEnv', parser.currentCS, 'multline'); } if (top.Size()) { // @test Shove Error (Top|Middle|Bottom) - throw new TexError(COMPONENT, 'CommandAtTheBeginingOfLine'); + throw new TexError(COMPONENT, 'CommandAtTheBeginingOfLine', parser.currentCS); } top.setProperty('shove', shove); }, @@ -741,7 +741,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { HandleTag(parser: TexParser, name: string) { if (!parser.tags.currentTag.taggable && parser.tags.env) { // @test Illegal Tag Error - throw new TexError(COMPONENT, 'CommandNotAllowedInEnv', parser.currentCS); + throw new TexError(COMPONENT, 'CommandNotAllowedInEnv', parser.currentCS, parser.tags.env); } if (parser.tags.currentTag.tag) { // @test Double Tag Error From b6475943839ba1c4929d86172634ad10ffd609df Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 02:06:38 +0200 Subject: [PATCH 13/95] fix for errors without locales from third party libraries --- ts/input/tex/TexError.ts | 4 +++- ts/input/tex/mhchem/MhchemConfiguration.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ts/input/tex/TexError.ts b/ts/input/tex/TexError.ts index 330c2a005..0ea647d11 100644 --- a/ts/input/tex/TexError.ts +++ b/ts/input/tex/TexError.ts @@ -36,6 +36,8 @@ export default class TexError { public id: string, ...args: string[] ) { - this.message = Locale.message(component, id, ...args); + this.message = component + ? Locale.message(component, id, ...args) + : args.join(' '); } } diff --git a/ts/input/tex/mhchem/MhchemConfiguration.ts b/ts/input/tex/mhchem/MhchemConfiguration.ts index 05c966955..4923008a1 100644 --- a/ts/input/tex/mhchem/MhchemConfiguration.ts +++ b/ts/input/tex/mhchem/MhchemConfiguration.ts @@ -105,7 +105,7 @@ export const MhchemMethods: { [key: string]: ParseMethod } = { tex = tex.replace(pattern, name as string); } } catch (err) { - throw new TexError(err[0], err[1]); + throw new TexError(null, err[0], err[1]); } parser.string = tex + parser.string.substring(parser.i); parser.i = 0; From 5878675c694f61a0eb74b764d40c228dd7c397bc Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 02:07:55 +0200 Subject: [PATCH 14/95] fix many locales --- testsuite/tests/input/tex/Mathtools.test.ts | 4 ++-- testsuite/tests/input/tex/Newcommand.test.ts | 2 +- ts/input/tex/base/BaseMethods.ts | 6 +++--- ts/input/tex/base/locales/en.json | 4 ++++ ts/input/tex/empheq/EmpheqConfiguration.ts | 2 +- ts/input/tex/empheq/locales/en.json | 2 +- ts/input/tex/mathtools/locales/en.json | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/testsuite/tests/input/tex/Mathtools.test.ts b/testsuite/tests/input/tex/Mathtools.test.ts index 9119cdb2a..5c950609f 100644 --- a/testsuite/tests/input/tex/Mathtools.test.ts +++ b/testsuite/tests/input/tex/Mathtools.test.ts @@ -918,7 +918,7 @@ describe('Mathtools More Environments', () => { test('ArrowBetweenLines error', () => { expectTexError('\\ArrowBetweenLines').toBe( - '\\ArrowBetweenLines can only be used in aligment environments' + '\\ArrowBetweenLines can only be used in alignment environments' ); }); @@ -1040,7 +1040,7 @@ describe('Mathtools Boxed Equations', () => { test('Aboxed error', () => { expectTexError('\\Aboxed{ a & = b}').toBe( - '\\Aboxed can only be used in aligment environments' + '\\Aboxed can only be used in alignment environments' ); }); diff --git a/testsuite/tests/input/tex/Newcommand.test.ts b/testsuite/tests/input/tex/Newcommand.test.ts index 79316245c..d482ff370 100644 --- a/testsuite/tests/input/tex/Newcommand.test.ts +++ b/testsuite/tests/input/tex/Newcommand.test.ts @@ -438,7 +438,7 @@ describe('NewcommandError', () => { it('Recursive Macro', () => { expectTexError('\\def\\x{\\x} \\x').toBe( - 'MathJax maximum macro substitution count exceeded; is here a recursive macro call?' + 'MathJax maximum macro substitution count exceeded; is there a recursive macro call?' ); }); diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index df70e3835..114961dc1 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -989,7 +989,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { switch (type) { case 'c': if (top.First) { - throw new TexError(COMPONENT, 'BreakFirstInEntry', parser.currentCS + '{t}'); + throw new TexError(COMPONENT, 'BreakFirstInEntry', parser.currentCS + '{c}'); } top.breakAlign.cell = splitAlignArray(parser.GetArgument(name), 1); break; @@ -1001,7 +1001,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { break; case 't': if (top.table.length || top.row.length || top.First) { - throw new TexError(COMPONENT, 'BreakFirstInTable', parser.currentCS + '{c}'); + throw new TexError(COMPONENT, 'BreakFirstInTable', parser.currentCS + '{t}'); } top.breakAlign.table = splitAlignArray(parser.GetArgument(name)); break; @@ -1039,7 +1039,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { ); if (!match) { // @test Token Invalid Attribute - throw new TexError(COMPONENT, 'InvalidMathMLAttr', attr); + throw new TexError(COMPONENT, 'InvalidMathMLAttr', attr.split(/[\s\n=]/)[0]); } if (!node.attributes.hasDefault(match[1]) && !MmlTokenAllow[match[1]]) { // @test Token Unknown Attribute, Token Wrong Attribute diff --git a/ts/input/tex/base/locales/en.json b/ts/input/tex/base/locales/en.json index ccb7169c1..1cd799b45 100644 --- a/ts/input/tex/base/locales/en.json +++ b/ts/input/tex/base/locales/en.json @@ -1,9 +1,13 @@ { "ExtraLeftMissingRight": "Extra \\left or missing \\right", "ExtraOpenMissingClose": "Extra open brace or missing close brace", + "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "ExtraMiddle": "Extra \\middle", + "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", "MissingScript": "Missing superscript or subscript argument", "MissingOpenForSup": "Missing open brace for superscript", "MissingOpenForSub": "Missing open brace for subscript", + "MissingLeftExtraRight": "Missing \\left or extra \\right", "UnknownEnv": "Unknown environment '%1'", "UndefinedControlSequence": "Undefined control sequence %1", "EnvMissingEnd": "Missing \\end{%1}", diff --git a/ts/input/tex/empheq/EmpheqConfiguration.ts b/ts/input/tex/empheq/EmpheqConfiguration.ts index d9f8e313d..56390547f 100644 --- a/ts/input/tex/empheq/EmpheqConfiguration.ts +++ b/ts/input/tex/empheq/EmpheqConfiguration.ts @@ -66,7 +66,7 @@ export const EmpheqMethods = { .GetArgument('\\begin{' + begin.getName() + '}') .split(/=/); if (!EmpheqUtil.checkEnv(env)) { - throw new TexError(COMPONENT, 'UnknownEnv', env); + throw new TexError(COMPONENT, 'EmpheqInvalidEnv', env, begin.getName()); } begin.setProperty('nestStart', true); if (opts) { diff --git a/ts/input/tex/empheq/locales/en.json b/ts/input/tex/empheq/locales/en.json index f82517b07..a723204a1 100644 --- a/ts/input/tex/empheq/locales/en.json +++ b/ts/input/tex/empheq/locales/en.json @@ -1,3 +1,3 @@ { - "UnknownEnv": "Unknown environment %1" + "EmpheqInvalidEnv": "Invalid environment \"%1\" for %2" } diff --git a/ts/input/tex/mathtools/locales/en.json b/ts/input/tex/mathtools/locales/en.json index d84d6b9aa..a1de77eec 100644 --- a/ts/input/tex/mathtools/locales/en.json +++ b/ts/input/tex/mathtools/locales/en.json @@ -1,5 +1,5 @@ { - "InvalidTagFormDef": "The tag form definition for %1 should be an array of three strings", + "InvalidTagFormDef": "The tag form definition for \"%1\" should be an array of three strings", "ForbiddenMathtoolsSet": "%1 is disabled", "UndefinedTagForm": "Undefined tag form: %1", "TagsNotMT": "%1 can only be used with ams or mathtools tags", From c04381888d8211522f56d912effed8738cdd3023 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 02:12:04 +0200 Subject: [PATCH 15/95] fix missing quotes --- ts/input/tex/setoptions/locales/en.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ts/input/tex/setoptions/locales/en.json b/ts/input/tex/setoptions/locales/en.json index 2e41f1343..38e7756f5 100644 --- a/ts/input/tex/setoptions/locales/en.json +++ b/ts/input/tex/setoptions/locales/en.json @@ -1,8 +1,8 @@ { - "InvalidOptionKey": "Invalid option %1 for package %2", - "InvalidTexOption": "Invalid TeX option %1", - "OptionNotSettable": "Option %1 is not allowed to be set", - "PackageNotSettable": "Options can't be set for package %1", + "InvalidOptionKey": "Invalid option \"%1\" for package \"%2\"", + "InvalidTexOption": "Invalid TeX option \"%1\"", + "OptionNotSettable": "Option \"%1\" is not allowed to be set for package %2", + "PackageNotSettable": "Options can't be set for package \"%1\"", "NotAPackage": "Not a defined package: %1", - "TeXOptionNotSettable": "Option %1 is not allowed to be set" + "TeXOptionNotSettable": "Option \"%1\" is not allowed to be set" } From 0566723a04139f1fa4efabea2d55bdfc71b518a7 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 02:15:58 +0200 Subject: [PATCH 16/95] correct braket error --- ts/input/tex/braket/BraketMethods.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ts/input/tex/braket/BraketMethods.ts b/ts/input/tex/braket/BraketMethods.ts index 53678477b..784f005c7 100644 --- a/ts/input/tex/braket/BraketMethods.ts +++ b/ts/input/tex/braket/BraketMethods.ts @@ -23,13 +23,10 @@ import { ParseMethod, ParseResult } from '../Types.js'; import BaseMethods from '../base/BaseMethods.js'; -import TexError from '../TexError.js'; import TexParser from '../TexParser.js'; import { TEXCLASS } from '../../../core/MmlTree/MmlNode.js'; import { BraketItem } from './BraketItems.js'; -const COMPONENT = '[tex]/braket'; - const BraketMethods: { [key: string]: ParseMethod } = { /** * Generate a bra-ket expression. @@ -44,17 +41,17 @@ const BraketMethods: { [key: string]: ParseMethod } = { */ Braket( parser: TexParser, - _name: string, + name: string, open: string, close: string, stretchy: boolean, barmax: number, space: boolean = false ) { - let next = parser.GetNext(); - if (next === '') { - throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); - } + const i = parser.i; + parser.GetArgument(name); // Error if there isn't a proper argument + parser.i = i; + const next = parser.GetNext(); let single = true; if (next === '{') { parser.i++; From d69a418ec5b09be9f79debb965ab9ddb27601c16 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 02:19:38 +0200 Subject: [PATCH 17/95] correct physics error --- ts/input/tex/physics/PhysicsMethods.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index 3369a515e..52bbceaa3 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -295,7 +295,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { * @param {TexParser} parser The calling parser. * @param {string} name The macro name. */ - Eval(parser: TexParser, _name: string) { + Eval(parser: TexParser, name: string) { const star = parser.GetStar(); const next = parser.GetNext(); if (next === '(' || next === '[') { @@ -310,7 +310,15 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { ); return; } - throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); + let replace = '\\left.\\vphantom{\\int}\\right|'; + if (next === '{') { + const arg = parser.GetArgument(name); + replace = `\\left.${star ? `\\smash{${arg}}` : arg}\\vphantom{\\int}\\right|`; + } + parser.string = + parser.string.substring(0, parser.i) + + replace + + parser.string.slice(parser.i); }, /** From f782ff9494b758af1bae77de5ddbf7665d5151f4 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 03:17:34 +0200 Subject: [PATCH 18/95] fix column parser --- ts/input/tex/ColumnParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/input/tex/ColumnParser.ts b/ts/input/tex/ColumnParser.ts index f939fc37d..e66b6dbc0 100644 --- a/ts/input/tex/ColumnParser.ts +++ b/ts/input/tex/ColumnParser.ts @@ -293,7 +293,7 @@ export class ColumnParser { */ public getBraces(state: ColumnState): string { while (state.template[state.i] === ' ') state.i++; - if (state.i > state.template.length) { + if (state.i >= state.template.length) { throw new TexError(COMPONENT, 'MissingArgForColumn', state.c); } if (state.template[state.i] !== '{') { From d2a6952dec8e4e5d1be46ef549b18b122f36075e Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 03:18:16 +0200 Subject: [PATCH 19/95] fix remaining tex errors --- testsuite/tests/input/tex/Tex.test.ts | 10 +++++----- ts/input/tex/TexError.ts | 4 +--- ts/util/Locale.ts | 11 ++++++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/testsuite/tests/input/tex/Tex.test.ts b/testsuite/tests/input/tex/Tex.test.ts index 01c139fae..a13a21551 100644 --- a/testsuite/tests/input/tex/Tex.test.ts +++ b/testsuite/tests/input/tex/Tex.test.ts @@ -138,22 +138,22 @@ describe('Tags', () => { describe('TexError', () => { test('Number argument', () => { - const err = new TexError('test', 'Number: %1', 1 as any); + const err = new TexError(null, 'test', 'Number: %1', 1 as any); expect(err.message).toBe('Number: 1'); }); test('Braced insertion', () => { - const err = new TexError('test', 'Msg: %{1}, Number: %{2}', 'OK', 2 as any); + const err = new TexError(null, 'test', 'Msg: %{1}, Number: %{2}', 'OK', 2 as any); expect(err.message).toBe('Msg: OK, Number: 2'); }); - test('Plural', () => { - const err = new TexError('test', '%{plural:%1|abc}', 'apple'); + test.skip('Plural', () => { + const err = new TexError(null, 'test', '%{plural:%1|abc}', 'apple'); expect(err.message).toBe('%{plural:%1|abc}'); }); test('Percent', () => { - const err = new TexError('test', '10%%'); + const err = new TexError(null, 'test', '10%%'); expect(err.message).toBe('10%'); }); }); diff --git a/ts/input/tex/TexError.ts b/ts/input/tex/TexError.ts index 0ea647d11..330c2a005 100644 --- a/ts/input/tex/TexError.ts +++ b/ts/input/tex/TexError.ts @@ -36,8 +36,6 @@ export default class TexError { public id: string, ...args: string[] ) { - this.message = component - ? Locale.message(component, id, ...args) - : args.join(' '); + this.message = Locale.message(component, id, ...args); } } diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index bb5a3b381..4723cea84 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -126,7 +126,16 @@ export class Locale { data: string | namedData = {}, ...args: string[] ): string { - const message = this.lookupMessage(component, id); + let message = ''; + if (component) { + message = this.lookupMessage(component, id); + } else { + if (typeof data !== 'string') { + return ''; + } + message = data; + data = args.shift()?.toString() ?? {}; + } if (typeof data === 'string') { data = { 1: data }; for (let i = 0; i < args.length; i++) { From 854c33902e12df24f751b982c69a6fda373c9e9f Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 03:42:33 +0200 Subject: [PATCH 20/95] ensure all locales are copied --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31149dd07..c9da2042e 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "=============================================================================== copy": "", "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:locales $1 && pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", - "copy:locales": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 3 'ts/input/tex/*/locales/*.json' $1/input/tex/extensions; }; copy", + "copy:locales": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 3 'ts/input/tex/locales/*.json' 'ts/input/tex/*/locales/*.json' $1/input/tex/extensions; }; copy", "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy", "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy", "copy:pkg": "copy() { pnpm -s log:single \"Copying package.json to $1\"; pnpm copyfiles -u 2 components/bin/package.json $1; }; copy", From 6ad39a9fd00ed9479197e2cc832214bf7296345a Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 09:33:26 +0200 Subject: [PATCH 21/95] more missing quotes --- ts/input/tex/require/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/input/tex/require/locales/en.json b/ts/input/tex/require/locales/en.json index 887d8b1db..590ebf565 100644 --- a/ts/input/tex/require/locales/en.json +++ b/ts/input/tex/require/locales/en.json @@ -1,5 +1,5 @@ { "BadPackageName": "Argument for %1 is not a valid package name", - "BadRequire": "Extension %1 is not allowed to be loaded", + "BadRequire": "Extension \"%1\" is not allowed to be loaded", "RequireFail": "Extension \"%1\" failed to load" } From 8dc5441d0810906cd408717d359e062322210ce8 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 4 May 2026 09:53:13 +0200 Subject: [PATCH 22/95] add missing locales --- ts/input/tex/begingroup/locales/en.json | 4 ++++ ts/input/tex/textmacros/locales/en.json | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 ts/input/tex/begingroup/locales/en.json create mode 100644 ts/input/tex/textmacros/locales/en.json diff --git a/ts/input/tex/begingroup/locales/en.json b/ts/input/tex/begingroup/locales/en.json new file mode 100644 index 000000000..4823473c2 --- /dev/null +++ b/ts/input/tex/begingroup/locales/en.json @@ -0,0 +1,4 @@ +{ + "MissingBegingroup": "Missing \\begingroup or extra \\endgroup", + "IllegalGlobal": "Invalid use of %1" +} diff --git a/ts/input/tex/textmacros/locales/en.json b/ts/input/tex/textmacros/locales/en.json new file mode 100644 index 000000000..bfc521e69 --- /dev/null +++ b/ts/input/tex/textmacros/locales/en.json @@ -0,0 +1,7 @@ +{ + "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "MathNotTerminated": "Math mode is not properly terminated", + "MathModeOnly": "'%1' allowed only in math mode", + "Misplaced": "Misplaced '%1'", + "MathMacro": "%1 is only supported in math mode" +} From efca1fd5b79fca572d6a7885d10c9d07039dcfb4 Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 09:52:19 +0200 Subject: [PATCH 23/95] refactors the components into a loading structure --- ts/input/tex/ColumnParser.ts | 2 +- ts/input/tex/Configuration.ts | 5 +---- ts/input/tex/ParseUtil.ts | 2 +- ts/input/tex/StackItem.ts | 2 +- ts/input/tex/TexParser.ts | 2 +- ts/input/tex/ams/AmsConfiguration.ts | 5 +---- ts/input/tex/ams/AmsItems.ts | 2 +- ts/input/tex/ams/AmsMethods.ts | 2 +- ts/input/tex/ams/locales/Component.ts | 3 +++ ts/input/tex/base/BaseConfiguration.ts | 5 +---- ts/input/tex/base/BaseItems.ts | 2 +- ts/input/tex/base/BaseMethods.ts | 2 +- ts/input/tex/base/locales/Component.ts | 3 +++ ts/input/tex/bbox/BboxConfiguration.ts | 12 +----------- ts/input/tex/bbox/locales/Component.ts | 3 +++ ts/input/tex/begingroup/BegingroupConfiguration.ts | 5 +---- ts/input/tex/begingroup/BegingroupMethods.ts | 2 +- ts/input/tex/begingroup/BegingroupStack.ts | 2 +- ts/input/tex/begingroup/locales/Component.ts | 3 +++ ts/input/tex/braket/BraketConfiguration.ts | 5 +---- ts/input/tex/braket/locales/Component.ts | 3 +++ ts/input/tex/bussproofs/BussproofsConfiguration.ts | 5 +---- ts/input/tex/bussproofs/BussproofsItems.ts | 2 +- ts/input/tex/bussproofs/BussproofsMethods.ts | 2 +- ts/input/tex/bussproofs/locales/Component.ts | 3 +++ ts/input/tex/cases/CasesConfiguration.ts | 5 +---- ts/input/tex/cases/locales/Component.ts | 3 +++ ts/input/tex/color/ColorConfiguration.ts | 5 +---- ts/input/tex/color/ColorUtil.ts | 2 +- ts/input/tex/color/locales/Component.ts | 3 +++ ts/input/tex/colortbl/ColortblConfiguration.ts | 5 +---- ts/input/tex/colortbl/locales/Component.ts | 3 +++ ts/input/tex/empheq/EmpheqConfiguration.ts | 5 +---- ts/input/tex/empheq/locales/Component.ts | 3 +++ ts/input/tex/extpfeil/ExtpfeilConfiguration.ts | 5 +---- ts/input/tex/extpfeil/locales/Component.ts | 3 +++ ts/input/tex/html/HtmlConfiguration.ts | 5 +---- ts/input/tex/html/HtmlMethods.ts | 2 +- ts/input/tex/html/locales/Component.ts | 3 +++ ts/input/tex/locales/Component.ts | 3 +++ ts/input/tex/mathtools/MathtoolsConfiguration.ts | 5 +---- ts/input/tex/mathtools/MathtoolsMethods.ts | 2 +- ts/input/tex/mathtools/MathtoolsTags.ts | 2 +- ts/input/tex/mathtools/MathtoolsUtil.ts | 2 +- ts/input/tex/mathtools/locales/Component.ts | 3 +++ ts/input/tex/newcommand/NewcommandConfiguration.ts | 5 +---- ts/input/tex/newcommand/NewcommandItems.ts | 2 +- ts/input/tex/newcommand/NewcommandMethods.ts | 2 +- ts/input/tex/newcommand/NewcommandUtil.ts | 2 +- ts/input/tex/newcommand/locales/Component.ts | 3 +++ ts/input/tex/physics/PhysicsConfiguration.ts | 5 +---- ts/input/tex/physics/PhysicsMethods.ts | 2 +- ts/input/tex/physics/locales/Component.ts | 3 +++ ts/input/tex/require/RequireConfiguration.ts | 3 +-- ts/input/tex/require/locales/Component.ts | 3 +++ ts/input/tex/setoptions/SetOptionsConfiguration.ts | 5 +---- ts/input/tex/setoptions/locales/Component.ts | 3 +++ ts/input/tex/texhtml/TexHtmlConfiguration.ts | 5 +---- ts/input/tex/texhtml/locales/Component.ts | 3 +++ ts/input/tex/textmacros/TextMacrosConfiguration.ts | 5 +---- ts/input/tex/textmacros/TextMacrosMethods.ts | 2 +- ts/input/tex/textmacros/locales/Component.ts | 3 +++ ts/input/tex/unicode/UnicodeConfiguration.ts | 5 +---- ts/input/tex/unicode/locales/Component.ts | 3 +++ ts/input/tex/verb/VerbConfiguration.ts | 5 +---- ts/input/tex/verb/locales/Component.ts | 3 +++ 66 files changed, 110 insertions(+), 115 deletions(-) create mode 100644 ts/input/tex/ams/locales/Component.ts create mode 100644 ts/input/tex/base/locales/Component.ts create mode 100644 ts/input/tex/bbox/locales/Component.ts create mode 100644 ts/input/tex/begingroup/locales/Component.ts create mode 100644 ts/input/tex/braket/locales/Component.ts create mode 100644 ts/input/tex/bussproofs/locales/Component.ts create mode 100644 ts/input/tex/cases/locales/Component.ts create mode 100644 ts/input/tex/color/locales/Component.ts create mode 100644 ts/input/tex/colortbl/locales/Component.ts create mode 100644 ts/input/tex/empheq/locales/Component.ts create mode 100644 ts/input/tex/extpfeil/locales/Component.ts create mode 100644 ts/input/tex/html/locales/Component.ts create mode 100644 ts/input/tex/locales/Component.ts create mode 100644 ts/input/tex/mathtools/locales/Component.ts create mode 100644 ts/input/tex/newcommand/locales/Component.ts create mode 100644 ts/input/tex/physics/locales/Component.ts create mode 100644 ts/input/tex/require/locales/Component.ts create mode 100644 ts/input/tex/setoptions/locales/Component.ts create mode 100644 ts/input/tex/texhtml/locales/Component.ts create mode 100644 ts/input/tex/textmacros/locales/Component.ts create mode 100644 ts/input/tex/unicode/locales/Component.ts create mode 100644 ts/input/tex/verb/locales/Component.ts diff --git a/ts/input/tex/ColumnParser.ts b/ts/input/tex/ColumnParser.ts index e66b6dbc0..181c3bfd4 100644 --- a/ts/input/tex/ColumnParser.ts +++ b/ts/input/tex/ColumnParser.ts @@ -28,7 +28,7 @@ import { lookup } from '../../util/Options.js'; import { ParseUtil } from './ParseUtil.js'; import { UnitUtil } from './UnitUtil.js'; -const COMPONENT = '[tex]'; +import { COMPONENT } from './locales/Component.js'; /***********************************************************************/ diff --git a/ts/input/tex/Configuration.ts b/ts/input/tex/Configuration.ts index a1e70de05..d55b90a7d 100644 --- a/ts/input/tex/Configuration.ts +++ b/ts/input/tex/Configuration.ts @@ -31,10 +31,7 @@ import { FunctionList } from '../../util/FunctionList.js'; import { TeX } from '../tex.js'; import { PrioritizedList } from '../../util/PrioritizedList.js'; import { TagsFactory } from './Tags.js'; -import { Locale } from '../../util/Locale.js'; - -export const COMPONENT = '[tex]'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex'); +export { COMPONENT } from './locales/Component.js'; export type StackItemConfig = { [kind: string]: StackItemClass }; export type TagsConfig = { [kind: string]: TagsClass }; diff --git a/ts/input/tex/ParseUtil.ts b/ts/input/tex/ParseUtil.ts index dd9b7253e..19f1d74f4 100644 --- a/ts/input/tex/ParseUtil.ts +++ b/ts/input/tex/ParseUtil.ts @@ -32,7 +32,7 @@ import { entities } from '../../util/Entities.js'; import { MmlMunderover } from '../../core/MmlTree/MmlNodes/munderover.js'; import { UnitUtil } from './UnitUtil.js'; -const COMPONENT = '[tex]'; +import { COMPONENT } from './locales/Component.js'; /** * The data needed for checking the value of a key-value pair. diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index 82430e492..f32b32746 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -27,7 +27,7 @@ import TexError from './TexError.js'; import StackItemFactory from './StackItemFactory.js'; import { TexConstant } from './TexConstants.js'; -const COMPONENT = '[tex]/base'; +import { COMPONENT } from './base/locales/Component.js'; // Union types for abbreviation. export type EnvProp = string | number | boolean; diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index ad2047dd1..ef4628c3d 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -36,7 +36,7 @@ import { Token } from './Token.js'; import { OptionList } from '../../util/Options.js'; import { TexConstant } from './TexConstants.js'; -const COMPONENT = '[tex]'; +import { COMPONENT } from './locales/Component.js'; /** * The main Tex Parser class. diff --git a/ts/input/tex/ams/AmsConfiguration.ts b/ts/input/tex/ams/AmsConfiguration.ts index 2c658c0a5..6786e8e44 100644 --- a/ts/input/tex/ams/AmsConfiguration.ts +++ b/ts/input/tex/ams/AmsConfiguration.ts @@ -27,10 +27,7 @@ import { MultlineItem, FlalignItem } from './AmsItems.js'; import { AbstractTags } from '../Tags.js'; import './AmsMappings.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/ams'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/ams'); +export { COMPONENT } from './locales/Component.js'; /** * Standard AMS style tagging. diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts index a4b2a5f16..2396a0bd5 100644 --- a/ts/input/tex/ams/AmsItems.ts +++ b/ts/input/tex/ams/AmsItems.ts @@ -29,7 +29,7 @@ import { TexConstant } from '../TexConstants.js'; import StackItemFactory from '../StackItemFactory.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; -const COMPONENT = '[tex]/ams'; +import { COMPONENT } from './locales/Component.js'; /** * Item dealing with multiline environments as a special case of arrays. Note, diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index 93e26bee5..ca4a24efe 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -42,7 +42,7 @@ import { } from '../../../core/MmlTree/MmlNode.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; -const COMPONENT = '[tex]/ams'; +import { COMPONENT } from './locales/Component.js'; /** * Utility for breaking the \sideset scripts from any other material. diff --git a/ts/input/tex/ams/locales/Component.ts b/ts/input/tex/ams/locales/Component.ts new file mode 100644 index 000000000..3e7ec5e52 --- /dev/null +++ b/ts/input/tex/ams/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/ams'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/ams'); diff --git a/ts/input/tex/base/BaseConfiguration.ts b/ts/input/tex/base/BaseConfiguration.ts index 262c91164..e8af0037a 100644 --- a/ts/input/tex/base/BaseConfiguration.ts +++ b/ts/input/tex/base/BaseConfiguration.ts @@ -37,10 +37,7 @@ import ParseMethods from '../ParseMethods.js'; import { ParseUtil } from '../ParseUtil.js'; import { TexConstant } from '../TexConstants.js'; import { context } from '../../../util/context.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/base'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/base'); +export { COMPONENT } from './locales/Component.js'; const MATHVARIANT = TexConstant.Variant; diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index f0a4ef4ef..0b08cf225 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -39,7 +39,7 @@ import { CheckType, BaseItem, StackItem, EnvList } from '../StackItem.js'; import { TRBL } from '../../../util/Styles.js'; import { TexConstant } from '../TexConstants.js'; -const COMPONENT = '[tex]/base'; +import { COMPONENT } from './locales/Component.js'; /** * Initial item on the stack. It's pushed when parsing begins. diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index 114961dc1..8cafdc66a 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -44,7 +44,7 @@ import { lookup } from '../../../util/Options.js'; import { ColumnState } from '../ColumnParser.js'; import { replaceUnicode } from '../../../util/string.js'; -const COMPONENT = '[tex]/base'; +import { COMPONENT } from './locales/Component.js'; const P_HEIGHT = 1.2 / 0.85; // cmex10 height plus depth over .85 const MmlTokenAllow: { [key: string]: number } = { diff --git a/ts/input/tex/base/locales/Component.ts b/ts/input/tex/base/locales/Component.ts new file mode 100644 index 000000000..7195884dd --- /dev/null +++ b/ts/input/tex/base/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/base'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/base'); diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index a41dfaf9a..0c1bb9fa4 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -27,17 +27,7 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; -import { Locale } from '../../../util/Locale.js'; - -/** - * The component name - */ -export const COMPONENT = '[tex]/bbox'; - -/** - * Register the locales - */ -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); +export { COMPONENT } from './locales/Component.js'; // Namespace const BboxMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/bbox/locales/Component.ts b/ts/input/tex/bbox/locales/Component.ts new file mode 100644 index 000000000..f87df018d --- /dev/null +++ b/ts/input/tex/bbox/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/bbox'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); diff --git a/ts/input/tex/begingroup/BegingroupConfiguration.ts b/ts/input/tex/begingroup/BegingroupConfiguration.ts index d29eaed54..9e70764ee 100644 --- a/ts/input/tex/begingroup/BegingroupConfiguration.ts +++ b/ts/input/tex/begingroup/BegingroupConfiguration.ts @@ -26,10 +26,7 @@ import { Configuration } from '../Configuration.js'; import { CommandMap } from '../TokenMap.js'; import { BegingroupStack, begingroupStack } from './BegingroupStack.js'; import { BegingroupMethods } from './BegingroupMethods.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/begingroup'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/begingroup'); +export { COMPONENT } from './locales/Component.js'; /** * Create the begingroup command map. diff --git a/ts/input/tex/begingroup/BegingroupMethods.ts b/ts/input/tex/begingroup/BegingroupMethods.ts index bad8bc931..4061dc4ab 100644 --- a/ts/input/tex/begingroup/BegingroupMethods.ts +++ b/ts/input/tex/begingroup/BegingroupMethods.ts @@ -25,7 +25,7 @@ import { CommandMap } from '../TokenMap.js'; import TexParser from '../TexParser.js'; import TexError from '../TexError.js'; -const COMPONENT = '[tex]/begingroup'; +import { COMPONENT } from './locales/Component.js'; import BaseMethods from '../base/BaseMethods.js'; import { begingroupStack } from './BegingroupStack.js'; diff --git a/ts/input/tex/begingroup/BegingroupStack.ts b/ts/input/tex/begingroup/BegingroupStack.ts index c0fcb2bb3..345f74d8f 100644 --- a/ts/input/tex/begingroup/BegingroupStack.ts +++ b/ts/input/tex/begingroup/BegingroupStack.ts @@ -33,7 +33,7 @@ import { Token } from '../Token.js'; import { MapHandler, SubHandlers } from '../MapHandler.js'; import TexError from '../TexError.js'; -const COMPONENT = '[tex]/begingroup'; +import { COMPONENT } from './locales/Component.js'; import { NewcommandTables as NT, NewcommandPriority, diff --git a/ts/input/tex/begingroup/locales/Component.ts b/ts/input/tex/begingroup/locales/Component.ts new file mode 100644 index 000000000..b1d603b60 --- /dev/null +++ b/ts/input/tex/begingroup/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/begingroup'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/begingroup'); diff --git a/ts/input/tex/braket/BraketConfiguration.ts b/ts/input/tex/braket/BraketConfiguration.ts index 6000ab23e..b98971f77 100644 --- a/ts/input/tex/braket/BraketConfiguration.ts +++ b/ts/input/tex/braket/BraketConfiguration.ts @@ -25,10 +25,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { BraketItem } from './BraketItems.js'; import './BraketMappings.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/braket'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/braket'); +export { COMPONENT } from './locales/Component.js'; export const BraketConfiguration = Configuration.create('braket', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/braket/locales/Component.ts b/ts/input/tex/braket/locales/Component.ts new file mode 100644 index 000000000..e41deae98 --- /dev/null +++ b/ts/input/tex/braket/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/braket'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/braket'); diff --git a/ts/input/tex/bussproofs/BussproofsConfiguration.ts b/ts/input/tex/bussproofs/BussproofsConfiguration.ts index 4dcb8f994..ccc9a8712 100644 --- a/ts/input/tex/bussproofs/BussproofsConfiguration.ts +++ b/ts/input/tex/bussproofs/BussproofsConfiguration.ts @@ -31,10 +31,7 @@ import { makeBsprAttributes, } from './BussproofsUtil.js'; import './BussproofsMappings.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/bussproofs'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bussproofs'); +export { COMPONENT } from './locales/Component.js'; export const BussproofsConfiguration = Configuration.create('bussproofs', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/bussproofs/BussproofsItems.ts b/ts/input/tex/bussproofs/BussproofsItems.ts index e3d868e8f..fd47bf814 100644 --- a/ts/input/tex/bussproofs/BussproofsItems.ts +++ b/ts/input/tex/bussproofs/BussproofsItems.ts @@ -27,7 +27,7 @@ import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import Stack from '../Stack.js'; import * as BussproofsUtil from './BussproofsUtil.js'; -const COMPONENT = '[tex]/bussproofs'; +import { COMPONENT } from './locales/Component.js'; export class ProofTreeItem extends BaseItem { /** diff --git a/ts/input/tex/bussproofs/BussproofsMethods.ts b/ts/input/tex/bussproofs/BussproofsMethods.ts index db22fb891..338a2e126 100644 --- a/ts/input/tex/bussproofs/BussproofsMethods.ts +++ b/ts/input/tex/bussproofs/BussproofsMethods.ts @@ -30,7 +30,7 @@ import { StackItem } from '../StackItem.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import * as BussproofsUtil from './BussproofsUtil.js'; -const COMPONENT = '[tex]/bussproofs'; +import { COMPONENT } from './locales/Component.js'; /** * Pads content of an inference rule. diff --git a/ts/input/tex/bussproofs/locales/Component.ts b/ts/input/tex/bussproofs/locales/Component.ts new file mode 100644 index 000000000..b71f7a063 --- /dev/null +++ b/ts/input/tex/bussproofs/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/bussproofs'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bussproofs'); diff --git a/ts/input/tex/cases/CasesConfiguration.ts b/ts/input/tex/cases/CasesConfiguration.ts index fdfa9ccf3..446b162ab 100644 --- a/ts/input/tex/cases/CasesConfiguration.ts +++ b/ts/input/tex/cases/CasesConfiguration.ts @@ -11,10 +11,7 @@ import { AmsTags } from '../ams/AmsConfiguration.js'; import { StackItem, CheckType } from '../StackItem.js'; import { MmlMtable } from '../../../core/MmlTree/MmlNodes/mtable.js'; import { EmpheqUtil } from '../empheq/EmpheqUtil.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/cases'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/cases'); +export { COMPONENT } from './locales/Component.js'; /** * The StackItem for the numcases environment. diff --git a/ts/input/tex/cases/locales/Component.ts b/ts/input/tex/cases/locales/Component.ts new file mode 100644 index 000000000..f28b3ad74 --- /dev/null +++ b/ts/input/tex/cases/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/cases'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/cases'); diff --git a/ts/input/tex/color/ColorConfiguration.ts b/ts/input/tex/color/ColorConfiguration.ts index b3f2220c5..7aa529040 100644 --- a/ts/input/tex/color/ColorConfiguration.ts +++ b/ts/input/tex/color/ColorConfiguration.ts @@ -27,10 +27,7 @@ import { Configuration, ParserConfiguration } from '../Configuration.js'; import { ColorMethods } from './ColorMethods.js'; import { ColorModel } from './ColorUtil.js'; import { TeX } from '../../tex.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/color'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/color'); +export { COMPONENT } from './locales/Component.js'; /** * The color macros diff --git a/ts/input/tex/color/ColorUtil.ts b/ts/input/tex/color/ColorUtil.ts index 759064caf..e2c92734c 100644 --- a/ts/input/tex/color/ColorUtil.ts +++ b/ts/input/tex/color/ColorUtil.ts @@ -24,7 +24,7 @@ import TexError from '../TexError.js'; import { COLORS } from './ColorConstants.js'; -const COMPONENT = '[tex]/color'; +import { COMPONENT } from './locales/Component.js'; type ColorModelProcessor = (def: string) => string; const ColorModelProcessors: Map = new Map< diff --git a/ts/input/tex/color/locales/Component.ts b/ts/input/tex/color/locales/Component.ts new file mode 100644 index 000000000..7b3468fb6 --- /dev/null +++ b/ts/input/tex/color/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/color'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/color'); diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts index af05d8500..74c6a3ce5 100644 --- a/ts/input/tex/colortbl/ColortblConfiguration.ts +++ b/ts/input/tex/colortbl/ColortblConfiguration.ts @@ -33,10 +33,7 @@ import TexParser from '../TexParser.js'; import TexError from '../TexError.js'; import { TeX } from '../../tex.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/colortbl'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/colortbl'); +export { COMPONENT } from './locales/Component.js'; /** * Information about table colors. diff --git a/ts/input/tex/colortbl/locales/Component.ts b/ts/input/tex/colortbl/locales/Component.ts new file mode 100644 index 000000000..4bcd0d79c --- /dev/null +++ b/ts/input/tex/colortbl/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/colortbl'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/colortbl'); diff --git a/ts/input/tex/empheq/EmpheqConfiguration.ts b/ts/input/tex/empheq/EmpheqConfiguration.ts index 56390547f..7b37de641 100644 --- a/ts/input/tex/empheq/EmpheqConfiguration.ts +++ b/ts/input/tex/empheq/EmpheqConfiguration.ts @@ -30,10 +30,7 @@ import TexError from '../TexError.js'; import { BeginItem } from '../base/BaseItems.js'; import { EmpheqUtil } from './EmpheqUtil.js'; import ParseMethods from '../ParseMethods.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/empheq'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/empheq'); +export { COMPONENT } from './locales/Component.js'; /** * The methods that implement the empheq package. diff --git a/ts/input/tex/empheq/locales/Component.ts b/ts/input/tex/empheq/locales/Component.ts new file mode 100644 index 000000000..bc17292c7 --- /dev/null +++ b/ts/input/tex/empheq/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/empheq'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/empheq'); diff --git a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts index 2c17a3fda..41e62f653 100644 --- a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts +++ b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts @@ -31,10 +31,7 @@ import { AmsMethods } from '../ams/AmsMethods.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; import TexError from '../TexError.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/extpfeil'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/extpfeil'); +export { COMPONENT } from './locales/Component.js'; // Namespace const ExtpfeilMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/extpfeil/locales/Component.ts b/ts/input/tex/extpfeil/locales/Component.ts new file mode 100644 index 000000000..50a07a5b2 --- /dev/null +++ b/ts/input/tex/extpfeil/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/extpfeil'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/extpfeil'); diff --git a/ts/input/tex/html/HtmlConfiguration.ts b/ts/input/tex/html/HtmlConfiguration.ts index 282d2816c..5f2257c13 100644 --- a/ts/input/tex/html/HtmlConfiguration.ts +++ b/ts/input/tex/html/HtmlConfiguration.ts @@ -25,10 +25,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { CommandMap } from '../TokenMap.js'; import HtmlMethods from './HtmlMethods.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/html'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/html'); +export { COMPONENT } from './locales/Component.js'; new CommandMap('html_macros', { data: HtmlMethods.Data, diff --git a/ts/input/tex/html/HtmlMethods.ts b/ts/input/tex/html/HtmlMethods.ts index c5056967b..7ac4a3a45 100644 --- a/ts/input/tex/html/HtmlMethods.ts +++ b/ts/input/tex/html/HtmlMethods.ts @@ -28,7 +28,7 @@ import { ParseUtil } from '../ParseUtil.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import TexError from '../TexError.js'; -const COMPONENT = '[tex]/html'; +import { COMPONENT } from './locales/Component.js'; /** Regexp for matching non-characters as specified by {@link https://infra.spec.whatwg.org/#noncharacter}. */ const nonCharacterRegexp = diff --git a/ts/input/tex/html/locales/Component.ts b/ts/input/tex/html/locales/Component.ts new file mode 100644 index 000000000..91e4fee65 --- /dev/null +++ b/ts/input/tex/html/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/html'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/html'); diff --git a/ts/input/tex/locales/Component.ts b/ts/input/tex/locales/Component.ts new file mode 100644 index 000000000..f787ce84e --- /dev/null +++ b/ts/input/tex/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../util/Locale.js'; +export const COMPONENT = '[tex]'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex'); diff --git a/ts/input/tex/mathtools/MathtoolsConfiguration.ts b/ts/input/tex/mathtools/MathtoolsConfiguration.ts index 84720de49..b3e551c1a 100644 --- a/ts/input/tex/mathtools/MathtoolsConfiguration.ts +++ b/ts/input/tex/mathtools/MathtoolsConfiguration.ts @@ -42,10 +42,7 @@ import { } from './MathtoolsMethods.js'; import { MathtoolsTagFormat } from './MathtoolsTags.js'; import { MultlinedItem } from './MathtoolsItems.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/mathtools'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mathtools'); +export { COMPONENT } from './locales/Component.js'; /** * Add any pre-defined paired delimiters, and subclass the configured tag format. diff --git a/ts/input/tex/mathtools/MathtoolsMethods.ts b/ts/input/tex/mathtools/MathtoolsMethods.ts index fe99bd69a..6cb21026c 100644 --- a/ts/input/tex/mathtools/MathtoolsMethods.ts +++ b/ts/input/tex/mathtools/MathtoolsMethods.ts @@ -47,7 +47,7 @@ import { PrioritizedList } from '../../../util/PrioritizedList.js'; import { MathtoolsTags } from './MathtoolsTags.js'; import { MathtoolsUtil } from './MathtoolsUtil.js'; -const COMPONENT = '[tex]/mathtools'; +import { COMPONENT } from './locales/Component.js'; export const LEGACYCONFIG = { [HandlerType.MACRO]: ['mathtools-legacycolonsymbols'], diff --git a/ts/input/tex/mathtools/MathtoolsTags.ts b/ts/input/tex/mathtools/MathtoolsTags.ts index e7eab5ddd..c9d29ec9b 100644 --- a/ts/input/tex/mathtools/MathtoolsTags.ts +++ b/ts/input/tex/mathtools/MathtoolsTags.ts @@ -25,7 +25,7 @@ import { ParserConfiguration } from '../Configuration.js'; import { TeX } from '../../tex.js'; import { AbstractTags, TagsFactory } from '../Tags.js'; -const COMPONENT = '[tex]/mathtools'; +import { COMPONENT } from './locales/Component.js'; /** * The type for the Mathtools tags (including their data). diff --git a/ts/input/tex/mathtools/MathtoolsUtil.ts b/ts/input/tex/mathtools/MathtoolsUtil.ts index 3f51fb86f..221df9fe9 100644 --- a/ts/input/tex/mathtools/MathtoolsUtil.ts +++ b/ts/input/tex/mathtools/MathtoolsUtil.ts @@ -31,7 +31,7 @@ import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { MathtoolsMethods } from './MathtoolsMethods.js'; -const COMPONENT = '[tex]/mathtools'; +import { COMPONENT } from './locales/Component.js'; /** * Utility functions for the Mathtools package. diff --git a/ts/input/tex/mathtools/locales/Component.ts b/ts/input/tex/mathtools/locales/Component.ts new file mode 100644 index 000000000..2f51f7690 --- /dev/null +++ b/ts/input/tex/mathtools/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/mathtools'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mathtools'); diff --git a/ts/input/tex/newcommand/NewcommandConfiguration.ts b/ts/input/tex/newcommand/NewcommandConfiguration.ts index 3a05ea9ea..8f35a3a7a 100644 --- a/ts/input/tex/newcommand/NewcommandConfiguration.ts +++ b/ts/input/tex/newcommand/NewcommandConfiguration.ts @@ -29,10 +29,7 @@ import { NewcommandTables, NewcommandPriority } from './NewcommandUtil.js'; import './NewcommandMappings.js'; import ParseMethods from '../ParseMethods.js'; import * as sm from '../TokenMap.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/newcommand'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/newcommand'); +export { COMPONENT } from './locales/Component.js'; /** * Initialize the newcommand maps for delimiters, commands, and environments, diff --git a/ts/input/tex/newcommand/NewcommandItems.ts b/ts/input/tex/newcommand/NewcommandItems.ts index 7515499d7..98bcdee44 100644 --- a/ts/input/tex/newcommand/NewcommandItems.ts +++ b/ts/input/tex/newcommand/NewcommandItems.ts @@ -24,7 +24,7 @@ import TexError from '../TexError.js'; import { CheckType, BaseItem, StackItem } from '../StackItem.js'; -const COMPONENT = '[tex]/newcommand'; +import { COMPONENT } from './locales/Component.js'; /** * Opening Item dealing with definitions of new environments. It's pushed onto diff --git a/ts/input/tex/newcommand/NewcommandMethods.ts b/ts/input/tex/newcommand/NewcommandMethods.ts index 1f25e9095..4acffaf71 100644 --- a/ts/input/tex/newcommand/NewcommandMethods.ts +++ b/ts/input/tex/newcommand/NewcommandMethods.ts @@ -33,7 +33,7 @@ import { UnitUtil } from '../UnitUtil.js'; import { StackItem } from '../StackItem.js'; import { NewcommandUtil } from './NewcommandUtil.js'; -const COMPONENT = '[tex]/newcommand'; +import { COMPONENT } from './locales/Component.js'; // Namespace const NewcommandMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/newcommand/NewcommandUtil.ts b/ts/input/tex/newcommand/NewcommandUtil.ts index eaaba8339..2670dbca7 100644 --- a/ts/input/tex/newcommand/NewcommandUtil.ts +++ b/ts/input/tex/newcommand/NewcommandUtil.ts @@ -30,7 +30,7 @@ import { Macro, Token } from '../Token.js'; import { Args, Attributes, ParseMethod } from '../Types.js'; import * as tm from '../TokenMap.js'; -const COMPONENT = '[tex]/newcommand'; +import { COMPONENT } from './locales/Component.js'; /** * Naming constants for the extension mappings. diff --git a/ts/input/tex/newcommand/locales/Component.ts b/ts/input/tex/newcommand/locales/Component.ts new file mode 100644 index 000000000..c96ded494 --- /dev/null +++ b/ts/input/tex/newcommand/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/newcommand'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/newcommand'); diff --git a/ts/input/tex/physics/PhysicsConfiguration.ts b/ts/input/tex/physics/PhysicsConfiguration.ts index cde9fba46..4e860a4af 100644 --- a/ts/input/tex/physics/PhysicsConfiguration.ts +++ b/ts/input/tex/physics/PhysicsConfiguration.ts @@ -25,10 +25,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { AutoOpen } from './PhysicsItems.js'; import './PhysicsMappings.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/physics'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/physics'); +export { COMPONENT } from './locales/Component.js'; export const PhysicsConfiguration = Configuration.create('physics', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index 52bbceaa3..27ed70878 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -33,7 +33,7 @@ import { NodeFactory } from '../NodeFactory.js'; import { Macro } from '../Token.js'; import { AutoOpen } from './PhysicsItems.js'; -const COMPONENT = '[tex]/physics'; +import { COMPONENT } from './locales/Component.js'; /** * Pairs open and closed fences. diff --git a/ts/input/tex/physics/locales/Component.ts b/ts/input/tex/physics/locales/Component.ts new file mode 100644 index 000000000..ba060707c --- /dev/null +++ b/ts/input/tex/physics/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/physics'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/physics'); diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 5eb166cab..51809d284 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -41,8 +41,7 @@ import { expandable } from '../../../util/Options.js'; import { MenuMathDocument } from '../../../ui/menu/MenuHandler.js'; import { Locale } from '../../../util/Locale.js'; -export const COMPONENT = '[tex]/require'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/require'); +export { COMPONENT } from './locales/Component.js'; /** * The MathJax configuration block (for looking up user-defined package options) diff --git a/ts/input/tex/require/locales/Component.ts b/ts/input/tex/require/locales/Component.ts new file mode 100644 index 000000000..1b80abc0e --- /dev/null +++ b/ts/input/tex/require/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/require'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/require'); diff --git a/ts/input/tex/setoptions/SetOptionsConfiguration.ts b/ts/input/tex/setoptions/SetOptionsConfiguration.ts index 121034bf2..849965eda 100644 --- a/ts/input/tex/setoptions/SetOptionsConfiguration.ts +++ b/ts/input/tex/setoptions/SetOptionsConfiguration.ts @@ -36,10 +36,7 @@ import { Macro } from '../Token.js'; import BaseMethods from '../base/BaseMethods.js'; import { expandable, isObject } from '../../../util/Options.js'; import { PrioritizedList } from '../../../util/PrioritizedList.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/setoptions'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/setoptions'); +export { COMPONENT } from './locales/Component.js'; export const SetOptionsUtil = { /** diff --git a/ts/input/tex/setoptions/locales/Component.ts b/ts/input/tex/setoptions/locales/Component.ts new file mode 100644 index 000000000..21c1d0781 --- /dev/null +++ b/ts/input/tex/setoptions/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/setoptions'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/setoptions'); diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 556a073cc..532497221 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -32,10 +32,7 @@ import { HTMLDocument } from '../../../handlers/html/HTMLDocument.js'; import { HtmlNode } from '../../../core/MmlTree/MmlNodes/HtmlNode.js'; import { HTMLDomStrings } from '../../../handlers/html/HTMLDomStrings.js'; import { DOMAdaptor } from '../../../core/DOMAdaptor.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/texhtml'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/texhtml'); +export { COMPONENT } from './locales/Component.js'; export const HtmlNodeMethods: { [key: string]: ParseMethod } = { /** diff --git a/ts/input/tex/texhtml/locales/Component.ts b/ts/input/tex/texhtml/locales/Component.ts new file mode 100644 index 000000000..37d3204a5 --- /dev/null +++ b/ts/input/tex/texhtml/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/texhtml'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/texhtml'); diff --git a/ts/input/tex/textmacros/TextMacrosConfiguration.ts b/ts/input/tex/textmacros/TextMacrosConfiguration.ts index a8d606566..faabdef0a 100644 --- a/ts/input/tex/textmacros/TextMacrosConfiguration.ts +++ b/ts/input/tex/textmacros/TextMacrosConfiguration.ts @@ -31,10 +31,7 @@ import { StartItem, StopItem, MmlItem, StyleItem } from '../base/BaseItems.js'; import { TextParser } from './TextParser.js'; import { TextMacrosMethods } from './TextMacrosMethods.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/textmacros'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/textmacros'); +export { COMPONENT } from './locales/Component.js'; import './TextMacrosMappings.js'; diff --git a/ts/input/tex/textmacros/TextMacrosMethods.ts b/ts/input/tex/textmacros/TextMacrosMethods.ts index b89d9a006..090cc5112 100644 --- a/ts/input/tex/textmacros/TextMacrosMethods.ts +++ b/ts/input/tex/textmacros/TextMacrosMethods.ts @@ -27,7 +27,7 @@ import { retryAfter } from '../../../util/Retries.js'; import { TextParser } from './TextParser.js'; import BaseMethods from '../base/BaseMethods.js'; -const COMPONENT = '[tex]/textmacros'; +import { COMPONENT } from './locales/Component.js'; /** * The methods used to implement the text-mode macros diff --git a/ts/input/tex/textmacros/locales/Component.ts b/ts/input/tex/textmacros/locales/Component.ts new file mode 100644 index 000000000..9bac95be7 --- /dev/null +++ b/ts/input/tex/textmacros/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/textmacros'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/textmacros'); diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index 74e9ac089..bb102a498 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -32,10 +32,7 @@ import { UnitUtil } from '../UnitUtil.js'; import NodeUtil from '../NodeUtil.js'; import { numeric } from '../../../util/Entities.js'; import { Other } from '../base/BaseConfiguration.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/unicode'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/unicode'); +export { COMPONENT } from './locales/Component.js'; const UnicodeCache: { [key: number]: [number, number, string, number] } = {}; diff --git a/ts/input/tex/unicode/locales/Component.ts b/ts/input/tex/unicode/locales/Component.ts new file mode 100644 index 000000000..9f82001bb --- /dev/null +++ b/ts/input/tex/unicode/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/unicode'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/unicode'); diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 5fab39b1b..44b888bf3 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -28,10 +28,7 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; -import { Locale } from '../../../util/Locale.js'; - -export const COMPONENT = '[tex]/verb'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/verb'); +export { COMPONENT } from './locales/Component.js'; // Namespace const VerbMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/verb/locales/Component.ts b/ts/input/tex/verb/locales/Component.ts new file mode 100644 index 000000000..1b60984ec --- /dev/null +++ b/ts/input/tex/verb/locales/Component.ts @@ -0,0 +1,3 @@ +import { Locale } from '../../../../util/Locale.js'; +export const COMPONENT = '[tex]/verb'; +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/verb'); From 156707850995034a4cfa78ebbbc4a776e462e3a1 Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 10:01:08 +0200 Subject: [PATCH 24/95] add missing copyright messages to files --- ts/input/tex/ams/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/base/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/bbox/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/begingroup/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/braket/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/bussproofs/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/cases/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/color/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/colortbl/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/empheq/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/extpfeil/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/html/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/mathtools/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/newcommand/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/physics/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/require/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/setoptions/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/texhtml/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/textmacros/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/unicode/locales/Component.ts | 23 ++++++++++++++++++++ ts/input/tex/verb/locales/Component.ts | 23 ++++++++++++++++++++ 22 files changed, 506 insertions(+) diff --git a/ts/input/tex/ams/locales/Component.ts b/ts/input/tex/ams/locales/Component.ts index 3e7ec5e52..f20889020 100644 --- a/ts/input/tex/ams/locales/Component.ts +++ b/ts/input/tex/ams/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/ams + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/ams'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/ams'); diff --git a/ts/input/tex/base/locales/Component.ts b/ts/input/tex/base/locales/Component.ts index 7195884dd..23b71f391 100644 --- a/ts/input/tex/base/locales/Component.ts +++ b/ts/input/tex/base/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/base + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/base'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/base'); diff --git a/ts/input/tex/bbox/locales/Component.ts b/ts/input/tex/bbox/locales/Component.ts index f87df018d..6cadf78d9 100644 --- a/ts/input/tex/bbox/locales/Component.ts +++ b/ts/input/tex/bbox/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/bbox + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/bbox'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); diff --git a/ts/input/tex/begingroup/locales/Component.ts b/ts/input/tex/begingroup/locales/Component.ts index b1d603b60..396fb5598 100644 --- a/ts/input/tex/begingroup/locales/Component.ts +++ b/ts/input/tex/begingroup/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/begingroup + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/begingroup'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/begingroup'); diff --git a/ts/input/tex/braket/locales/Component.ts b/ts/input/tex/braket/locales/Component.ts index e41deae98..308f548c7 100644 --- a/ts/input/tex/braket/locales/Component.ts +++ b/ts/input/tex/braket/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/braket + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/braket'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/braket'); diff --git a/ts/input/tex/bussproofs/locales/Component.ts b/ts/input/tex/bussproofs/locales/Component.ts index b71f7a063..8ff866ba3 100644 --- a/ts/input/tex/bussproofs/locales/Component.ts +++ b/ts/input/tex/bussproofs/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/bussproofs + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/bussproofs'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bussproofs'); diff --git a/ts/input/tex/cases/locales/Component.ts b/ts/input/tex/cases/locales/Component.ts index f28b3ad74..bbfb0e6ad 100644 --- a/ts/input/tex/cases/locales/Component.ts +++ b/ts/input/tex/cases/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/cases + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/cases'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/cases'); diff --git a/ts/input/tex/color/locales/Component.ts b/ts/input/tex/color/locales/Component.ts index 7b3468fb6..4a8eba242 100644 --- a/ts/input/tex/color/locales/Component.ts +++ b/ts/input/tex/color/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/color + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/color'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/color'); diff --git a/ts/input/tex/colortbl/locales/Component.ts b/ts/input/tex/colortbl/locales/Component.ts index 4bcd0d79c..32279e00c 100644 --- a/ts/input/tex/colortbl/locales/Component.ts +++ b/ts/input/tex/colortbl/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/colortbl + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/colortbl'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/colortbl'); diff --git a/ts/input/tex/empheq/locales/Component.ts b/ts/input/tex/empheq/locales/Component.ts index bc17292c7..b1d0709b1 100644 --- a/ts/input/tex/empheq/locales/Component.ts +++ b/ts/input/tex/empheq/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/empheq + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/empheq'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/empheq'); diff --git a/ts/input/tex/extpfeil/locales/Component.ts b/ts/input/tex/extpfeil/locales/Component.ts index 50a07a5b2..c7374ac3f 100644 --- a/ts/input/tex/extpfeil/locales/Component.ts +++ b/ts/input/tex/extpfeil/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/extpfeil + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/extpfeil'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/extpfeil'); diff --git a/ts/input/tex/html/locales/Component.ts b/ts/input/tex/html/locales/Component.ts index 91e4fee65..97fb74931 100644 --- a/ts/input/tex/html/locales/Component.ts +++ b/ts/input/tex/html/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/html + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/html'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/html'); diff --git a/ts/input/tex/locales/Component.ts b/ts/input/tex/locales/Component.ts index f787ce84e..77c17353c 100644 --- a/ts/input/tex/locales/Component.ts +++ b/ts/input/tex/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex] + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../util/Locale.js'; export const COMPONENT = '[tex]'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex'); diff --git a/ts/input/tex/mathtools/locales/Component.ts b/ts/input/tex/mathtools/locales/Component.ts index 2f51f7690..48b1812e0 100644 --- a/ts/input/tex/mathtools/locales/Component.ts +++ b/ts/input/tex/mathtools/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/mathtools + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/mathtools'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mathtools'); diff --git a/ts/input/tex/newcommand/locales/Component.ts b/ts/input/tex/newcommand/locales/Component.ts index c96ded494..4be8ddf2f 100644 --- a/ts/input/tex/newcommand/locales/Component.ts +++ b/ts/input/tex/newcommand/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/newcommand + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/newcommand'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/newcommand'); diff --git a/ts/input/tex/physics/locales/Component.ts b/ts/input/tex/physics/locales/Component.ts index ba060707c..8aa4343cc 100644 --- a/ts/input/tex/physics/locales/Component.ts +++ b/ts/input/tex/physics/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/physics + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/physics'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/physics'); diff --git a/ts/input/tex/require/locales/Component.ts b/ts/input/tex/require/locales/Component.ts index 1b80abc0e..6d20c6a09 100644 --- a/ts/input/tex/require/locales/Component.ts +++ b/ts/input/tex/require/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/require + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/require'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/require'); diff --git a/ts/input/tex/setoptions/locales/Component.ts b/ts/input/tex/setoptions/locales/Component.ts index 21c1d0781..b65ea650d 100644 --- a/ts/input/tex/setoptions/locales/Component.ts +++ b/ts/input/tex/setoptions/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/setoptions + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/setoptions'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/setoptions'); diff --git a/ts/input/tex/texhtml/locales/Component.ts b/ts/input/tex/texhtml/locales/Component.ts index 37d3204a5..d3f297a18 100644 --- a/ts/input/tex/texhtml/locales/Component.ts +++ b/ts/input/tex/texhtml/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/texhtml + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/texhtml'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/texhtml'); diff --git a/ts/input/tex/textmacros/locales/Component.ts b/ts/input/tex/textmacros/locales/Component.ts index 9bac95be7..4c2eec0b4 100644 --- a/ts/input/tex/textmacros/locales/Component.ts +++ b/ts/input/tex/textmacros/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/textmacros + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/textmacros'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/textmacros'); diff --git a/ts/input/tex/unicode/locales/Component.ts b/ts/input/tex/unicode/locales/Component.ts index 9f82001bb..0dfd7fb1a 100644 --- a/ts/input/tex/unicode/locales/Component.ts +++ b/ts/input/tex/unicode/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/unicode + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/unicode'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/unicode'); diff --git a/ts/input/tex/verb/locales/Component.ts b/ts/input/tex/verb/locales/Component.ts index 1b60984ec..76d53c253 100644 --- a/ts/input/tex/verb/locales/Component.ts +++ b/ts/input/tex/verb/locales/Component.ts @@ -1,3 +1,26 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/verb + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/verb'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/verb'); From 3798f57c70b76cf04c8fd9fb17e386fc6f1c268d Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 10:04:23 +0200 Subject: [PATCH 25/95] prettier and linting --- ts/input/tex/StackItem.ts | 1 + ts/input/tex/TexParser.ts | 7 ++++- ts/input/tex/ams/AmsMethods.ts | 32 +++++++++++++++++--- ts/input/tex/ams/locales/Component.ts | 2 ++ ts/input/tex/base/BaseItems.ts | 7 ++++- ts/input/tex/base/BaseMethods.ts | 24 ++++++++++++--- ts/input/tex/base/locales/Component.ts | 2 ++ ts/input/tex/bbox/BboxConfiguration.ts | 14 +++++++-- ts/input/tex/bbox/locales/Component.ts | 2 ++ ts/input/tex/begingroup/locales/Component.ts | 2 ++ ts/input/tex/braket/locales/Component.ts | 2 ++ ts/input/tex/bussproofs/BussproofsMethods.ts | 4 +-- ts/input/tex/bussproofs/locales/Component.ts | 2 ++ ts/input/tex/cases/locales/Component.ts | 2 ++ ts/input/tex/color/locales/Component.ts | 2 ++ ts/input/tex/colortbl/locales/Component.ts | 2 ++ ts/input/tex/empheq/locales/Component.ts | 2 ++ ts/input/tex/extpfeil/locales/Component.ts | 2 ++ ts/input/tex/html/locales/Component.ts | 2 ++ ts/input/tex/locales/Component.ts | 2 ++ ts/input/tex/mathtools/locales/Component.ts | 2 ++ ts/input/tex/newcommand/NewcommandItems.ts | 7 ++++- ts/input/tex/newcommand/locales/Component.ts | 2 ++ ts/input/tex/physics/locales/Component.ts | 2 ++ ts/input/tex/require/locales/Component.ts | 2 ++ ts/input/tex/setoptions/locales/Component.ts | 2 ++ ts/input/tex/texhtml/TexHtmlConfiguration.ts | 7 ++++- ts/input/tex/texhtml/locales/Component.ts | 2 ++ ts/input/tex/textmacros/locales/Component.ts | 2 ++ ts/input/tex/unicode/UnicodeConfiguration.ts | 12 ++++++-- ts/input/tex/unicode/locales/Component.ts | 2 ++ ts/input/tex/verb/VerbConfiguration.ts | 1 + ts/input/tex/verb/locales/Component.ts | 2 ++ 33 files changed, 141 insertions(+), 19 deletions(-) diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index f32b32746..fb9998df1 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -389,6 +389,7 @@ export abstract class BaseItem extends MmlStack implements StackItem { /** * A list of basic errors. + * * @type {{[key: string]: string}} */ protected static errors: { [key: string]: string } = { diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index ef4628c3d..4ab24ca17 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -510,7 +510,12 @@ export default class TexParser { } } // @test TokenNotFoundForCommand - throw new TexError(COMPONENT, 'TokenNotFoundForCommand', token, this.currentCS); + throw new TexError( + COMPONENT, + 'TokenNotFoundForCommand', + token, + this.currentCS + ); } /** diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index ca4a24efe..61bd0c822 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -149,7 +149,11 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const n = parser.GetArgument('\\begin{' + name + '}'); if (n.match(/[^0-9]/)) { // @test PositiveIntegerArg - throw new TexError(COMPONENT, 'PositiveIntegerArg', '\\begin{' + name + '}'); + throw new TexError( + COMPONENT, + 'PositiveIntegerArg', + '\\begin{' + name + '}' + ); } let count = parseInt(n, 10); while (count > 0) { @@ -238,7 +242,11 @@ export const AmsMethods: { [key: string]: ParseMethod } = { ): ParseResult { const n = parser.GetArgument('\\begin{' + begin.getName() + '}'); if (n.match(/[^0-9]/)) { - throw new TexError(COMPONENT, 'PositiveIntegerArg', '\\begin{' + begin.getName() + '}'); + throw new TexError( + COMPONENT, + 'PositiveIntegerArg', + '\\begin{' + begin.getName() + '}' + ); } const align = padded ? 'crl' : 'rlc'; const balign = padded ? 'mbt' : 'btm'; @@ -613,11 +621,20 @@ export const AmsMethods: { [key: string]: ParseMethod } = { // @test Shove (Left|Right) (Top|Middle|Bottom) if (top.kind !== 'multline') { // @test Shove Error Environment - throw new TexError(COMPONENT, 'CommandOnlyAllowedInEnv', parser.currentCS, 'multline'); + throw new TexError( + COMPONENT, + 'CommandOnlyAllowedInEnv', + parser.currentCS, + 'multline' + ); } if (top.Size()) { // @test Shove Error (Top|Middle|Bottom) - throw new TexError(COMPONENT, 'CommandAtTheBeginingOfLine', parser.currentCS); + throw new TexError( + COMPONENT, + 'CommandAtTheBeginingOfLine', + parser.currentCS + ); } top.setProperty('shove', shove); }, @@ -741,7 +758,12 @@ export const AmsMethods: { [key: string]: ParseMethod } = { HandleTag(parser: TexParser, name: string) { if (!parser.tags.currentTag.taggable && parser.tags.env) { // @test Illegal Tag Error - throw new TexError(COMPONENT, 'CommandNotAllowedInEnv', parser.currentCS, parser.tags.env); + throw new TexError( + COMPONENT, + 'CommandNotAllowedInEnv', + parser.currentCS, + parser.tags.env + ); } if (parser.tags.currentTag.tag) { // @test Double Tag Error diff --git a/ts/input/tex/ams/locales/Component.ts b/ts/input/tex/ams/locales/Component.ts index f20889020..b547dcf77 100644 --- a/ts/input/tex/ams/locales/Component.ts +++ b/ts/input/tex/ams/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/ams'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/ams'); diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index 0b08cf225..4061c8aaf 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -586,7 +586,12 @@ export class BeginItem extends BaseItem { if (item.isKind('end')) { if (item.getName() !== this.getName()) { // @test EnvBadEnd - throw new TexError(COMPONENT, 'EnvBadEnd', this.getName(), item.getName()); + throw new TexError( + COMPONENT, + 'EnvBadEnd', + this.getName(), + item.getName() + ); } // @test Hfill const node = this.toMml(); diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index 8cafdc66a..8456967db 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -989,19 +989,31 @@ const BaseMethods: { [key: string]: ParseMethod } = { switch (type) { case 'c': if (top.First) { - throw new TexError(COMPONENT, 'BreakFirstInEntry', parser.currentCS + '{c}'); + throw new TexError( + COMPONENT, + 'BreakFirstInEntry', + parser.currentCS + '{c}' + ); } top.breakAlign.cell = splitAlignArray(parser.GetArgument(name), 1); break; case 'r': if (top.row.length || top.First) { - throw new TexError(COMPONENT, 'BreakFirstInRow', parser.currentCS + '{r}'); + throw new TexError( + COMPONENT, + 'BreakFirstInRow', + parser.currentCS + '{r}' + ); } top.breakAlign.row = splitAlignArray(parser.GetArgument(name)); break; case 't': if (top.table.length || top.row.length || top.First) { - throw new TexError(COMPONENT, 'BreakFirstInTable', parser.currentCS + '{t}'); + throw new TexError( + COMPONENT, + 'BreakFirstInTable', + parser.currentCS + '{t}' + ); } top.breakAlign.table = splitAlignArray(parser.GetArgument(name)); break; @@ -1039,7 +1051,11 @@ const BaseMethods: { [key: string]: ParseMethod } = { ); if (!match) { // @test Token Invalid Attribute - throw new TexError(COMPONENT, 'InvalidMathMLAttr', attr.split(/[\s\n=]/)[0]); + throw new TexError( + COMPONENT, + 'InvalidMathMLAttr', + attr.split(/[\s\n=]/)[0] + ); } if (!node.attributes.hasDefault(match[1]) && !MmlTokenAllow[match[1]]) { // @test Token Unknown Attribute, Token Wrong Attribute diff --git a/ts/input/tex/base/locales/Component.ts b/ts/input/tex/base/locales/Component.ts index 23b71f391..8a366032e 100644 --- a/ts/input/tex/base/locales/Component.ts +++ b/ts/input/tex/base/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/base'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/base'); diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index 0c1bb9fa4..e4655cbc7 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -51,7 +51,12 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Padding if (def) { // @test Bbox-Padding-Error - throw new TexError(COMPONENT, 'MultipleBBoxProperty', 'Padding', name); + throw new TexError( + COMPONENT, + 'MultipleBBoxProperty', + 'Padding', + name + ); } const pad = BBoxPadding(match[1] + match[3]); if (pad) { @@ -67,7 +72,12 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Background if (background) { // @test Bbox-Background-Error - throw new TexError(COMPONENT, 'MultipleBBoxProperty', 'Background', name); + throw new TexError( + COMPONENT, + 'MultipleBBoxProperty', + 'Background', + name + ); } background = part; } else if (part.match(/^[-a-z]+:/i)) { diff --git a/ts/input/tex/bbox/locales/Component.ts b/ts/input/tex/bbox/locales/Component.ts index 6cadf78d9..5c1b19e9c 100644 --- a/ts/input/tex/bbox/locales/Component.ts +++ b/ts/input/tex/bbox/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/bbox'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); diff --git a/ts/input/tex/begingroup/locales/Component.ts b/ts/input/tex/begingroup/locales/Component.ts index 396fb5598..0e9b0ae1e 100644 --- a/ts/input/tex/begingroup/locales/Component.ts +++ b/ts/input/tex/begingroup/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/begingroup'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/begingroup'); diff --git a/ts/input/tex/braket/locales/Component.ts b/ts/input/tex/braket/locales/Component.ts index 308f548c7..1ea6b11df 100644 --- a/ts/input/tex/braket/locales/Component.ts +++ b/ts/input/tex/braket/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/braket'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/braket'); diff --git a/ts/input/tex/bussproofs/BussproofsMethods.ts b/ts/input/tex/bussproofs/BussproofsMethods.ts index 338a2e126..89c74f1ae 100644 --- a/ts/input/tex/bussproofs/BussproofsMethods.ts +++ b/ts/input/tex/bussproofs/BussproofsMethods.ts @@ -141,8 +141,8 @@ function parseFCenterLine(parser: TexParser, name: string): MmlNode { throw new TexError(COMPONENT, 'IllegalUseOfCommand', name); } parser.i++; - let axiom = parser.GetUpTo(name, '$'); - if (axiom.indexOf('\\fCenter') === -1) { + const axiom = parser.GetUpTo(name, '$'); + if (!axiom.includes('\\fCenter')) { throw new TexError(COMPONENT, 'MissingProofCommand', '\\fCenter', name); } // Check for fCenter and throw error? diff --git a/ts/input/tex/bussproofs/locales/Component.ts b/ts/input/tex/bussproofs/locales/Component.ts index 8ff866ba3..74bcc29ad 100644 --- a/ts/input/tex/bussproofs/locales/Component.ts +++ b/ts/input/tex/bussproofs/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/bussproofs'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bussproofs'); diff --git a/ts/input/tex/cases/locales/Component.ts b/ts/input/tex/cases/locales/Component.ts index bbfb0e6ad..6eb0bedce 100644 --- a/ts/input/tex/cases/locales/Component.ts +++ b/ts/input/tex/cases/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/cases'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/cases'); diff --git a/ts/input/tex/color/locales/Component.ts b/ts/input/tex/color/locales/Component.ts index 4a8eba242..d79509c61 100644 --- a/ts/input/tex/color/locales/Component.ts +++ b/ts/input/tex/color/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/color'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/color'); diff --git a/ts/input/tex/colortbl/locales/Component.ts b/ts/input/tex/colortbl/locales/Component.ts index 32279e00c..2415e5895 100644 --- a/ts/input/tex/colortbl/locales/Component.ts +++ b/ts/input/tex/colortbl/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/colortbl'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/colortbl'); diff --git a/ts/input/tex/empheq/locales/Component.ts b/ts/input/tex/empheq/locales/Component.ts index b1d0709b1..a85fd89c3 100644 --- a/ts/input/tex/empheq/locales/Component.ts +++ b/ts/input/tex/empheq/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/empheq'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/empheq'); diff --git a/ts/input/tex/extpfeil/locales/Component.ts b/ts/input/tex/extpfeil/locales/Component.ts index c7374ac3f..cb8ff0e6c 100644 --- a/ts/input/tex/extpfeil/locales/Component.ts +++ b/ts/input/tex/extpfeil/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/extpfeil'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/extpfeil'); diff --git a/ts/input/tex/html/locales/Component.ts b/ts/input/tex/html/locales/Component.ts index 97fb74931..fc3eafa07 100644 --- a/ts/input/tex/html/locales/Component.ts +++ b/ts/input/tex/html/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/html'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/html'); diff --git a/ts/input/tex/locales/Component.ts b/ts/input/tex/locales/Component.ts index 77c17353c..86bfab72c 100644 --- a/ts/input/tex/locales/Component.ts +++ b/ts/input/tex/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../util/Locale.js'; + export const COMPONENT = '[tex]'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex'); diff --git a/ts/input/tex/mathtools/locales/Component.ts b/ts/input/tex/mathtools/locales/Component.ts index 48b1812e0..071d87daf 100644 --- a/ts/input/tex/mathtools/locales/Component.ts +++ b/ts/input/tex/mathtools/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/mathtools'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mathtools'); diff --git a/ts/input/tex/newcommand/NewcommandItems.ts b/ts/input/tex/newcommand/NewcommandItems.ts index 98bcdee44..c3c427f1e 100644 --- a/ts/input/tex/newcommand/NewcommandItems.ts +++ b/ts/input/tex/newcommand/NewcommandItems.ts @@ -54,7 +54,12 @@ export class BeginEnvItem extends BaseItem { // @test Newenvironment Empty, Newenvironment Align if (item.getName() !== this.getName()) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc\end{equation} - throw new TexError(COMPONENT, 'EnvBadEnd', this.getName(), item.getName()); + throw new TexError( + COMPONENT, + 'EnvBadEnd', + this.getName(), + item.getName() + ); } return [[this.factory.create('mml', this.toMml())], true]; } diff --git a/ts/input/tex/newcommand/locales/Component.ts b/ts/input/tex/newcommand/locales/Component.ts index 4be8ddf2f..a7ad030e9 100644 --- a/ts/input/tex/newcommand/locales/Component.ts +++ b/ts/input/tex/newcommand/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/newcommand'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/newcommand'); diff --git a/ts/input/tex/physics/locales/Component.ts b/ts/input/tex/physics/locales/Component.ts index 8aa4343cc..c5c391e2f 100644 --- a/ts/input/tex/physics/locales/Component.ts +++ b/ts/input/tex/physics/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/physics'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/physics'); diff --git a/ts/input/tex/require/locales/Component.ts b/ts/input/tex/require/locales/Component.ts index 6d20c6a09..5519890a3 100644 --- a/ts/input/tex/require/locales/Component.ts +++ b/ts/input/tex/require/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/require'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/require'); diff --git a/ts/input/tex/setoptions/locales/Component.ts b/ts/input/tex/setoptions/locales/Component.ts index b65ea650d..35630731c 100644 --- a/ts/input/tex/setoptions/locales/Component.ts +++ b/ts/input/tex/setoptions/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/setoptions'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/setoptions'); diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 532497221..72ddfe414 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -60,7 +60,12 @@ export const HtmlNodeMethods: { [key: string]: ParseMethod } = { const end = (match[1] ? `` : '') + ''; const i = parser.string.slice(parser.i).indexOf(end); if (i < 0) { - throw new TexError(COMPONENT, 'TokenNotFoundForCommand', end, '<' + match[0]); + throw new TexError( + COMPONENT, + 'TokenNotFoundForCommand', + end, + '<' + match[0] + ); } const html = parser.string.substring(parser.i, parser.i + i).trim(); parser.i += i + 11 + (match[1] ? 3 + match[1].length : 0); diff --git a/ts/input/tex/texhtml/locales/Component.ts b/ts/input/tex/texhtml/locales/Component.ts index d3f297a18..46389e9a7 100644 --- a/ts/input/tex/texhtml/locales/Component.ts +++ b/ts/input/tex/texhtml/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/texhtml'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/texhtml'); diff --git a/ts/input/tex/textmacros/locales/Component.ts b/ts/input/tex/textmacros/locales/Component.ts index 4c2eec0b4..cfce9e2b0 100644 --- a/ts/input/tex/textmacros/locales/Component.ts +++ b/ts/input/tex/textmacros/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/textmacros'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/textmacros'); diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index bb102a498..aabd17a79 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -135,7 +135,11 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { parser.i += 2; const cs = [...parser.GetCS()]; if (cs.length > 1) { - throw new TexError(COMPONENT, 'InvalidAlphanumeric', parser.currentCS); + throw new TexError( + COMPONENT, + 'InvalidAlphanumeric', + parser.currentCS + ); } c = cs[0]; match = ['']; @@ -157,7 +161,11 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { parser.i += 2; const cs = [...parser.GetCS()]; if (cs.length > 1) { - throw new TexError(COMPONENT, 'InvalidAlphanumeric', parser.currentCS); + throw new TexError( + COMPONENT, + 'InvalidAlphanumeric', + parser.currentCS + ); } c = cs[0]; match = ['']; diff --git a/ts/input/tex/unicode/locales/Component.ts b/ts/input/tex/unicode/locales/Component.ts index 0dfd7fb1a..776f460d1 100644 --- a/ts/input/tex/unicode/locales/Component.ts +++ b/ts/input/tex/unicode/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/unicode'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/unicode'); diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 44b888bf3..25bc4935d 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -34,6 +34,7 @@ export { COMPONENT } from './locales/Component.js'; const VerbMethods: { [key: string]: ParseMethod } = { /** * Implements the verbatim notation \verb|...|. + * * @param {TexParser} parser The current tex parser. * @param {string} name The name of the calling macro. */ diff --git a/ts/input/tex/verb/locales/Component.ts b/ts/input/tex/verb/locales/Component.ts index 76d53c253..5b85bb7fe 100644 --- a/ts/input/tex/verb/locales/Component.ts +++ b/ts/input/tex/verb/locales/Component.ts @@ -22,5 +22,7 @@ */ import { Locale } from '../../../../util/Locale.js'; + export const COMPONENT = '[tex]/verb'; + Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/verb'); From d60b0b0a7477a88ecf0ef25a0959590738ef8b44 Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 10:37:28 +0200 Subject: [PATCH 26/95] localize the internal error --- ts/util/Locale.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 4723cea84..f87e72c8d 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -58,6 +58,13 @@ export class Locale { locale: { en: { LocaleJsonError: "MathJax(%1): Can't load '%2': %3", + LocaleMessageNotFound: + "MathJax(Locales): No localized or default version for message with id '%1' from '%2'", + }, + de: { + LocaleJsonError: "MathJax(%1): '%2' kann nicht geladen werden: %3", + LocaleMessageNotFound: + "MathJax(Locales): Keine lokalisierte oder Standardversion für die Meldung mit der ID '%1' aus '%2'", }, }, }; @@ -157,7 +164,11 @@ export class Locale { return ( this.data[component]?.[this.current]?.[id] || this.data[component]?.[this.default]?.[id] || - `No localized or default version for message with id '${id}' from '${component}'` + this.substituteArguments( + this.data.locale[this.current]['LocaleMessageNotFound'] || + this.data.locale[this.default]['LocaleMessageNotFound'], + { 1: id, 2: component } + ) ); } From 10f8b0237588bfc43d5778b6547a68a6728ab9f8 Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 12:04:36 +0200 Subject: [PATCH 27/95] correctly loads and uses default locale --- ts/util/Locale.ts | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index f87e72c8d..fff82ba8c 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -38,7 +38,7 @@ export class Locale { /** * The current locale */ - public static current: string = 'en'; + public static current: string = 'de'; /** * The default locale for when a message has no current localization @@ -254,17 +254,19 @@ export class Locale { } /** - * Report an error thrown when loading a component's locale file + * Report an error thrown when loading a component's locale file, and fall + * back to loading the default locale if the failed locale was not the default. * * @param {string} component The component whose localization is being loaded * @param {string} locale The locale being loaded * @param {Error} error The Error object causing the issue + * @returns {Promise|void} A promise for loading the default locale, or void */ protected static localeError( component: string, locale: string, error: Error - ) { + ): Promise | void { const message = this.message( 'locale', 'LocaleJsonError', @@ -273,5 +275,19 @@ export class Locale { error.message ); console.error(message); + if (locale !== this.default) { + const location = this.locations[component]; + if (location) { + const [directory, loaded] = location; + if (!loaded.has(this.default)) { + loaded.add(this.default); + return this.getLocaleData( + component, + this.default, + `${directory}/${this.default}.json` + ); + } + } + } } } From 656ed9ad3c5baaa3e5ac36f93159f8be745667d5 Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 12:51:38 +0200 Subject: [PATCH 28/95] import/export components when needed locally --- ts/input/tex/base/BaseConfiguration.ts | 3 ++- ts/input/tex/bbox/BboxConfiguration.ts | 3 ++- ts/input/tex/cases/CasesConfiguration.ts | 3 ++- ts/input/tex/colortbl/ColortblConfiguration.ts | 3 ++- ts/input/tex/empheq/EmpheqConfiguration.ts | 3 ++- ts/input/tex/extpfeil/ExtpfeilConfiguration.ts | 3 ++- ts/input/tex/require/RequireConfiguration.ts | 3 ++- ts/input/tex/setoptions/SetOptionsConfiguration.ts | 3 ++- ts/input/tex/texhtml/TexHtmlConfiguration.ts | 3 ++- ts/input/tex/textmacros/TextMacrosConfiguration.ts | 3 ++- ts/input/tex/unicode/UnicodeConfiguration.ts | 3 ++- ts/input/tex/verb/VerbConfiguration.ts | 3 ++- ts/util/Locale.ts | 2 +- 13 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ts/input/tex/base/BaseConfiguration.ts b/ts/input/tex/base/BaseConfiguration.ts index e8af0037a..482883b7e 100644 --- a/ts/input/tex/base/BaseConfiguration.ts +++ b/ts/input/tex/base/BaseConfiguration.ts @@ -37,7 +37,8 @@ import ParseMethods from '../ParseMethods.js'; import { ParseUtil } from '../ParseUtil.js'; import { TexConstant } from '../TexConstants.js'; import { context } from '../../../util/context.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; const MATHVARIANT = TexConstant.Variant; diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index e4655cbc7..a4d66dc27 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -27,7 +27,8 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; // Namespace const BboxMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/cases/CasesConfiguration.ts b/ts/input/tex/cases/CasesConfiguration.ts index 446b162ab..5d32136c4 100644 --- a/ts/input/tex/cases/CasesConfiguration.ts +++ b/ts/input/tex/cases/CasesConfiguration.ts @@ -11,7 +11,8 @@ import { AmsTags } from '../ams/AmsConfiguration.js'; import { StackItem, CheckType } from '../StackItem.js'; import { MmlMtable } from '../../../core/MmlTree/MmlNodes/mtable.js'; import { EmpheqUtil } from '../empheq/EmpheqUtil.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; /** * The StackItem for the numcases environment. diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts index 74c6a3ce5..f16a31731 100644 --- a/ts/input/tex/colortbl/ColortblConfiguration.ts +++ b/ts/input/tex/colortbl/ColortblConfiguration.ts @@ -33,7 +33,8 @@ import TexParser from '../TexParser.js'; import TexError from '../TexError.js'; import { TeX } from '../../tex.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; /** * Information about table colors. diff --git a/ts/input/tex/empheq/EmpheqConfiguration.ts b/ts/input/tex/empheq/EmpheqConfiguration.ts index 7b37de641..2ceef38f1 100644 --- a/ts/input/tex/empheq/EmpheqConfiguration.ts +++ b/ts/input/tex/empheq/EmpheqConfiguration.ts @@ -30,7 +30,8 @@ import TexError from '../TexError.js'; import { BeginItem } from '../base/BaseItems.js'; import { EmpheqUtil } from './EmpheqUtil.js'; import ParseMethods from '../ParseMethods.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; /** * The methods that implement the empheq package. diff --git a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts index 41e62f653..2eef3e1b5 100644 --- a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts +++ b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts @@ -31,7 +31,8 @@ import { AmsMethods } from '../ams/AmsMethods.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; import TexError from '../TexError.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; // Namespace const ExtpfeilMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 51809d284..849cf2339 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -41,7 +41,8 @@ import { expandable } from '../../../util/Options.js'; import { MenuMathDocument } from '../../../ui/menu/MenuHandler.js'; import { Locale } from '../../../util/Locale.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; /** * The MathJax configuration block (for looking up user-defined package options) diff --git a/ts/input/tex/setoptions/SetOptionsConfiguration.ts b/ts/input/tex/setoptions/SetOptionsConfiguration.ts index 849965eda..bca44dab6 100644 --- a/ts/input/tex/setoptions/SetOptionsConfiguration.ts +++ b/ts/input/tex/setoptions/SetOptionsConfiguration.ts @@ -36,7 +36,8 @@ import { Macro } from '../Token.js'; import BaseMethods from '../base/BaseMethods.js'; import { expandable, isObject } from '../../../util/Options.js'; import { PrioritizedList } from '../../../util/PrioritizedList.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; export const SetOptionsUtil = { /** diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 72ddfe414..0a6aaef00 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -32,7 +32,8 @@ import { HTMLDocument } from '../../../handlers/html/HTMLDocument.js'; import { HtmlNode } from '../../../core/MmlTree/MmlNodes/HtmlNode.js'; import { HTMLDomStrings } from '../../../handlers/html/HTMLDomStrings.js'; import { DOMAdaptor } from '../../../core/DOMAdaptor.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; export const HtmlNodeMethods: { [key: string]: ParseMethod } = { /** diff --git a/ts/input/tex/textmacros/TextMacrosConfiguration.ts b/ts/input/tex/textmacros/TextMacrosConfiguration.ts index faabdef0a..d5f508bbf 100644 --- a/ts/input/tex/textmacros/TextMacrosConfiguration.ts +++ b/ts/input/tex/textmacros/TextMacrosConfiguration.ts @@ -31,7 +31,8 @@ import { StartItem, StopItem, MmlItem, StyleItem } from '../base/BaseItems.js'; import { TextParser } from './TextParser.js'; import { TextMacrosMethods } from './TextMacrosMethods.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; import './TextMacrosMappings.js'; diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index aabd17a79..01a2c8213 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -32,7 +32,8 @@ import { UnitUtil } from '../UnitUtil.js'; import NodeUtil from '../NodeUtil.js'; import { numeric } from '../../../util/Entities.js'; import { Other } from '../base/BaseConfiguration.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; const UnicodeCache: { [key: number]: [number, number, string, number] } = {}; diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 25bc4935d..1f881e7b9 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -28,7 +28,8 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; -export { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './locales/Component.js'; +export { COMPONENT }; // Namespace const VerbMethods: { [key: string]: ParseMethod } = { diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index fff82ba8c..b5d6b307d 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -38,7 +38,7 @@ export class Locale { /** * The current locale */ - public static current: string = 'de'; + public static current: string = 'en'; /** * The default locale for when a message has no current localization From 92a499e681c302c5551fd9f589eb1121befe86cc Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 13:04:39 +0200 Subject: [PATCH 29/95] fix tests for missing locale files --- testsuite/tests/util/Locale.test.ts | 11 +++++++---- ts/util/Locale.ts | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index 6e88ef721..6189aa690 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -31,8 +31,11 @@ describe('Locale', () => { console.error = (message) => { throw message; }; - await expect(Locale.setLocale('de')).rejects.toMatch( - "MathJax(component): Can't load 'de.json': ENOENT: no such file or directory" + await expect(Locale.setLocale('xy')).rejects.toContain( + "MathJax(component): Can't load 'xy.json': ENOENT: no such file or directory" + ); + await expect(Locale.setLocale('de')).rejects.toContain( + "MathJax(component): 'de.json' kann nicht geladen werden: ENOENT: no such file or directory" ); console.error = error; await Locale.setLocale('en'); @@ -62,10 +65,10 @@ describe('Locale', () => { ).toBe('Named HELLO WORLD'); expect(Locale.message('component', 'Id1', 'a', 'b')).toBe('Test of a in b'); expect(Locale.message('component', 'Id2')).toBe( - "No localized or default version for message with id 'Id2' from 'component'" + "MathJax(Locale): No localized or default version for message with id 'Id2' from 'component'" ); expect(Locale.message('undefined', 'Id1')).toBe( - "No localized or default version for message with id 'Id1' from 'undefined'" + "MathJax(Locale): No localized or default version for message with id 'Id1' from 'undefined'" ); expect(() => Locale.error('component', 'error', 'x')).toThrow('Error in x'); }); diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index b5d6b307d..4cf9c92be 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -59,12 +59,12 @@ export class Locale { en: { LocaleJsonError: "MathJax(%1): Can't load '%2': %3", LocaleMessageNotFound: - "MathJax(Locales): No localized or default version for message with id '%1' from '%2'", + "MathJax(Locale): No localized or default version for message with id '%1' from '%2'", }, de: { LocaleJsonError: "MathJax(%1): '%2' kann nicht geladen werden: %3", LocaleMessageNotFound: - "MathJax(Locales): Keine lokalisierte oder Standardversion für die Meldung mit der ID '%1' aus '%2'", + "MathJax(Locale): Keine lokalisierte oder Standardversion für die Meldung mit der ID '%1' aus '%2'", }, }, }; @@ -165,8 +165,8 @@ export class Locale { this.data[component]?.[this.current]?.[id] || this.data[component]?.[this.default]?.[id] || this.substituteArguments( - this.data.locale[this.current]['LocaleMessageNotFound'] || - this.data.locale[this.default]['LocaleMessageNotFound'], + this.data.locale[this.current]?.['LocaleMessageNotFound'] || + this.data.locale[this.default]?.['LocaleMessageNotFound'], { 1: id, 2: component } ) ); From f480c782cf36ef2d71f956e80b9162aa1bff985c Mon Sep 17 00:00:00 2001 From: zorkow Date: Wed, 6 May 2026 13:31:01 +0200 Subject: [PATCH 30/95] sorts all the english locales --- ts/input/tex/ams/locales/en.json | 12 ++-- ts/input/tex/base/locales/en.json | 74 ++++++++++++------------- ts/input/tex/bbox/locales/en.json | 4 +- ts/input/tex/begingroup/locales/en.json | 4 +- ts/input/tex/bussproofs/locales/en.json | 4 +- ts/input/tex/color/locales/en.json | 8 +-- ts/input/tex/colortbl/locales/en.json | 2 +- ts/input/tex/extpfeil/locales/en.json | 4 +- ts/input/tex/locales/en.json | 36 ++++++------ ts/input/tex/mathtools/locales/en.json | 18 +++--- ts/input/tex/newcommand/locales/en.json | 16 +++--- ts/input/tex/setoptions/locales/en.json | 2 +- ts/input/tex/textmacros/locales/en.json | 6 +- ts/input/tex/unicode/locales/en.json | 6 +- ts/input/tex/verb/locales/en.json | 4 +- 15 files changed, 100 insertions(+), 100 deletions(-) diff --git a/ts/input/tex/ams/locales/en.json b/ts/input/tex/ams/locales/en.json index ef908d07f..a17d518ae 100644 --- a/ts/input/tex/ams/locales/en.json +++ b/ts/input/tex/ams/locales/en.json @@ -1,11 +1,11 @@ { - "XalignOverflow": "Extra %1 in row of %2", - "MultlineRowsOneCol": "The rows within the %1 environment must have exactly one column", - "MultipleCommand": "Multiple %1", - "CommandNotAllowedInEnv": "%1 not allowed in %2 environment", "BadMathStyleFor": "Bad math style for %1", - "IllegalAlign": "Illegal alignment specified in %1", "CommandAtTheBeginingOfLine": "%1 must come at the beginning of the line", + "CommandNotAllowedInEnv": "%1 not allowed in %2 environment", "CommandOnlyAllowedInEnv": "%1 only allowed in %2 environment", - "PositiveIntegerArg": "Argument to %1 must be a positive integer" + "IllegalAlign": "Illegal alignment specified in %1", + "MultipleCommand": "Multiple %1", + "MultlineRowsOneCol": "The rows within the %1 environment must have exactly one column", + "PositiveIntegerArg": "Argument to %1 must be a positive integer", + "XalignOverflow": "Extra %1 in row of %2" } diff --git a/ts/input/tex/base/locales/en.json b/ts/input/tex/base/locales/en.json index 1cd799b45..9c27e25f7 100644 --- a/ts/input/tex/base/locales/en.json +++ b/ts/input/tex/base/locales/en.json @@ -1,48 +1,48 @@ { - "ExtraLeftMissingRight": "Extra \\left or missing \\right", - "ExtraOpenMissingClose": "Extra open brace or missing close brace", - "ExtraCloseMissingOpen": "Extra close brace or missing open brace", - "ExtraMiddle": "Extra \\middle", - "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", - "MissingScript": "Missing superscript or subscript argument", - "MissingOpenForSup": "Missing open brace for superscript", - "MissingOpenForSub": "Missing open brace for subscript", - "MissingLeftExtraRight": "Missing \\left or extra \\right", - "UnknownEnv": "Unknown environment '%1'", - "UndefinedControlSequence": "Undefined control sequence %1", - "EnvMissingEnd": "Missing \\end{%1}", - "MissingCloseBrace": "Missing close brace", - "MissingBoxFor": "Missing box for %1", - "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", "AmbiguousUseOf": "Ambiguous use of %1", - "MultipleLabel": "Label '%1' multiply defined", - "MultipleCommand": "Multiple %1", "BadAlignment": "Alignment must be one to three copies of l, c, or r", - "BracketMustBeDimension": "Bracket argument to %1 must be a dimension", - "InvalidEnv": "Invalid environment name '%1'", - "PositiveIntegerArg": "Argument to %1 must be a positive integer", + "BadBreakAlign": "Invalid alignment character: %1", "BadColumnName": "Column specifier must be exactly one character: %1", - "UnsupportedHFill": "Unsupported use of %1", - "Misplaced": "Misplaced %1", - "ExtraAlignTab": "Extra alignment tab in \\cases text", - "MissingArgFor": "Missing argument for %1", - "UnknownAttrForElement": "%1 is not a recognized attribute for %2", - "InvalidMathMLAttr": "Invalid MathML attribute: %1", - "NotMathMLToken": "%1 is not a token element", - "BreakType": "First argument to %1 must be one of c, r, or t", - "BreakFirstInTable": "%1 must be at the beginning of an alignment", - "BreakFirstInRow": "%1 must be at the beginning of an alignment row", + "BracketMustBeDimension": "Bracket argument to %1 must be a dimension", "BreakFirstInEntry": "%1 must be at the beginning of an alignment entry", + "BreakFirstInRow": "%1 must be at the beginning of an alignment row", + "BreakFirstInTable": "%1 must be at the beginning of an alignment", "BreakNotInArray": "%1 must be used in an alignment environment", - "IntegerArg": "The argument to %1 must be an integer", - "MultipleMoveRoot": "Multiple use of %1", - "MisplacedMoveRoot": "%1 can appear only within a root", - "MisplacedLimits": "%1 is allowed only on operators", + "BreakType": "First argument to %1 must be one of c, r, or t", "CantUseHash1": "You can't use 'macro parameter character #' in math mode", + "DoubleExponent": "Double exponent: use braces to clarify", "DoubleExponentPrime": "Prime causes double exponent: use braces to clarify", "DoubleSubscripts": "Double subscripts: use braces to clarify", - "DoubleExponent": "Double exponent: use braces to clarify", + "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", + "EnvMissingEnd": "Missing \\end{%1}", + "ExtraAlignTab": "Extra alignment tab in \\cases text", + "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "ExtraLeftMissingRight": "Extra \\left or missing \\right", + "ExtraMiddle": "Extra \\middle", + "ExtraOpenMissingClose": "Extra open brace or missing close brace", + "IntegerArg": "The argument to %1 must be an integer", + "InvalidEnv": "Invalid environment name '%1'", + "InvalidMathMLAttr": "Invalid MathML attribute: %1", + "MaxTemplateSubs": "Maximum template substitutions exceeded; is there an invalid use of \\\\ in the template?", + "Misplaced": "Misplaced %1", + "MisplacedLimits": "%1 is allowed only on operators", + "MisplacedMoveRoot": "%1 can appear only within a root", + "MissingArgFor": "Missing argument for %1", + "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", + "MissingBoxFor": "Missing box for %1", + "MissingCloseBrace": "Missing close brace", + "MissingLeftExtraRight": "Missing \\left or extra \\right", + "MissingOpenForSub": "Missing open brace for subscript", + "MissingOpenForSup": "Missing open brace for superscript", + "MissingScript": "Missing superscript or subscript argument", + "MultipleCommand": "Multiple %1", + "MultipleLabel": "Label '%1' multiply defined", + "MultipleMoveRoot": "Multiple use of %1", + "NotMathMLToken": "%1 is not a token element", + "PositiveIntegerArg": "Argument to %1 must be a positive integer", "TooManyAligns": "Too many alignment characters: %1", - "BadBreakAlign": "Invalid alignment character: %1", - "MaxTemplateSubs": "Maximum template substitutions exceeded; is there an invalid use of \\\\ in the template?" + "UndefinedControlSequence": "Undefined control sequence %1", + "UnknownAttrForElement": "%1 is not a recognized attribute for %2", + "UnknownEnv": "Unknown environment '%1'", + "UnsupportedHFill": "Unsupported use of %1" } diff --git a/ts/input/tex/bbox/locales/en.json b/ts/input/tex/bbox/locales/en.json index e06b8dfba..38d9d1919 100644 --- a/ts/input/tex/bbox/locales/en.json +++ b/ts/input/tex/bbox/locales/en.json @@ -1,4 +1,4 @@ { - "MultipleBBoxProperty": "%1 specified twice in %2", - "InvalidBBoxProperty": "'%1' doesn't look like a color, a padding dimension, or a style" + "InvalidBBoxProperty": "'%1' doesn't look like a color, a padding dimension, or a style", + "MultipleBBoxProperty": "%1 specified twice in %2" } diff --git a/ts/input/tex/begingroup/locales/en.json b/ts/input/tex/begingroup/locales/en.json index 4823473c2..7e6f351a8 100644 --- a/ts/input/tex/begingroup/locales/en.json +++ b/ts/input/tex/begingroup/locales/en.json @@ -1,4 +1,4 @@ { - "MissingBegingroup": "Missing \\begingroup or extra \\endgroup", - "IllegalGlobal": "Invalid use of %1" + "IllegalGlobal": "Invalid use of %1", + "MissingBegingroup": "Missing \\begingroup or extra \\endgroup" } diff --git a/ts/input/tex/bussproofs/locales/en.json b/ts/input/tex/bussproofs/locales/en.json index 93280edaa..8ecb97ba4 100644 --- a/ts/input/tex/bussproofs/locales/en.json +++ b/ts/input/tex/bussproofs/locales/en.json @@ -1,7 +1,7 @@ { "BadProofTree": "Proof tree badly specified.", + "EnvMissingEnd": "Missing \\end{%1}", "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", - "MissingProofCommand": "Missing %1 in %2.", "IllegalUseOfCommand": "Use of %1 does not match its definition.", - "EnvMissingEnd": "Missing \\end{%1}" + "MissingProofCommand": "Missing %1 in %2." } diff --git a/ts/input/tex/color/locales/en.json b/ts/input/tex/color/locales/en.json index c9873885e..574e35fc8 100644 --- a/ts/input/tex/color/locales/en.json +++ b/ts/input/tex/color/locales/en.json @@ -1,8 +1,8 @@ { - "ModelArg1": "Color values for the %1 model require 3 numbers", - "ModelArg2": "Color values for the %1 model must be between %2 and %3", + "BadColorValue": "Invalid color value", "InvalidDecimalNumber": "Invalid decimal number", "InvalidNumber": "Invalid number", - "UndefinedColorModel": "Color model '%1' not defined", - "BadColorValue": "Invalid color value" + "ModelArg1": "Color values for the %1 model require 3 numbers", + "ModelArg2": "Color values for the %1 model must be between %2 and %3", + "UndefinedColorModel": "Color model '%1' not defined" } diff --git a/ts/input/tex/colortbl/locales/en.json b/ts/input/tex/colortbl/locales/en.json index b8b941761..51f906ece 100644 --- a/ts/input/tex/colortbl/locales/en.json +++ b/ts/input/tex/colortbl/locales/en.json @@ -1,5 +1,5 @@ { - "RowColorNotFirst": "%1 must be at the beginning of a row", "ColumnColorNotTop": "%1 must be in the top row or preamble", + "RowColorNotFirst": "%1 must be at the beginning of a row", "UnsupportedTableColor": "Unsupported use of %1" } diff --git a/ts/input/tex/extpfeil/locales/en.json b/ts/input/tex/extpfeil/locales/en.json index 0f4121064..135821255 100644 --- a/ts/input/tex/extpfeil/locales/en.json +++ b/ts/input/tex/extpfeil/locales/en.json @@ -1,5 +1,5 @@ { - "NewextarrowArg3": "Third argument to %1 must be a unicode character number", + "NewextarrowArg1": "First argument to %1 must be a control sequence name", "NewextarrowArg2": "Second argument to %1 must be two integers separated by a comma", - "NewextarrowArg1": "First argument to %1 must be a control sequence name" + "NewextarrowArg3": "Third argument to %1 must be a unicode character number" } diff --git a/ts/input/tex/locales/en.json b/ts/input/tex/locales/en.json index 10444cfe1..75995313f 100644 --- a/ts/input/tex/locales/en.json +++ b/ts/input/tex/locales/en.json @@ -1,29 +1,29 @@ { + "BadPreamToken": "Illegal pream-token (%1)", + "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", + "ColArgNotNum": "First argument to %1 column specifier must be a number", + "ErroneousNestingEq": "Erroneous nesting of equation structures", + "ExtraCloseLooking": "Extra close brace while looking for %1", "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "ExtraMiddle": "Extra \\middle", "ExtraOpenMissingClose": "Extra open brace or missing close brace", - "MathNotTerminated": "Math mode is not properly terminated", "IllegalMacroParam": "Illegal macro parameter reference", + "InvalidOption": "Invalid option: %1", + "InvalidValue": "Value for key '%1' is not of the expected type", + "MathNotTerminated": "Math mode is not properly terminated", "MaxBufferSize": "MathJax internal buffer size exceeded; is there a recursive macro call?", + "MaxColumns": "Too many column specifiers (perhaps looping column definitions?)", "MaxMacroSub1": "MathJax maximum macro substitution count exceeded; is there a recursive macro call?", "MaxMacroSub2": "MathJax maximum substitution count exceeded; is there a recursive latex environment?", - "InvalidValue": "Value for key '%1' is not of the expected type", - "InvalidOption": "Invalid option: %1", - "ErroneousNestingEq": "Erroneous nesting of equation structures", - "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", - "MissingLeftExtraRight": "Missing \\left or extra \\right", - "ExtraMiddle": "Extra \\middle", - "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", - "TokenNotFoundForCommand": "Could not find %1 for %2", - "ExtraCloseLooking": "Extra close brace while looking for %1", - "MissingDimOrUnits": "Missing dimension or its units for %1", - "MissingCloseBracket": "Could not find closing ']' for argument to %1", - "MissingCloseBrace": "Missing close brace", + "Misplaced": "Misplaced %1", "MissingArgFor": "Missing argument for %1", - "ColArgNotNum": "First argument to %1 column specifier must be a number", "MissingArgForColumn": "Missing argument for %1 column declaration", + "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", + "MissingCloseBrace": "Missing close brace", + "MissingCloseBracket": "Could not find closing ']' for argument to %1", "MissingColumnDimOrUnits": "Missing dimension or its units for %1 column declaration", - "BadPreamToken": "Illegal pream-token (%1)", - "MaxColumns": "Too many column specifiers (perhaps looping column definitions?)", - "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", - "Misplaced": "Misplaced %1" + "MissingDimOrUnits": "Missing dimension or its units for %1", + "MissingLeftExtraRight": "Missing \\left or extra \\right", + "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", + "TokenNotFoundForCommand": "Could not find %1 for %2" } diff --git a/ts/input/tex/mathtools/locales/en.json b/ts/input/tex/mathtools/locales/en.json index a1de77eec..f43fbbd74 100644 --- a/ts/input/tex/mathtools/locales/en.json +++ b/ts/input/tex/mathtools/locales/en.json @@ -1,16 +1,16 @@ { - "InvalidTagFormDef": "The tag form definition for \"%1\" should be an array of three strings", - "ForbiddenMathtoolsSet": "%1 is disabled", - "UndefinedTagForm": "Undefined tag form: %1", - "TagsNotMT": "%1 can only be used with ams or mathtools tags", - "DuplicateTagForm": "Duplicate tag form: %1", - "InvalidTagFormID": "Tag form name can't be empty", + "AlreadyDefined": "%1 is already defined", + "BadWidth": "Width for %1 must be a dimension", "BetweenLines": "%1 must be on a row by itself", + "CommadExists": "Command %1 already defined", "CommandAtTheBeginingOfLine": "%1 must come at the beginning of the line", "CommandInMultlined": "%1 can only appear within the multline or multlined environments", - "BadWidth": "Width for %1 must be a dimension", + "DuplicateTagForm": "Duplicate tag form: %1", + "ForbiddenMathtoolsSet": "%1 is disabled", + "InvalidTagFormDef": "The tag form definition for \"%1\" should be an array of three strings", + "InvalidTagFormID": "Tag form name can't be empty", "NotANumber": "Argument to %1 is not a number", "NotInAlignment": "%1 can only be used in alignment environments", - "AlreadyDefined": "%1 is already defined", - "CommadExists": "Command %1 already defined" + "TagsNotMT": "%1 can only be used with ams or mathtools tags", + "UndefinedTagForm": "Undefined tag form: %1" } diff --git a/ts/input/tex/newcommand/locales/en.json b/ts/input/tex/newcommand/locales/en.json index c865ef91e..c6b2fa866 100644 --- a/ts/input/tex/newcommand/locales/en.json +++ b/ts/input/tex/newcommand/locales/en.json @@ -1,13 +1,13 @@ { - "MismatchUseDef": "Use of %1 doesn't match its definition", - "EnvMissingEnd": "Missing \\end{%1}", - "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", - "RunawayArgument": "Runaway argument for %1?", - "MissingReplacementString": "Missing replacement string for definition of %1", - "SequentialParam": "Parameters for %1 must be numbered sequentially", "CantUseHash2": "Illegal use of # in template for %1", - "IllegalParamNumber": "Illegal number of parameters specified in %1", + "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", + "EnvMissingEnd": "Missing \\end{%1}", "IllegalControlSequenceName": "Illegal control sequence name for %1", + "IllegalParamNumber": "Illegal number of parameters specified in %1", + "MismatchUseDef": "Use of %1 doesn't match its definition", "MissingCS": "%1 must be followed by a control sequence", - "ProtectedMacro": "The control sequence %1 can't be redefined" + "MissingReplacementString": "Missing replacement string for definition of %1", + "ProtectedMacro": "The control sequence %1 can't be redefined", + "RunawayArgument": "Runaway argument for %1?", + "SequentialParam": "Parameters for %1 must be numbered sequentially" } diff --git a/ts/input/tex/setoptions/locales/en.json b/ts/input/tex/setoptions/locales/en.json index 38e7756f5..2d56e407f 100644 --- a/ts/input/tex/setoptions/locales/en.json +++ b/ts/input/tex/setoptions/locales/en.json @@ -1,8 +1,8 @@ { "InvalidOptionKey": "Invalid option \"%1\" for package \"%2\"", "InvalidTexOption": "Invalid TeX option \"%1\"", + "NotAPackage": "Not a defined package: %1", "OptionNotSettable": "Option \"%1\" is not allowed to be set for package %2", "PackageNotSettable": "Options can't be set for package \"%1\"", - "NotAPackage": "Not a defined package: %1", "TeXOptionNotSettable": "Option \"%1\" is not allowed to be set" } diff --git a/ts/input/tex/textmacros/locales/en.json b/ts/input/tex/textmacros/locales/en.json index bfc521e69..7734cbce5 100644 --- a/ts/input/tex/textmacros/locales/en.json +++ b/ts/input/tex/textmacros/locales/en.json @@ -1,7 +1,7 @@ { "ExtraCloseMissingOpen": "Extra close brace or missing open brace", - "MathNotTerminated": "Math mode is not properly terminated", + "MathMacro": "%1 is only supported in math mode", "MathModeOnly": "'%1' allowed only in math mode", - "Misplaced": "Misplaced '%1'", - "MathMacro": "%1 is only supported in math mode" + "MathNotTerminated": "Math mode is not properly terminated", + "Misplaced": "Misplaced '%1'" } diff --git a/ts/input/tex/unicode/locales/en.json b/ts/input/tex/unicode/locales/en.json index b136e16f8..9b4d77b05 100644 --- a/ts/input/tex/unicode/locales/en.json +++ b/ts/input/tex/unicode/locales/en.json @@ -1,7 +1,7 @@ { - "MissingNumber": "Missing numeric constant for %1", - "InvalidAlphanumeric": "Invalid alphanumeric constant for %1", + "BadFont": "Font name for %1 can't contain semicolons", "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", "BadUnicode": "Argument to %1 must be a number", - "BadFont": "Font name for %1 can't contain semicolons" + "InvalidAlphanumeric": "Invalid alphanumeric constant for %1", + "MissingNumber": "Missing numeric constant for %1" } diff --git a/ts/input/tex/verb/locales/en.json b/ts/input/tex/verb/locales/en.json index b9a311cf5..98156c0f0 100644 --- a/ts/input/tex/verb/locales/en.json +++ b/ts/input/tex/verb/locales/en.json @@ -1,4 +1,4 @@ { - "NoClosingDelim": "Can't find closing delimiter for %1", - "MissingArgFor": "Missing argument for %1" + "MissingArgFor": "Missing argument for %1", + "NoClosingDelim": "Can't find closing delimiter for %1" } From b2e1d106a5ff7898abd5f7c5a1358a01be08ac0d Mon Sep 17 00:00:00 2001 From: zorkow Date: Fri, 8 May 2026 13:39:23 +0200 Subject: [PATCH 31/95] first german locale file --- ts/input/tex/base/locales/de.json | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 ts/input/tex/base/locales/de.json diff --git a/ts/input/tex/base/locales/de.json b/ts/input/tex/base/locales/de.json new file mode 100644 index 000000000..e5e2c2ebc --- /dev/null +++ b/ts/input/tex/base/locales/de.json @@ -0,0 +1,48 @@ +{ + "AmbiguousUseOf": "Mehrdeutige Verwendung von %1", + "BadAlignment": "Die Ausrichtung muss aus einer bis drei Kopien von l, c oder r bestehen", + "BadBreakAlign": "Ungültiges Ausrichtungszeichen: %1", + "BadColumnName": "Der Spaltenbezeichner muss genau ein Zeichen lang sein: %1", + "BracketMustBeDimension": "Das Klammerargument für %1 muss eine Bemaßung sein", + "BreakFirstInEntry": "%1 muss am Anfang eines Ausrichtungs-Eintrags stehen", + "BreakFirstInRow": "%1 muss am Anfang einer Ausrichtungszeile stehen", + "BreakFirstInTable": "%1 muss am Anfang einer Ausrichtung stehen", + "BreakNotInArray": "%1 muss in einer Ausrichtungsumgebung verwendet werden", + "BreakType": "Das erste Argument für %1 muss c, r oder t sein", + "CantUseHash1": "Das Makroparameterzeichen '#' darf im mathematischen Modus nicht verwendet werden", + "DoubleExponent": "Doppelter Exponent: Verwende Klammern zur Verdeutlichung", + "DoubleExponentPrime": "Prime führt zu doppeltem Exponenten: Verwende Klammern zur Verdeutlichung", + "DoubleSubscripts": "Doppelte Indizes: Verwende Klammern zur Verdeutlichung", + "EnvBadEnd": "\\begin{%1} endete mit \\end{%2}", + "EnvMissingEnd": "Fehlendes \\end{%1}", + "ExtraAlignTab": "Zusätzlicher Ausrichtungs-Tabulator im \\cases-Text", + "ExtraCloseMissingOpen": "Überflüssige schließende Klammer oder fehlende öffnende Klammer", + "ExtraLeftMissingRight": "Überflüssiges \\left oder fehlendes \\right", + "ExtraMiddle": "Überflüssiges \\middle", + "ExtraOpenMissingClose": "Überflüssige öffnende Klammer oder fehlende schließende Klammer", + "IntegerArg": "Das Argument für %1 muss eine ganze Zahl sein", + "InvalidEnv": "Ungültiger Umgebungsname '%1'", + "InvalidMathMLAttr": "Ungültiges MathML-Attribut: %1", + "MaxTemplateSubs": "Maximale Anzahl an Vorlagenersetzungen überschritten; liegt eine ungültige Verwendung von \\\\ in der Vorlage vor?", + "Misplaced": "Falsch platziertes %1", + "MisplacedLimits": "%1 ist nur bei Operatoren zulässig", + "MisplacedMoveRoot": "%1 darf nur innerhalb einer Wurzel stehen", + "MissingArgFor": "Fehlendes Argument für %1", + "MissingBeginExtraEnd": "Fehlendes \\begin{%1} oder zusätzliches \\end{%1}", + "MissingBoxFor": "Fehlende Box für %1", + "MissingCloseBrace": "Fehlende schließende Klammer", + "MissingLeftExtraRight": "Fehlendes \\left oder überflüssiges \\right", + "MissingOpenForSub": "Fehlende öffnende Klammer für Tiefstellung", + "MissingOpenForSup": "Fehlende öffnende Klammer für Hochstellung", + "MissingScript": "Fehlendes Argument für Hoch- oder Tiefstellung", + "MultipleCommand": "Mehrere %1", + "MultipleLabel": "Bezeichnung '%1' mehrfach definiert", + "MultipleMoveRoot": "Mehrfache Verwendung von %1", + "NotMathMLToken": "%1 ist kein Token-Element", + "PositiveIntegerArg": "Das Argument für %1 muss eine positive ganze Zahl sein", + "TooManyAligns": "Zu viele Ausrichtungszeichen: %1", + "UndefinedControlSequence": "Undefinierte Steuerungssequenz %1", + "UnknownAttrForElement": "%1 ist kein anerkanntes Attribut für %2", + "UnknownEnv": "Unbekannte Umgebung '%1'", + "UnsupportedHFill": "Nicht unterstützte Verwendung von %1" +} From 04049b4ee381d8dc85fbb6fa58874cb24e83c441 Mon Sep 17 00:00:00 2001 From: zorkow Date: Fri, 8 May 2026 13:54:51 +0200 Subject: [PATCH 32/95] all german locale files --- ts/input/tex/ams/locales/de.json | 11 ++++++++++ ts/input/tex/bbox/locales/de.json | 4 ++++ ts/input/tex/begingroup/locales/de.json | 4 ++++ ts/input/tex/braket/locales/de.json | 3 +++ ts/input/tex/bussproofs/locales/de.json | 7 ++++++ ts/input/tex/cases/locales/de.json | 3 +++ ts/input/tex/color/locales/de.json | 8 +++++++ ts/input/tex/colortbl/locales/de.json | 5 +++++ ts/input/tex/empheq/locales/de.json | 3 +++ ts/input/tex/extpfeil/locales/de.json | 5 +++++ ts/input/tex/html/locales/de.json | 3 +++ ts/input/tex/locales/de.json | 29 +++++++++++++++++++++++++ ts/input/tex/mathtools/locales/de.json | 16 ++++++++++++++ ts/input/tex/newcommand/locales/de.json | 13 +++++++++++ ts/input/tex/physics/locales/de.json | 4 ++++ ts/input/tex/require/locales/de.json | 5 +++++ ts/input/tex/setoptions/locales/de.json | 8 +++++++ ts/input/tex/texhtml/locales/de.json | 3 +++ ts/input/tex/textmacros/locales/de.json | 7 ++++++ ts/input/tex/unicode/locales/de.json | 7 ++++++ ts/input/tex/verb/locales/de.json | 4 ++++ 21 files changed, 152 insertions(+) create mode 100644 ts/input/tex/ams/locales/de.json create mode 100644 ts/input/tex/bbox/locales/de.json create mode 100644 ts/input/tex/begingroup/locales/de.json create mode 100644 ts/input/tex/braket/locales/de.json create mode 100644 ts/input/tex/bussproofs/locales/de.json create mode 100644 ts/input/tex/cases/locales/de.json create mode 100644 ts/input/tex/color/locales/de.json create mode 100644 ts/input/tex/colortbl/locales/de.json create mode 100644 ts/input/tex/empheq/locales/de.json create mode 100644 ts/input/tex/extpfeil/locales/de.json create mode 100644 ts/input/tex/html/locales/de.json create mode 100644 ts/input/tex/locales/de.json create mode 100644 ts/input/tex/mathtools/locales/de.json create mode 100644 ts/input/tex/newcommand/locales/de.json create mode 100644 ts/input/tex/physics/locales/de.json create mode 100644 ts/input/tex/require/locales/de.json create mode 100644 ts/input/tex/setoptions/locales/de.json create mode 100644 ts/input/tex/texhtml/locales/de.json create mode 100644 ts/input/tex/textmacros/locales/de.json create mode 100644 ts/input/tex/unicode/locales/de.json create mode 100644 ts/input/tex/verb/locales/de.json diff --git a/ts/input/tex/ams/locales/de.json b/ts/input/tex/ams/locales/de.json new file mode 100644 index 000000000..f89ba889f --- /dev/null +++ b/ts/input/tex/ams/locales/de.json @@ -0,0 +1,11 @@ +{ + "BadMathStyleFor": "Falscher mathematischer Stil für %1", + "CommandAtTheBeginingOfLine": "%1 muss am Zeilenanfang stehen", + "CommandNotAllowedInEnv": "%1 ist in der Umgebung %2 nicht zulässig", + "CommandOnlyAllowedInEnv": "%1 ist nur in der Umgebung %2 zulässig", + "IllegalAlign": "Ungültige Ausrichtung in %1 angegeben", + "MultipleCommand": "Mehrere %1", + "MultlineRowsOneCol": "Die Zeilen innerhalb der %1-Umgebung müssen genau eine Spalte haben", + "PositiveIntegerArg": "Das Argument für %1 muss eine positive ganze Zahl sein", + "XalignOverflow": "Zusätzliches %1 in Zeile %2" +} diff --git a/ts/input/tex/bbox/locales/de.json b/ts/input/tex/bbox/locales/de.json new file mode 100644 index 000000000..189d848b1 --- /dev/null +++ b/ts/input/tex/bbox/locales/de.json @@ -0,0 +1,4 @@ +{ + "InvalidBBoxProperty": "'%1' sieht nicht nach einer Farbe, einem Abstand oder einem Stil aus", + "MultipleBBoxProperty": "%1 wurde in %2 zweimal angegeben" +} diff --git a/ts/input/tex/begingroup/locales/de.json b/ts/input/tex/begingroup/locales/de.json new file mode 100644 index 000000000..68520ec2c --- /dev/null +++ b/ts/input/tex/begingroup/locales/de.json @@ -0,0 +1,4 @@ +{ + "IllegalGlobal": "Ungültige Verwendung von %1", + "MissingBegingroup": "Fehlende \\begingroup oder überflüssige \\endgroup" +} diff --git a/ts/input/tex/braket/locales/de.json b/ts/input/tex/braket/locales/de.json new file mode 100644 index 000000000..f80c3381b --- /dev/null +++ b/ts/input/tex/braket/locales/de.json @@ -0,0 +1,3 @@ +{ + "MissingArgFor": "Argument für %1 fehlt" +} diff --git a/ts/input/tex/bussproofs/locales/de.json b/ts/input/tex/bussproofs/locales/de.json new file mode 100644 index 000000000..76dfe1782 --- /dev/null +++ b/ts/input/tex/bussproofs/locales/de.json @@ -0,0 +1,7 @@ +{ + "BadProofTree": "Beweisbaum falsch angegeben.", + "EnvMissingEnd": "\\end{%1} fehlt", + "IllegalProofCommand": "Beweisbefehle sind nur in der prooftree-Umgebung zulässig.", + "IllegalUseOfCommand": "Die Verwendung von %1 entspricht nicht seiner Definition.", + "MissingProofCommand": "%1 fehlt in %2." +} diff --git a/ts/input/tex/cases/locales/de.json b/ts/input/tex/cases/locales/de.json new file mode 100644 index 000000000..454506afd --- /dev/null +++ b/ts/input/tex/cases/locales/de.json @@ -0,0 +1,3 @@ +{ + "ExtraCasesAlignTab": "Zusätzlicher Ausrichtungs-Tabulator im Text für die numcase-Umgebung" +} diff --git a/ts/input/tex/color/locales/de.json b/ts/input/tex/color/locales/de.json new file mode 100644 index 000000000..6ea0ad493 --- /dev/null +++ b/ts/input/tex/color/locales/de.json @@ -0,0 +1,8 @@ +{ + "BadColorValue": "Ungültiger Farbwert", + "InvalidDecimalNumber": "Ungültige Dezimalzahl", + "InvalidNumber": "Ungültige Zahl", + "ModelArg1": "Farbwerte für das Modell %1 erfordern 3 Zahlen", + "ModelArg2": "Farbwerte für das Modell %1 müssen zwischen %2 und %3 liegen", + "UndefinedColorModel": "Farbmodell '%1' nicht definiert" +} diff --git a/ts/input/tex/colortbl/locales/de.json b/ts/input/tex/colortbl/locales/de.json new file mode 100644 index 000000000..4021cfee9 --- /dev/null +++ b/ts/input/tex/colortbl/locales/de.json @@ -0,0 +1,5 @@ +{ + "ColumnColorNotTop": "%1 muss in der obersten Zeile oder im Vorspann stehen", + "RowColorNotFirst": "%1 muss am Anfang einer Zeile stehen", + "UnsupportedTableColor": "%1 wird nicht unterstützt" +} diff --git a/ts/input/tex/empheq/locales/de.json b/ts/input/tex/empheq/locales/de.json new file mode 100644 index 000000000..148636823 --- /dev/null +++ b/ts/input/tex/empheq/locales/de.json @@ -0,0 +1,3 @@ +{ + "EmpheqInvalidEnv": "Ungültige Umgebung \"%1\" für %2" +} diff --git a/ts/input/tex/extpfeil/locales/de.json b/ts/input/tex/extpfeil/locales/de.json new file mode 100644 index 000000000..9fedfaacf --- /dev/null +++ b/ts/input/tex/extpfeil/locales/de.json @@ -0,0 +1,5 @@ +{ + "NewextarrowArg1": "Das erste Argument für %1 muss ein Name einer Steuerungssequenz sein", + "NewextarrowArg2": "Das zweite Argument für %1 muss aus zwei durch ein Komma getrennten Ganzzahlen bestehen", + "NewextarrowArg3": "Das dritte Argument für %1 muss eine Unicode-Zeichennummer sein" +} diff --git a/ts/input/tex/html/locales/de.json b/ts/input/tex/html/locales/de.json new file mode 100644 index 000000000..8ee87dca3 --- /dev/null +++ b/ts/input/tex/html/locales/de.json @@ -0,0 +1,3 @@ +{ + "InvalidHTMLAttr": "Ungültiges HTML-Attribut: %1" +} diff --git a/ts/input/tex/locales/de.json b/ts/input/tex/locales/de.json new file mode 100644 index 000000000..461307196 --- /dev/null +++ b/ts/input/tex/locales/de.json @@ -0,0 +1,29 @@ +{ + "BadPreamToken": "Ungültiges Pream-Token (%1)", + "BadRawUnicode": "Das Argument für %1 muss eine hexadezimale Zahl mit 1 bis 6 Ziffern sein", + "ColArgNotNum": "Das erste Argument für den Spaltenbezeichner %1 muss eine Zahl sein", + "ErroneousNestingEq": "Fehlerhafte Verschachtelung von Gleichungsstrukturen", + "ExtraCloseLooking": "Überflüssige schließende Klammer bei der Suche nach %1", + "ExtraCloseMissingOpen": "Überflüssige schließende Klammer oder fehlende öffnende Klammer", + "ExtraMiddle": "Zusätzliches \\middle", + "ExtraOpenMissingClose": "Zusätzliche öffnende Klammer oder fehlende schließende Klammer", + "IllegalMacroParam": "Ungültiger Makroparameterverweis", + "InvalidOption": "Ungültige Option: %1", + "InvalidValue": "Der Wert für den Schlüssel '%1' hat nicht den erwarteten Typ", + "MathNotTerminated": "Der Mathematikmodus wurde nicht ordnungsgemäß beendet", + "MaxBufferSize": "Die interne Puffergröße von MathJax wurde überschritten; liegt ein rekursiver Makroaufruf vor?", + "MaxColumns": "Zu viele Spaltenangaben (möglicherweise sich wiederholende Spaltendefinitionen?)", + "MaxMacroSub1": "Maximale Anzahl an Makrosubstitutionen in MathJax überschritten; liegt ein rekursiver Makroaufruf vor?", + "MaxMacroSub2": "Maximale Anzahl an Ersetzungen in MathJax überschritten; liegt eine rekursive LaTeX-Umgebung vor?", + "Misplaced": "%1 falsch platziert", + "MissingArgFor": "Fehlendes Argument für %1", + "MissingArgForColumn": "Fehlendes Argument für die Spaltendeklaration %1", + "MissingBeginExtraEnd": "Fehlendes \\begin{%1} oder zusätzliches \\end{%1}", + "MissingCloseBrace": "Fehlende schließende Klammer", + "MissingCloseBracket": "Schließendes ']' für Argument zu %1 nicht gefunden", + "MissingColumnDimOrUnits": "Missing dimension or its units for %1 column declaration", + "MissingDimOrUnits": "Missing dimension or its units for %1", + "MissingLeftExtraRight": "Missing \\left or extra \\right", + "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", + "TokenNotFoundForCommand": "Could not find %1 for %2" +} diff --git a/ts/input/tex/mathtools/locales/de.json b/ts/input/tex/mathtools/locales/de.json new file mode 100644 index 000000000..dec337736 --- /dev/null +++ b/ts/input/tex/mathtools/locales/de.json @@ -0,0 +1,16 @@ +{ + "AlreadyDefined": "%1 ist bereits definiert", + "BadWidth": "Die Breite für %1 muss eine Abmessung sein", + "BetweenLines": "%1 muss in einer eigenen Zeile stehen", + "BefehlExistiert": "Befehl %1 ist bereits definiert", + "BefehlAmZeilenanfang": "%1 muss am Zeilenanfang stehen", + "BefehlInMultlined": "%1 darf nur innerhalb der Umgebungen multline oder multlined vorkommen", + "DoppelteTagForm": "Doppelte Tag-Form: %1", + "ForbiddenMathtoolsSet": "%1 ist deaktiviert", + "InvalidTagFormDef": "Die Tag-Form-Definition für \"%1\" sollte ein Array aus drei Strings sein", + "InvalidTagFormID": "Der Name der Tag-Form darf nicht leer sein", + "NotANumber": "Das Argument für %1 ist keine Zahl", + "NotInAlignment": "%1 kann nur in Ausrichtungsumgebungen verwendet werden", + "TagsNotMT": "%1 kann nur mit ams- oder mathtools-Tags verwendet werden", + "UndefinedTagForm": "Undefinierte Tag-Form: %1" +} diff --git a/ts/input/tex/newcommand/locales/de.json b/ts/input/tex/newcommand/locales/de.json new file mode 100644 index 000000000..bb1ee2681 --- /dev/null +++ b/ts/input/tex/newcommand/locales/de.json @@ -0,0 +1,13 @@ +{ + "CantUseHash2": "Unzulässige Verwendung von # in der Vorlage für %1", + "EnvBadEnd": "\\begin{%1} endete mit \\end{%2}", + "EnvMissingEnd": "Fehlendes \\end{%1}", + "IllegalControlSequenceName": "Ungültiger Name der Steuerungssequenz für %1", + "IllegalParamNumber": "Ungültige Anzahl von Parametern in %1 angegeben", + "MismatchUseDef": "Die Verwendung von %1 stimmt nicht mit der Definition überein", + "MissingCS": "Auf %1 muss eine Steuerungssequenz folgen", + "MissingReplacementString": "Ersetzungszeichenfolge für die Definition von %1 fehlt", + "ProtectedMacro": "Die Steuerungssequenz %1 kann nicht neu definiert werden", + "RunawayArgument": "Fehlerhaftes Argument für %1?", + "SequentialParam": "Parameter für %1 müssen fortlaufend nummeriert sein" +} diff --git a/ts/input/tex/physics/locales/de.json b/ts/input/tex/physics/locales/de.json new file mode 100644 index 000000000..67ec1e7c2 --- /dev/null +++ b/ts/input/tex/physics/locales/de.json @@ -0,0 +1,4 @@ +{ + "InvalidNumber": "Ungültige Zahl", + "MissingArgFor": "Fehlendes Argument für %1" +} diff --git a/ts/input/tex/require/locales/de.json b/ts/input/tex/require/locales/de.json new file mode 100644 index 000000000..017eff802 --- /dev/null +++ b/ts/input/tex/require/locales/de.json @@ -0,0 +1,5 @@ +{ + "BadPackageName": "Das Argument für %1 ist kein gültiger Paketname", + "BadRequire": "Die Erweiterung \"%1\" darf nicht geladen werden", + "RequireFail": "Die Erweiterung \"%1\" konnte nicht geladen werden" +} diff --git a/ts/input/tex/setoptions/locales/de.json b/ts/input/tex/setoptions/locales/de.json new file mode 100644 index 000000000..46953f849 --- /dev/null +++ b/ts/input/tex/setoptions/locales/de.json @@ -0,0 +1,8 @@ +{ + "InvalidOptionKey": "Ungültige Option \"%1\" für das Paket \"%2\"", + "InvalidTexOption": "Ungültige TeX-Option \"%1\"", + "NotAPackage": "Kein definiertes Paket: %1", + "OptionNotSettable": "Die Option \"%1\" darf für das Paket %2 nicht gesetzt werden", + "PackageNotSettable": "Für das Paket \"%1\" können keine Optionen gesetzt werden", + "TeXOptionNotSettable": "Die Option \"%1\" darf nicht gesetzt werden" +} diff --git a/ts/input/tex/texhtml/locales/de.json b/ts/input/tex/texhtml/locales/de.json new file mode 100644 index 000000000..5f88b1882 --- /dev/null +++ b/ts/input/tex/texhtml/locales/de.json @@ -0,0 +1,3 @@ +{ + "TokenNotFoundForCommand": "%1 für %2 konnte nicht gefunden werden" +} diff --git a/ts/input/tex/textmacros/locales/de.json b/ts/input/tex/textmacros/locales/de.json new file mode 100644 index 000000000..28c332a6a --- /dev/null +++ b/ts/input/tex/textmacros/locales/de.json @@ -0,0 +1,7 @@ +{ + "ExtraCloseMissingOpen": "Zusätzliche schließende Klammer oder fehlende öffnende Klammer", + "MathMacro": "%1 wird nur im mathematischen Modus unterstützt", + "MathModeOnly": "'%1' ist nur im mathematischen Modus zulässig", + "MathNotTerminated": "Der mathematische Modus wurde nicht ordnungsgemäß beendet", + "Misplaced": "Falsch platziertes '%1'" +} diff --git a/ts/input/tex/unicode/locales/de.json b/ts/input/tex/unicode/locales/de.json new file mode 100644 index 000000000..b375c87a7 --- /dev/null +++ b/ts/input/tex/unicode/locales/de.json @@ -0,0 +1,7 @@ +{ + "BadFont": "Der Schriftartenname für %1 darf keine Semikolons enthalten", + "BadRawUnicode": "Das Argument für %1 muss eine hexadezimale Zahl mit 1 bis 6 Ziffern sein", + "BadUnicode": "Das Argument für %1 muss eine Zahl sein", + "InvalidAlphanumeric": "Ungültige alphanumerische Konstante für %1", + "MissingNumber": "Fehlende numerische Konstante für %1" +} diff --git a/ts/input/tex/verb/locales/de.json b/ts/input/tex/verb/locales/de.json new file mode 100644 index 000000000..e0d850fe3 --- /dev/null +++ b/ts/input/tex/verb/locales/de.json @@ -0,0 +1,4 @@ +{ + "MissingArgFor": "Argument für %1 fehlt", + "NoClosingDelim": "Schließendes Trennzeichen für %1 nicht gefunden" +} From 1f662589503e6a8a7b0c461252c740f9b0eefcd6 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 11 May 2026 09:47:57 +0200 Subject: [PATCH 33/95] rename locales directories --- testsuite/lib/component/{locales => __locales__}/en.json | 0 testsuite/lib/component/{locales => __locales__}/test.json | 0 ts/input/tex/{locales => __locales__}/Component.ts | 0 ts/input/tex/{locales => __locales__}/de.json | 0 ts/input/tex/{locales => __locales__}/en.json | 0 ts/input/tex/ams/{locales => __locales__}/Component.ts | 0 ts/input/tex/ams/{locales => __locales__}/de.json | 0 ts/input/tex/ams/{locales => __locales__}/en.json | 0 ts/input/tex/base/{locales => __locales__}/Component.ts | 0 ts/input/tex/base/{locales => __locales__}/de.json | 0 ts/input/tex/base/{locales => __locales__}/en.json | 0 ts/input/tex/bbox/{locales => __locales__}/Component.ts | 0 ts/input/tex/bbox/{locales => __locales__}/de.json | 0 ts/input/tex/bbox/{locales => __locales__}/en.json | 0 ts/input/tex/begingroup/{locales => __locales__}/Component.ts | 0 ts/input/tex/begingroup/{locales => __locales__}/de.json | 0 ts/input/tex/begingroup/{locales => __locales__}/en.json | 0 ts/input/tex/braket/{locales => __locales__}/Component.ts | 0 ts/input/tex/braket/{locales => __locales__}/de.json | 0 ts/input/tex/braket/{locales => __locales__}/en.json | 0 ts/input/tex/bussproofs/{locales => __locales__}/Component.ts | 0 ts/input/tex/bussproofs/{locales => __locales__}/de.json | 0 ts/input/tex/bussproofs/{locales => __locales__}/en.json | 0 ts/input/tex/cases/{locales => __locales__}/Component.ts | 0 ts/input/tex/cases/{locales => __locales__}/de.json | 0 ts/input/tex/cases/{locales => __locales__}/en.json | 0 ts/input/tex/color/{locales => __locales__}/Component.ts | 0 ts/input/tex/color/{locales => __locales__}/de.json | 0 ts/input/tex/color/{locales => __locales__}/en.json | 0 ts/input/tex/colortbl/{locales => __locales__}/Component.ts | 0 ts/input/tex/colortbl/{locales => __locales__}/de.json | 0 ts/input/tex/colortbl/{locales => __locales__}/en.json | 0 ts/input/tex/empheq/{locales => __locales__}/Component.ts | 0 ts/input/tex/empheq/{locales => __locales__}/de.json | 0 ts/input/tex/empheq/{locales => __locales__}/en.json | 0 ts/input/tex/extpfeil/{locales => __locales__}/Component.ts | 0 ts/input/tex/extpfeil/{locales => __locales__}/de.json | 0 ts/input/tex/extpfeil/{locales => __locales__}/en.json | 0 ts/input/tex/html/{locales => __locales__}/Component.ts | 0 ts/input/tex/html/{locales => __locales__}/de.json | 0 ts/input/tex/html/{locales => __locales__}/en.json | 0 ts/input/tex/mathtools/{locales => __locales__}/Component.ts | 0 ts/input/tex/mathtools/{locales => __locales__}/de.json | 0 ts/input/tex/mathtools/{locales => __locales__}/en.json | 0 ts/input/tex/newcommand/{locales => __locales__}/Component.ts | 0 ts/input/tex/newcommand/{locales => __locales__}/de.json | 0 ts/input/tex/newcommand/{locales => __locales__}/en.json | 0 ts/input/tex/physics/{locales => __locales__}/Component.ts | 0 ts/input/tex/physics/{locales => __locales__}/de.json | 0 ts/input/tex/physics/{locales => __locales__}/en.json | 0 ts/input/tex/require/{locales => __locales__}/Component.ts | 0 ts/input/tex/require/{locales => __locales__}/de.json | 0 ts/input/tex/require/{locales => __locales__}/en.json | 0 ts/input/tex/setoptions/{locales => __locales__}/Component.ts | 0 ts/input/tex/setoptions/{locales => __locales__}/de.json | 0 ts/input/tex/setoptions/{locales => __locales__}/en.json | 0 ts/input/tex/texhtml/{locales => __locales__}/Component.ts | 0 ts/input/tex/texhtml/{locales => __locales__}/de.json | 0 ts/input/tex/texhtml/{locales => __locales__}/en.json | 0 ts/input/tex/textmacros/{locales => __locales__}/Component.ts | 0 ts/input/tex/textmacros/{locales => __locales__}/de.json | 0 ts/input/tex/textmacros/{locales => __locales__}/en.json | 0 ts/input/tex/unicode/{locales => __locales__}/Component.ts | 0 ts/input/tex/unicode/{locales => __locales__}/de.json | 0 ts/input/tex/unicode/{locales => __locales__}/en.json | 0 ts/input/tex/verb/{locales => __locales__}/Component.ts | 0 ts/input/tex/verb/{locales => __locales__}/de.json | 0 ts/input/tex/verb/{locales => __locales__}/en.json | 0 68 files changed, 0 insertions(+), 0 deletions(-) rename testsuite/lib/component/{locales => __locales__}/en.json (100%) rename testsuite/lib/component/{locales => __locales__}/test.json (100%) rename ts/input/tex/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/{locales => __locales__}/de.json (100%) rename ts/input/tex/{locales => __locales__}/en.json (100%) rename ts/input/tex/ams/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/ams/{locales => __locales__}/de.json (100%) rename ts/input/tex/ams/{locales => __locales__}/en.json (100%) rename ts/input/tex/base/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/base/{locales => __locales__}/de.json (100%) rename ts/input/tex/base/{locales => __locales__}/en.json (100%) rename ts/input/tex/bbox/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/bbox/{locales => __locales__}/de.json (100%) rename ts/input/tex/bbox/{locales => __locales__}/en.json (100%) rename ts/input/tex/begingroup/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/begingroup/{locales => __locales__}/de.json (100%) rename ts/input/tex/begingroup/{locales => __locales__}/en.json (100%) rename ts/input/tex/braket/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/braket/{locales => __locales__}/de.json (100%) rename ts/input/tex/braket/{locales => __locales__}/en.json (100%) rename ts/input/tex/bussproofs/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/bussproofs/{locales => __locales__}/de.json (100%) rename ts/input/tex/bussproofs/{locales => __locales__}/en.json (100%) rename ts/input/tex/cases/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/cases/{locales => __locales__}/de.json (100%) rename ts/input/tex/cases/{locales => __locales__}/en.json (100%) rename ts/input/tex/color/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/color/{locales => __locales__}/de.json (100%) rename ts/input/tex/color/{locales => __locales__}/en.json (100%) rename ts/input/tex/colortbl/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/colortbl/{locales => __locales__}/de.json (100%) rename ts/input/tex/colortbl/{locales => __locales__}/en.json (100%) rename ts/input/tex/empheq/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/empheq/{locales => __locales__}/de.json (100%) rename ts/input/tex/empheq/{locales => __locales__}/en.json (100%) rename ts/input/tex/extpfeil/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/extpfeil/{locales => __locales__}/de.json (100%) rename ts/input/tex/extpfeil/{locales => __locales__}/en.json (100%) rename ts/input/tex/html/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/html/{locales => __locales__}/de.json (100%) rename ts/input/tex/html/{locales => __locales__}/en.json (100%) rename ts/input/tex/mathtools/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/mathtools/{locales => __locales__}/de.json (100%) rename ts/input/tex/mathtools/{locales => __locales__}/en.json (100%) rename ts/input/tex/newcommand/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/newcommand/{locales => __locales__}/de.json (100%) rename ts/input/tex/newcommand/{locales => __locales__}/en.json (100%) rename ts/input/tex/physics/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/physics/{locales => __locales__}/de.json (100%) rename ts/input/tex/physics/{locales => __locales__}/en.json (100%) rename ts/input/tex/require/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/require/{locales => __locales__}/de.json (100%) rename ts/input/tex/require/{locales => __locales__}/en.json (100%) rename ts/input/tex/setoptions/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/setoptions/{locales => __locales__}/de.json (100%) rename ts/input/tex/setoptions/{locales => __locales__}/en.json (100%) rename ts/input/tex/texhtml/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/texhtml/{locales => __locales__}/de.json (100%) rename ts/input/tex/texhtml/{locales => __locales__}/en.json (100%) rename ts/input/tex/textmacros/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/textmacros/{locales => __locales__}/de.json (100%) rename ts/input/tex/textmacros/{locales => __locales__}/en.json (100%) rename ts/input/tex/unicode/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/unicode/{locales => __locales__}/de.json (100%) rename ts/input/tex/unicode/{locales => __locales__}/en.json (100%) rename ts/input/tex/verb/{locales => __locales__}/Component.ts (100%) rename ts/input/tex/verb/{locales => __locales__}/de.json (100%) rename ts/input/tex/verb/{locales => __locales__}/en.json (100%) diff --git a/testsuite/lib/component/locales/en.json b/testsuite/lib/component/__locales__/en.json similarity index 100% rename from testsuite/lib/component/locales/en.json rename to testsuite/lib/component/__locales__/en.json diff --git a/testsuite/lib/component/locales/test.json b/testsuite/lib/component/__locales__/test.json similarity index 100% rename from testsuite/lib/component/locales/test.json rename to testsuite/lib/component/__locales__/test.json diff --git a/ts/input/tex/locales/Component.ts b/ts/input/tex/__locales__/Component.ts similarity index 100% rename from ts/input/tex/locales/Component.ts rename to ts/input/tex/__locales__/Component.ts diff --git a/ts/input/tex/locales/de.json b/ts/input/tex/__locales__/de.json similarity index 100% rename from ts/input/tex/locales/de.json rename to ts/input/tex/__locales__/de.json diff --git a/ts/input/tex/locales/en.json b/ts/input/tex/__locales__/en.json similarity index 100% rename from ts/input/tex/locales/en.json rename to ts/input/tex/__locales__/en.json diff --git a/ts/input/tex/ams/locales/Component.ts b/ts/input/tex/ams/__locales__/Component.ts similarity index 100% rename from ts/input/tex/ams/locales/Component.ts rename to ts/input/tex/ams/__locales__/Component.ts diff --git a/ts/input/tex/ams/locales/de.json b/ts/input/tex/ams/__locales__/de.json similarity index 100% rename from ts/input/tex/ams/locales/de.json rename to ts/input/tex/ams/__locales__/de.json diff --git a/ts/input/tex/ams/locales/en.json b/ts/input/tex/ams/__locales__/en.json similarity index 100% rename from ts/input/tex/ams/locales/en.json rename to ts/input/tex/ams/__locales__/en.json diff --git a/ts/input/tex/base/locales/Component.ts b/ts/input/tex/base/__locales__/Component.ts similarity index 100% rename from ts/input/tex/base/locales/Component.ts rename to ts/input/tex/base/__locales__/Component.ts diff --git a/ts/input/tex/base/locales/de.json b/ts/input/tex/base/__locales__/de.json similarity index 100% rename from ts/input/tex/base/locales/de.json rename to ts/input/tex/base/__locales__/de.json diff --git a/ts/input/tex/base/locales/en.json b/ts/input/tex/base/__locales__/en.json similarity index 100% rename from ts/input/tex/base/locales/en.json rename to ts/input/tex/base/__locales__/en.json diff --git a/ts/input/tex/bbox/locales/Component.ts b/ts/input/tex/bbox/__locales__/Component.ts similarity index 100% rename from ts/input/tex/bbox/locales/Component.ts rename to ts/input/tex/bbox/__locales__/Component.ts diff --git a/ts/input/tex/bbox/locales/de.json b/ts/input/tex/bbox/__locales__/de.json similarity index 100% rename from ts/input/tex/bbox/locales/de.json rename to ts/input/tex/bbox/__locales__/de.json diff --git a/ts/input/tex/bbox/locales/en.json b/ts/input/tex/bbox/__locales__/en.json similarity index 100% rename from ts/input/tex/bbox/locales/en.json rename to ts/input/tex/bbox/__locales__/en.json diff --git a/ts/input/tex/begingroup/locales/Component.ts b/ts/input/tex/begingroup/__locales__/Component.ts similarity index 100% rename from ts/input/tex/begingroup/locales/Component.ts rename to ts/input/tex/begingroup/__locales__/Component.ts diff --git a/ts/input/tex/begingroup/locales/de.json b/ts/input/tex/begingroup/__locales__/de.json similarity index 100% rename from ts/input/tex/begingroup/locales/de.json rename to ts/input/tex/begingroup/__locales__/de.json diff --git a/ts/input/tex/begingroup/locales/en.json b/ts/input/tex/begingroup/__locales__/en.json similarity index 100% rename from ts/input/tex/begingroup/locales/en.json rename to ts/input/tex/begingroup/__locales__/en.json diff --git a/ts/input/tex/braket/locales/Component.ts b/ts/input/tex/braket/__locales__/Component.ts similarity index 100% rename from ts/input/tex/braket/locales/Component.ts rename to ts/input/tex/braket/__locales__/Component.ts diff --git a/ts/input/tex/braket/locales/de.json b/ts/input/tex/braket/__locales__/de.json similarity index 100% rename from ts/input/tex/braket/locales/de.json rename to ts/input/tex/braket/__locales__/de.json diff --git a/ts/input/tex/braket/locales/en.json b/ts/input/tex/braket/__locales__/en.json similarity index 100% rename from ts/input/tex/braket/locales/en.json rename to ts/input/tex/braket/__locales__/en.json diff --git a/ts/input/tex/bussproofs/locales/Component.ts b/ts/input/tex/bussproofs/__locales__/Component.ts similarity index 100% rename from ts/input/tex/bussproofs/locales/Component.ts rename to ts/input/tex/bussproofs/__locales__/Component.ts diff --git a/ts/input/tex/bussproofs/locales/de.json b/ts/input/tex/bussproofs/__locales__/de.json similarity index 100% rename from ts/input/tex/bussproofs/locales/de.json rename to ts/input/tex/bussproofs/__locales__/de.json diff --git a/ts/input/tex/bussproofs/locales/en.json b/ts/input/tex/bussproofs/__locales__/en.json similarity index 100% rename from ts/input/tex/bussproofs/locales/en.json rename to ts/input/tex/bussproofs/__locales__/en.json diff --git a/ts/input/tex/cases/locales/Component.ts b/ts/input/tex/cases/__locales__/Component.ts similarity index 100% rename from ts/input/tex/cases/locales/Component.ts rename to ts/input/tex/cases/__locales__/Component.ts diff --git a/ts/input/tex/cases/locales/de.json b/ts/input/tex/cases/__locales__/de.json similarity index 100% rename from ts/input/tex/cases/locales/de.json rename to ts/input/tex/cases/__locales__/de.json diff --git a/ts/input/tex/cases/locales/en.json b/ts/input/tex/cases/__locales__/en.json similarity index 100% rename from ts/input/tex/cases/locales/en.json rename to ts/input/tex/cases/__locales__/en.json diff --git a/ts/input/tex/color/locales/Component.ts b/ts/input/tex/color/__locales__/Component.ts similarity index 100% rename from ts/input/tex/color/locales/Component.ts rename to ts/input/tex/color/__locales__/Component.ts diff --git a/ts/input/tex/color/locales/de.json b/ts/input/tex/color/__locales__/de.json similarity index 100% rename from ts/input/tex/color/locales/de.json rename to ts/input/tex/color/__locales__/de.json diff --git a/ts/input/tex/color/locales/en.json b/ts/input/tex/color/__locales__/en.json similarity index 100% rename from ts/input/tex/color/locales/en.json rename to ts/input/tex/color/__locales__/en.json diff --git a/ts/input/tex/colortbl/locales/Component.ts b/ts/input/tex/colortbl/__locales__/Component.ts similarity index 100% rename from ts/input/tex/colortbl/locales/Component.ts rename to ts/input/tex/colortbl/__locales__/Component.ts diff --git a/ts/input/tex/colortbl/locales/de.json b/ts/input/tex/colortbl/__locales__/de.json similarity index 100% rename from ts/input/tex/colortbl/locales/de.json rename to ts/input/tex/colortbl/__locales__/de.json diff --git a/ts/input/tex/colortbl/locales/en.json b/ts/input/tex/colortbl/__locales__/en.json similarity index 100% rename from ts/input/tex/colortbl/locales/en.json rename to ts/input/tex/colortbl/__locales__/en.json diff --git a/ts/input/tex/empheq/locales/Component.ts b/ts/input/tex/empheq/__locales__/Component.ts similarity index 100% rename from ts/input/tex/empheq/locales/Component.ts rename to ts/input/tex/empheq/__locales__/Component.ts diff --git a/ts/input/tex/empheq/locales/de.json b/ts/input/tex/empheq/__locales__/de.json similarity index 100% rename from ts/input/tex/empheq/locales/de.json rename to ts/input/tex/empheq/__locales__/de.json diff --git a/ts/input/tex/empheq/locales/en.json b/ts/input/tex/empheq/__locales__/en.json similarity index 100% rename from ts/input/tex/empheq/locales/en.json rename to ts/input/tex/empheq/__locales__/en.json diff --git a/ts/input/tex/extpfeil/locales/Component.ts b/ts/input/tex/extpfeil/__locales__/Component.ts similarity index 100% rename from ts/input/tex/extpfeil/locales/Component.ts rename to ts/input/tex/extpfeil/__locales__/Component.ts diff --git a/ts/input/tex/extpfeil/locales/de.json b/ts/input/tex/extpfeil/__locales__/de.json similarity index 100% rename from ts/input/tex/extpfeil/locales/de.json rename to ts/input/tex/extpfeil/__locales__/de.json diff --git a/ts/input/tex/extpfeil/locales/en.json b/ts/input/tex/extpfeil/__locales__/en.json similarity index 100% rename from ts/input/tex/extpfeil/locales/en.json rename to ts/input/tex/extpfeil/__locales__/en.json diff --git a/ts/input/tex/html/locales/Component.ts b/ts/input/tex/html/__locales__/Component.ts similarity index 100% rename from ts/input/tex/html/locales/Component.ts rename to ts/input/tex/html/__locales__/Component.ts diff --git a/ts/input/tex/html/locales/de.json b/ts/input/tex/html/__locales__/de.json similarity index 100% rename from ts/input/tex/html/locales/de.json rename to ts/input/tex/html/__locales__/de.json diff --git a/ts/input/tex/html/locales/en.json b/ts/input/tex/html/__locales__/en.json similarity index 100% rename from ts/input/tex/html/locales/en.json rename to ts/input/tex/html/__locales__/en.json diff --git a/ts/input/tex/mathtools/locales/Component.ts b/ts/input/tex/mathtools/__locales__/Component.ts similarity index 100% rename from ts/input/tex/mathtools/locales/Component.ts rename to ts/input/tex/mathtools/__locales__/Component.ts diff --git a/ts/input/tex/mathtools/locales/de.json b/ts/input/tex/mathtools/__locales__/de.json similarity index 100% rename from ts/input/tex/mathtools/locales/de.json rename to ts/input/tex/mathtools/__locales__/de.json diff --git a/ts/input/tex/mathtools/locales/en.json b/ts/input/tex/mathtools/__locales__/en.json similarity index 100% rename from ts/input/tex/mathtools/locales/en.json rename to ts/input/tex/mathtools/__locales__/en.json diff --git a/ts/input/tex/newcommand/locales/Component.ts b/ts/input/tex/newcommand/__locales__/Component.ts similarity index 100% rename from ts/input/tex/newcommand/locales/Component.ts rename to ts/input/tex/newcommand/__locales__/Component.ts diff --git a/ts/input/tex/newcommand/locales/de.json b/ts/input/tex/newcommand/__locales__/de.json similarity index 100% rename from ts/input/tex/newcommand/locales/de.json rename to ts/input/tex/newcommand/__locales__/de.json diff --git a/ts/input/tex/newcommand/locales/en.json b/ts/input/tex/newcommand/__locales__/en.json similarity index 100% rename from ts/input/tex/newcommand/locales/en.json rename to ts/input/tex/newcommand/__locales__/en.json diff --git a/ts/input/tex/physics/locales/Component.ts b/ts/input/tex/physics/__locales__/Component.ts similarity index 100% rename from ts/input/tex/physics/locales/Component.ts rename to ts/input/tex/physics/__locales__/Component.ts diff --git a/ts/input/tex/physics/locales/de.json b/ts/input/tex/physics/__locales__/de.json similarity index 100% rename from ts/input/tex/physics/locales/de.json rename to ts/input/tex/physics/__locales__/de.json diff --git a/ts/input/tex/physics/locales/en.json b/ts/input/tex/physics/__locales__/en.json similarity index 100% rename from ts/input/tex/physics/locales/en.json rename to ts/input/tex/physics/__locales__/en.json diff --git a/ts/input/tex/require/locales/Component.ts b/ts/input/tex/require/__locales__/Component.ts similarity index 100% rename from ts/input/tex/require/locales/Component.ts rename to ts/input/tex/require/__locales__/Component.ts diff --git a/ts/input/tex/require/locales/de.json b/ts/input/tex/require/__locales__/de.json similarity index 100% rename from ts/input/tex/require/locales/de.json rename to ts/input/tex/require/__locales__/de.json diff --git a/ts/input/tex/require/locales/en.json b/ts/input/tex/require/__locales__/en.json similarity index 100% rename from ts/input/tex/require/locales/en.json rename to ts/input/tex/require/__locales__/en.json diff --git a/ts/input/tex/setoptions/locales/Component.ts b/ts/input/tex/setoptions/__locales__/Component.ts similarity index 100% rename from ts/input/tex/setoptions/locales/Component.ts rename to ts/input/tex/setoptions/__locales__/Component.ts diff --git a/ts/input/tex/setoptions/locales/de.json b/ts/input/tex/setoptions/__locales__/de.json similarity index 100% rename from ts/input/tex/setoptions/locales/de.json rename to ts/input/tex/setoptions/__locales__/de.json diff --git a/ts/input/tex/setoptions/locales/en.json b/ts/input/tex/setoptions/__locales__/en.json similarity index 100% rename from ts/input/tex/setoptions/locales/en.json rename to ts/input/tex/setoptions/__locales__/en.json diff --git a/ts/input/tex/texhtml/locales/Component.ts b/ts/input/tex/texhtml/__locales__/Component.ts similarity index 100% rename from ts/input/tex/texhtml/locales/Component.ts rename to ts/input/tex/texhtml/__locales__/Component.ts diff --git a/ts/input/tex/texhtml/locales/de.json b/ts/input/tex/texhtml/__locales__/de.json similarity index 100% rename from ts/input/tex/texhtml/locales/de.json rename to ts/input/tex/texhtml/__locales__/de.json diff --git a/ts/input/tex/texhtml/locales/en.json b/ts/input/tex/texhtml/__locales__/en.json similarity index 100% rename from ts/input/tex/texhtml/locales/en.json rename to ts/input/tex/texhtml/__locales__/en.json diff --git a/ts/input/tex/textmacros/locales/Component.ts b/ts/input/tex/textmacros/__locales__/Component.ts similarity index 100% rename from ts/input/tex/textmacros/locales/Component.ts rename to ts/input/tex/textmacros/__locales__/Component.ts diff --git a/ts/input/tex/textmacros/locales/de.json b/ts/input/tex/textmacros/__locales__/de.json similarity index 100% rename from ts/input/tex/textmacros/locales/de.json rename to ts/input/tex/textmacros/__locales__/de.json diff --git a/ts/input/tex/textmacros/locales/en.json b/ts/input/tex/textmacros/__locales__/en.json similarity index 100% rename from ts/input/tex/textmacros/locales/en.json rename to ts/input/tex/textmacros/__locales__/en.json diff --git a/ts/input/tex/unicode/locales/Component.ts b/ts/input/tex/unicode/__locales__/Component.ts similarity index 100% rename from ts/input/tex/unicode/locales/Component.ts rename to ts/input/tex/unicode/__locales__/Component.ts diff --git a/ts/input/tex/unicode/locales/de.json b/ts/input/tex/unicode/__locales__/de.json similarity index 100% rename from ts/input/tex/unicode/locales/de.json rename to ts/input/tex/unicode/__locales__/de.json diff --git a/ts/input/tex/unicode/locales/en.json b/ts/input/tex/unicode/__locales__/en.json similarity index 100% rename from ts/input/tex/unicode/locales/en.json rename to ts/input/tex/unicode/__locales__/en.json diff --git a/ts/input/tex/verb/locales/Component.ts b/ts/input/tex/verb/__locales__/Component.ts similarity index 100% rename from ts/input/tex/verb/locales/Component.ts rename to ts/input/tex/verb/__locales__/Component.ts diff --git a/ts/input/tex/verb/locales/de.json b/ts/input/tex/verb/__locales__/de.json similarity index 100% rename from ts/input/tex/verb/locales/de.json rename to ts/input/tex/verb/__locales__/de.json diff --git a/ts/input/tex/verb/locales/en.json b/ts/input/tex/verb/__locales__/en.json similarity index 100% rename from ts/input/tex/verb/locales/en.json rename to ts/input/tex/verb/__locales__/en.json From a018a607d2f1845fd1b1594d99c585a239980858 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 11 May 2026 09:48:34 +0200 Subject: [PATCH 34/95] rename all imports --- ts/input/tex/ColumnParser.ts | 2 +- ts/input/tex/Configuration.ts | 2 +- ts/input/tex/ParseUtil.ts | 2 +- ts/input/tex/StackItem.ts | 2 +- ts/input/tex/TexParser.ts | 2 +- ts/input/tex/ams/AmsConfiguration.ts | 2 +- ts/input/tex/ams/AmsItems.ts | 2 +- ts/input/tex/ams/AmsMethods.ts | 2 +- ts/input/tex/base/BaseConfiguration.ts | 2 +- ts/input/tex/base/BaseItems.ts | 2 +- ts/input/tex/base/BaseMethods.ts | 2 +- ts/input/tex/bbox/BboxConfiguration.ts | 2 +- ts/input/tex/begingroup/BegingroupConfiguration.ts | 2 +- ts/input/tex/begingroup/BegingroupMethods.ts | 2 +- ts/input/tex/begingroup/BegingroupStack.ts | 2 +- ts/input/tex/braket/BraketConfiguration.ts | 2 +- ts/input/tex/bussproofs/BussproofsConfiguration.ts | 2 +- ts/input/tex/bussproofs/BussproofsItems.ts | 2 +- ts/input/tex/bussproofs/BussproofsMethods.ts | 2 +- ts/input/tex/cases/CasesConfiguration.ts | 2 +- ts/input/tex/color/ColorConfiguration.ts | 2 +- ts/input/tex/color/ColorUtil.ts | 2 +- ts/input/tex/colortbl/ColortblConfiguration.ts | 2 +- ts/input/tex/empheq/EmpheqConfiguration.ts | 2 +- ts/input/tex/extpfeil/ExtpfeilConfiguration.ts | 2 +- ts/input/tex/html/HtmlConfiguration.ts | 2 +- ts/input/tex/html/HtmlMethods.ts | 2 +- ts/input/tex/mathtools/MathtoolsConfiguration.ts | 2 +- ts/input/tex/mathtools/MathtoolsMethods.ts | 2 +- ts/input/tex/mathtools/MathtoolsTags.ts | 2 +- ts/input/tex/mathtools/MathtoolsUtil.ts | 2 +- ts/input/tex/newcommand/NewcommandConfiguration.ts | 2 +- ts/input/tex/newcommand/NewcommandItems.ts | 2 +- ts/input/tex/newcommand/NewcommandMethods.ts | 2 +- ts/input/tex/newcommand/NewcommandUtil.ts | 2 +- ts/input/tex/physics/PhysicsConfiguration.ts | 2 +- ts/input/tex/physics/PhysicsMethods.ts | 2 +- ts/input/tex/require/RequireConfiguration.ts | 2 +- ts/input/tex/setoptions/SetOptionsConfiguration.ts | 2 +- ts/input/tex/texhtml/TexHtmlConfiguration.ts | 2 +- ts/input/tex/textmacros/TextMacrosConfiguration.ts | 2 +- ts/input/tex/textmacros/TextMacrosMethods.ts | 2 +- ts/input/tex/unicode/UnicodeConfiguration.ts | 2 +- ts/input/tex/verb/VerbConfiguration.ts | 2 +- ts/util/Locale.ts | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ts/input/tex/ColumnParser.ts b/ts/input/tex/ColumnParser.ts index 181c3bfd4..c86a440a7 100644 --- a/ts/input/tex/ColumnParser.ts +++ b/ts/input/tex/ColumnParser.ts @@ -28,7 +28,7 @@ import { lookup } from '../../util/Options.js'; import { ParseUtil } from './ParseUtil.js'; import { UnitUtil } from './UnitUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /***********************************************************************/ diff --git a/ts/input/tex/Configuration.ts b/ts/input/tex/Configuration.ts index d55b90a7d..50fc8c862 100644 --- a/ts/input/tex/Configuration.ts +++ b/ts/input/tex/Configuration.ts @@ -31,7 +31,7 @@ import { FunctionList } from '../../util/FunctionList.js'; import { TeX } from '../tex.js'; import { PrioritizedList } from '../../util/PrioritizedList.js'; import { TagsFactory } from './Tags.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; export type StackItemConfig = { [kind: string]: StackItemClass }; export type TagsConfig = { [kind: string]: TagsClass }; diff --git a/ts/input/tex/ParseUtil.ts b/ts/input/tex/ParseUtil.ts index 19f1d74f4..4fab7078d 100644 --- a/ts/input/tex/ParseUtil.ts +++ b/ts/input/tex/ParseUtil.ts @@ -32,7 +32,7 @@ import { entities } from '../../util/Entities.js'; import { MmlMunderover } from '../../core/MmlTree/MmlNodes/munderover.js'; import { UnitUtil } from './UnitUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * The data needed for checking the value of a key-value pair. diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index fb9998df1..b1974a5c6 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -27,7 +27,7 @@ import TexError from './TexError.js'; import StackItemFactory from './StackItemFactory.js'; import { TexConstant } from './TexConstants.js'; -import { COMPONENT } from './base/locales/Component.js'; +import { COMPONENT } from './base/__locales__/Component.js'; // Union types for abbreviation. export type EnvProp = string | number | boolean; diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index 4ab24ca17..6b5e08611 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -36,7 +36,7 @@ import { Token } from './Token.js'; import { OptionList } from '../../util/Options.js'; import { TexConstant } from './TexConstants.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * The main Tex Parser class. diff --git a/ts/input/tex/ams/AmsConfiguration.ts b/ts/input/tex/ams/AmsConfiguration.ts index 6786e8e44..832f61105 100644 --- a/ts/input/tex/ams/AmsConfiguration.ts +++ b/ts/input/tex/ams/AmsConfiguration.ts @@ -27,7 +27,7 @@ import { MultlineItem, FlalignItem } from './AmsItems.js'; import { AbstractTags } from '../Tags.js'; import './AmsMappings.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; /** * Standard AMS style tagging. diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts index 2396a0bd5..fde4ba8c1 100644 --- a/ts/input/tex/ams/AmsItems.ts +++ b/ts/input/tex/ams/AmsItems.ts @@ -29,7 +29,7 @@ import { TexConstant } from '../TexConstants.js'; import StackItemFactory from '../StackItemFactory.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Item dealing with multiline environments as a special case of arrays. Note, diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index 61bd0c822..5f0c66743 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -42,7 +42,7 @@ import { } from '../../../core/MmlTree/MmlNode.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Utility for breaking the \sideset scripts from any other material. diff --git a/ts/input/tex/base/BaseConfiguration.ts b/ts/input/tex/base/BaseConfiguration.ts index 482883b7e..b39883433 100644 --- a/ts/input/tex/base/BaseConfiguration.ts +++ b/ts/input/tex/base/BaseConfiguration.ts @@ -37,7 +37,7 @@ import ParseMethods from '../ParseMethods.js'; import { ParseUtil } from '../ParseUtil.js'; import { TexConstant } from '../TexConstants.js'; import { context } from '../../../util/context.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; const MATHVARIANT = TexConstant.Variant; diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index 4061c8aaf..7ac9d4e75 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -39,7 +39,7 @@ import { CheckType, BaseItem, StackItem, EnvList } from '../StackItem.js'; import { TRBL } from '../../../util/Styles.js'; import { TexConstant } from '../TexConstants.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Initial item on the stack. It's pushed when parsing begins. diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index 8456967db..419ab77aa 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -44,7 +44,7 @@ import { lookup } from '../../../util/Options.js'; import { ColumnState } from '../ColumnParser.js'; import { replaceUnicode } from '../../../util/string.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; const P_HEIGHT = 1.2 / 0.85; // cmex10 height plus depth over .85 const MmlTokenAllow: { [key: string]: number } = { diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index a4d66dc27..a4966f242 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -27,7 +27,7 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; // Namespace diff --git a/ts/input/tex/begingroup/BegingroupConfiguration.ts b/ts/input/tex/begingroup/BegingroupConfiguration.ts index 9e70764ee..d2aaa6e33 100644 --- a/ts/input/tex/begingroup/BegingroupConfiguration.ts +++ b/ts/input/tex/begingroup/BegingroupConfiguration.ts @@ -26,7 +26,7 @@ import { Configuration } from '../Configuration.js'; import { CommandMap } from '../TokenMap.js'; import { BegingroupStack, begingroupStack } from './BegingroupStack.js'; import { BegingroupMethods } from './BegingroupMethods.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; /** * Create the begingroup command map. diff --git a/ts/input/tex/begingroup/BegingroupMethods.ts b/ts/input/tex/begingroup/BegingroupMethods.ts index 4061dc4ab..83e7366e5 100644 --- a/ts/input/tex/begingroup/BegingroupMethods.ts +++ b/ts/input/tex/begingroup/BegingroupMethods.ts @@ -25,7 +25,7 @@ import { CommandMap } from '../TokenMap.js'; import TexParser from '../TexParser.js'; import TexError from '../TexError.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; import BaseMethods from '../base/BaseMethods.js'; import { begingroupStack } from './BegingroupStack.js'; diff --git a/ts/input/tex/begingroup/BegingroupStack.ts b/ts/input/tex/begingroup/BegingroupStack.ts index 345f74d8f..d338b1ac4 100644 --- a/ts/input/tex/begingroup/BegingroupStack.ts +++ b/ts/input/tex/begingroup/BegingroupStack.ts @@ -33,7 +33,7 @@ import { Token } from '../Token.js'; import { MapHandler, SubHandlers } from '../MapHandler.js'; import TexError from '../TexError.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; import { NewcommandTables as NT, NewcommandPriority, diff --git a/ts/input/tex/braket/BraketConfiguration.ts b/ts/input/tex/braket/BraketConfiguration.ts index b98971f77..3e2d755e2 100644 --- a/ts/input/tex/braket/BraketConfiguration.ts +++ b/ts/input/tex/braket/BraketConfiguration.ts @@ -25,7 +25,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { BraketItem } from './BraketItems.js'; import './BraketMappings.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; export const BraketConfiguration = Configuration.create('braket', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/bussproofs/BussproofsConfiguration.ts b/ts/input/tex/bussproofs/BussproofsConfiguration.ts index ccc9a8712..d2d75d9cb 100644 --- a/ts/input/tex/bussproofs/BussproofsConfiguration.ts +++ b/ts/input/tex/bussproofs/BussproofsConfiguration.ts @@ -31,7 +31,7 @@ import { makeBsprAttributes, } from './BussproofsUtil.js'; import './BussproofsMappings.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; export const BussproofsConfiguration = Configuration.create('bussproofs', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/bussproofs/BussproofsItems.ts b/ts/input/tex/bussproofs/BussproofsItems.ts index fd47bf814..ca52d5b3b 100644 --- a/ts/input/tex/bussproofs/BussproofsItems.ts +++ b/ts/input/tex/bussproofs/BussproofsItems.ts @@ -27,7 +27,7 @@ import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import Stack from '../Stack.js'; import * as BussproofsUtil from './BussproofsUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export class ProofTreeItem extends BaseItem { /** diff --git a/ts/input/tex/bussproofs/BussproofsMethods.ts b/ts/input/tex/bussproofs/BussproofsMethods.ts index 89c74f1ae..ccd6d3577 100644 --- a/ts/input/tex/bussproofs/BussproofsMethods.ts +++ b/ts/input/tex/bussproofs/BussproofsMethods.ts @@ -30,7 +30,7 @@ import { StackItem } from '../StackItem.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import * as BussproofsUtil from './BussproofsUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Pads content of an inference rule. diff --git a/ts/input/tex/cases/CasesConfiguration.ts b/ts/input/tex/cases/CasesConfiguration.ts index 5d32136c4..e93ae1ce4 100644 --- a/ts/input/tex/cases/CasesConfiguration.ts +++ b/ts/input/tex/cases/CasesConfiguration.ts @@ -11,7 +11,7 @@ import { AmsTags } from '../ams/AmsConfiguration.js'; import { StackItem, CheckType } from '../StackItem.js'; import { MmlMtable } from '../../../core/MmlTree/MmlNodes/mtable.js'; import { EmpheqUtil } from '../empheq/EmpheqUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; /** diff --git a/ts/input/tex/color/ColorConfiguration.ts b/ts/input/tex/color/ColorConfiguration.ts index 7aa529040..4b76f3c0e 100644 --- a/ts/input/tex/color/ColorConfiguration.ts +++ b/ts/input/tex/color/ColorConfiguration.ts @@ -27,7 +27,7 @@ import { Configuration, ParserConfiguration } from '../Configuration.js'; import { ColorMethods } from './ColorMethods.js'; import { ColorModel } from './ColorUtil.js'; import { TeX } from '../../tex.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; /** * The color macros diff --git a/ts/input/tex/color/ColorUtil.ts b/ts/input/tex/color/ColorUtil.ts index e2c92734c..3f0d9261e 100644 --- a/ts/input/tex/color/ColorUtil.ts +++ b/ts/input/tex/color/ColorUtil.ts @@ -24,7 +24,7 @@ import TexError from '../TexError.js'; import { COLORS } from './ColorConstants.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; type ColorModelProcessor = (def: string) => string; const ColorModelProcessors: Map = new Map< diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts index f16a31731..c753d7432 100644 --- a/ts/input/tex/colortbl/ColortblConfiguration.ts +++ b/ts/input/tex/colortbl/ColortblConfiguration.ts @@ -33,7 +33,7 @@ import TexParser from '../TexParser.js'; import TexError from '../TexError.js'; import { TeX } from '../../tex.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; /** diff --git a/ts/input/tex/empheq/EmpheqConfiguration.ts b/ts/input/tex/empheq/EmpheqConfiguration.ts index 2ceef38f1..7c872bb07 100644 --- a/ts/input/tex/empheq/EmpheqConfiguration.ts +++ b/ts/input/tex/empheq/EmpheqConfiguration.ts @@ -30,7 +30,7 @@ import TexError from '../TexError.js'; import { BeginItem } from '../base/BaseItems.js'; import { EmpheqUtil } from './EmpheqUtil.js'; import ParseMethods from '../ParseMethods.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; /** diff --git a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts index 2eef3e1b5..dbf0f6426 100644 --- a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts +++ b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts @@ -31,7 +31,7 @@ import { AmsMethods } from '../ams/AmsMethods.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; import TexError from '../TexError.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; // Namespace diff --git a/ts/input/tex/html/HtmlConfiguration.ts b/ts/input/tex/html/HtmlConfiguration.ts index 5f2257c13..c0ea54245 100644 --- a/ts/input/tex/html/HtmlConfiguration.ts +++ b/ts/input/tex/html/HtmlConfiguration.ts @@ -25,7 +25,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { CommandMap } from '../TokenMap.js'; import HtmlMethods from './HtmlMethods.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; new CommandMap('html_macros', { data: HtmlMethods.Data, diff --git a/ts/input/tex/html/HtmlMethods.ts b/ts/input/tex/html/HtmlMethods.ts index 7ac4a3a45..c27a56106 100644 --- a/ts/input/tex/html/HtmlMethods.ts +++ b/ts/input/tex/html/HtmlMethods.ts @@ -28,7 +28,7 @@ import { ParseUtil } from '../ParseUtil.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import TexError from '../TexError.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** Regexp for matching non-characters as specified by {@link https://infra.spec.whatwg.org/#noncharacter}. */ const nonCharacterRegexp = diff --git a/ts/input/tex/mathtools/MathtoolsConfiguration.ts b/ts/input/tex/mathtools/MathtoolsConfiguration.ts index b3e551c1a..e01f494fa 100644 --- a/ts/input/tex/mathtools/MathtoolsConfiguration.ts +++ b/ts/input/tex/mathtools/MathtoolsConfiguration.ts @@ -42,7 +42,7 @@ import { } from './MathtoolsMethods.js'; import { MathtoolsTagFormat } from './MathtoolsTags.js'; import { MultlinedItem } from './MathtoolsItems.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; /** * Add any pre-defined paired delimiters, and subclass the configured tag format. diff --git a/ts/input/tex/mathtools/MathtoolsMethods.ts b/ts/input/tex/mathtools/MathtoolsMethods.ts index 6cb21026c..c725073ad 100644 --- a/ts/input/tex/mathtools/MathtoolsMethods.ts +++ b/ts/input/tex/mathtools/MathtoolsMethods.ts @@ -47,7 +47,7 @@ import { PrioritizedList } from '../../../util/PrioritizedList.js'; import { MathtoolsTags } from './MathtoolsTags.js'; import { MathtoolsUtil } from './MathtoolsUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export const LEGACYCONFIG = { [HandlerType.MACRO]: ['mathtools-legacycolonsymbols'], diff --git a/ts/input/tex/mathtools/MathtoolsTags.ts b/ts/input/tex/mathtools/MathtoolsTags.ts index c9d29ec9b..22c8ec693 100644 --- a/ts/input/tex/mathtools/MathtoolsTags.ts +++ b/ts/input/tex/mathtools/MathtoolsTags.ts @@ -25,7 +25,7 @@ import { ParserConfiguration } from '../Configuration.js'; import { TeX } from '../../tex.js'; import { AbstractTags, TagsFactory } from '../Tags.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * The type for the Mathtools tags (including their data). diff --git a/ts/input/tex/mathtools/MathtoolsUtil.ts b/ts/input/tex/mathtools/MathtoolsUtil.ts index 221df9fe9..1d724e9e3 100644 --- a/ts/input/tex/mathtools/MathtoolsUtil.ts +++ b/ts/input/tex/mathtools/MathtoolsUtil.ts @@ -31,7 +31,7 @@ import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { MathtoolsMethods } from './MathtoolsMethods.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Utility functions for the Mathtools package. diff --git a/ts/input/tex/newcommand/NewcommandConfiguration.ts b/ts/input/tex/newcommand/NewcommandConfiguration.ts index 8f35a3a7a..9530712dc 100644 --- a/ts/input/tex/newcommand/NewcommandConfiguration.ts +++ b/ts/input/tex/newcommand/NewcommandConfiguration.ts @@ -29,7 +29,7 @@ import { NewcommandTables, NewcommandPriority } from './NewcommandUtil.js'; import './NewcommandMappings.js'; import ParseMethods from '../ParseMethods.js'; import * as sm from '../TokenMap.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; /** * Initialize the newcommand maps for delimiters, commands, and environments, diff --git a/ts/input/tex/newcommand/NewcommandItems.ts b/ts/input/tex/newcommand/NewcommandItems.ts index c3c427f1e..10482c83b 100644 --- a/ts/input/tex/newcommand/NewcommandItems.ts +++ b/ts/input/tex/newcommand/NewcommandItems.ts @@ -24,7 +24,7 @@ import TexError from '../TexError.js'; import { CheckType, BaseItem, StackItem } from '../StackItem.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Opening Item dealing with definitions of new environments. It's pushed onto diff --git a/ts/input/tex/newcommand/NewcommandMethods.ts b/ts/input/tex/newcommand/NewcommandMethods.ts index 4acffaf71..4ad4dff38 100644 --- a/ts/input/tex/newcommand/NewcommandMethods.ts +++ b/ts/input/tex/newcommand/NewcommandMethods.ts @@ -33,7 +33,7 @@ import { UnitUtil } from '../UnitUtil.js'; import { StackItem } from '../StackItem.js'; import { NewcommandUtil } from './NewcommandUtil.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; // Namespace const NewcommandMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/newcommand/NewcommandUtil.ts b/ts/input/tex/newcommand/NewcommandUtil.ts index 2670dbca7..fef773426 100644 --- a/ts/input/tex/newcommand/NewcommandUtil.ts +++ b/ts/input/tex/newcommand/NewcommandUtil.ts @@ -30,7 +30,7 @@ import { Macro, Token } from '../Token.js'; import { Args, Attributes, ParseMethod } from '../Types.js'; import * as tm from '../TokenMap.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Naming constants for the extension mappings. diff --git a/ts/input/tex/physics/PhysicsConfiguration.ts b/ts/input/tex/physics/PhysicsConfiguration.ts index 4e860a4af..dde9672e6 100644 --- a/ts/input/tex/physics/PhysicsConfiguration.ts +++ b/ts/input/tex/physics/PhysicsConfiguration.ts @@ -25,7 +25,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { AutoOpen } from './PhysicsItems.js'; import './PhysicsMappings.js'; -export { COMPONENT } from './locales/Component.js'; +export { COMPONENT } from './__locales__/Component.js'; export const PhysicsConfiguration = Configuration.create('physics', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index 27ed70878..a227c6b4e 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -33,7 +33,7 @@ import { NodeFactory } from '../NodeFactory.js'; import { Macro } from '../Token.js'; import { AutoOpen } from './PhysicsItems.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Pairs open and closed fences. diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 849cf2339..88cb08bc9 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -41,7 +41,7 @@ import { expandable } from '../../../util/Options.js'; import { MenuMathDocument } from '../../../ui/menu/MenuHandler.js'; import { Locale } from '../../../util/Locale.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; /** diff --git a/ts/input/tex/setoptions/SetOptionsConfiguration.ts b/ts/input/tex/setoptions/SetOptionsConfiguration.ts index bca44dab6..969d1cf0c 100644 --- a/ts/input/tex/setoptions/SetOptionsConfiguration.ts +++ b/ts/input/tex/setoptions/SetOptionsConfiguration.ts @@ -36,7 +36,7 @@ import { Macro } from '../Token.js'; import BaseMethods from '../base/BaseMethods.js'; import { expandable, isObject } from '../../../util/Options.js'; import { PrioritizedList } from '../../../util/PrioritizedList.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; export const SetOptionsUtil = { diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 0a6aaef00..422cd580e 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -32,7 +32,7 @@ import { HTMLDocument } from '../../../handlers/html/HTMLDocument.js'; import { HtmlNode } from '../../../core/MmlTree/MmlNodes/HtmlNode.js'; import { HTMLDomStrings } from '../../../handlers/html/HTMLDomStrings.js'; import { DOMAdaptor } from '../../../core/DOMAdaptor.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; export const HtmlNodeMethods: { [key: string]: ParseMethod } = { diff --git a/ts/input/tex/textmacros/TextMacrosConfiguration.ts b/ts/input/tex/textmacros/TextMacrosConfiguration.ts index d5f508bbf..712daeec5 100644 --- a/ts/input/tex/textmacros/TextMacrosConfiguration.ts +++ b/ts/input/tex/textmacros/TextMacrosConfiguration.ts @@ -31,7 +31,7 @@ import { StartItem, StopItem, MmlItem, StyleItem } from '../base/BaseItems.js'; import { TextParser } from './TextParser.js'; import { TextMacrosMethods } from './TextMacrosMethods.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; import './TextMacrosMappings.js'; diff --git a/ts/input/tex/textmacros/TextMacrosMethods.ts b/ts/input/tex/textmacros/TextMacrosMethods.ts index 090cc5112..be6227ad0 100644 --- a/ts/input/tex/textmacros/TextMacrosMethods.ts +++ b/ts/input/tex/textmacros/TextMacrosMethods.ts @@ -27,7 +27,7 @@ import { retryAfter } from '../../../util/Retries.js'; import { TextParser } from './TextParser.js'; import BaseMethods from '../base/BaseMethods.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * The methods used to implement the text-mode macros diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index 01a2c8213..18118090d 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -32,7 +32,7 @@ import { UnitUtil } from '../UnitUtil.js'; import NodeUtil from '../NodeUtil.js'; import { numeric } from '../../../util/Entities.js'; import { Other } from '../base/BaseConfiguration.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; const UnicodeCache: { [key: number]: [number, number, string, number] } = {}; diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 1f881e7b9..4b4bd012c 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -28,7 +28,7 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; -import { COMPONENT } from './locales/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; // Namespace diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 4cf9c92be..40587d314 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -86,7 +86,7 @@ export class Locale { prefix: string = component ) { this.locations[component] = [ - `${this.isComponent ? component : prefix}/locales`, + `${this.isComponent ? component : prefix}/__locales__`, new Set(), ]; } From 1c423ce60060e6bd5bffa37f6a6ba6ea6f6a04d2 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 11 May 2026 09:48:57 +0200 Subject: [PATCH 35/95] fix scripts and tests --- package.json | 2 +- testsuite/tests/util/Locale.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c9da2042e..5f4f169f0 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "=============================================================================== copy": "", "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:locales $1 && pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", - "copy:locales": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 3 'ts/input/tex/locales/*.json' 'ts/input/tex/*/locales/*.json' $1/input/tex/extensions; }; copy", + "copy:locales": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 3 'ts/input/tex/__locales__/*.json' 'ts/input/tex/*/__locales__/*.json' $1/input/tex/extensions; }; copy", "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy", "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy", "copy:pkg": "copy() { pnpm -s log:single \"Copying package.json to $1\"; pnpm copyfiles -u 2 components/bin/package.json $1; }; copy", diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index 6189aa690..b268c06db 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -24,7 +24,7 @@ describe('Locale', () => { const locale = Locale as any; Locale.registerLocaleFiles('component', '../testsuite/lib/component'); expect(locale.locations.component).toEqual([ - '../testsuite/lib/component/locales', + '../testsuite/lib/component/__locales__', new Set(), ]); const error = console.error; From e56940b04dc5c47d03afbe0faf8f66f38e307c43 Mon Sep 17 00:00:00 2001 From: zorkow Date: Mon, 11 May 2026 10:21:04 +0200 Subject: [PATCH 36/95] Add missing tests for Locale.ts --- testsuite/tests/util/Locale.test.ts | 36 +++++++++++++++++++++++++++++ ts/util/Locale.ts | 3 ++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index b268c06db..aaa1299e4 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -71,6 +71,15 @@ describe('Locale', () => { "MathJax(Locale): No localized or default version for message with id 'Id1' from 'undefined'" ); expect(() => Locale.error('component', 'error', 'x')).toThrow('Error in x'); + Locale.current = 'de'; + expect(Locale.message('undefined', 'Id1')).toBe( + "MathJax(Locale): Keine lokalisierte oder Standardversion für die Meldung mit der ID 'Id1' aus 'undefined'" + ); + Locale.current = 'xy'; + Locale.default = 'xy'; + expect(Locale.message('undefined', 'Id1')).toBe(''); + Locale.current = 'en'; + Locale.default = 'en'; }); /********************************************************************************/ @@ -84,6 +93,33 @@ describe('Locale', () => { }); /********************************************************************************/ + + test('Message with empty component', () => { + expect(Locale.message('', 'any')).toBe(''); + expect(Locale.message('', 'any', {})).toBe(''); + expect(Locale.message('', 'any', 'raw text')).toBe('raw text'); + expect(Locale.message('', 'any', '%1 + %2', 'a', 'b')).toBe('a + b'); + }); + + /********************************************************************************/ + + test('Locale error falls back to default locale', async () => { + const locale = Locale as any; + Locale.registerLocaleFiles('fallback', '../testsuite/lib/component'); + + const errors: string[] = []; + const origError = console.error; + console.error = (msg: string) => errors.push(msg); + + await locale.localeError('fallback', 'xy', new Error('xy.json not found')); + + console.error = origError; + + expect(errors[0]).toContain("MathJax(fallback): Can't load 'xy.json'"); + expect(locale.data.fallback?.en).toEqual({ Id1: 'Test of %1 in %2' }); + }); + + /********************************************************************************/ }); /**********************************************************************************/ diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 40587d314..1ac72a89d 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -166,7 +166,8 @@ export class Locale { this.data[component]?.[this.default]?.[id] || this.substituteArguments( this.data.locale[this.current]?.['LocaleMessageNotFound'] || - this.data.locale[this.default]?.['LocaleMessageNotFound'], + this.data.locale[this.default]?.['LocaleMessageNotFound'] || + '', { 1: id, 2: component } ) ); From 382b09bf7f872c79242b642884beb39a701396aa Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 16 May 2026 09:21:21 -0400 Subject: [PATCH 37/95] Add an excludes option to the copy configuration block for components. --- components/bin/copy | 17 ++++++++++------- .../mjs/input/tex/extensions/bbox/config.json | 3 ++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/components/bin/copy b/components/bin/copy index a5e28a686..ea0db6520 100755 --- a/components/bin/copy +++ b/components/bin/copy @@ -70,19 +70,21 @@ const bundleDir = path.resolve(parent, bundle); /** * Copy a file or directory tree * - * @param {string} from The directory to copy from - * @param {string} to The directory to copy to - * @param {string} name The name of the file or directory to copy - * @param {string} space The indentation for output + * @param {string} from The directory to copy from + * @param {string} to The directory to copy to + * @param {string} name The name of the file or directory to copy + * @param {string[]} eclude The files to exclude + * @param {string} space The indentation for output */ -function copyFile(from, to, name, space) { +function copyFile(from, to, name, excludes, space = '') { !fs.existsSync(to) && fs.mkdirSync(to, {recursive: true}); const copy = path.resolve(from, name); const dest = path.resolve(to, name); + if (excludes.includes(copy)) return; if (fs.lstatSync(copy).isDirectory()) { console.info(space + name + '/'); for (const file of fs.readdirSync(copy)) { - copyFile(copy, dest, file, space + INDENT); + copyFile(copy, dest, file, excludes, space + INDENT); } } else { console.info(space + name); @@ -112,8 +114,9 @@ function resolvePaths(name) { function processConfig(config) { const to = resolvePaths(config.to); const from = resolvePaths(config.from); + const excludes = config.excludes?.map((file) => path.resolve(from, file)) || []; for (const name of config.copy) { - copyFile(from, to, name, ''); + copyFile(from, to, name, excludes); } } diff --git a/components/mjs/input/tex/extensions/bbox/config.json b/components/mjs/input/tex/extensions/bbox/config.json index 992885a51..8470d057a 100644 --- a/components/mjs/input/tex/extensions/bbox/config.json +++ b/components/mjs/input/tex/extensions/bbox/config.json @@ -7,7 +7,8 @@ "copy": { "to": "[bundle]/input/tex/extensions/bbox", "from": "[ts]/input/tex/bbox", - "copy": ["locales"] + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] }, "webpack": { "name": "input/tex/extensions/bbox", From 9a18e3dd13e2c4de8d3b9002d210f02b0f76cb4e Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sun, 17 May 2026 10:49:55 -0400 Subject: [PATCH 38/95] Copy __locales__ for all components, and improve default json loading. --- components/mjs/core/core.js | 11 +++---- components/mjs/input/tex/config.json | 13 ++++++++ .../mjs/input/tex/extensions/ams/config.json | 6 ++++ .../tex/extensions/begingroup/config.json | 6 ++++ .../input/tex/extensions/braket/config.json | 6 ++++ .../tex/extensions/bussproofs/config.json | 6 ++++ .../input/tex/extensions/cases/config.json | 6 ++++ .../input/tex/extensions/color/config.json | 6 ++++ .../input/tex/extensions/colortbl/config.json | 6 ++++ .../input/tex/extensions/empheq/config.json | 6 ++++ .../input/tex/extensions/extpfeil/config.json | 6 ++++ .../mjs/input/tex/extensions/html/config.json | 6 ++++ .../tex/extensions/mathtools/config.json | 6 ++++ .../tex/extensions/newcommand/config.json | 6 ++++ .../input/tex/extensions/physics/config.json | 6 ++++ .../input/tex/extensions/require/config.json | 6 ++++ .../tex/extensions/setoptions/config.json | 6 ++++ .../input/tex/extensions/texhtml/config.json | 6 ++++ .../tex/extensions/textmacros/config.json | 6 ++++ .../input/tex/extensions/unicode/config.json | 6 ++++ .../mjs/input/tex/extensions/verb/config.json | 6 ++++ components/mjs/startup/init.js | 3 +- testsuite/tests/input/tex/Bbox.test.ts | 2 +- ts/components/cjs/json.ts | 30 +++++++++++++++++++ ts/components/mjs/json.ts | 28 +++++++++++++++++ ts/input/tex/__locales__/Component.ts | 2 +- ts/mathjax.ts | 3 +- tsconfig/components.json | 1 + 28 files changed, 198 insertions(+), 9 deletions(-) create mode 100644 ts/components/cjs/json.ts create mode 100644 ts/components/mjs/json.ts diff --git a/components/mjs/core/core.js b/components/mjs/core/core.js index f8ca8ecef..d583d9355 100644 --- a/components/mjs/core/core.js +++ b/components/mjs/core/core.js @@ -14,15 +14,16 @@ if (MathJax.startup) { if (MathJax.loader) { const config = MathJax.config.loader; const {mathjax} = MathJax._.mathjax; - mathjax.asyncLoad = (name => { + mathjax.asyncLoad = (name) => { if (name.match(/\.json$/)) { - if (name.charAt(0) === '[') { - name = Package.resolvePath(name); - } + name = Package.resolvePath(name); return (config.json || mathjax.json)(name).then((data) => data.default ?? data); } return name.substring(0, 5) === 'node:' ? config.require(name) : MathJax.loader.load(name).then(result => result[0]); - }); + }; + mathjax.json = mathjax.context.window + ? (file) => fetch(file).then((data) => data.json()) + : (file) => import( /* webpackIgnore: true */ file, {with: {type: 'json'}}); } diff --git a/components/mjs/input/tex/config.json b/components/mjs/input/tex/config.json index 135d306c3..70c9f09b5 100644 --- a/components/mjs/input/tex/config.json +++ b/components/mjs/input/tex/config.json @@ -15,6 +15,19 @@ ], "excludeSubdirs": true }, + "copy": [ + { + "to": "[bundle]/input/tex", + "from": "[ts]/input/tex", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + },{ + "to": "[bundle]/input/tex/extensions/base", + "from": "[ts]/input/tex/base", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + } + ], "webpack": { "name": "input/tex", "libs": [ diff --git a/components/mjs/input/tex/extensions/ams/config.json b/components/mjs/input/tex/extensions/ams/config.json index a236d0358..52fc62049 100644 --- a/components/mjs/input/tex/extensions/ams/config.json +++ b/components/mjs/input/tex/extensions/ams/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/ams", "targets": ["input/tex/ams"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/ams", + "from": "[ts]/input/tex/ams", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/ams", "libs": [ diff --git a/components/mjs/input/tex/extensions/begingroup/config.json b/components/mjs/input/tex/extensions/begingroup/config.json index 8452effd2..e44030ba8 100644 --- a/components/mjs/input/tex/extensions/begingroup/config.json +++ b/components/mjs/input/tex/extensions/begingroup/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/begingroup", "targets": ["input/tex/begingroup"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/begingroup", + "from": "[ts]/input/tex/begingroup", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/begingroup", "libs": [ diff --git a/components/mjs/input/tex/extensions/braket/config.json b/components/mjs/input/tex/extensions/braket/config.json index 12cf84f1f..adafbfdb8 100644 --- a/components/mjs/input/tex/extensions/braket/config.json +++ b/components/mjs/input/tex/extensions/braket/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/braket", "targets": ["input/tex/braket"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/braket", + "from": "[ts]/input/tex/braket", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/braket", "libs": [ diff --git a/components/mjs/input/tex/extensions/bussproofs/config.json b/components/mjs/input/tex/extensions/bussproofs/config.json index dcfee11bf..cdb9f9156 100644 --- a/components/mjs/input/tex/extensions/bussproofs/config.json +++ b/components/mjs/input/tex/extensions/bussproofs/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/bussproofs", "targets": ["input/tex/bussproofs"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/bussproofs", + "from": "[ts]/input/tex/bussproofs", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/bussproofs", "libs": [ diff --git a/components/mjs/input/tex/extensions/cases/config.json b/components/mjs/input/tex/extensions/cases/config.json index 49d7c48e4..a0b335815 100644 --- a/components/mjs/input/tex/extensions/cases/config.json +++ b/components/mjs/input/tex/extensions/cases/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/cases", "targets": ["input/tex/cases"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/cases", + "from": "[ts]/input/tex/cases", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/cases", "libs": [ diff --git a/components/mjs/input/tex/extensions/color/config.json b/components/mjs/input/tex/extensions/color/config.json index 84041ca4d..d919d5bde 100644 --- a/components/mjs/input/tex/extensions/color/config.json +++ b/components/mjs/input/tex/extensions/color/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/color", "targets": ["input/tex/color"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/color", + "from": "[ts]/input/tex/color", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/color", "libs": [ diff --git a/components/mjs/input/tex/extensions/colortbl/config.json b/components/mjs/input/tex/extensions/colortbl/config.json index 13a313e50..835a4567c 100644 --- a/components/mjs/input/tex/extensions/colortbl/config.json +++ b/components/mjs/input/tex/extensions/colortbl/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/colortbl", "targets": ["input/tex/colortbl"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/colortbl", + "from": "[ts]/input/tex/colortbl", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/colortbl", "libs": [ diff --git a/components/mjs/input/tex/extensions/empheq/config.json b/components/mjs/input/tex/extensions/empheq/config.json index 5231b5d62..8164e9695 100644 --- a/components/mjs/input/tex/extensions/empheq/config.json +++ b/components/mjs/input/tex/extensions/empheq/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/empheq", "targets": ["input/tex/empheq"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/empheq", + "from": "[ts]/input/tex/empheq", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/empheq", "libs": [ diff --git a/components/mjs/input/tex/extensions/extpfeil/config.json b/components/mjs/input/tex/extensions/extpfeil/config.json index 493771252..79e17baf6 100644 --- a/components/mjs/input/tex/extensions/extpfeil/config.json +++ b/components/mjs/input/tex/extensions/extpfeil/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/extpfeil", "targets": ["input/tex/extpfeil"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/extpfeil", + "from": "[ts]/input/tex/extpfeil", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/extpfeil", "libs": [ diff --git a/components/mjs/input/tex/extensions/html/config.json b/components/mjs/input/tex/extensions/html/config.json index ee870d405..0d679215e 100644 --- a/components/mjs/input/tex/extensions/html/config.json +++ b/components/mjs/input/tex/extensions/html/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/html", "targets": ["input/tex/html"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/html", + "from": "[ts]/input/tex/html", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/html", "libs": [ diff --git a/components/mjs/input/tex/extensions/mathtools/config.json b/components/mjs/input/tex/extensions/mathtools/config.json index 0c57ebc10..572b2b13d 100644 --- a/components/mjs/input/tex/extensions/mathtools/config.json +++ b/components/mjs/input/tex/extensions/mathtools/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/mathtools", "targets": ["input/tex/mathtools"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/mathtools", + "from": "[ts]/input/tex/mathtools", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/mathtools", "libs": [ diff --git a/components/mjs/input/tex/extensions/newcommand/config.json b/components/mjs/input/tex/extensions/newcommand/config.json index 0ef05e0a3..35e836d98 100644 --- a/components/mjs/input/tex/extensions/newcommand/config.json +++ b/components/mjs/input/tex/extensions/newcommand/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/newcommand", "targets": ["input/tex/newcommand"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/newcommand", + "from": "[ts]/input/tex/newcommand", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/newcommand", "libs": [ diff --git a/components/mjs/input/tex/extensions/physics/config.json b/components/mjs/input/tex/extensions/physics/config.json index c1e020b82..00f8e37a7 100644 --- a/components/mjs/input/tex/extensions/physics/config.json +++ b/components/mjs/input/tex/extensions/physics/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/physics", "targets": ["input/tex/physics"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/physics", + "from": "[ts]/input/tex/physics", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/physics", "libs": [ diff --git a/components/mjs/input/tex/extensions/require/config.json b/components/mjs/input/tex/extensions/require/config.json index 6ba57a337..8ded53df3 100644 --- a/components/mjs/input/tex/extensions/require/config.json +++ b/components/mjs/input/tex/extensions/require/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/require", "targets": ["input/tex/require"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/require", + "from": "[ts]/input/tex/require", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/require", "libs": [ diff --git a/components/mjs/input/tex/extensions/setoptions/config.json b/components/mjs/input/tex/extensions/setoptions/config.json index f329b6f34..b3e3ff9c9 100644 --- a/components/mjs/input/tex/extensions/setoptions/config.json +++ b/components/mjs/input/tex/extensions/setoptions/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/setoptions", "targets": ["input/tex/setoptions"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/setoptions", + "from": "[ts]/input/tex/setoptions", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/setoptions", "libs": [ diff --git a/components/mjs/input/tex/extensions/texhtml/config.json b/components/mjs/input/tex/extensions/texhtml/config.json index a47940bae..ad4ee1304 100644 --- a/components/mjs/input/tex/extensions/texhtml/config.json +++ b/components/mjs/input/tex/extensions/texhtml/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/texhtml", "targets": ["input/tex/texhtml"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/texhtml", + "from": "[ts]/input/tex/texhtml", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/texhtml", "libs": [ diff --git a/components/mjs/input/tex/extensions/textmacros/config.json b/components/mjs/input/tex/extensions/textmacros/config.json index bd05f220d..c6cf071a5 100644 --- a/components/mjs/input/tex/extensions/textmacros/config.json +++ b/components/mjs/input/tex/extensions/textmacros/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/textmacros", "targets": ["input/tex/textmacros"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/textmacros", + "from": "[ts]/input/tex/textmacros", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/textmacros", "libs": [ diff --git a/components/mjs/input/tex/extensions/unicode/config.json b/components/mjs/input/tex/extensions/unicode/config.json index 4d228828e..8065e185f 100644 --- a/components/mjs/input/tex/extensions/unicode/config.json +++ b/components/mjs/input/tex/extensions/unicode/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/unicode", "targets": ["input/tex/unicode"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/unicode", + "from": "[ts]/input/tex/unicode", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/unicode", "libs": [ diff --git a/components/mjs/input/tex/extensions/verb/config.json b/components/mjs/input/tex/extensions/verb/config.json index 4632c17a6..0cee85c9c 100644 --- a/components/mjs/input/tex/extensions/verb/config.json +++ b/components/mjs/input/tex/extensions/verb/config.json @@ -4,6 +4,12 @@ "component": "input/tex/extensions/verb", "targets": ["input/tex/verb"] }, + "copy": { + "to": "[bundle]/input/tex/extensions/verb", + "from": "[ts]/input/tex/verb", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/verb", "libs": [ diff --git a/components/mjs/startup/init.js b/components/mjs/startup/init.js index 558f1af4c..14c91abdb 100644 --- a/components/mjs/startup/init.js +++ b/components/mjs/startup/init.js @@ -1,11 +1,12 @@ import './hasown.js'; // Can be removed with ES2024 implementation of Object.hasown import './lib/startup.js'; +import '../core/core.js'; import {combineDefaults} from '#js/components/global.js'; import {dependencies, paths, provides, compatibility} from '../dependencies.js'; import {Loader, CONFIG} from '#js/components/loader.js'; -Loader.preLoaded('loader', 'startup'); +Loader.preLoaded('loader', 'startup', 'core'); combineDefaults(MathJax.config.loader, 'dependencies', dependencies); combineDefaults(MathJax.config.loader, 'paths', paths); diff --git a/testsuite/tests/input/tex/Bbox.test.ts b/testsuite/tests/input/tex/Bbox.test.ts index 51f5f138d..2e92a23e2 100644 --- a/testsuite/tests/input/tex/Bbox.test.ts +++ b/testsuite/tests/input/tex/Bbox.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeEach, describe, expect, it } from '@jest/globals'; import { getTokens, setupTex, tex2mml, expectTexError } from '#helpers'; import '#js/input/tex/bbox/BboxConfiguration'; -beforeEach(async () => setupTex(['base', 'bbox'])); +beforeEach(() => setupTex(['base', 'bbox'])); /**********************************************************************************/ diff --git a/ts/components/cjs/json.ts b/ts/components/cjs/json.ts new file mode 100644 index 000000000..ae4a23afd --- /dev/null +++ b/ts/components/cjs/json.ts @@ -0,0 +1,30 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file ES5 shim for loading json files + * + * @author dpvc@mathjax.org (Davide Cervone) + */ + +declare const require: (file: string) => any; + +import { context } from '../../util/context.js'; + +export const json = context.window + ? (file: string) => fetch(file).then((data) => data.json()) + : (file: string) => require(file); diff --git a/ts/components/mjs/json.ts b/ts/components/mjs/json.ts new file mode 100644 index 000000000..e1c33e5fa --- /dev/null +++ b/ts/components/mjs/json.ts @@ -0,0 +1,28 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file ES6 shim for loading json files + * + * @author dpvc@mathjax.org (Davide Cervone) + */ + +import { context } from '../../util/context.js'; + +export const json = context.window + ? (file: string) => fetch(file).then((data) => data.json()) + : (file: string) => import(file, {with: {type: 'json'}}); diff --git a/ts/input/tex/__locales__/Component.ts b/ts/input/tex/__locales__/Component.ts index 86bfab72c..214ebf114 100644 --- a/ts/input/tex/__locales__/Component.ts +++ b/ts/input/tex/__locales__/Component.ts @@ -23,6 +23,6 @@ import { Locale } from '../../../util/Locale.js'; -export const COMPONENT = '[tex]'; +export const COMPONENT = 'input/tex'; Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex'); diff --git a/ts/mathjax.ts b/ts/mathjax.ts index 17b439666..d1d79ed9d 100644 --- a/ts/mathjax.ts +++ b/ts/mathjax.ts @@ -27,6 +27,7 @@ import { handleRetriesFor, retryAfter } from './util/Retries.js'; import { OptionList } from './util/Options.js'; import { MathDocument } from './core/MathDocument.js'; import { context } from './util/context.js'; +import { json } from '#root/json.js'; /*****************************************************************/ /** @@ -84,5 +85,5 @@ export const mathjax = { * @param {string} file The name of the JSON file to load * @returns {Promise} A promise resolving to the JSON data */ - json: (file: string) => fetch(file).then((data) => data.json()), + json: json }; diff --git a/tsconfig/components.json b/tsconfig/components.json index 41fedf842..8c13a152f 100644 --- a/tsconfig/components.json +++ b/tsconfig/components.json @@ -1,6 +1,7 @@ { "extends": "./cjs.json", "compilerOptions": { + "removeComments": false, "allowJs": true, "sourceMap": false, "declaration": false, From 7c35e7f4c87cb933bcd35a61e5082dc0395bdac3 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 18 May 2026 18:52:20 -0400 Subject: [PATCH 39/95] Fix formatting for prettier --- ts/components/mjs/json.ts | 2 +- ts/mathjax.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/components/mjs/json.ts b/ts/components/mjs/json.ts index e1c33e5fa..f23bba2d0 100644 --- a/ts/components/mjs/json.ts +++ b/ts/components/mjs/json.ts @@ -25,4 +25,4 @@ import { context } from '../../util/context.js'; export const json = context.window ? (file: string) => fetch(file).then((data) => data.json()) - : (file: string) => import(file, {with: {type: 'json'}}); + : (file: string) => import(file, { with: { type: 'json' } }); diff --git a/ts/mathjax.ts b/ts/mathjax.ts index d1d79ed9d..739e9f9d0 100644 --- a/ts/mathjax.ts +++ b/ts/mathjax.ts @@ -85,5 +85,5 @@ export const mathjax = { * @param {string} file The name of the JSON file to load * @returns {Promise} A promise resolving to the JSON data */ - json: json + json: json, }; From a88ad80a25f92374cefc2f14af44c2fcc413cccc Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sun, 17 May 2026 22:09:47 -0400 Subject: [PATCH 40/95] Add localization for mhchem error messages. --- .../input/tex/extensions/mhchem/config.json | 6 ++++ testsuite/tests/input/tex/Mhchem.test.ts | 6 +++- ts/input/tex/mhchem/MhchemConfiguration.ts | 18 ++++++++++-- ts/input/tex/mhchem/__locales__/Component.ts | 28 +++++++++++++++++++ ts/input/tex/mhchem/__locales__/de.json | 5 ++++ ts/input/tex/mhchem/__locales__/en.json | 5 ++++ 6 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 ts/input/tex/mhchem/__locales__/Component.ts create mode 100644 ts/input/tex/mhchem/__locales__/de.json create mode 100644 ts/input/tex/mhchem/__locales__/en.json diff --git a/components/mjs/input/tex/extensions/mhchem/config.json b/components/mjs/input/tex/extensions/mhchem/config.json index 120c6b886..5e911a4ca 100644 --- a/components/mjs/input/tex/extensions/mhchem/config.json +++ b/components/mjs/input/tex/extensions/mhchem/config.json @@ -5,6 +5,12 @@ "targets": ["input/tex/mhchem"], "excludeSubdirs": true }, + "copy": { + "to": "[bundle]/input/tex/extensions/mhchem", + "from": "[ts]/input/tex/mhchem", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/tex/extensions/mhchem", "libs": [ diff --git a/testsuite/tests/input/tex/Mhchem.test.ts b/testsuite/tests/input/tex/Mhchem.test.ts index 46571c44d..562d9bdcb 100644 --- a/testsuite/tests/input/tex/Mhchem.test.ts +++ b/testsuite/tests/input/tex/Mhchem.test.ts @@ -486,10 +486,14 @@ describe('Mhchem-Ams', () => { ).toMatchSnapshot(); }); - it('Mhchem Error', () => { + it('Mhchem Bond Error', () => { expectTexError('\\ce{A\\bond{x}B}').toBe('mhchem bug T. Please report.'); }); + it('Mhchem Brace Error', () => { + expectTexError('\\ce{{x^${x}}}').toBe('Extra close brace or missing open brace'); + }); + it('Mhchem stretchy <-', () => { expect(tex2mml('\\ce{A <-[text] B}')).toMatchSnapshot(); }); diff --git a/ts/input/tex/mhchem/MhchemConfiguration.ts b/ts/input/tex/mhchem/MhchemConfiguration.ts index 4923008a1..cc00be68b 100644 --- a/ts/input/tex/mhchem/MhchemConfiguration.ts +++ b/ts/input/tex/mhchem/MhchemConfiguration.ts @@ -32,6 +32,8 @@ import BaseMethods from '../base/BaseMethods.js'; import { AmsMethods } from '../ams/AmsMethods.js'; import { mhchemParser } from '#mhchem/mhchemParser.js'; import { TEXCLASS } from '../../../core/MmlTree/MmlNode.js'; +import { COMPONENT } from './__locales__/Component.js'; +export { COMPONENT }; /** * Creates mo token elements with the proper attributes @@ -104,8 +106,20 @@ export const MhchemMethods: { [key: string]: ParseMethod } = { for (const [name, pattern] of MhchemReplacements.entries()) { tex = tex.replace(pattern, name as string); } - } catch (err) { - throw new TexError(null, err[0], err[1]); + } catch ([id, msg]) { + if (id === 'MhchemErrorBond') { + const match = msg.match(/\((.*)\)/); + throw new TexError(COMPONENT, id, match[1]); + } + if (id.startsWith('MhchemBug')) { + const match = msg.match(/mhchem bug (.).*\((.*)\)/); + if (match) { + throw new TexError(COMPONENT, 'MhchemBug2', match[1], match[2]); + } else { + throw new TexError(COMPONENT, 'MhchemBug', id.charAt(9)); + } + } + throw new TexError('[tex]/base', id); } parser.string = tex + parser.string.substring(parser.i); parser.i = 0; diff --git a/ts/input/tex/mhchem/__locales__/Component.ts b/ts/input/tex/mhchem/__locales__/Component.ts new file mode 100644 index 000000000..98a270a40 --- /dev/null +++ b/ts/input/tex/mhchem/__locales__/Component.ts @@ -0,0 +1,28 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for [tex]/mhchem + * + * @author dpvc@mathjax.org (Davide P. Cervone) + */ + +import { Locale } from '../../../../util/Locale.js'; + +export const COMPONENT = '[tex]/mhchem'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); diff --git a/ts/input/tex/mhchem/__locales__/de.json b/ts/input/tex/mhchem/__locales__/de.json new file mode 100644 index 000000000..bdf85b8e0 --- /dev/null +++ b/ts/input/tex/mhchem/__locales__/de.json @@ -0,0 +1,5 @@ +{ + "MhchemBug": "mhchem-Fehler %1. Bitte melden.", + "MhchemBug2": "mhchem-Fehler %1. Bitte melden. (%2)", + "MhchemErrorBond": "mhchem-Fehler. Unbekannter Bindungstyp (%1)" +} diff --git a/ts/input/tex/mhchem/__locales__/en.json b/ts/input/tex/mhchem/__locales__/en.json new file mode 100644 index 000000000..1fcf478e7 --- /dev/null +++ b/ts/input/tex/mhchem/__locales__/en.json @@ -0,0 +1,5 @@ +{ + "MhchemBug": "mhchem bug %1. Please report.", + "MhchemBug2": "mhchem bug %1. Please report. (%2)", + "MhchemErrorBond": "mhchem Error. Unknown bond type (%1)" +} From 2aa588a3b9548d7798f925020b5f97d6b6318a75 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 18 May 2026 17:03:18 -0400 Subject: [PATCH 41/95] Localize menu entries, dialogs, and error messages --- components/mjs/ui/menu/config.json | 6 + package.json | 4 +- ts/a11y/speech/SpeechMenu.ts | 11 +- ts/ui/menu/MJContextMenu.ts | 12 +- ts/ui/menu/Menu.ts | 359 +++++++++++----------------- ts/ui/menu/__locales__/Component.ts | 39 +++ ts/ui/menu/__locales__/en.json | 143 +++++++++++ 7 files changed, 348 insertions(+), 226 deletions(-) create mode 100644 ts/ui/menu/__locales__/Component.ts create mode 100644 ts/ui/menu/__locales__/en.json diff --git a/components/mjs/ui/menu/config.json b/components/mjs/ui/menu/config.json index 4fffd9231..6c49de3d7 100644 --- a/components/mjs/ui/menu/config.json +++ b/components/mjs/ui/menu/config.json @@ -4,6 +4,12 @@ "targets": ["ui/menu", "a11y/speech/SpeechMenu.ts"], "excludeSubdirs": true }, + "copy": { + "to": "[bundle]/ui/menu", + "from": "[ts]/ui/menu", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "ui/menu", "libs": [ diff --git a/package.json b/package.json index 5f4f169f0..01e89b577 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,9 @@ "=============================================================================== copy": "", "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:locales $1 && pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", - "copy:locales": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 3 'ts/input/tex/__locales__/*.json' 'ts/input/tex/*/__locales__/*.json' $1/input/tex/extensions; }; copy", + "copy:locales": "copy() { pnpm -s copy:locales:menu $1; pnpm -s copy:locales:tex $1; }; copy ", + "copy:locales:menu": "pnpm -s log:single 'Copying menu locales'; copy() { pnpm copyfiles -u 1 'ts/ui/menu/__locales__/*.json' $1; }; copy", + "copy:locales:tex": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 1 'ts/input/tex/__locales__/*.json' $1 && pnpm copyfiles -u 3 'ts/input/tex/*/__locales__/*.json' $1/input/tex/extensions; }; copy", "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy", "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy", "copy:pkg": "copy() { pnpm -s log:single \"Copying package.json to $1\"; pnpm copyfiles -u 2 components/bin/package.json $1; }; copy", diff --git a/ts/a11y/speech/SpeechMenu.ts b/ts/a11y/speech/SpeechMenu.ts index 1f3598f9d..5a19f96c7 100644 --- a/ts/a11y/speech/SpeechMenu.ts +++ b/ts/a11y/speech/SpeechMenu.ts @@ -29,6 +29,7 @@ import { SelectionGrid, } from '../../ui/dialog/SelectionDialog.js'; import { SubMenu, Submenu } from '../../ui/menu/mj-context-menu.js'; +import { localize } from '../../ui/menu/__locales__/Component.js'; import * as Sre from '../sre.js'; /** @@ -127,7 +128,7 @@ function csSelectionBox(menu: MJContextMenu, locale: string): object { }); } const sb = new SelectionDialog( - 'Clearspeak Preferences', + localize('ClearspeakTitle'), '', items, SelectionOrder.ALPHABETICAL, @@ -137,7 +138,7 @@ function csSelectionBox(menu: MJContextMenu, locale: string): object { return { type: 'command', id: 'ClearspeakPreferences', - content: 'Select Preferences', + content: localize('SelectPrefs'), action: () => sb.post(), }; } @@ -159,13 +160,13 @@ function basePreferences(previous: string): object[] { const items = [ { type: 'radio', - content: 'No Preferences', + content: localize('NoPrefs'), id: 'clearspeak-default', variable: 'speechRules', }, { type: 'radio', - content: 'Current Preferences', + content: localize('CurrentPrefs'), id: 'clearspeak-' + previous, variable: 'speechRules', }, @@ -191,7 +192,7 @@ function smartPreferences( ): object[] { const loc = localePreferences.get(locale); const items = [ - { type: 'label', content: 'Preferences for ' + smart }, + { type: 'label', content: localize('PrefsFor', smart) }, { type: 'rule' }, ]; return items.concat( diff --git a/ts/ui/menu/MJContextMenu.ts b/ts/ui/menu/MJContextMenu.ts index 9e7abf2c8..ebebc79eb 100644 --- a/ts/ui/menu/MJContextMenu.ts +++ b/ts/ui/menu/MJContextMenu.ts @@ -187,8 +187,8 @@ export class MJContextMenu extends ContextMenu { */ protected getSpeechMenu() { const speech = this.mathItem.outputData.speech; - this.findID('Show', 'Speech')[speech ? 'enable' : 'disable'](); - this.findID('Copy', 'Speech')[speech ? 'enable' : 'disable'](); + this.findID('Show', 'SpeechText')[speech ? 'enable' : 'disable'](); + this.findID('Copy', 'SpeechText')[speech ? 'enable' : 'disable'](); } /** @@ -196,8 +196,8 @@ export class MJContextMenu extends ContextMenu { */ protected getBrailleMenu() { const braille = this.mathItem.outputData.braille; - this.findID('Show', 'Braille')[braille ? 'enable' : 'disable'](); - this.findID('Copy', 'Braille')[braille ? 'enable' : 'disable'](); + this.findID('Show', 'BrailleCode')[braille ? 'enable' : 'disable'](); + this.findID('Copy', 'BrailleCode')[braille ? 'enable' : 'disable'](); } /** @@ -205,8 +205,8 @@ export class MJContextMenu extends ContextMenu { */ protected getSvgMenu() { const svg = this.jax.SVG; - this.findID('Show', 'SVG')[svg ? 'enable' : 'disable'](); - this.findID('Copy', 'SVG')[svg ? 'enable' : 'disable'](); + this.findID('Show', 'SvgImage')[svg ? 'enable' : 'disable'](); + this.findID('Copy', 'SvgImage')[svg ? 'enable' : 'disable'](); } /** diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts index ebee11f7b..97cc40c94 100644 --- a/ts/ui/menu/Menu.ts +++ b/ts/ui/menu/Menu.ts @@ -49,6 +49,9 @@ import * as MenuUtil from './MenuUtil.js'; import { Parser, Rule, CssStyles, Submenu } from './mj-context-menu.js'; +import { COMPONENT, localize } from './__locales__/Component.js'; +export { COMPONENT }; + /*==========================================================================*/ /** @@ -302,15 +305,15 @@ export class Menu { // Add the input and output jax and the document type // lines.push( - 'Input Jax: ' + this.document.inputJax.map((jax) => jax.name).join(', ') + localize('InputJax', this.document.inputJax.map((jax) => jax.name).join(', ')), + localize('OutputJax', this.document.outputJax.name), + localize('DocType', this.document.kind) ); - lines.push('Output Jax: ' + this.document.outputJax.name); - lines.push('Document Type: ' + this.document.kind); // // Add the loaded packages and their versions // if (MathJax && MathJax.loader) { - lines.push('
Modules Loaded:'); + lines.push('
' + localize('Modules')); const Package = MathJax._.components.package.Package; const versions = (MathJax as any).loader.versions; for (const name of Array.from(Package.packages.keys()).sort( @@ -391,41 +394,8 @@ export class Menu { */ protected help() { InfoDialog.post({ - title: 'MathJax Help', - message: [ - '

MathJax is a JavaScript library that allows page', - ' authors to include mathematics within their web pages.', - " As a reader, you don't need to do anything to make that happen.

", - '

Browsers: MathJax works with all modern browsers including', - ' Edge, Firefox, Chrome, Safari, Opera, and most mobile browsers.

', - '

Math Menu: MathJax adds a contextual menu to equations.', - ' Right-click or CTRL-click on any mathematics to access the menu.

', - '
', - "

Show Math As: These options allow you to view the formula's", - ' source markup (as MathML or in its original format).

', - "

Copy to Clipboard: These options copy the formula's source markup,", - ' as MathML or in its original format, to the clipboard', - ' (in browsers that support that).

', - '

Math Settings: These give you control over features of MathJax,', - ' such the size of the mathematics, the mechanism used to display equations,', - ' how to handle equations that are too wide, and the language to use for', - " MathJax's menus and error messages (not yet implemented in v4).", - '

', - '

Accessibility: MathJax can work with screen', - ' readers to make mathematics accessible to the visually impaired.', - ' Turn on speech or braille generation to enable creation of speech strings', - ' and the ability to investigate expressions interactively. You can control', - ' the style of the explorer in its menu.

', - '
', - '

Math Zoom: If you are having difficulty reading an', - ' equation, MathJax can enlarge it to help you see it better, or', - ' you can scale all the math on the page to make it larger.', - ' Turn these features on in the Math Settings menu.

', - "

Preferences: MathJax uses your browser's localStorage database", - ' to save the preferences set via this menu locally in your browser. These', - ' are not used to track you, and are not transferred or used remotely by', - ' MathJax in any way.

', - ].join('\n'), + title: localize('HelpTitle'), + message: localize('HelpMessage'), adaptor: this.document.adaptor, extraNodes: [ this.document.adaptor.node( @@ -442,7 +412,7 @@ export class Menu { */ protected mathMLCode() { CopyDialog.post({ - title: 'MathJax MathML Expression', + title: localize('MmlTitle'), message: this.menu.mathItem ? this.toMML(this.menu.mathItem) : '', adaptor: this.document.adaptor, code: true, @@ -454,7 +424,7 @@ export class Menu { */ protected originalText() { CopyDialog.post({ - title: 'MathJax Original Source', + title: localize('SourceTitle'), message: this.menu.mathItem?.math ?? '', adaptor: this.document.adaptor, code: true, @@ -466,7 +436,7 @@ export class Menu { */ protected annotationBox() { CopyDialog.post({ - title: 'MathJax Annotation Text', + title: localize('AnnotationTitle'), message: AnnotationMenu.annotation, adaptor: this.document.adaptor, code: true, @@ -478,7 +448,7 @@ export class Menu { */ public async svgImage() { CopyDialog.post({ - title: 'MathJax SVG Image', + title: localize('SvgTitle'), message: await this.toSVG(this.menu.mathItem), adaptor: this.document.adaptor, code: true, @@ -490,7 +460,7 @@ export class Menu { */ protected speechText() { CopyDialog.post({ - title: 'MathJax Speech Text', + title: localize('SpeechTitle'), message: this.menu.mathItem?.outputData?.speech ?? '', adaptor: this.document.adaptor, code: true, @@ -498,11 +468,11 @@ export class Menu { } /** - * The "Show As Speech Text" info box + * The "Show As Braille Text" info box */ protected brailleText() { CopyDialog.post({ - title: 'MathJax Braille Text', + title: localize('BrailleTitle'), message: this.menu.mathItem?.outputData?.braille ?? '', adaptor: this.document.adaptor, code: true, @@ -514,7 +484,7 @@ export class Menu { */ protected errorMessage() { CopyDialog.post({ - title: 'MathJax Error Message', + title: localize('ErrorTitle'), message: this.menu.mathItem ? this.menu.errorMsg : '', adaptor: this.document.adaptor, code: true, @@ -535,7 +505,7 @@ export class Menu { text = `
${zoom.outerHTML}
`; } InfoDialog.post({ - title: 'MathJax Zoomed Expression', + title: localize('ZoomTitle'), message: text, adaptor: this.document.adaptor, styles: { @@ -680,262 +650,231 @@ export class Menu { ), ], items: [ - this.submenu('Show', 'Show Math As', [ - this.command('MathMLcode', 'MathML Code', () => this.mathMLCode()), - this.command('Original', 'Original Form', () => this.originalText()), + this.submenu('Show', [ + this.command('MathMLcode', () => this.mathMLCode()), + this.command('Original', () => this.originalText()), this.rule(), - this.command('Speech', 'Speech Text', () => this.speechText(), { + this.command('SpeechText', () => this.speechText(), { disabled: true, }), - this.command('Braille', 'Braille Code', () => this.brailleText(), { + this.command('BrailleCode', () => this.brailleText(), { disabled: true, }), - this.command('SVG', 'SVG Image', () => this.svgImage(), { + this.command('SvgImage', () => this.svgImage(), { disabled: true, }), - this.submenu('ShowAnnotation', 'Annotation'), + this.submenu('ShowAnnotation'), this.rule(), - this.command('Error', 'Error Message', () => this.errorMessage(), { + this.command('Error', () => this.errorMessage(), { disabled: true, }), ]), - this.submenu('Copy', 'Copy to Clipboard', [ - this.command('MathMLcode', 'MathML Code', () => this.copyMathML()), - this.command('Original', 'Original Form', () => this.copyOriginal()), + this.submenu('Copy', [ + this.command('MathMLcode', () => this.copyMathML()), + this.command('Original', () => this.copyOriginal()), this.rule(), - this.command('Speech', 'Speech Text', () => this.copySpeechText(), { + this.command('SpeechText', () => this.copySpeechText(), { disabled: true, }), this.command( - 'Braille', - 'Braille Code', + 'BrailleCode', () => this.copyBrailleText(), { disabled: true } ), - this.command('SVG', 'SVG Image', () => this.copySvgImage(), { + this.command('SvgImage', () => this.copySvgImage(), { disabled: true, }), - this.submenu('CopyAnnotation', 'Annotation'), + this.submenu('CopyAnnotation'), this.rule(), this.command( 'Error', - 'Error Message', () => this.copyErrorMessage(), { disabled: true } ), ]), this.rule(), - this.submenu('Settings', 'Math Settings', [ + this.submenu('Settings', [ this.submenu( 'Renderer', - 'Math Renderer', - this.radioGroup('renderer', [['CHTML'], ['SVG']]) + this.radioGroup('renderer', ['CHTML', 'SVG']) ), - this.submenu('Overflow', 'Wide Expressions', [ + this.submenu('WideExpressions', [ this.radioGroup('overflow', [ - ['Overflow'], - ['Scroll'], - ['Linebreak'], - ['Scale'], - ['Truncate'], - ['Elide'], + 'Overflow', + 'Scroll', + 'Linebreak', + 'Scale', + 'Truncate', + 'Elide', ]), this.rule(), - this.checkbox('BreakInline', 'Allow In-line Breaks', 'breakInline'), + this.checkbox('BreakInline', 'breakInline'), ]), this.rule(), - this.submenu('MathmlIncludes', 'MathML/SVG has', [ - this.checkbox('showSRE', 'Semantic attributes', 'showSRE'), - this.checkbox('showTex', 'LaTeX attributes', 'showTex'), - this.checkbox('texHints', 'TeX hints', 'texHints'), - this.checkbox('semantics', 'Original as annotation', 'semantics'), + this.submenu('MathmlIncludes', [ + this.checkbox('showSRE', 'showSRE'), + this.checkbox('showTex', 'showTex'), + this.checkbox('texHints', 'texHints'), + this.checkbox('semantics', 'semantics'), ]), - this.submenu('Language', 'Language'), + this.submenu('Language'), this.rule(), - this.submenu('ZoomTrigger', 'Zoom Trigger', [ - this.command('ZoomNow', 'Zoom Once Now', () => this.zoom(null, '')), + this.submenu('ZoomTrigger', [ + this.command('ZoomNow', () => this.zoom(null, '')), this.rule(), - this.radioGroup('zoom', [ - ['Click'], - ['DoubleClick', 'Double-Click'], - ['NoZoom', 'No Zoom'], - ]), + this.radioGroup('zoom', ['Click', 'DoubleClick', 'NoZoom']), this.rule(), - this.label('TriggerRequires', 'Trigger Requires:'), + this.label('TriggerRequires'), this.checkbox( - MenuUtil.isMac ? 'Option' : 'Alt', MenuUtil.isMac ? 'Option' : 'Alt', 'alt' ), - this.checkbox('Command', 'Command', 'cmd', { + this.checkbox('Command', 'cmd', { hidden: !MenuUtil.isMac, }), - this.checkbox('Control', 'Control', 'ctrl', { + this.checkbox('Control', 'ctrl', { hidden: MenuUtil.isMac, }), - this.checkbox('Shift', 'Shift', 'shift'), + this.checkbox('Shift', 'shift'), ]), this.submenu( 'ZoomFactor', - 'Zoom Factor', this.radioGroup('zscale', [ - ['150%'], - ['175%'], - ['200%'], - ['250%'], - ['300%'], - ['400%'], + '150%', + '175%', + '200%', + '250%', + '300%', + '400%', ]) ), this.rule(), - this.command('Scale', 'Scale All Math...', () => this.scaleAllMath()), + this.command('ScaleAllMath', () => this.scaleAllMath()), this.rule(), - this.command('Reset', 'Reset to defaults', () => + this.command('Reset', () => this.resetDefaults() ), ]), this.rule(), - this.label('Accessibility', '\xA0\xA0 Accessibility:'), - this.submenu('Speech', '\xA0 \xA0 Speech', [ - this.checkbox('Generate', 'Generate', 'speech'), - this.checkbox('Subtitles', 'Show Subtitles', 'subtitles'), - this.checkbox('Auto Voicing', 'Auto Voicing', 'voicing'), + this.label('Accessibility'), + this.submenu('Speech', [ + this.checkbox('Generate', 'speech'), + this.checkbox('Subtitles', 'subtitles'), + this.checkbox('AutoVoicing', 'voicing'), this.rule(), - this.label('Rules', 'Rules:'), + this.label('Rules'), this.submenu( - 'Mathspeak', 'Mathspeak', this.radioGroup('speechRules', [ - ['mathspeak-default', 'Verbose'], - ['mathspeak-brief', 'Brief'], - ['mathspeak-sbrief', 'Superbrief'], + 'mathspeak-default', + 'mathspeak-brief', + 'mathspeak-sbrief', ]) ), this.submenu( 'Clearspeak', - 'Clearspeak', - this.radioGroup('speechRules', [['clearspeak-default', 'Auto']]) + this.radioGroup('speechRules', ['clearspeak-default']) ), this.rule(), - this.submenu('A11yLanguage', 'Language'), + this.submenu('A11yLanguage'), ]), - this.submenu('Braille', '\xA0 \xA0 Braille', [ - this.checkbox('Generate', 'Generate', 'braille'), - this.checkbox('Subtitles', 'Show Subtitles', 'viewBraille'), - this.checkbox('BrailleSpeech', 'Replace Speech', 'brailleSpeech', { + this.submenu('Braille', [ + this.checkbox('Generate', 'braille'), + this.checkbox('Subtitles', 'viewBraille'), + this.checkbox('BrailleSpeech', 'brailleSpeech', { hidden: true, }), this.checkbox( 'BrailleCombine', - 'Combine with Speech', 'brailleCombine' ), this.rule(), - this.label('Code', 'Code Format:'), - this.radioGroup('brailleCode', [ - ['nemeth', 'Nemeth'], - ['ueb', 'UEB'], - ['euro', 'Euro'], - ]), + this.label('Code'), + this.radioGroup('brailleCode', ['nemeth', 'ueb', 'euro']), ]), - this.submenu('Explorer', '\xA0 \xA0 Explorer', [ - this.submenu('Highlight', 'Highlight', [ + this.submenu('Explorer', [ + this.submenu('Highlight', [ this.submenu( - 'Background', 'Background', this.radioGroup('backgroundColor', [ - ['Blue'], - ['Red'], - ['Green'], - ['Yellow'], - ['Cyan'], - ['Magenta'], - ['White'], - ['Black'], + 'Blue', + 'Red', + 'Green', + 'Yellow', + 'Cyan', + 'Magenta', + 'White', + 'Black', ]) ), { type: 'slider', variable: 'backgroundOpacity', content: ' ' }, this.submenu( - 'Foreground', 'Foreground', this.radioGroup('foregroundColor', [ - ['Black'], - ['White'], - ['Magenta'], - ['Cyan'], - ['Yellow'], - ['Green'], - ['Red'], - ['Blue'], + 'Black', + 'White', + 'Magenta', + 'Cyan', + 'Yellow', + 'Green', + 'Red', + 'Blue', ]) ), { type: 'slider', variable: 'foregroundOpacity', content: ' ' }, this.rule(), - this.radioGroup('highlight', [['None'], ['Hover'], ['Flame']]), + this.radioGroup('highlight', ['None', 'Hover', 'Flame']), this.rule(), - this.checkbox('TreeColoring', 'Tree Coloring', 'treeColoring'), + this.checkbox('TreeColoring', 'treeColoring'), ]), - this.submenu('Magnification', 'Magnification', [ - this.radioGroup('magnification', [ - ['None'], - ['Keyboard'], - ['Mouse'], - ]), + this.submenu('Magnification', [ + this.radioGroup('magnification', ['None', 'Keyboard', 'Mouse']), this.rule(), - this.radioGroup('magnify', [ - ['200%'], - ['300%'], - ['400%'], - ['500%'], - ]), + this.radioGroup('magnify', ['200%', '300%', '400%', '500%']), ]), - this.submenu('Semantic Info', 'Semantic Info', [ - this.checkbox('Type', 'Type', 'infoType'), - this.checkbox('Role', 'Role', 'infoRole'), - this.checkbox('Prefix', 'Prefix', 'infoPrefix'), + this.submenu('SemanticInfo', [ + this.checkbox('Type', 'infoType'), + this.checkbox('Role', 'infoRole'), + this.checkbox('Prefix', 'infoPrefix'), ]), this.rule(), - this.submenu('Role Description', 'Describe math as', [ + this.submenu('RoleDescription', [ this.radioGroup('roleDescription', [ - ['MathJax expression'], - ['MathJax'], - ['math'], - ['clickable math'], - ['explorable math'], - ['none'], + 'MathJax expression', + 'MathJax', + 'math', + 'clickable math', + 'explorable math', + 'none', ]), ]), - this.checkbox('Math Help', 'Help message on focus', 'help'), + this.checkbox('MathHelp', 'help'), ]), - this.submenu('Options', '\xA0 \xA0 Options', [ - this.checkbox('Enrich', 'Semantic Enrichment', 'enrich'), - this.checkbox('Collapsible', 'Collapsible Math', 'collapsible'), - this.checkbox('AutoCollapse', 'Auto Collapse', 'autocollapse', { + this.submenu('Options', [ + this.checkbox('Enrich', 'enrich'), + this.checkbox('Collapsible', 'collapsible'), + this.checkbox('AutoCollapse', 'autocollapse', { disabled: true, }), this.rule(), - this.checkbox('InTabOrder', 'Include in Tab Order', 'inTabOrder'), - this.submenu('TabSelects', 'Tabbing Focuses on', [ - this.radioGroup('tabSelects', [ - ['all', 'Whole Expression'], - ['last', 'Last Explored Node'], - ]), + this.checkbox('InTabOrder', 'inTabOrder'), + this.submenu('TabSelects', [ + this.radioGroup('tabSelects', ['all', 'last']), ]), this.rule(), this.checkbox( 'AssistiveMml', - 'Include Hidden MathML', 'assistiveMml' ), ]), this.rule(), - this.command('About', 'About MathJax', () => this.about()), - this.command('Help', 'MathJax Help', () => this.help()), + this.command('About', () => this.about()), + this.command('Help', () => this.help()), ], }) as MJContextMenu; const menu = this.menu; menu.settings = this.settings; - menu.findID('Settings', 'Overflow', 'Elide').disable(); + menu.findID('Settings', 'WideExpressions', 'Elide').disable(); menu.findID('Braille', 'ueb').hide(); menu.setJax(this.jax); this.checkLoadableItems(); @@ -1025,7 +964,7 @@ export class Menu { Object.assign(this.settings, settings); this.setA11y(settings); } catch (err) { - console.log('MathJax localStorage error: ' + err.message); + console.log(localize('StorageError', err.message)); } } @@ -1046,7 +985,7 @@ export class Menu { localStorage.removeItem(Menu.MENU_STORAGE); } } catch (err) { - console.log('MathJax localStorage error: ' + err.message); + console.log(localize('StorageError', err.message)); } } @@ -1151,7 +1090,7 @@ export class Menu { this.loadComponent('output/' + name, () => { const startup = MathJax.startup; if (!(name in startup.constructors)) { - return fail(new Error(`Component ${name} not loaded`)); + return fail(new Error(localize('ComponentNotLoaded', name))); } startup.useOutput(name, true); startup.output = this.applyRendererOptions(startup.getOutputJax()); @@ -1448,10 +1387,7 @@ export class Menu { const scale = (parseFloat(this.settings.scale) * 100) .toFixed(1) .replace(/.0$/, ''); - const percent = prompt( - 'Scale all mathematics (compared to surrounding text) by', - scale + '%' - ); + const percent = prompt(localize('ScalePrompt'), scale + '%'); if (this.current) { const speech = (this.menu.mathItem as ExplorerMathItem).explorers.speech; speech.refocus = this.current; @@ -1463,10 +1399,10 @@ export class Menu { if (scale) { this.menu.pool.lookup('scale').setValue(String(scale)); } else { - alert('The scale should not be zero'); + alert(localize('ScaleNonZero')); } } else { - alert('The scale should be a percentage (e.g., 120%)'); + alert(localize('ScalePercent')); } } } @@ -1627,7 +1563,7 @@ export class Menu { protected async toSVG(math: HTMLMATHITEM): Promise { const jax = this.jax.SVG; if (!jax) { - return "SVG can't be produced.
Try switching to SVG output first."; + return localize('NoSvgProduced'); } const adaptor = jax.adaptor; const cache = jax.options.fontCache; @@ -1954,14 +1890,12 @@ export class Menu { * Create JSON for a submenu item * * @param {string} id The id for the item - * @param {string} content The content for the item * @param {any[]} entries The JSON for the entries * @param {boolean=} disabled True if this item is diabled initially * @returns {object} The JSON for the submenu item */ public submenu( id: string, - content: string, entries: any[] = [], disabled: boolean = false ): object { @@ -1976,7 +1910,7 @@ export class Menu { return { type: 'submenu', id, - content, + content: localize(id), menu: { items }, disabled: items.length === 0 || disabled, }; @@ -1986,17 +1920,16 @@ export class Menu { * Create JSON for a command item * * @param {string} id The id for the item - * @param {string} content The content for the item * @param {() => void} action The action function for the command * @param {object} other Other values to include in the generated JSON object * @returns {object} The JSON for the command item */ public command( id: string, - content: string, action: () => void, other: object = {} ): object { + const content = localize(id); return Object.assign({ type: 'command', id, content, action }, other); } @@ -2004,47 +1937,45 @@ export class Menu { * Create JSON for a checkbox item * * @param {string} id The id for the item - * @param {string} content The content for the item * @param {string} variable The (pool) variable to attach to this checkbox * @param {object} other Other values to include in the generated JSON object * @returns {object} The JSON for the checkbox item */ public checkbox( id: string, - content: string, variable: string, other: object = {} ): object { + const content = localize(id); return Object.assign({ type: 'checkbox', id, content, variable }, other); } /** * Create JSON for a group of connected radio buttons * - * @param {string} variable The (pool) variable to attach to each radio button - * @param {string[][]} radios An array of [string] or [string, string], giving the id and content - * for each radio button (if only one string is given it is used for both) - * @returns {object[]} An array of JSON objects for radion buttons + * @param {string} variable The (pool) variable to attach to each radio button + * @param {string[]} radios An array of [string] or [string, string], giving the id and content + * for each radio button (if only one string is given it is used for both) + * @returns {object[]} An array of JSON objects for radion buttons */ - public radioGroup(variable: string, radios: string[][]): object[] { - return radios.map((def) => this.radio(def[0], def[1] || def[0], variable)); + public radioGroup(variable: string, radios: string[]): object[] { + return radios.map((item) => this.radio(item, variable)); } /** * Create JSON for a radio button item * * @param {string} id The id for the item - * @param {string} content The content for the item * @param {string} variable The (pool) variable to attach to this radio button * @param {object} other Other values to include in the generated JSON object * @returns {object} The JSON for the radio button item */ public radio( id: string, - content: string, variable: string, other: object = {} ): object { + const content = localize(id); return Object.assign({ type: 'radio', id, content, variable }, other); } @@ -2052,10 +1983,10 @@ export class Menu { * Create JSON for a label item * * @param {string} id The id for the item - * @param {string} content The content for the item * @returns {object} The JSON for the label item */ - public label(id: string, content: string): object { + public label(id: string): object { + const content = localize(id); return { type: 'label', id, content }; } diff --git a/ts/ui/menu/__locales__/Component.ts b/ts/ui/menu/__locales__/Component.ts new file mode 100644 index 000000000..fbd032936 --- /dev/null +++ b/ts/ui/menu/__locales__/Component.ts @@ -0,0 +1,39 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for ui/menu + * + * @author dpvc@mathjax.org (Davide P. Cervone + */ + +import { Locale, namedData } from '../../../util/Locale.js'; + +export const COMPONENT = 'ui/menu'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/ui/menu'); + +/** + * Get a localized message for this component + * + * @param {string} id The id of the message + * @param {(string|namedData)[]} args The replacement arguments for the message, if any + * @returns {string} The localized message + */ +export function localize(id: string, ...args: (string | namedData)[]): string { + return Locale.message(COMPONENT, id, ...args); +} diff --git a/ts/ui/menu/__locales__/en.json b/ts/ui/menu/__locales__/en.json new file mode 100644 index 000000000..ee0525172 --- /dev/null +++ b/ts/ui/menu/__locales__/en.json @@ -0,0 +1,143 @@ +{ + "150%": "150%", + "175%": "175%", + "200%": "200%", + "250%": "250%", + "300%": "300%", + "400%": "400%", + "500%": "500%", + "A11yLanguage": "Language", + "About": "About MathJax", + "Accessibility": "\u00A0\u00A0 Accessibility:", + "Alt": "Alt", + "AssistiveMml": "Include Hidden MathML", + "AutoCollapse": "Auto Collapse", + "AutoVoicing": "Auto Voicing", + "Background": "Background", + "Black": "Black", + "Blue": "Blue", + "Braille": "\u00A0 \u00A0 Braille", + "BrailleCode": "Braille Code", + "BrailleCombine": "Combine with Speech", + "BrailleSpeech": "Replace Speech", + "BreakInline": "Allow In-line Breaks", + "CHTML": "CHTML", + "Clearspeak": "Clearspeak", + "Click": "Click", + "Code": "Code Format:", + "Collapsible": "Collapsible Math", + "Command": "Command", + "Control": "Control", + "Copy": "Copy to Clipboard", + "CopyAnnotation": "Annotation", + "Cyan": "Cyan", + "DoubleClick": "Double-Click", + "Elide": "Elide", + "Enrich": "Semantic Enrichment", + "Error": "Error Message", + "Explorer": "\u00A0 \u00A0 Explorer", + "Flame": "Flame", + "Foreground": "Foreground", + "Generate": "Generate", + "Green": "Green", + "Help": "MathJax Help", + "Highlight": "Highlight", + "Hover": "Hover", + "InTabOrder": "Include in Tab Order", + "Keyboard": "Keyboard", + "Language": "Language", + "Linebreak": "Linebreak", + "Magenta": "Magenta", + "Magnification": "Magnification", + "MathHelp": "Help message on focus", + "MathJax": "MathJax", + "MathJax expression": "MathJax expression", + "MathMLcode": "MathML Code", + "MathmlIncludes": "MathML/SVG has", + "Mathspeak": "Mathspeak", + "Mouse": "Mouse", + "NoZoom": "No Zoom", + "None": "None", + "Option": "Option", + "Options": "\u00A0 \u00A0 Options", + "Original": "Original Form", + "Overflow": "Overflow", + "Prefix": "Prefix", + "Red": "Red", + "Renderer": "Math Renderer", + "Reset": "Reset to defaults", + "Role": "Role", + "RoleDescription": "Describe math as", + "Rules": "Rules:", + "SVG": "SVG", + "Scale": "Scale", + "ScaleAllMath": "Scale All Math...", + "Scroll": "Scroll", + "SemanticInfo": "Semantic Info", + "Settings": "Math Settings", + "Shift": "Shift", + "Show": "Show Math As", + "ShowAnnotation": "Annotation", + "Speech": "\u00A0 \u00A0 Speech", + "SpeechText": "Speech Text", + "Subtitles": "Show Subtitles", + "SvgImage": "SVG Image", + "TabSelects": "Tabbing Focuses on", + "TreeColoring": "Tree Coloring", + "TriggerRequires": "Trigger Requires:", + "Truncate": "Truncate", + "Type": "Type", + "White": "White", + "WideExpressions": "Wide Expressions", + "Yellow": "Yellow", + "ZoomFactor": "Zoom Factor", + "ZoomNow": "Zoom Once Now", + "ZoomTrigger": "Zoom Trigger", + "all": "Whole Expression", + "clearspeak-default": "Auto", + "clickable math": "clickable math", + "euro": "Euro", + "explorable math": "explorable math", + "last": "Last Explored Node", + "math": "math", + "mathspeak-brief": "Brief", + "mathspeak-default": "Verbose", + "mathspeak-sbrief": "Superbrief", + "nemeth": "Nemeth", + "none": "none", + "semantics": "Original as annotation", + "showSRE": "Semantic attributes", + "showTex": "LaTeX attributes", + "texHints": "TeX hints", + "ueb": "UEB", + + "InputJax": "Input Jax: %1", + "OutputJax": "Outut Jax: %1", + "DocType": "Document Type: %1", + "Modules": "Modules Loaded:", + + "HelpTitle": "MathJax Help", + "HelpMessage": "

MathJax is a JavaScript library that allows page authors to include mathematics within their web pages. As a reader, you don't need to do anything to make that happen.

Browsers: MathJax works with all modern browsers including Edge, Firefox, Chrome, Safari, Opera, and most mobile browsers.

Math Menu: MathJax adds a contextual menu to equations. Right-click or CTRL-click on any mathematics to access the menu.

Show Math As: These options allow you to view the formula's source markup (as MathML or in its original format).

Copy to Clipboard: These options copy the formula's source markup, as MathML or in its original format, to the clipboard (in browsers that support that).

Math Settings: These give you control over features of MathJax, such the size of the mathematics, the mechanism used to display equations, how to handle equations that are too wide, and the language to use for MathJax's menus and error messages (not yet implemented in v4).

Accessibility: MathJax can work with screen readers to make mathematics accessible to the visually impaired. Turn on speech or braille generation to enable creation of speech strings and the ability to investigate expressions interactively. You can control the style of the explorer in its menu.

Math Zoom: If you are having difficulty reading an equation, MathJax can enlarge it to help you see it better, or you can scale all the math on the page to make it larger. Turn these features on in the Math Settings menu.

Preferences: MathJax uses your browser's localStorage database to save the preferences set via this menu locally in your browser. These are not used to track you, and are not transferred or used remotely by MathJax in any way.

", + + "MmlTitle": "MathJax MathML Expression", + "SourceTitle": "MathJax Original Source", + "AnnotationTitle": "MathJax Annotation Text", + "SvgTitle": "MathJax SVG Image", + "SpeechTitle": "MathJax Speech Text", + "BrailleTitle": "MathJax Braille Text", + "ErrorTitle": "MathJax Error Message", + "ZoomTitle": "MathJax Zoomed Expression", + + "StorageError": "MathJax localStorage error: %1", + "ComponentNotLoaded": "Component %1 not loaded", + "ScalePrompt": "Scale all mathematics (compared to surrounding text) by", + "ScaleNonZero": "The scale should not be zero", + "ScalePercent": "The scale should be a percentage (e.g., 120%)", + "NoSvgProduced": "SVG can't be produced.
Try switching to SVG output first.", + + "ClearspeakTitle": "Clearspeak Preferences", + "SelectPrefs": "Select Preferences", + "NoPrefs": "No Preferences", + "CurrentPrefs": "Current Preferences", + "PrefsFor": "Preferences for %1" +} From 7751069cce38e8e82ae97788b411ed237ef6630f Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 18 May 2026 18:38:53 -0400 Subject: [PATCH 42/95] Formatting fixed for prettier --- ts/ui/menu/Menu.ts | 60 ++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts index 97cc40c94..ecc766a40 100644 --- a/ts/ui/menu/Menu.ts +++ b/ts/ui/menu/Menu.ts @@ -305,7 +305,10 @@ export class Menu { // Add the input and output jax and the document type // lines.push( - localize('InputJax', this.document.inputJax.map((jax) => jax.name).join(', ')), + localize( + 'InputJax', + this.document.inputJax.map((jax) => jax.name).join(', ') + ), localize('OutputJax', this.document.outputJax.name), localize('DocType', this.document.kind) ); @@ -676,21 +679,17 @@ export class Menu { this.command('SpeechText', () => this.copySpeechText(), { disabled: true, }), - this.command( - 'BrailleCode', - () => this.copyBrailleText(), - { disabled: true } - ), + this.command('BrailleCode', () => this.copyBrailleText(), { + disabled: true, + }), this.command('SvgImage', () => this.copySvgImage(), { disabled: true, }), this.submenu('CopyAnnotation'), this.rule(), - this.command( - 'Error', - () => this.copyErrorMessage(), - { disabled: true } - ), + this.command('Error', () => this.copyErrorMessage(), { + disabled: true, + }), ]), this.rule(), this.submenu('Settings', [ @@ -725,10 +724,7 @@ export class Menu { this.radioGroup('zoom', ['Click', 'DoubleClick', 'NoZoom']), this.rule(), this.label('TriggerRequires'), - this.checkbox( - MenuUtil.isMac ? 'Option' : 'Alt', - 'alt' - ), + this.checkbox(MenuUtil.isMac ? 'Option' : 'Alt', 'alt'), this.checkbox('Command', 'cmd', { hidden: !MenuUtil.isMac, }), @@ -751,9 +747,7 @@ export class Menu { this.rule(), this.command('ScaleAllMath', () => this.scaleAllMath()), this.rule(), - this.command('Reset', () => - this.resetDefaults() - ), + this.command('Reset', () => this.resetDefaults()), ]), this.rule(), this.label('Accessibility'), @@ -784,10 +778,7 @@ export class Menu { this.checkbox('BrailleSpeech', 'brailleSpeech', { hidden: true, }), - this.checkbox( - 'BrailleCombine', - 'brailleCombine' - ), + this.checkbox('BrailleCombine', 'brailleCombine'), this.rule(), this.label('Code'), this.radioGroup('brailleCode', ['nemeth', 'ueb', 'euro']), @@ -832,7 +823,7 @@ export class Menu { this.rule(), this.radioGroup('magnify', ['200%', '300%', '400%', '500%']), ]), - this.submenu('SemanticInfo', [ + this.submenu('SemanticInfo', [ this.checkbox('Type', 'infoType'), this.checkbox('Role', 'infoRole'), this.checkbox('Prefix', 'infoPrefix'), @@ -862,10 +853,7 @@ export class Menu { this.radioGroup('tabSelects', ['all', 'last']), ]), this.rule(), - this.checkbox( - 'AssistiveMml', - 'assistiveMml' - ), + this.checkbox('AssistiveMml', 'assistiveMml'), ]), this.rule(), this.command('About', () => this.about()), @@ -1924,11 +1912,7 @@ export class Menu { * @param {object} other Other values to include in the generated JSON object * @returns {object} The JSON for the command item */ - public command( - id: string, - action: () => void, - other: object = {} - ): object { + public command(id: string, action: () => void, other: object = {}): object { const content = localize(id); return Object.assign({ type: 'command', id, content, action }, other); } @@ -1941,11 +1925,7 @@ export class Menu { * @param {object} other Other values to include in the generated JSON object * @returns {object} The JSON for the checkbox item */ - public checkbox( - id: string, - variable: string, - other: object = {} - ): object { + public checkbox(id: string, variable: string, other: object = {}): object { const content = localize(id); return Object.assign({ type: 'checkbox', id, content, variable }, other); } @@ -1970,11 +1950,7 @@ export class Menu { * @param {object} other Other values to include in the generated JSON object * @returns {object} The JSON for the radio button item */ - public radio( - id: string, - variable: string, - other: object = {} - ): object { + public radio(id: string, variable: string, other: object = {}): object { const content = localize(id); return Object.assign({ type: 'radio', id, content, variable }, other); } From 71b8965da36cec2c4c7870dfc5e61c73d67d0aff Mon Sep 17 00:00:00 2001 From: zorkow Date: Tue, 19 May 2026 10:58:10 +0200 Subject: [PATCH 43/95] incorporate review comments --- ts/input/tex/HandlerTypes.ts | 1 - ts/input/tex/StackItem.ts | 10 +++++----- ts/input/tex/base/BaseItems.ts | 2 +- ts/input/tex/base/BaseMethods.ts | 2 +- ts/input/tex/bussproofs/BussproofsMethods.ts | 2 +- ts/input/tex/unicode/UnicodeConfiguration.ts | 14 +------------- ts/input/tex/verb/VerbConfiguration.ts | 1 + 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/ts/input/tex/HandlerTypes.ts b/ts/input/tex/HandlerTypes.ts index 0ed0db4c0..ec2f6f003 100644 --- a/ts/input/tex/HandlerTypes.ts +++ b/ts/input/tex/HandlerTypes.ts @@ -34,7 +34,6 @@ export enum ConfigurationType { CONFIG = 'config', PRIORITY = 'priority', PARSER = 'parser', - ERRORS = 'errors', } export enum HandlerType { diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index 82430e492..bc0deb7ca 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -517,10 +517,10 @@ export abstract class BaseItem extends MmlStack implements StackItem { // @test Ampersand-error throw new TexError(COMPONENT, 'Misplaced', item.getName()); } - if (item.isClose && this.getErrors(item.kind)) { + if (item.isClose && this.getError(item.kind)) { // @test ExtraOpenMissingClose, ExtraCloseMissingOpen, // MissingLeftExtraRight, MissingBeginExtraEnd - throw new TexError(COMPONENT, this.getErrors(item.kind), item.getName()); + throw new TexError(COMPONENT, this.getError(item.kind), item.getName()); } if (!item.isFinal) { return BaseItem.success; @@ -566,11 +566,11 @@ export abstract class BaseItem extends MmlStack implements StackItem { * subclasses. * * @param {string} kind The stack item type. - * @returns {string[]} The list of arguments for the TeXError. + * @returns {string} The id of the error message. */ - public getErrors(kind: string): string { + public getError(kind: string): string { const CLASS = this.constructor as typeof BaseItem; - return (CLASS.errors || {})[kind] || BaseItem.errors[kind]; + return CLASS.errors?.[kind] ?? BaseItem.errors[kind]; } /** diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index f0a4ef4ef..1824209e5 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -280,7 +280,7 @@ export class SubsupItem extends BaseItem { } if (super.checkItem(item)[1]) { // @test Brace Superscript Error, MissingOpenForSup, MissingOpenForSub - const error = this.getErrors(['', 'sub', 'sup'][position]); + const error = this.getError(['', 'sub', 'sup'][position]); throw new TexError(COMPONENT, error); } return null; diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index 114961dc1..976d735a5 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -65,7 +65,7 @@ const MmlTokenAllow: { [key: string]: number } = { * @param {number} n The number of expected alignment characters * @returns {string} String with space separated alignment characters */ -export function splitAlignArray(align: string, n: number = Infinity) { +export function splitAlignArray(align: string, n: number = Infinity): string { const list = align .replace(/\s+/g, '') .split('') diff --git a/ts/input/tex/bussproofs/BussproofsMethods.ts b/ts/input/tex/bussproofs/BussproofsMethods.ts index db22fb891..9af25db5f 100644 --- a/ts/input/tex/bussproofs/BussproofsMethods.ts +++ b/ts/input/tex/bussproofs/BussproofsMethods.ts @@ -141,7 +141,7 @@ function parseFCenterLine(parser: TexParser, name: string): MmlNode { throw new TexError(COMPONENT, 'IllegalUseOfCommand', name); } parser.i++; - let axiom = parser.GetUpTo(name, '$'); + const axiom = parser.GetUpTo(name, '$'); if (axiom.indexOf('\\fCenter') === -1) { throw new TexError(COMPONENT, 'MissingProofCommand', '\\fCenter', name); } diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index 74e9ac089..9847a52c3 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -130,19 +130,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { // @ts-ignore match = text.match(/^'([0-7]{1,7}) ?/u); if (match) { - if (match[1]) { - c = String.fromCodePoint(parseInt(match[1], 8)); - } else if (match[3]) { - c = match[3]; - } else { - parser.i += 2; - const cs = [...parser.GetCS()]; - if (cs.length > 1) { - throw new TexError(COMPONENT, 'InvalidAlphanumeric', parser.currentCS); - } - c = cs[0]; - match = ['']; - } + c = String.fromCodePoint(parseInt(match[1], 8)); } } else if (next === '"') { match = text.match(/^"([0-9A-F]{1,6}) ?/); diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 5fab39b1b..37be39ccb 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -37,6 +37,7 @@ Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/verb'); const VerbMethods: { [key: string]: ParseMethod } = { /** * Implements the verbatim notation \verb|...|. + * * @param {TexParser} parser The current tex parser. * @param {string} name The name of the calling macro. */ From 30e520b9f45c2250ce553d50ad63b49a22b93c94 Mon Sep 17 00:00:00 2001 From: zorkow Date: Fri, 15 May 2026 17:13:27 +0200 Subject: [PATCH 44/95] add copy commands to all config files --- components/mjs/input/tex/config.json | 12 ++++++++++++ components/mjs/input/tex/extensions/ams/config.json | 11 ++++++++++- components/mjs/input/tex/extensions/bbox/config.json | 3 ++- .../mjs/input/tex/extensions/begingroup/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/braket/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/bussproofs/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/cases/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/color/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/colortbl/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/empheq/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/extpfeil/config.json | 11 ++++++++++- components/mjs/input/tex/extensions/html/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/mathtools/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/newcommand/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/physics/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/require/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/setoptions/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/texhtml/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/textmacros/config.json | 11 ++++++++++- .../mjs/input/tex/extensions/unicode/config.json | 11 ++++++++++- components/mjs/input/tex/extensions/verb/config.json | 11 ++++++++++- 21 files changed, 204 insertions(+), 20 deletions(-) diff --git a/components/mjs/input/tex/config.json b/components/mjs/input/tex/config.json index 135d306c3..5fa28d5d4 100644 --- a/components/mjs/input/tex/config.json +++ b/components/mjs/input/tex/config.json @@ -15,6 +15,18 @@ ], "excludeSubdirs": true }, + "copy": [ + { + "to": "[bundle]/input/tex", + "from": "[ts]/input/tex", + "copy": ["__locales__"] + }, + { + "to": "[bundle]/input/tex/extensions/base", + "from": "[ts]/input/tex/base", + "copy": ["__locales__"] + } + ], "webpack": { "name": "input/tex", "libs": [ diff --git a/components/mjs/input/tex/extensions/ams/config.json b/components/mjs/input/tex/extensions/ams/config.json index a236d0358..0663b39aa 100644 --- a/components/mjs/input/tex/extensions/ams/config.json +++ b/components/mjs/input/tex/extensions/ams/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/ams", "component": "input/tex/extensions/ams", - "targets": ["input/tex/ams"] + "targets": [ + "input/tex/ams" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/ams", + "from": "[ts]/input/tex/ams", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/ams", diff --git a/components/mjs/input/tex/extensions/bbox/config.json b/components/mjs/input/tex/extensions/bbox/config.json index 992885a51..08c75b5c1 100644 --- a/components/mjs/input/tex/extensions/bbox/config.json +++ b/components/mjs/input/tex/extensions/bbox/config.json @@ -1,3 +1,4 @@ + { "build": { "id": "[tex]/bbox", @@ -7,7 +8,7 @@ "copy": { "to": "[bundle]/input/tex/extensions/bbox", "from": "[ts]/input/tex/bbox", - "copy": ["locales"] + "copy": ["__locales__"] }, "webpack": { "name": "input/tex/extensions/bbox", diff --git a/components/mjs/input/tex/extensions/begingroup/config.json b/components/mjs/input/tex/extensions/begingroup/config.json index 8452effd2..8cee0798a 100644 --- a/components/mjs/input/tex/extensions/begingroup/config.json +++ b/components/mjs/input/tex/extensions/begingroup/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/begingroup", "component": "input/tex/extensions/begingroup", - "targets": ["input/tex/begingroup"] + "targets": [ + "input/tex/begingroup" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/begingroup", + "from": "[ts]/input/tex/begingroup", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/begingroup", diff --git a/components/mjs/input/tex/extensions/braket/config.json b/components/mjs/input/tex/extensions/braket/config.json index 12cf84f1f..6c565b4d3 100644 --- a/components/mjs/input/tex/extensions/braket/config.json +++ b/components/mjs/input/tex/extensions/braket/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/braket", "component": "input/tex/extensions/braket", - "targets": ["input/tex/braket"] + "targets": [ + "input/tex/braket" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/braket", + "from": "[ts]/input/tex/braket", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/braket", diff --git a/components/mjs/input/tex/extensions/bussproofs/config.json b/components/mjs/input/tex/extensions/bussproofs/config.json index dcfee11bf..91458d30d 100644 --- a/components/mjs/input/tex/extensions/bussproofs/config.json +++ b/components/mjs/input/tex/extensions/bussproofs/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/bussproofs", "component": "input/tex/extensions/bussproofs", - "targets": ["input/tex/bussproofs"] + "targets": [ + "input/tex/bussproofs" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/bussproofs", + "from": "[ts]/input/tex/bussproofs", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/bussproofs", diff --git a/components/mjs/input/tex/extensions/cases/config.json b/components/mjs/input/tex/extensions/cases/config.json index 49d7c48e4..4321f4afc 100644 --- a/components/mjs/input/tex/extensions/cases/config.json +++ b/components/mjs/input/tex/extensions/cases/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/cases", "component": "input/tex/extensions/cases", - "targets": ["input/tex/cases"] + "targets": [ + "input/tex/cases" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/cases", + "from": "[ts]/input/tex/cases", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/cases", diff --git a/components/mjs/input/tex/extensions/color/config.json b/components/mjs/input/tex/extensions/color/config.json index 84041ca4d..0c6e0424b 100644 --- a/components/mjs/input/tex/extensions/color/config.json +++ b/components/mjs/input/tex/extensions/color/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/color", "component": "input/tex/extensions/color", - "targets": ["input/tex/color"] + "targets": [ + "input/tex/color" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/color", + "from": "[ts]/input/tex/color", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/color", diff --git a/components/mjs/input/tex/extensions/colortbl/config.json b/components/mjs/input/tex/extensions/colortbl/config.json index 13a313e50..926784c14 100644 --- a/components/mjs/input/tex/extensions/colortbl/config.json +++ b/components/mjs/input/tex/extensions/colortbl/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/colortbl", "component": "input/tex/extensions/colortbl", - "targets": ["input/tex/colortbl"] + "targets": [ + "input/tex/colortbl" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/colortbl", + "from": "[ts]/input/tex/colortbl", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/colortbl", diff --git a/components/mjs/input/tex/extensions/empheq/config.json b/components/mjs/input/tex/extensions/empheq/config.json index 5231b5d62..05b8c5e3e 100644 --- a/components/mjs/input/tex/extensions/empheq/config.json +++ b/components/mjs/input/tex/extensions/empheq/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/empheq", "component": "input/tex/extensions/empheq", - "targets": ["input/tex/empheq"] + "targets": [ + "input/tex/empheq" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/empheq", + "from": "[ts]/input/tex/empheq", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/empheq", diff --git a/components/mjs/input/tex/extensions/extpfeil/config.json b/components/mjs/input/tex/extensions/extpfeil/config.json index 493771252..e898dc86f 100644 --- a/components/mjs/input/tex/extensions/extpfeil/config.json +++ b/components/mjs/input/tex/extensions/extpfeil/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/extpfeil", "component": "input/tex/extensions/extpfeil", - "targets": ["input/tex/extpfeil"] + "targets": [ + "input/tex/extpfeil" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/extpfeil", + "from": "[ts]/input/tex/extpfeil", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/extpfeil", diff --git a/components/mjs/input/tex/extensions/html/config.json b/components/mjs/input/tex/extensions/html/config.json index ee870d405..05c3f625a 100644 --- a/components/mjs/input/tex/extensions/html/config.json +++ b/components/mjs/input/tex/extensions/html/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/html", "component": "input/tex/extensions/html", - "targets": ["input/tex/html"] + "targets": [ + "input/tex/html" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/html", + "from": "[ts]/input/tex/html", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/html", diff --git a/components/mjs/input/tex/extensions/mathtools/config.json b/components/mjs/input/tex/extensions/mathtools/config.json index 0c57ebc10..c5753928f 100644 --- a/components/mjs/input/tex/extensions/mathtools/config.json +++ b/components/mjs/input/tex/extensions/mathtools/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/mathtools", "component": "input/tex/extensions/mathtools", - "targets": ["input/tex/mathtools"] + "targets": [ + "input/tex/mathtools" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/mathtools", + "from": "[ts]/input/tex/mathtools", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/mathtools", diff --git a/components/mjs/input/tex/extensions/newcommand/config.json b/components/mjs/input/tex/extensions/newcommand/config.json index 0ef05e0a3..3c7b47b65 100644 --- a/components/mjs/input/tex/extensions/newcommand/config.json +++ b/components/mjs/input/tex/extensions/newcommand/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/newcommand", "component": "input/tex/extensions/newcommand", - "targets": ["input/tex/newcommand"] + "targets": [ + "input/tex/newcommand" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/newcommand", + "from": "[ts]/input/tex/newcommand", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/newcommand", diff --git a/components/mjs/input/tex/extensions/physics/config.json b/components/mjs/input/tex/extensions/physics/config.json index c1e020b82..05971773a 100644 --- a/components/mjs/input/tex/extensions/physics/config.json +++ b/components/mjs/input/tex/extensions/physics/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/physics", "component": "input/tex/extensions/physics", - "targets": ["input/tex/physics"] + "targets": [ + "input/tex/physics" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/physics", + "from": "[ts]/input/tex/physics", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/physics", diff --git a/components/mjs/input/tex/extensions/require/config.json b/components/mjs/input/tex/extensions/require/config.json index 6ba57a337..06fc7f9ab 100644 --- a/components/mjs/input/tex/extensions/require/config.json +++ b/components/mjs/input/tex/extensions/require/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/require", "component": "input/tex/extensions/require", - "targets": ["input/tex/require"] + "targets": [ + "input/tex/require" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/require", + "from": "[ts]/input/tex/require", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/require", diff --git a/components/mjs/input/tex/extensions/setoptions/config.json b/components/mjs/input/tex/extensions/setoptions/config.json index f329b6f34..32e9f980d 100644 --- a/components/mjs/input/tex/extensions/setoptions/config.json +++ b/components/mjs/input/tex/extensions/setoptions/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/setoptions", "component": "input/tex/extensions/setoptions", - "targets": ["input/tex/setoptions"] + "targets": [ + "input/tex/setoptions" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/setoptions", + "from": "[ts]/input/tex/setoptions", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/setoptions", diff --git a/components/mjs/input/tex/extensions/texhtml/config.json b/components/mjs/input/tex/extensions/texhtml/config.json index a47940bae..f83300f1d 100644 --- a/components/mjs/input/tex/extensions/texhtml/config.json +++ b/components/mjs/input/tex/extensions/texhtml/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/texhtml", "component": "input/tex/extensions/texhtml", - "targets": ["input/tex/texhtml"] + "targets": [ + "input/tex/texhtml" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/texhtml", + "from": "[ts]/input/tex/texhtml", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/texhtml", diff --git a/components/mjs/input/tex/extensions/textmacros/config.json b/components/mjs/input/tex/extensions/textmacros/config.json index bd05f220d..63ef76704 100644 --- a/components/mjs/input/tex/extensions/textmacros/config.json +++ b/components/mjs/input/tex/extensions/textmacros/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/textmacros", "component": "input/tex/extensions/textmacros", - "targets": ["input/tex/textmacros"] + "targets": [ + "input/tex/textmacros" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/textmacros", + "from": "[ts]/input/tex/textmacros", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/textmacros", diff --git a/components/mjs/input/tex/extensions/unicode/config.json b/components/mjs/input/tex/extensions/unicode/config.json index 4d228828e..1e7a52ba8 100644 --- a/components/mjs/input/tex/extensions/unicode/config.json +++ b/components/mjs/input/tex/extensions/unicode/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/unicode", "component": "input/tex/extensions/unicode", - "targets": ["input/tex/unicode"] + "targets": [ + "input/tex/unicode" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/unicode", + "from": "[ts]/input/tex/unicode", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/unicode", diff --git a/components/mjs/input/tex/extensions/verb/config.json b/components/mjs/input/tex/extensions/verb/config.json index 4632c17a6..0dc2068b0 100644 --- a/components/mjs/input/tex/extensions/verb/config.json +++ b/components/mjs/input/tex/extensions/verb/config.json @@ -2,7 +2,16 @@ "build": { "id": "[tex]/verb", "component": "input/tex/extensions/verb", - "targets": ["input/tex/verb"] + "targets": [ + "input/tex/verb" + ] + }, + "copy": { + "to": "[bundle]/input/tex/extensions/verb", + "from": "[ts]/input/tex/verb", + "copy": [ + "__locales__" + ] }, "webpack": { "name": "input/tex/extensions/verb", From 6235c8edd6dcf7c4dcd3ce9cab5403cb990bbe16 Mon Sep 17 00:00:00 2001 From: zorkow Date: Fri, 15 May 2026 17:26:34 +0200 Subject: [PATCH 45/95] remove reference to base locale from top level --- ts/input/tex/StackItem.ts | 2 +- ts/input/tex/__locales__/en.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index b1974a5c6..a036b463e 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -27,7 +27,7 @@ import TexError from './TexError.js'; import StackItemFactory from './StackItemFactory.js'; import { TexConstant } from './TexConstants.js'; -import { COMPONENT } from './base/__locales__/Component.js'; +import { COMPONENT } from './__locales__/Component.js'; // Union types for abbreviation. export type EnvProp = string | number | boolean; diff --git a/ts/input/tex/__locales__/en.json b/ts/input/tex/__locales__/en.json index 75995313f..829f1d746 100644 --- a/ts/input/tex/__locales__/en.json +++ b/ts/input/tex/__locales__/en.json @@ -5,6 +5,7 @@ "ErroneousNestingEq": "Erroneous nesting of equation structures", "ExtraCloseLooking": "Extra close brace while looking for %1", "ExtraCloseMissingOpen": "Extra close brace or missing open brace", + "ExtraLeftMissingRight": "Extra \\left or missing \\right", "ExtraMiddle": "Extra \\middle", "ExtraOpenMissingClose": "Extra open brace or missing close brace", "IllegalMacroParam": "Illegal macro parameter reference", @@ -25,5 +26,6 @@ "MissingDimOrUnits": "Missing dimension or its units for %1", "MissingLeftExtraRight": "Missing \\left or extra \\right", "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", + "MissingScript": "Missing superscript or subscript argument", "TokenNotFoundForCommand": "Could not find %1 for %2" } From 46b2b9b97778604dcac9fce397ddef3589f4878c Mon Sep 17 00:00:00 2001 From: zorkow Date: Fri, 15 May 2026 17:41:27 +0200 Subject: [PATCH 46/95] remove duplicates from locales --- ts/input/tex/__locales__/de.json | 2 ++ ts/input/tex/base/__locales__/de.json | 10 ------- ts/input/tex/base/__locales__/en.json | 10 ------- ts/input/tex/braket/__locales__/Component.ts | 28 ------------------- ts/input/tex/braket/__locales__/de.json | 3 -- ts/input/tex/braket/__locales__/en.json | 3 -- ts/input/tex/physics/__locales__/de.json | 2 +- ts/input/tex/physics/__locales__/en.json | 2 +- ts/input/tex/texhtml/__locales__/Component.ts | 28 ------------------- ts/input/tex/texhtml/__locales__/de.json | 3 -- ts/input/tex/texhtml/__locales__/en.json | 3 -- ts/input/tex/textmacros/__locales__/de.json | 5 +--- ts/input/tex/textmacros/__locales__/en.json | 5 +--- ts/input/tex/unicode/__locales__/de.json | 1 - ts/input/tex/unicode/__locales__/en.json | 1 - ts/input/tex/verb/__locales__/de.json | 1 - ts/input/tex/verb/__locales__/en.json | 1 - 17 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 ts/input/tex/braket/__locales__/Component.ts delete mode 100644 ts/input/tex/braket/__locales__/de.json delete mode 100644 ts/input/tex/braket/__locales__/en.json delete mode 100644 ts/input/tex/texhtml/__locales__/Component.ts delete mode 100644 ts/input/tex/texhtml/__locales__/de.json delete mode 100644 ts/input/tex/texhtml/__locales__/en.json diff --git a/ts/input/tex/__locales__/de.json b/ts/input/tex/__locales__/de.json index 461307196..bfc88580e 100644 --- a/ts/input/tex/__locales__/de.json +++ b/ts/input/tex/__locales__/de.json @@ -5,6 +5,7 @@ "ErroneousNestingEq": "Fehlerhafte Verschachtelung von Gleichungsstrukturen", "ExtraCloseLooking": "Überflüssige schließende Klammer bei der Suche nach %1", "ExtraCloseMissingOpen": "Überflüssige schließende Klammer oder fehlende öffnende Klammer", + "ExtraLeftMissingRight": "Überflüssiges \\left oder fehlendes \\right", "ExtraMiddle": "Zusätzliches \\middle", "ExtraOpenMissingClose": "Zusätzliche öffnende Klammer oder fehlende schließende Klammer", "IllegalMacroParam": "Ungültiger Makroparameterverweis", @@ -25,5 +26,6 @@ "MissingDimOrUnits": "Missing dimension or its units for %1", "MissingLeftExtraRight": "Missing \\left or extra \\right", "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", + "MissingScript": "Fehlendes Argument für Hoch- oder Tiefstellung", "TokenNotFoundForCommand": "Could not find %1 for %2" } diff --git a/ts/input/tex/base/__locales__/de.json b/ts/input/tex/base/__locales__/de.json index e5e2c2ebc..ae939b480 100644 --- a/ts/input/tex/base/__locales__/de.json +++ b/ts/input/tex/base/__locales__/de.json @@ -16,25 +16,15 @@ "EnvBadEnd": "\\begin{%1} endete mit \\end{%2}", "EnvMissingEnd": "Fehlendes \\end{%1}", "ExtraAlignTab": "Zusätzlicher Ausrichtungs-Tabulator im \\cases-Text", - "ExtraCloseMissingOpen": "Überflüssige schließende Klammer oder fehlende öffnende Klammer", - "ExtraLeftMissingRight": "Überflüssiges \\left oder fehlendes \\right", - "ExtraMiddle": "Überflüssiges \\middle", - "ExtraOpenMissingClose": "Überflüssige öffnende Klammer oder fehlende schließende Klammer", "IntegerArg": "Das Argument für %1 muss eine ganze Zahl sein", "InvalidEnv": "Ungültiger Umgebungsname '%1'", "InvalidMathMLAttr": "Ungültiges MathML-Attribut: %1", "MaxTemplateSubs": "Maximale Anzahl an Vorlagenersetzungen überschritten; liegt eine ungültige Verwendung von \\\\ in der Vorlage vor?", - "Misplaced": "Falsch platziertes %1", "MisplacedLimits": "%1 ist nur bei Operatoren zulässig", "MisplacedMoveRoot": "%1 darf nur innerhalb einer Wurzel stehen", - "MissingArgFor": "Fehlendes Argument für %1", - "MissingBeginExtraEnd": "Fehlendes \\begin{%1} oder zusätzliches \\end{%1}", "MissingBoxFor": "Fehlende Box für %1", - "MissingCloseBrace": "Fehlende schließende Klammer", - "MissingLeftExtraRight": "Fehlendes \\left oder überflüssiges \\right", "MissingOpenForSub": "Fehlende öffnende Klammer für Tiefstellung", "MissingOpenForSup": "Fehlende öffnende Klammer für Hochstellung", - "MissingScript": "Fehlendes Argument für Hoch- oder Tiefstellung", "MultipleCommand": "Mehrere %1", "MultipleLabel": "Bezeichnung '%1' mehrfach definiert", "MultipleMoveRoot": "Mehrfache Verwendung von %1", diff --git a/ts/input/tex/base/__locales__/en.json b/ts/input/tex/base/__locales__/en.json index 9c27e25f7..79028ff29 100644 --- a/ts/input/tex/base/__locales__/en.json +++ b/ts/input/tex/base/__locales__/en.json @@ -16,25 +16,15 @@ "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", "EnvMissingEnd": "Missing \\end{%1}", "ExtraAlignTab": "Extra alignment tab in \\cases text", - "ExtraCloseMissingOpen": "Extra close brace or missing open brace", - "ExtraLeftMissingRight": "Extra \\left or missing \\right", - "ExtraMiddle": "Extra \\middle", - "ExtraOpenMissingClose": "Extra open brace or missing close brace", "IntegerArg": "The argument to %1 must be an integer", "InvalidEnv": "Invalid environment name '%1'", "InvalidMathMLAttr": "Invalid MathML attribute: %1", "MaxTemplateSubs": "Maximum template substitutions exceeded; is there an invalid use of \\\\ in the template?", - "Misplaced": "Misplaced %1", "MisplacedLimits": "%1 is allowed only on operators", "MisplacedMoveRoot": "%1 can appear only within a root", - "MissingArgFor": "Missing argument for %1", - "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", "MissingBoxFor": "Missing box for %1", - "MissingCloseBrace": "Missing close brace", - "MissingLeftExtraRight": "Missing \\left or extra \\right", "MissingOpenForSub": "Missing open brace for subscript", "MissingOpenForSup": "Missing open brace for superscript", - "MissingScript": "Missing superscript or subscript argument", "MultipleCommand": "Multiple %1", "MultipleLabel": "Label '%1' multiply defined", "MultipleMoveRoot": "Multiple use of %1", diff --git a/ts/input/tex/braket/__locales__/Component.ts b/ts/input/tex/braket/__locales__/Component.ts deleted file mode 100644 index 1ea6b11df..000000000 --- a/ts/input/tex/braket/__locales__/Component.ts +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************* - * - * Copyright (c) 2026 The MathJax Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file Locale component registration for [tex]/braket - * - * @author v.sorge@mathjax.org (Volker Sorge) - */ - -import { Locale } from '../../../../util/Locale.js'; - -export const COMPONENT = '[tex]/braket'; - -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/braket'); diff --git a/ts/input/tex/braket/__locales__/de.json b/ts/input/tex/braket/__locales__/de.json deleted file mode 100644 index f80c3381b..000000000 --- a/ts/input/tex/braket/__locales__/de.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MissingArgFor": "Argument für %1 fehlt" -} diff --git a/ts/input/tex/braket/__locales__/en.json b/ts/input/tex/braket/__locales__/en.json deleted file mode 100644 index 0e8f6ed04..000000000 --- a/ts/input/tex/braket/__locales__/en.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MissingArgFor": "Missing argument for %1" -} diff --git a/ts/input/tex/physics/__locales__/de.json b/ts/input/tex/physics/__locales__/de.json index 67ec1e7c2..684dc244e 100644 --- a/ts/input/tex/physics/__locales__/de.json +++ b/ts/input/tex/physics/__locales__/de.json @@ -1,4 +1,4 @@ { "InvalidNumber": "Ungültige Zahl", - "MissingArgFor": "Fehlendes Argument für %1" + } diff --git a/ts/input/tex/physics/__locales__/en.json b/ts/input/tex/physics/__locales__/en.json index 5725a464c..ed021475d 100644 --- a/ts/input/tex/physics/__locales__/en.json +++ b/ts/input/tex/physics/__locales__/en.json @@ -1,4 +1,4 @@ { "InvalidNumber": "Invalid number", - "MissingArgFor": "Missing argument for %1" + } diff --git a/ts/input/tex/texhtml/__locales__/Component.ts b/ts/input/tex/texhtml/__locales__/Component.ts deleted file mode 100644 index 46389e9a7..000000000 --- a/ts/input/tex/texhtml/__locales__/Component.ts +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************* - * - * Copyright (c) 2026 The MathJax Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file Locale component registration for [tex]/texhtml - * - * @author v.sorge@mathjax.org (Volker Sorge) - */ - -import { Locale } from '../../../../util/Locale.js'; - -export const COMPONENT = '[tex]/texhtml'; - -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/texhtml'); diff --git a/ts/input/tex/texhtml/__locales__/de.json b/ts/input/tex/texhtml/__locales__/de.json deleted file mode 100644 index 5f88b1882..000000000 --- a/ts/input/tex/texhtml/__locales__/de.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "TokenNotFoundForCommand": "%1 für %2 konnte nicht gefunden werden" -} diff --git a/ts/input/tex/texhtml/__locales__/en.json b/ts/input/tex/texhtml/__locales__/en.json deleted file mode 100644 index ec234afaf..000000000 --- a/ts/input/tex/texhtml/__locales__/en.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "TokenNotFoundForCommand": "Could not find %1 for %2" -} diff --git a/ts/input/tex/textmacros/__locales__/de.json b/ts/input/tex/textmacros/__locales__/de.json index 28c332a6a..5af2226a6 100644 --- a/ts/input/tex/textmacros/__locales__/de.json +++ b/ts/input/tex/textmacros/__locales__/de.json @@ -1,7 +1,4 @@ { - "ExtraCloseMissingOpen": "Zusätzliche schließende Klammer oder fehlende öffnende Klammer", "MathMacro": "%1 wird nur im mathematischen Modus unterstützt", - "MathModeOnly": "'%1' ist nur im mathematischen Modus zulässig", - "MathNotTerminated": "Der mathematische Modus wurde nicht ordnungsgemäß beendet", - "Misplaced": "Falsch platziertes '%1'" + "MathModeOnly": "'%1' ist nur im mathematischen Modus zulässig" } diff --git a/ts/input/tex/textmacros/__locales__/en.json b/ts/input/tex/textmacros/__locales__/en.json index 7734cbce5..5d718f440 100644 --- a/ts/input/tex/textmacros/__locales__/en.json +++ b/ts/input/tex/textmacros/__locales__/en.json @@ -1,7 +1,4 @@ { - "ExtraCloseMissingOpen": "Extra close brace or missing open brace", "MathMacro": "%1 is only supported in math mode", - "MathModeOnly": "'%1' allowed only in math mode", - "MathNotTerminated": "Math mode is not properly terminated", - "Misplaced": "Misplaced '%1'" + "MathModeOnly": "'%1' allowed only in math mode" } diff --git a/ts/input/tex/unicode/__locales__/de.json b/ts/input/tex/unicode/__locales__/de.json index b375c87a7..975416c57 100644 --- a/ts/input/tex/unicode/__locales__/de.json +++ b/ts/input/tex/unicode/__locales__/de.json @@ -1,6 +1,5 @@ { "BadFont": "Der Schriftartenname für %1 darf keine Semikolons enthalten", - "BadRawUnicode": "Das Argument für %1 muss eine hexadezimale Zahl mit 1 bis 6 Ziffern sein", "BadUnicode": "Das Argument für %1 muss eine Zahl sein", "InvalidAlphanumeric": "Ungültige alphanumerische Konstante für %1", "MissingNumber": "Fehlende numerische Konstante für %1" diff --git a/ts/input/tex/unicode/__locales__/en.json b/ts/input/tex/unicode/__locales__/en.json index 9b4d77b05..6e711af79 100644 --- a/ts/input/tex/unicode/__locales__/en.json +++ b/ts/input/tex/unicode/__locales__/en.json @@ -1,6 +1,5 @@ { "BadFont": "Font name for %1 can't contain semicolons", - "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", "BadUnicode": "Argument to %1 must be a number", "InvalidAlphanumeric": "Invalid alphanumeric constant for %1", "MissingNumber": "Missing numeric constant for %1" diff --git a/ts/input/tex/verb/__locales__/de.json b/ts/input/tex/verb/__locales__/de.json index e0d850fe3..1d6f562fa 100644 --- a/ts/input/tex/verb/__locales__/de.json +++ b/ts/input/tex/verb/__locales__/de.json @@ -1,4 +1,3 @@ { - "MissingArgFor": "Argument für %1 fehlt", "NoClosingDelim": "Schließendes Trennzeichen für %1 nicht gefunden" } diff --git a/ts/input/tex/verb/__locales__/en.json b/ts/input/tex/verb/__locales__/en.json index 98156c0f0..a34910e01 100644 --- a/ts/input/tex/verb/__locales__/en.json +++ b/ts/input/tex/verb/__locales__/en.json @@ -1,4 +1,3 @@ { - "MissingArgFor": "Missing argument for %1", "NoClosingDelim": "Can't find closing delimiter for %1" } From 4e8d6b40971ca598a8cb65a347304cd645e40dc7 Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 17 May 2026 16:57:36 +0200 Subject: [PATCH 47/95] remove empty locales and move missing physics error --- components/mjs/input/tex/extensions/braket/config.json | 7 ------- components/mjs/input/tex/extensions/texhtml/config.json | 7 ------- ts/input/tex/__locales__/de.json | 2 +- ts/input/tex/__locales__/en.json | 2 +- ts/input/tex/braket/BraketConfiguration.ts | 1 - ts/input/tex/physics/PhysicsItems.ts | 2 +- ts/input/tex/physics/PhysicsMethods.ts | 7 ++++--- ts/input/tex/physics/__locales__/de.json | 2 +- ts/input/tex/physics/__locales__/en.json | 3 +-- ts/input/tex/texhtml/TexHtmlConfiguration.ts | 3 +-- 10 files changed, 10 insertions(+), 26 deletions(-) diff --git a/components/mjs/input/tex/extensions/braket/config.json b/components/mjs/input/tex/extensions/braket/config.json index 6c565b4d3..b548fd447 100644 --- a/components/mjs/input/tex/extensions/braket/config.json +++ b/components/mjs/input/tex/extensions/braket/config.json @@ -6,13 +6,6 @@ "input/tex/braket" ] }, - "copy": { - "to": "[bundle]/input/tex/extensions/braket", - "from": "[ts]/input/tex/braket", - "copy": [ - "__locales__" - ] - }, "webpack": { "name": "input/tex/extensions/braket", "libs": [ diff --git a/components/mjs/input/tex/extensions/texhtml/config.json b/components/mjs/input/tex/extensions/texhtml/config.json index f83300f1d..ec464a094 100644 --- a/components/mjs/input/tex/extensions/texhtml/config.json +++ b/components/mjs/input/tex/extensions/texhtml/config.json @@ -6,13 +6,6 @@ "input/tex/texhtml" ] }, - "copy": { - "to": "[bundle]/input/tex/extensions/texhtml", - "from": "[ts]/input/tex/texhtml", - "copy": [ - "__locales__" - ] - }, "webpack": { "name": "input/tex/extensions/texhtml", "libs": [ diff --git a/ts/input/tex/__locales__/de.json b/ts/input/tex/__locales__/de.json index bfc88580e..d5835baaf 100644 --- a/ts/input/tex/__locales__/de.json +++ b/ts/input/tex/__locales__/de.json @@ -16,7 +16,7 @@ "MaxColumns": "Zu viele Spaltenangaben (möglicherweise sich wiederholende Spaltendefinitionen?)", "MaxMacroSub1": "Maximale Anzahl an Makrosubstitutionen in MathJax überschritten; liegt ein rekursiver Makroaufruf vor?", "MaxMacroSub2": "Maximale Anzahl an Ersetzungen in MathJax überschritten; liegt eine rekursive LaTeX-Umgebung vor?", - "Misplaced": "%1 falsch platziert", + "Misplaced": "'%1' falsch platziert", "MissingArgFor": "Fehlendes Argument für %1", "MissingArgForColumn": "Fehlendes Argument für die Spaltendeklaration %1", "MissingBeginExtraEnd": "Fehlendes \\begin{%1} oder zusätzliches \\end{%1}", diff --git a/ts/input/tex/__locales__/en.json b/ts/input/tex/__locales__/en.json index 829f1d746..5161a692d 100644 --- a/ts/input/tex/__locales__/en.json +++ b/ts/input/tex/__locales__/en.json @@ -16,7 +16,7 @@ "MaxColumns": "Too many column specifiers (perhaps looping column definitions?)", "MaxMacroSub1": "MathJax maximum macro substitution count exceeded; is there a recursive macro call?", "MaxMacroSub2": "MathJax maximum substitution count exceeded; is there a recursive latex environment?", - "Misplaced": "Misplaced %1", + "Misplaced": "Misplaced '%1'", "MissingArgFor": "Missing argument for %1", "MissingArgForColumn": "Missing argument for %1 column declaration", "MissingBeginExtraEnd": "Missing \\begin{%1} or extra \\end{%1}", diff --git a/ts/input/tex/braket/BraketConfiguration.ts b/ts/input/tex/braket/BraketConfiguration.ts index 3e2d755e2..344e88e52 100644 --- a/ts/input/tex/braket/BraketConfiguration.ts +++ b/ts/input/tex/braket/BraketConfiguration.ts @@ -25,7 +25,6 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { BraketItem } from './BraketItems.js'; import './BraketMappings.js'; -export { COMPONENT } from './__locales__/Component.js'; export const BraketConfiguration = Configuration.create('braket', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/physics/PhysicsItems.ts b/ts/input/tex/physics/PhysicsItems.ts index 3fab3799c..89a843521 100644 --- a/ts/input/tex/physics/PhysicsItems.ts +++ b/ts/input/tex/physics/PhysicsItems.ts @@ -32,7 +32,7 @@ export class AutoOpen extends BaseItem { * @override */ protected static errors = Object.assign(Object.create(BaseItem.errors), { - stop: ['ExtraOrMissingDelims', 'Extra open or missing close delimiter'], + stop: 'ExtraOrMissingDelims', }); /** diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index a227c6b4e..e6146504f 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -33,6 +33,7 @@ import { NodeFactory } from '../NodeFactory.js'; import { Macro } from '../Token.js'; import { AutoOpen } from './PhysicsItems.js'; +import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js'; import { COMPONENT } from './__locales__/Component.js'; /** @@ -245,7 +246,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { } let right = pairs[next]; if (arg && next !== '{') { - throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); + throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } if (!right) { const empty = parser.create('node', 'mrow'); @@ -343,12 +344,12 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { big = parser.GetCS(); if (!big.match(biggs)) { // Actually a commutator error arg1 error. - throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); + throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } next = parser.GetNext(); } if (next !== '{') { - throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); + throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } const arg1 = parser.GetArgument(name); const arg2 = parser.GetArgument(name); diff --git a/ts/input/tex/physics/__locales__/de.json b/ts/input/tex/physics/__locales__/de.json index 684dc244e..46ac00177 100644 --- a/ts/input/tex/physics/__locales__/de.json +++ b/ts/input/tex/physics/__locales__/de.json @@ -1,4 +1,4 @@ { "InvalidNumber": "Ungültige Zahl", - + "ExtraOrMissingDelims": "Extra open or missing close delimiter" } diff --git a/ts/input/tex/physics/__locales__/en.json b/ts/input/tex/physics/__locales__/en.json index ed021475d..c702ca39c 100644 --- a/ts/input/tex/physics/__locales__/en.json +++ b/ts/input/tex/physics/__locales__/en.json @@ -1,4 +1,3 @@ { - "InvalidNumber": "Invalid number", - + "InvalidNumber": "Invalid number" } diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 422cd580e..ce5a34686 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -32,8 +32,7 @@ import { HTMLDocument } from '../../../handlers/html/HTMLDocument.js'; import { HtmlNode } from '../../../core/MmlTree/MmlNodes/HtmlNode.js'; import { HTMLDomStrings } from '../../../handlers/html/HTMLDomStrings.js'; import { DOMAdaptor } from '../../../core/DOMAdaptor.js'; -import { COMPONENT } from './__locales__/Component.js'; -export { COMPONENT }; +import { COMPONENT } from '../__locales__/Component.js'; export const HtmlNodeMethods: { [key: string]: ParseMethod } = { /** From fb3bb4dd4b1f5780a69a2af44be0aaeb00785707 Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 17 May 2026 17:00:46 +0200 Subject: [PATCH 48/95] fixes all missing error imports --- testsuite/tests/input/tex/Base.test.ts | 6 +++--- .../tests/input/tex/__snapshots__/Base.test.ts.snap | 4 ++-- .../tests/input/tex/__snapshots__/Noerrors.test.ts.snap | 6 +++--- ts/input/tex/base/BaseItems.ts | 3 ++- ts/input/tex/base/BaseMethods.ts | 5 +++-- ts/input/tex/textmacros/TextMacrosMethods.ts | 9 +++++---- ts/input/tex/unicode/UnicodeConfiguration.ts | 3 ++- ts/input/tex/verb/VerbConfiguration.ts | 3 ++- 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/testsuite/tests/input/tex/Base.test.ts b/testsuite/tests/input/tex/Base.test.ts index 6e06df5d7..ac6aa539c 100644 --- a/testsuite/tests/input/tex/Base.test.ts +++ b/testsuite/tests/input/tex/Base.test.ts @@ -255,7 +255,7 @@ describe('Error', () => { }); it('Ampersand-error', () => { - expectTexError('&').toBe('Misplaced &'); + expectTexError('&').toBe("Misplaced '&'"); }); it('Argument-error', () => { @@ -389,7 +389,7 @@ describe('Error', () => { }); it('Misplaced Cr', () => { - expectTexError('a\\cr b').toBe('Misplaced \\cr'); + expectTexError('a\\cr b').toBe("Misplaced '\\cr'"); }); it('Dimension Error', () => { @@ -461,7 +461,7 @@ describe('Error', () => { }); it('Misplaced hline', () => { - expectTexError('\\hline').toBe('Misplaced \\hline'); + expectTexError('\\hline').toBe("Misplaced '\\hline'"); }); it('UnsupportedHFill', () => { diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap index bc59e9aa3..66b32fe9e 100644 --- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap +++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap @@ -3495,8 +3495,8 @@ exports[`Environments math 1`] = ` exports[`Error merror node 1`] = ` " - - Misplaced & + + Misplaced '&' " `; diff --git a/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap index 78b214274..2cf6cc091 100644 --- a/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap +++ b/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap @@ -2,7 +2,7 @@ exports[`NoError Ampersand-error 1`] = ` " - + & " @@ -210,7 +210,7 @@ exports[`NoError Middle with Right 1`] = ` exports[`NoError Misplaced Cr 1`] = ` " - + a\\cr b " @@ -226,7 +226,7 @@ exports[`NoError Misplaced Move Root 1`] = ` exports[`NoError Misplaced hline 1`] = ` " - + \\hline " diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index 11a626673..8bc1e4c3b 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -39,6 +39,7 @@ import { CheckType, BaseItem, StackItem, EnvList } from '../StackItem.js'; import { TRBL } from '../../../util/Styles.js'; import { TexConstant } from '../TexConstants.js'; +import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js'; import { COMPONENT } from './__locales__/Component.js'; /** @@ -1083,7 +1084,7 @@ export class ArrayItem extends BaseItem { return [[newItem], true]; } // @test MissingCloseBrace2 - throw new TexError(COMPONENT, 'MissingCloseBrace'); + throw new TexError(TEX_COMPONENT, 'MissingCloseBrace'); } return [[newItem, item], true]; } diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index e8d77aa2c..99f967df7 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -44,6 +44,7 @@ import { lookup } from '../../../util/Options.js'; import { ColumnState } from '../ColumnParser.js'; import { replaceUnicode } from '../../../util/string.js'; +import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js'; import { COMPONENT } from './__locales__/Component.js'; const P_HEIGHT = 1.2 / 0.85; // cmex10 height plus depth over .85 @@ -1512,7 +1513,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const c = parser.GetNext(); if (c === '') { // @test Matrix Error - throw new TexError(COMPONENT, 'MissingArgFor', parser.currentCS); + throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } if (c === '{') { // @test Matrix Braces, Matrix Columns, Matrix Rows. @@ -1746,7 +1747,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); if (!(top instanceof sitem.ArrayItem) || top.Size()) { // @test Misplaced hline - throw new TexError(COMPONENT, 'Misplaced', parser.currentCS); + throw new TexError(TEX_COMPONENT, 'Misplaced', parser.currentCS); } if (!top.table.length) { // @test Enclosed top, Enclosed top bottom diff --git a/ts/input/tex/textmacros/TextMacrosMethods.ts b/ts/input/tex/textmacros/TextMacrosMethods.ts index be6227ad0..102c330d4 100644 --- a/ts/input/tex/textmacros/TextMacrosMethods.ts +++ b/ts/input/tex/textmacros/TextMacrosMethods.ts @@ -27,6 +27,7 @@ import { retryAfter } from '../../../util/Retries.js'; import { TextParser } from './TextParser.js'; import BaseMethods from '../base/BaseMethods.js'; +import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js'; import { COMPONENT } from './__locales__/Component.js'; /** @@ -91,13 +92,13 @@ export const TextMacrosMethods = { case '}': if (braces === 0) { - parser.Error(COMPONENT, 'ExtraCloseMissingOpen'); + parser.Error(TEX_COMPONENT, 'ExtraCloseMissingOpen'); } braces--; break; } } - parser.Error(COMPONENT, 'MathNotTerminated'); + parser.Error(TEX_COMPONENT, 'MathNotTerminated'); }, /** @@ -113,7 +114,7 @@ export const TextMacrosMethods = { * @param {string} c The character that called this function */ Misplaced(parser: TextParser, c: string) { - parser.Error(COMPONENT, 'Misplaced', c); + parser.Error(TEX_COMPONENT, 'Misplaced', c); }, /** @@ -142,7 +143,7 @@ export const TextMacrosMethods = { parser.saveText(); parser.stack.env = parser.envStack.pop(); } else { - parser.Error(COMPONENT, 'ExtraCloseMissingOpen'); + parser.Error(TEX_COMPONENT, 'ExtraCloseMissingOpen'); } }, diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index edc41b1f9..9c82bfea5 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -32,6 +32,7 @@ import { UnitUtil } from '../UnitUtil.js'; import NodeUtil from '../NodeUtil.js'; import { numeric } from '../../../util/Entities.js'; import { Other } from '../base/BaseConfiguration.js'; +import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; @@ -105,7 +106,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { RawUnicode(parser: TexParser, name: string) { const hex = parser.GetArgument(name).trim(); if (!hex.match(/^[0-9A-F]{1,6}$/)) { - throw new TexError(COMPONENT, 'BadRawUnicode', parser.currentCS); + throw new TexError(TEX_COMPONENT, 'BadRawUnicode', parser.currentCS); } const n = parseInt(hex, 16); parser.string = String.fromCodePoint(n) + parser.string.substring(parser.i); diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 4b4bd012c..7a4994068 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -28,6 +28,7 @@ import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import TexError from '../TexError.js'; +import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; @@ -43,7 +44,7 @@ const VerbMethods: { [key: string]: ParseMethod } = { const c = parser.GetNext(); const start = ++parser.i; if (c === '') { - throw new TexError(COMPONENT, 'MissingArgFor', name); + throw new TexError(TEX_COMPONENT, 'MissingArgFor', name); } while ( parser.i < parser.string.length && From 8f62893da22da52513486fe73b8c779723b936af Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 17 May 2026 18:36:22 +0200 Subject: [PATCH 49/95] Physics test and renaming. --- testsuite/tests/input/tex/Physics.test.ts | 12 ++++++++++++ .../input/tex/__snapshots__/Physics.test.ts.snap | 16 ++++++++++++++++ ts/input/tex/StackItem.ts | 15 +++++++++++++-- ts/input/tex/base/BaseItems.ts | 6 ++++++ ts/input/tex/physics/PhysicsItems.ts | 6 ++++++ ts/input/tex/physics/__locales__/en.json | 3 ++- 6 files changed, 55 insertions(+), 3 deletions(-) diff --git a/testsuite/tests/input/tex/Physics.test.ts b/testsuite/tests/input/tex/Physics.test.ts index f95ea9cc5..7f0987202 100644 --- a/testsuite/tests/input/tex/Physics.test.ts +++ b/testsuite/tests/input/tex/Physics.test.ts @@ -2472,6 +2472,18 @@ describe('Physics Errors', () => { it('InvalidNumber XMatrix m+', () => { expectTexError('\\smqty(\\xmatrix{a}{2}{2.0})').toBe('Invalid number'); }); + + it('Missing Closing Delimiter', () => { + expect( + tex2mml('\\sin(1\\over2') + ).toMatchSnapshot(); + }); + + it('Extra Open Delimiter', () => { + expect( + tex2mml('\\sin((1\\over2)') + ).toMatchSnapshot(); + }); }); /**********************************************************************************/ diff --git a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap index 218039580..e644e868f 100644 --- a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap +++ b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap @@ -1154,6 +1154,22 @@ exports[`Options Italicdif true 1`] = ` " `; +exports[`Physics Errors Extra Open Delimiter 1`] = ` +" + + Extra open or missing close delimiter + +" +`; + +exports[`Physics Errors Missing Closing Delimiter 1`] = ` +" + + Extra open or missing close delimiter + +" +`; + exports[`Physics1_0 Quantities_Quantities_0 1`] = ` " diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index a5407dda0..4118dbe63 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -407,6 +407,13 @@ export abstract class BaseItem extends MmlStack implements StackItem { */ public global: EnvList = {}; + /** + * The component for error messages. + */ + protected component: string = COMPONENT; + + private baseComponent: string = COMPONENT; + private _env: EnvList; private _properties: PropList = {}; @@ -516,12 +523,16 @@ export abstract class BaseItem extends MmlStack implements StackItem { return BaseItem.fail; } // @test Ampersand-error - throw new TexError(COMPONENT, 'Misplaced', item.getName()); + throw new TexError(this.component, 'Misplaced', item.getName()); } if (item.isClose && this.getError(item.kind)) { // @test ExtraOpenMissingClose, ExtraCloseMissingOpen, // MissingLeftExtraRight, MissingBeginExtraEnd - throw new TexError(COMPONENT, this.getError(item.kind), item.getName()); + throw new TexError( + this.component, + this.getError(item.kind), + item.getName() + ); } if (!item.isFinal) { return BaseItem.success; diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index 8bc1e4c3b..bc670abf9 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -220,6 +220,7 @@ export class PrimeItem extends BaseItem { * expression. */ export class SubsupItem extends BaseItem { + /** * @override */ @@ -232,6 +233,11 @@ export class SubsupItem extends BaseItem { sub: 'MissingOpenForSub', }); + /** + * @override + */ + protected component = COMPONENT; + /** * @override */ diff --git a/ts/input/tex/physics/PhysicsItems.ts b/ts/input/tex/physics/PhysicsItems.ts index 89a843521..3c0572c2b 100644 --- a/ts/input/tex/physics/PhysicsItems.ts +++ b/ts/input/tex/physics/PhysicsItems.ts @@ -26,6 +26,7 @@ import { ParseUtil } from '../ParseUtil.js'; import NodeUtil from '../NodeUtil.js'; import TexParser from '../TexParser.js'; import { AbstractMmlTokenNode } from '../../../core/MmlTree/MmlNode.js'; +import { COMPONENT } from './__locales__/Component.js'; export class AutoOpen extends BaseItem { /** @@ -41,6 +42,11 @@ export class AutoOpen extends BaseItem { */ public openCount: number = 0; + /** + * @override + */ + protected component = COMPONENT; + /** * @override */ diff --git a/ts/input/tex/physics/__locales__/en.json b/ts/input/tex/physics/__locales__/en.json index c702ca39c..0b659d22f 100644 --- a/ts/input/tex/physics/__locales__/en.json +++ b/ts/input/tex/physics/__locales__/en.json @@ -1,3 +1,4 @@ { - "InvalidNumber": "Invalid number" + "InvalidNumber": "Invalid number", + "ExtraOrMissingDelims": "Extra open or missing close delimiter" } From 9cb77a1082d40a6df3ff82c4614ca8b5e8af475b Mon Sep 17 00:00:00 2001 From: zorkow Date: Sun, 17 May 2026 23:54:38 +0200 Subject: [PATCH 50/95] fixes problem with StackItem error structure --- ts/input/tex/StackItem.ts | 27 ++++++++++++++++++--------- ts/util/Locale.ts | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index 4118dbe63..7b438e886 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -26,7 +26,7 @@ import { FactoryNodeClass } from '../../core/Tree/Factory.js'; import TexError from './TexError.js'; import StackItemFactory from './StackItemFactory.js'; import { TexConstant } from './TexConstants.js'; - +import { Locale } from '../../util/Locale.js'; import { COMPONENT } from './__locales__/Component.js'; // Union types for abbreviation. @@ -412,8 +412,6 @@ export abstract class BaseItem extends MmlStack implements StackItem { */ protected component: string = COMPONENT; - private baseComponent: string = COMPONENT; - private _env: EnvList; private _properties: PropList = {}; @@ -523,16 +521,12 @@ export abstract class BaseItem extends MmlStack implements StackItem { return BaseItem.fail; } // @test Ampersand-error - throw new TexError(this.component, 'Misplaced', item.getName()); + this.throwError('Misplaced', item.getName()); } if (item.isClose && this.getError(item.kind)) { // @test ExtraOpenMissingClose, ExtraCloseMissingOpen, // MissingLeftExtraRight, MissingBeginExtraEnd - throw new TexError( - this.component, - this.getError(item.kind), - item.getName() - ); + this.throwError(this.getError(item.kind), item.getName()); } if (!item.isFinal) { return BaseItem.success; @@ -585,6 +579,21 @@ export abstract class BaseItem extends MmlStack implements StackItem { return CLASS.errors?.[kind] ?? BaseItem.errors[kind]; } + /** + * Throw a TexError with the given component or the default component. + * + * @param {string} id The message id for the error. + * @param {string[]} ...args Any arguments for the error message. + * @param {...any} args + */ + protected throwError(id: string, ...args: string[]) { + throw new TexError( + Locale.hasMessage(this.component, id) ? this.component : COMPONENT, + id, + ...args + ); + } + /** * Adds auxiliary attributes for LaTeX output to node. * diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 1ac72a89d..161d833d0 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -153,6 +153,20 @@ export class Locale { return this.substituteArguments(message, data); } + /** + * Check if a message exists for the given component and id, either in the + * current locale or the default locale. + * + * @param {string} component The component for this message. + * @param {string} id The id of the message. + * @returns {boolean} True if a message exists for the given component and id, + * false otherwise. + */ + public static hasMessage(component: string, id: string): boolean { + return !!this.data[component]?.[this.current]?.[id] || + !!this.data[component]?.[this.default]?.[id]; + } + /** * Find a localized message string, or use the default if not available * From 208b4c55f0aec3719cd59b7e61fb8d744d9d1909 Mon Sep 17 00:00:00 2001 From: zorkow Date: Tue, 19 May 2026 12:44:02 +0200 Subject: [PATCH 51/95] rewrite stack item errors to come with a component --- ts/input/tex/StackItem.ts | 41 +++++++-------------------- ts/input/tex/__locales__/de.json | 1 - ts/input/tex/__locales__/en.json | 1 - ts/input/tex/base/BaseItems.ts | 17 ++++------- ts/input/tex/base/__locales__/de.json | 3 ++ ts/input/tex/base/__locales__/en.json | 3 ++ ts/input/tex/physics/PhysicsItems.ts | 2 +- ts/util/Locale.ts | 14 --------- 8 files changed, 23 insertions(+), 59 deletions(-) diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index 7b438e886..c3a83d4ee 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -26,7 +26,6 @@ import { FactoryNodeClass } from '../../core/Tree/Factory.js'; import TexError from './TexError.js'; import StackItemFactory from './StackItemFactory.js'; import { TexConstant } from './TexConstants.js'; -import { Locale } from '../../util/Locale.js'; import { COMPONENT } from './__locales__/Component.js'; // Union types for abbreviation. @@ -390,16 +389,16 @@ export abstract class BaseItem extends MmlStack implements StackItem { /** * A list of basic errors. * - * @type {{[key: string]: string}} + * @type {{[key: string]: [string, string]}} */ - protected static errors: { [key: string]: string } = { + protected static errors: { [key: string]: [string, string] } = { // @test ExtraOpenMissingClose - end: 'MissingBeginExtraEnd', + end: [COMPONENT, 'MissingBeginExtraEnd'], // @test ExtraCloseMissingOpen - close: 'ExtraCloseMissingOpen', + close: [COMPONENT, 'ExtraCloseMissingOpen'], // @test MissingLeftExtraRight - right: 'MissingLeftExtraRight', - middle: 'ExtraMiddle', + right: [COMPONENT, 'MissingLeftExtraRight'], + middle: [COMPONENT, 'ExtraMiddle'], }; /** @@ -407,11 +406,6 @@ export abstract class BaseItem extends MmlStack implements StackItem { */ public global: EnvList = {}; - /** - * The component for error messages. - */ - protected component: string = COMPONENT; - private _env: EnvList; private _properties: PropList = {}; @@ -521,12 +515,12 @@ export abstract class BaseItem extends MmlStack implements StackItem { return BaseItem.fail; } // @test Ampersand-error - this.throwError('Misplaced', item.getName()); + throw new TexError(COMPONENT, 'Misplaced', item.getName()); } if (item.isClose && this.getError(item.kind)) { // @test ExtraOpenMissingClose, ExtraCloseMissingOpen, // MissingLeftExtraRight, MissingBeginExtraEnd - this.throwError(this.getError(item.kind), item.getName()); + throw new TexError(...this.getError(item.kind), item.getName()); } if (!item.isFinal) { return BaseItem.success; @@ -572,28 +566,13 @@ export abstract class BaseItem extends MmlStack implements StackItem { * subclasses. * * @param {string} kind The stack item type. - * @returns {string} The id of the error message. + * @returns {[string, string]} The component and id of the error message. */ - public getError(kind: string): string { + public getError(kind: string): [string, string] { const CLASS = this.constructor as typeof BaseItem; return CLASS.errors?.[kind] ?? BaseItem.errors[kind]; } - /** - * Throw a TexError with the given component or the default component. - * - * @param {string} id The message id for the error. - * @param {string[]} ...args Any arguments for the error message. - * @param {...any} args - */ - protected throwError(id: string, ...args: string[]) { - throw new TexError( - Locale.hasMessage(this.component, id) ? this.component : COMPONENT, - id, - ...args - ); - } - /** * Adds auxiliary attributes for LaTeX output to node. * diff --git a/ts/input/tex/__locales__/de.json b/ts/input/tex/__locales__/de.json index d5835baaf..9ff75dcf1 100644 --- a/ts/input/tex/__locales__/de.json +++ b/ts/input/tex/__locales__/de.json @@ -5,7 +5,6 @@ "ErroneousNestingEq": "Fehlerhafte Verschachtelung von Gleichungsstrukturen", "ExtraCloseLooking": "Überflüssige schließende Klammer bei der Suche nach %1", "ExtraCloseMissingOpen": "Überflüssige schließende Klammer oder fehlende öffnende Klammer", - "ExtraLeftMissingRight": "Überflüssiges \\left oder fehlendes \\right", "ExtraMiddle": "Zusätzliches \\middle", "ExtraOpenMissingClose": "Zusätzliche öffnende Klammer oder fehlende schließende Klammer", "IllegalMacroParam": "Ungültiger Makroparameterverweis", diff --git a/ts/input/tex/__locales__/en.json b/ts/input/tex/__locales__/en.json index 5161a692d..bc4903f58 100644 --- a/ts/input/tex/__locales__/en.json +++ b/ts/input/tex/__locales__/en.json @@ -5,7 +5,6 @@ "ErroneousNestingEq": "Erroneous nesting of equation structures", "ExtraCloseLooking": "Extra close brace while looking for %1", "ExtraCloseMissingOpen": "Extra close brace or missing open brace", - "ExtraLeftMissingRight": "Extra \\left or missing \\right", "ExtraMiddle": "Extra \\middle", "ExtraOpenMissingClose": "Extra open brace or missing close brace", "IllegalMacroParam": "Illegal macro parameter reference", diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index bc670abf9..13bba85fe 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -114,7 +114,7 @@ export class OpenItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test ExtraOpenMissingClose - stop: 'ExtraOpenMissingClose', + stop: [TEX_COMPONENT, 'ExtraOpenMissingClose'], }); /** @@ -226,18 +226,13 @@ export class SubsupItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test MissingScript Sub, MissingScript Sup - stop: 'MissingScript', + stop: [COMPONENT, 'MissingScript'], // @test MissingOpenForSup - sup: 'MissingOpenForSup', + sup: [COMPONENT, 'MissingOpenForSup'], // @test MissingOpenForSub - sub: 'MissingOpenForSub', + sub: [COMPONENT, 'MissingOpenForSub'], }); - /** - * @override - */ - protected component = COMPONENT; - /** * @override */ @@ -288,7 +283,7 @@ export class SubsupItem extends BaseItem { if (super.checkItem(item)[1]) { // @test Brace Superscript Error, MissingOpenForSup, MissingOpenForSub const error = this.getError(['', 'sub', 'sup'][position]); - throw new TexError(COMPONENT, error); + throw new TexError(...error); } return null; } @@ -380,7 +375,7 @@ export class LeftItem extends BaseItem { */ protected static errors = Object.assign(Object.create(BaseItem.errors), { // @test ExtraLeftMissingRight - stop: 'ExtraLeftMissingRight', + stop: [COMPONENT, 'ExtraLeftMissingRight'], }); /** diff --git a/ts/input/tex/base/__locales__/de.json b/ts/input/tex/base/__locales__/de.json index ae939b480..c5d53b47a 100644 --- a/ts/input/tex/base/__locales__/de.json +++ b/ts/input/tex/base/__locales__/de.json @@ -16,6 +16,8 @@ "EnvBadEnd": "\\begin{%1} endete mit \\end{%2}", "EnvMissingEnd": "Fehlendes \\end{%1}", "ExtraAlignTab": "Zusätzlicher Ausrichtungs-Tabulator im \\cases-Text", + "ExtraLeftMissingRight": "Überflüssiges \\left oder fehlendes \\right", + "ExtraOpenMissingClose": "Zusätzliche öffnende Klammer oder fehlende schließende Klammer", "IntegerArg": "Das Argument für %1 muss eine ganze Zahl sein", "InvalidEnv": "Ungültiger Umgebungsname '%1'", "InvalidMathMLAttr": "Ungültiges MathML-Attribut: %1", @@ -25,6 +27,7 @@ "MissingBoxFor": "Fehlende Box für %1", "MissingOpenForSub": "Fehlende öffnende Klammer für Tiefstellung", "MissingOpenForSup": "Fehlende öffnende Klammer für Hochstellung", + "MissingScript": "Fehlendes Argument für Hoch- oder Tiefstellung", "MultipleCommand": "Mehrere %1", "MultipleLabel": "Bezeichnung '%1' mehrfach definiert", "MultipleMoveRoot": "Mehrfache Verwendung von %1", diff --git a/ts/input/tex/base/__locales__/en.json b/ts/input/tex/base/__locales__/en.json index 79028ff29..6b5f3b71e 100644 --- a/ts/input/tex/base/__locales__/en.json +++ b/ts/input/tex/base/__locales__/en.json @@ -16,6 +16,8 @@ "EnvBadEnd": "\\begin{%1} ended with \\end{%2}", "EnvMissingEnd": "Missing \\end{%1}", "ExtraAlignTab": "Extra alignment tab in \\cases text", + "ExtraLeftMissingRight": "Extra \\left or missing \\right", + "ExtraOpenMissingClose": "Extra open brace or missing close brace", "IntegerArg": "The argument to %1 must be an integer", "InvalidEnv": "Invalid environment name '%1'", "InvalidMathMLAttr": "Invalid MathML attribute: %1", @@ -25,6 +27,7 @@ "MissingBoxFor": "Missing box for %1", "MissingOpenForSub": "Missing open brace for subscript", "MissingOpenForSup": "Missing open brace for superscript", + "MissingScript": "Missing superscript or subscript argument", "MultipleCommand": "Multiple %1", "MultipleLabel": "Label '%1' multiply defined", "MultipleMoveRoot": "Multiple use of %1", diff --git a/ts/input/tex/physics/PhysicsItems.ts b/ts/input/tex/physics/PhysicsItems.ts index 3c0572c2b..e877a59bb 100644 --- a/ts/input/tex/physics/PhysicsItems.ts +++ b/ts/input/tex/physics/PhysicsItems.ts @@ -33,7 +33,7 @@ export class AutoOpen extends BaseItem { * @override */ protected static errors = Object.assign(Object.create(BaseItem.errors), { - stop: 'ExtraOrMissingDelims', + stop: [COMPONENT, 'ExtraOrMissingDelims'], }); /** diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 161d833d0..1ac72a89d 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -153,20 +153,6 @@ export class Locale { return this.substituteArguments(message, data); } - /** - * Check if a message exists for the given component and id, either in the - * current locale or the default locale. - * - * @param {string} component The component for this message. - * @param {string} id The id of the message. - * @returns {boolean} True if a message exists for the given component and id, - * false otherwise. - */ - public static hasMessage(component: string, id: string): boolean { - return !!this.data[component]?.[this.current]?.[id] || - !!this.data[component]?.[this.default]?.[id]; - } - /** * Find a localized message string, or use the default if not available * From 9d2b5831a21905bd8dccb104baf575c28756a73d Mon Sep 17 00:00:00 2001 From: zorkow Date: Tue, 19 May 2026 13:19:43 +0200 Subject: [PATCH 52/95] introduce convenience function for throwing tex errors --- ts/input/tex/TexError.ts | 19 +++++++++++++++---- ts/util/Locale.ts | 28 ++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/ts/input/tex/TexError.ts b/ts/input/tex/TexError.ts index 330c2a005..e0c5fb7a9 100644 --- a/ts/input/tex/TexError.ts +++ b/ts/input/tex/TexError.ts @@ -27,15 +27,26 @@ export default class TexError { public message: string; /** - * @param {string} component locale component (e.g. '[tex]/base') * @param {string} id message id + * @param _id + * @param {string} message text of English message * @param {string[]} args substitution arguments */ constructor( - public component: string, - public id: string, + public _id: string, + message: string, ...args: string[] ) { - this.message = Locale.message(component, id, ...args); + this.message = Locale.processMessage(message, args[0], ...args.slice(1)); } } + +/** + * @param {string} component locale component (e.g. '[tex]/base') + * @param {string} id message id + * @param {string[]} args substitution arguments + */ +export function texError(component: string, id: string, ...args: string[]) { + const message = Locale.message(component, id, ...args); + throw new TexError(id, message, ...args); +} diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 1ac72a89d..7c8cdf330 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -136,13 +136,29 @@ export class Locale { let message = ''; if (component) { message = this.lookupMessage(component, id); - } else { - if (typeof data !== 'string') { - return ''; - } - message = data; - data = args.shift()?.toString() ?? {}; + return this.processMessage(message, data, ...args); + } + if (typeof data !== 'string') { + return ''; } + return this.processMessage(message, args[0], ...args.slice(1)); + } + + /** + * Process a message string by substituting the given arguments. The arguments + * can be positional, or a data mapping of names to values. + * + * @param {string} message The message string to process. + * @param {string | namedData = {}} data The first argument or the object of + * names arguments + * @param {string[]} ...args Additional arguments (if data is a string) + * @returns {string} The processed message string with arguments substituted + */ + public static processMessage( + message: string, + data: string | namedData = {}, + ...args: string[] + ): string { if (typeof data === 'string') { data = { 1: data }; for (let i = 0; i < args.length; i++) { From 723c5f426bac6fec7467615cdd9fe188b7639be9 Mon Sep 17 00:00:00 2001 From: zorkow Date: Tue, 19 May 2026 13:33:27 +0200 Subject: [PATCH 53/95] refactor TexErrors to use the new method --- ts/input/tex/ColumnParser.ts | 14 ++--- ts/input/tex/ParseUtil.ts | 24 +++---- ts/input/tex/StackItem.ts | 6 +- ts/input/tex/TexError.ts | 5 +- ts/input/tex/TexParser.ts | 22 +++---- ts/input/tex/ams/AmsItems.ts | 6 +- ts/input/tex/ams/AmsMethods.ts | 18 +++--- ts/input/tex/base/BaseConfiguration.ts | 6 +- ts/input/tex/base/BaseItems.ts | 18 +++--- ts/input/tex/base/BaseMethods.ts | 62 +++++++++---------- ts/input/tex/bbox/BboxConfiguration.ts | 10 +-- ts/input/tex/begingroup/BegingroupMethods.ts | 4 +- ts/input/tex/begingroup/BegingroupStack.ts | 4 +- ts/input/tex/bussproofs/BussproofsItems.ts | 4 +- ts/input/tex/bussproofs/BussproofsMethods.ts | 24 +++---- ts/input/tex/cases/CasesConfiguration.ts | 4 +- ts/input/tex/color/ColorUtil.ts | 24 +++---- .../tex/colortbl/ColortblConfiguration.ts | 8 +-- ts/input/tex/empheq/EmpheqConfiguration.ts | 4 +- .../tex/extpfeil/ExtpfeilConfiguration.ts | 8 +-- ts/input/tex/html/HtmlMethods.ts | 4 +- ts/input/tex/mathtools/MathtoolsMethods.ts | 24 +++---- ts/input/tex/mathtools/MathtoolsTags.ts | 4 +- ts/input/tex/mathtools/MathtoolsUtil.ts | 8 +-- ts/input/tex/mhchem/MhchemConfiguration.ts | 4 +- ts/input/tex/newcommand/NewcommandItems.ts | 6 +- ts/input/tex/newcommand/NewcommandMethods.ts | 4 +- ts/input/tex/newcommand/NewcommandUtil.ts | 18 +++--- ts/input/tex/physics/PhysicsMethods.ts | 12 ++-- ts/input/tex/require/RequireConfiguration.ts | 8 +-- .../tex/setoptions/SetOptionsConfiguration.ts | 14 ++--- ts/input/tex/texhtml/TexHtmlConfiguration.ts | 4 +- ts/input/tex/textmacros/TextParser.ts | 4 +- ts/input/tex/unicode/UnicodeConfiguration.ts | 12 ++-- ts/input/tex/verb/VerbConfiguration.ts | 6 +- 35 files changed, 203 insertions(+), 204 deletions(-) diff --git a/ts/input/tex/ColumnParser.ts b/ts/input/tex/ColumnParser.ts index c86a440a7..ffa6ed05c 100644 --- a/ts/input/tex/ColumnParser.ts +++ b/ts/input/tex/ColumnParser.ts @@ -23,7 +23,7 @@ import { ArrayItem } from './base/BaseItems.js'; import TexParser from './TexParser.js'; -import TexError from './TexError.js'; +import { texError } from './TexError.js'; import { lookup } from '../../util/Options.js'; import { ParseUtil } from './ParseUtil.js'; import { UnitUtil } from './UnitUtil.js'; @@ -135,13 +135,13 @@ export class ColumnParser { let n = 0; while (state.i < state.template.length) { if (n++ > this.MAXCOLUMNS) { - throw new TexError(COMPONENT, 'MaxColumns'); + texError(COMPONENT, 'MaxColumns'); } const code = state.template.codePointAt(state.i); const c = (state.c = String.fromCodePoint(code)); state.i += c.length; if (!Object.hasOwn(this.columnHandler, c)) { - throw new TexError(COMPONENT, 'BadPreamToken', c); + texError(COMPONENT, 'BadPreamToken', c); } this.columnHandler[c](state); } @@ -263,7 +263,7 @@ export class ColumnParser { public getDimen(state: ColumnState): string { const dim = this.getBraces(state); if (!UnitUtil.matchDimen(dim)[0]) { - throw new TexError(COMPONENT, 'MissingColumnDimOrUnits', state.c); + texError(COMPONENT, 'MissingColumnDimOrUnits', state.c); } return dim; } @@ -294,7 +294,7 @@ export class ColumnParser { public getBraces(state: ColumnState): string { while (state.template[state.i] === ' ') state.i++; if (state.i >= state.template.length) { - throw new TexError(COMPONENT, 'MissingArgForColumn', state.c); + texError(COMPONENT, 'MissingArgForColumn', state.c); } if (state.template[state.i] !== '{') { return state.template[state.i++]; @@ -316,7 +316,7 @@ export class ColumnParser { break; } } - throw new TexError(COMPONENT, 'MissingCloseBrace'); + texError(COMPONENT, 'MissingCloseBrace'); } /** @@ -401,7 +401,7 @@ export class ColumnParser { const cols = this.getBraces(state); const n = parseInt(num); if (String(n) !== num) { - throw new TexError(COMPONENT, 'ColArgNotNum', '*'); + texError(COMPONENT, 'ColArgNotNum', '*'); } state.template = new Array(n).fill(cols).join('') + state.template.substring(state.i); diff --git a/ts/input/tex/ParseUtil.ts b/ts/input/tex/ParseUtil.ts index 4fab7078d..807c22b7b 100644 --- a/ts/input/tex/ParseUtil.ts +++ b/ts/input/tex/ParseUtil.ts @@ -27,7 +27,7 @@ import { ArrayItem } from './base/BaseItems.js'; import ParseOptions from './ParseOptions.js'; import NodeUtil from './NodeUtil.js'; import TexParser from './TexParser.js'; -import TexError from './TexError.js'; +import { texError } from './TexError.js'; import { entities } from '../../util/Entities.js'; import { MmlMunderover } from '../../core/MmlTree/MmlNodes/munderover.js'; import { UnitUtil } from './UnitUtil.js'; @@ -188,7 +188,7 @@ function readValue( case '}': if (!braces) { // Closing braces. - throw new TexError(COMPONENT, 'ExtraCloseMissingOpen'); + texError(COMPONENT, 'ExtraCloseMissingOpen'); } braces--; countBraces = false; // Stop counting start left braces. @@ -211,7 +211,7 @@ function readValue( value += c; } if (braces) { - throw new TexError(COMPONENT, 'ExtraOpenMissingClose'); + texError(COMPONENT, 'ExtraOpenMissingClose'); } return dropBrace && start ? ['', '', removeBraces(value, 1)] @@ -543,7 +543,7 @@ export const ParseUtil = { .substring(i) .match(/^\s*(?:([0-9A-F])|\{\s*([0-9A-F]+)\s*\})/); if (!arg) { - throw new TexError(COMPONENT, 'BadRawUnicode', '\\U'); + texError(COMPONENT, 'BadRawUnicode', '\\U'); } // Replace \U{...} with specified character const c = String.fromCodePoint(parseInt(arg[1] || arg[2], 16)); @@ -558,7 +558,7 @@ export const ParseUtil = { } if (match !== '') { // @test Internal Math Error - throw new TexError(COMPONENT, 'MathNotTerminated'); + texError(COMPONENT, 'MathNotTerminated'); } } if (k < text.length) { @@ -723,7 +723,7 @@ export const ParseUtil = { text += c; } else { if (!c.match(/[1-9]/) || parseInt(c, 10) > args.length) { - throw new TexError(COMPONENT, 'IllegalMacroParam'); + texError(COMPONENT, 'IllegalMacroParam'); } newstring = ParseUtil.addArgs( parser, @@ -754,7 +754,7 @@ export const ParseUtil = { s1 += ' '; } if (s1.length + s2.length > parser.configuration.options['maxBuffer']) { - throw new TexError(COMPONENT, 'MaxBufferSize'); + texError(COMPONENT, 'MaxBufferSize'); } return s1 + s2; }, @@ -770,9 +770,9 @@ export const ParseUtil = { return; } if (isMacro) { - throw new TexError(COMPONENT, 'MaxMacroSub1'); + texError(COMPONENT, 'MaxMacroSub1'); } else { - throw new TexError(COMPONENT, 'MaxMacroSub2'); + texError(COMPONENT, 'MaxMacroSub2'); } }, @@ -795,7 +795,7 @@ export const ParseUtil = { return; } if (!top.isKind('start') || first) { - throw new TexError(COMPONENT, 'ErroneousNestingEq'); + texError(COMPONENT, 'ErroneousNestingEq'); } }, @@ -874,13 +874,13 @@ export const ParseUtil = { const type = allowed[key] as KeyValueDef; const value = String(def[key]); if (!type.verify(value)) { - throw new TexError(COMPONENT, 'InvalidValue', key); + texError(COMPONENT, 'InvalidValue', key); } def[key] = type.convert(value); } } else { if (error) { - throw new TexError(COMPONENT, 'InvalidOption', key); + texError(COMPONENT, 'InvalidOption', key); } delete def[key]; } diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts index c3a83d4ee..e86b23839 100644 --- a/ts/input/tex/StackItem.ts +++ b/ts/input/tex/StackItem.ts @@ -23,7 +23,7 @@ import { MmlNode } from '../../core/MmlTree/MmlNode.js'; import { FactoryNodeClass } from '../../core/Tree/Factory.js'; -import TexError from './TexError.js'; +import { texError } from './TexError.js'; import StackItemFactory from './StackItemFactory.js'; import { TexConstant } from './TexConstants.js'; import { COMPONENT } from './__locales__/Component.js'; @@ -515,12 +515,12 @@ export abstract class BaseItem extends MmlStack implements StackItem { return BaseItem.fail; } // @test Ampersand-error - throw new TexError(COMPONENT, 'Misplaced', item.getName()); + texError(COMPONENT, 'Misplaced', item.getName()); } if (item.isClose && this.getError(item.kind)) { // @test ExtraOpenMissingClose, ExtraCloseMissingOpen, // MissingLeftExtraRight, MissingBeginExtraEnd - throw new TexError(...this.getError(item.kind), item.getName()); + texError(...this.getError(item.kind), item.getName()); } if (!item.isFinal) { return BaseItem.success; diff --git a/ts/input/tex/TexError.ts b/ts/input/tex/TexError.ts index e0c5fb7a9..20bbb7e48 100644 --- a/ts/input/tex/TexError.ts +++ b/ts/input/tex/TexError.ts @@ -28,12 +28,11 @@ export default class TexError { /** * @param {string} id message id - * @param _id * @param {string} message text of English message * @param {string[]} args substitution arguments */ constructor( - public _id: string, + public id: string, message: string, ...args: string[] ) { @@ -46,7 +45,7 @@ export default class TexError { * @param {string} id message id * @param {string[]} args substitution arguments */ -export function texError(component: string, id: string, ...args: string[]) { +export function texError(component: string, id: string, ...args: string[]): never { const message = Locale.message(component, id, ...args); throw new TexError(id, message, ...args); } diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index 6b5e08611..360921ffe 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -27,7 +27,7 @@ import { UnitUtil } from './UnitUtil.js'; import Stack from './Stack.js'; import StackItemFactory from './StackItemFactory.js'; import { Tags } from './Tags.js'; -import TexError from './TexError.js'; +import { texError } from './TexError.js'; import { MmlNode, AbstractMmlNode } from '../../core/MmlTree/MmlNode.js'; import { ParseInput, ParseResult } from './Types.js'; import ParseOptions from './ParseOptions.js'; @@ -332,13 +332,13 @@ export default class TexParser { case '': if (!noneOK) { // @test MissingArgFor - throw new TexError(COMPONENT, 'MissingArgFor', this.currentCS); + texError(COMPONENT, 'MissingArgFor', this.currentCS); } return null; case '}': if (!noneOK) { // @test ExtraCloseMissingOpen - throw new TexError(COMPONENT, 'ExtraCloseMissingOpen'); + texError(COMPONENT, 'ExtraCloseMissingOpen'); } return null; case '\\': @@ -363,7 +363,7 @@ export default class TexParser { } } // @test MissingCloseBrace - throw new TexError(COMPONENT, 'MissingCloseBrace'); + texError(COMPONENT, 'MissingCloseBrace'); } } const c = this.getCodePoint(); @@ -401,7 +401,7 @@ export default class TexParser { case '}': if (braces-- <= 0) { // @test ExtraCloseLooking1 - throw new TexError(COMPONENT, 'ExtraCloseLooking', "']'"); + texError(COMPONENT, 'ExtraCloseLooking', "']'"); } break; case '[': @@ -418,7 +418,7 @@ export default class TexParser { } } // @test MissingCloseBracket - throw new TexError(COMPONENT, 'MissingCloseBracket', this.currentCS); + texError(COMPONENT, 'MissingCloseBracket', this.currentCS); } /** @@ -443,7 +443,7 @@ export default class TexParser { } } // @test MissingOrUnrecognizedDelim1, MissingOrUnrecognizedDelim2 - throw new TexError(COMPONENT, 'MissingOrUnrecognizedDelim', this.currentCS); + texError(COMPONENT, 'MissingOrUnrecognizedDelim', this.currentCS); } /** @@ -470,7 +470,7 @@ export default class TexParser { } } // @test MissingDimOrUnits - throw new TexError(COMPONENT, 'MissingDimOrUnits', this.currentCS); + texError(COMPONENT, 'MissingDimOrUnits', this.currentCS); } /** @@ -500,7 +500,7 @@ export default class TexParser { case '}': if (braces === 0) { // @test ExtraCloseLooking2 - throw new TexError(COMPONENT, 'ExtraCloseLooking', token); + texError(COMPONENT, 'ExtraCloseLooking', token); } braces--; break; @@ -510,7 +510,7 @@ export default class TexParser { } } // @test TokenNotFoundForCommand - throw new TexError( + texError( COMPONENT, 'TokenNotFoundForCommand', token, @@ -562,7 +562,7 @@ export default class TexParser { return c; } // @test MissingOrUnrecognizedDelim - throw new TexError(COMPONENT, 'MissingOrUnrecognizedDelim', this.currentCS); + texError(COMPONENT, 'MissingOrUnrecognizedDelim', this.currentCS); } /** diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts index fde4ba8c1..c4f122a93 100644 --- a/ts/input/tex/ams/AmsItems.ts +++ b/ts/input/tex/ams/AmsItems.ts @@ -24,7 +24,7 @@ import { ArrayItem, EqnArrayItem } from '../base/BaseItems.js'; import { ParseUtil } from '../ParseUtil.js'; import NodeUtil from '../NodeUtil.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { TexConstant } from '../TexConstants.js'; import StackItemFactory from '../StackItemFactory.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; @@ -79,7 +79,7 @@ export class MultlineItem extends ArrayItem { public EndRow() { if (this.row.length !== 1) { // @test MultlineRowsOneCol - throw new TexError(COMPONENT, 'MultlineRowsOneCol', 'multline'); + texError(COMPONENT, 'MultlineRowsOneCol', 'multline'); } const row = this.create('node', 'mtr', this.row); this.table.push(row); @@ -171,7 +171,7 @@ export class FlalignItem extends EqnArrayItem { const n = this.getProperty('xalignat') as number; if (!n) return; if (this.row.length > n) { - throw new TexError(COMPONENT, 'XalignOverflow', '&', this.name); + texError(COMPONENT, 'XalignOverflow', '&', this.name); } } diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index 5f0c66743..4f215e947 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -29,7 +29,7 @@ import ParseMethods from '../ParseMethods.js'; import NodeUtil from '../NodeUtil.js'; import { TexConstant } from '../TexConstants.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { ArrayItem } from '../base/BaseItems.js'; import { FlalignItem } from './AmsItems.js'; import BaseMethods from '../base/BaseMethods.js'; @@ -149,7 +149,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const n = parser.GetArgument('\\begin{' + name + '}'); if (n.match(/[^0-9]/)) { // @test PositiveIntegerArg - throw new TexError( + texError( COMPONENT, 'PositiveIntegerArg', '\\begin{' + name + '}' @@ -242,7 +242,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { ): ParseResult { const n = parser.GetArgument('\\begin{' + begin.getName() + '}'); if (n.match(/[^0-9]/)) { - throw new TexError( + texError( COMPONENT, 'PositiveIntegerArg', '\\begin{' + begin.getName() + '}' @@ -621,7 +621,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { // @test Shove (Left|Right) (Top|Middle|Bottom) if (top.kind !== 'multline') { // @test Shove Error Environment - throw new TexError( + texError( COMPONENT, 'CommandOnlyAllowedInEnv', parser.currentCS, @@ -630,7 +630,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { } if (top.Size()) { // @test Shove Error (Top|Middle|Bottom) - throw new TexError( + texError( COMPONENT, 'CommandAtTheBeginingOfLine', parser.currentCS @@ -668,7 +668,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { lr = lrMap[lr]; if (lr == null) { // @test Center Fraction Error - throw new TexError(COMPONENT, 'IllegalAlign', parser.currentCS); + texError(COMPONENT, 'IllegalAlign', parser.currentCS); } if (lr) { // @test Right Fraction, Left Fraction @@ -729,7 +729,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const styleAlpha = ['D', 'T', 'S', 'SS'][styleDigit]; if (styleAlpha == null) { // @test Genfrac Error - throw new TexError(COMPONENT, 'BadMathStyleFor', parser.currentCS); + texError(COMPONENT, 'BadMathStyleFor', parser.currentCS); } frac = parser.create('node', 'mstyle', [frac]); if (styleAlpha === 'D') { @@ -758,7 +758,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { HandleTag(parser: TexParser, name: string) { if (!parser.tags.currentTag.taggable && parser.tags.env) { // @test Illegal Tag Error - throw new TexError( + texError( COMPONENT, 'CommandNotAllowedInEnv', parser.currentCS, @@ -767,7 +767,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { } if (parser.tags.currentTag.tag) { // @test Double Tag Error - throw new TexError(COMPONENT, 'MultipleCommand', parser.currentCS); + texError(COMPONENT, 'MultipleCommand', parser.currentCS); } const star = parser.GetStar(); const tagId = UnitUtil.trimSpaces(parser.GetArgument(name)); diff --git a/ts/input/tex/base/BaseConfiguration.ts b/ts/input/tex/base/BaseConfiguration.ts index b39883433..fb3ef2b68 100644 --- a/ts/input/tex/base/BaseConfiguration.ts +++ b/ts/input/tex/base/BaseConfiguration.ts @@ -24,7 +24,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { MapHandler } from '../MapHandler.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import NodeUtil from '../NodeUtil.js'; import TexParser from '../TexParser.js'; import { CharacterMap, RegExpMap } from '../TokenMap.js'; @@ -91,7 +91,7 @@ export function Other(parser: TexParser, char: string) { */ function csUndefined(_parser: TexParser, name: string) { // @test Undefined-CS - throw new TexError(COMPONENT, 'UndefinedControlSequence', '\\' + name); + texError(COMPONENT, 'UndefinedControlSequence', '\\' + name); } /** @@ -102,7 +102,7 @@ function csUndefined(_parser: TexParser, name: string) { */ function envUndefined(_parser: TexParser, env: string) { // @test Undefined-Env - throw new TexError(COMPONENT, 'UnknownEnv', env); + texError(COMPONENT, 'UnknownEnv', env); } /** diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index 13bba85fe..4dea07592 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -29,7 +29,7 @@ import { MmlMo } from '../../../core/MmlTree/MmlNodes/mo.js'; import { MmlMsubsup } from '../../../core/MmlTree/MmlNodes/msubsup.js'; import { MmlMunderover } from '../../../core/MmlTree/MmlNodes/munderover.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { ParseUtil } from '../ParseUtil.js'; import { UnitUtil } from '../UnitUtil.js'; import NodeUtil from '../NodeUtil.js'; @@ -283,7 +283,7 @@ export class SubsupItem extends BaseItem { if (super.checkItem(item)[1]) { // @test Brace Superscript Error, MissingOpenForSup, MissingOpenForSub const error = this.getError(['', 'sub', 'sup'][position]); - throw new TexError(...error); + texError(...error); } return null; } @@ -321,7 +321,7 @@ export class OverItem extends BaseItem { public checkItem(item: StackItem): CheckType { if (item.isKind('over')) { // @test Double Over - throw new TexError(COMPONENT, 'AmbiguousUseOf', item.getName()); + texError(COMPONENT, 'AmbiguousUseOf', item.getName()); } if (item.isClose) { // @test Over @@ -588,7 +588,7 @@ export class BeginItem extends BaseItem { if (item.isKind('end')) { if (item.getName() !== this.getName()) { // @test EnvBadEnd - throw new TexError( + texError( COMPONENT, 'EnvBadEnd', this.getName(), @@ -602,7 +602,7 @@ export class BeginItem extends BaseItem { } if (item.isKind('stop')) { // @test EnvMissingEnd Array - throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); + texError(COMPONENT, 'EnvMissingEnd', this.getName()); } return super.checkItem(item); } @@ -675,7 +675,7 @@ export class PositionItem extends BaseItem { public checkItem(item: StackItem): CheckType { if (item.isClose) { // @test MissingBoxFor - throw new TexError(COMPONENT, 'MissingBoxFor', this.getName()); + texError(COMPONENT, 'MissingBoxFor', this.getName()); } if (item.isFinal) { let mml = item.toMml(); @@ -1085,7 +1085,7 @@ export class ArrayItem extends BaseItem { return [[newItem], true]; } // @test MissingCloseBrace2 - throw new TexError(TEX_COMPONENT, 'MissingCloseBrace'); + texError(TEX_COMPONENT, 'MissingCloseBrace'); } return [[newItem, item], true]; } @@ -1227,7 +1227,7 @@ export class ArrayItem extends BaseItem { ++this.templateSubs > parser.configuration.options.maxTemplateSubtitutions ) { - throw new TexError(COMPONENT, 'MaxTemplateSubs'); + texError(COMPONENT, 'MaxTemplateSubs'); } } } @@ -1646,7 +1646,7 @@ export class EquationItem extends BaseItem { } if (item.isKind('stop')) { // @test EnvMissingEnd Equation - throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); + texError(COMPONENT, 'EnvMissingEnd', this.getName()); } return super.checkItem(item); } diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index 99f967df7..c4e1819bd 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -27,7 +27,7 @@ import { StackItem, EnvList } from '../StackItem.js'; import { Macro } from '../Token.js'; import { ParseResult, ParseMethod } from '../Types.js'; import NodeUtil from '../NodeUtil.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import TexParser from '../TexParser.js'; import { TexConstant } from '../TexConstants.js'; import { ParseUtil } from '../ParseUtil.js'; @@ -73,12 +73,12 @@ export function splitAlignArray(align: string, n: number = Infinity): string { .map((s: string) => { const name = { t: 'top', b: 'bottom', m: 'middle', c: 'center' }[s]; if (!name) { - throw new TexError(COMPONENT, 'BadBreakAlign', s); + texError(COMPONENT, 'BadBreakAlign', s); } return name; }); if (list.length > n) { - throw new TexError(COMPONENT, 'TooManyAligns', align); + texError(COMPONENT, 'TooManyAligns', align); } return n === 1 ? list[0] : list.join(' '); } @@ -219,7 +219,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double-super-error, Double-over-error - throw new TexError(COMPONENT, 'DoubleExponent'); + texError(COMPONENT, 'DoubleExponent'); } if (!NodeUtil.isType(base, 'msubsup') || NodeUtil.isType(base, 'msup')) { if (movesupsub) { @@ -291,7 +291,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double-sub-error, Double-under-error - throw new TexError(COMPONENT, 'DoubleSubscripts'); + texError(COMPONENT, 'DoubleSubscripts'); } if (!NodeUtil.isType(base, 'msubsup') || NodeUtil.isType(base, 'msup')) { if (movesupsub) { @@ -345,7 +345,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !NodeUtil.getProperty(base, 'subsupOK')) ) { // @test Double Prime Error - throw new TexError(COMPONENT, 'DoubleExponentPrime'); + texError(COMPONENT, 'DoubleExponentPrime'); } let sup = ''; parser.i--; @@ -383,7 +383,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { */ Hash(_parser: TexParser, _c: string) { // @test Hash Error - throw new TexError(COMPONENT, 'CantUseHash1'); + texError(COMPONENT, 'CantUseHash1'); }, /** @@ -616,7 +616,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { NodeUtil.getProperty(op, 'movesupsub') == null) ) { // @test Limits Error - throw new TexError(COMPONENT, 'MisplacedLimits', parser.currentCS); + texError(COMPONENT, 'MisplacedLimits', parser.currentCS); } const top = parser.stack.Top(); let node; @@ -739,16 +739,16 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Tweaked Root if (!parser.stack.env['inRoot']) { // @test Misplaced Move Root - throw new TexError(COMPONENT, 'MisplacedMoveRoot', parser.currentCS); + texError(COMPONENT, 'MisplacedMoveRoot', parser.currentCS); } if (parser.stack.global[id]) { // @test Multiple Move Root - throw new TexError(COMPONENT, 'MultipleMoveRoot', parser.currentCS); + texError(COMPONENT, 'MultipleMoveRoot', parser.currentCS); } let n = parser.GetArgument(name); if (!n.match(/-?[0-9]+/)) { // @test Incorrect Move Root - throw new TexError(COMPONENT, 'IntegerArg', parser.currentCS); + texError(COMPONENT, 'IntegerArg', parser.currentCS); } n = parseInt(n, 10) / 15 + 'em'; if (n.substring(0, 1) !== '-') { @@ -984,13 +984,13 @@ const BaseMethods: { [key: string]: ParseMethod } = { BreakAlign(parser: TexParser, name: string) { const top = parser.stack.Top() as sitem.ArrayItem; if (!(top instanceof sitem.ArrayItem)) { - throw new TexError(COMPONENT, 'BreakNotInArray', parser.currentCS); + texError(COMPONENT, 'BreakNotInArray', parser.currentCS); } const type = parser.GetArgument(name).trim(); switch (type) { case 'c': if (top.First) { - throw new TexError( + texError( COMPONENT, 'BreakFirstInEntry', parser.currentCS + '{c}' @@ -1000,7 +1000,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { break; case 'r': if (top.row.length || top.First) { - throw new TexError( + texError( COMPONENT, 'BreakFirstInRow', parser.currentCS + '{r}' @@ -1010,7 +1010,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { break; case 't': if (top.table.length || top.row.length || top.First) { - throw new TexError( + texError( COMPONENT, 'BreakFirstInTable', parser.currentCS + '{t}' @@ -1019,7 +1019,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { top.breakAlign.table = splitAlignArray(parser.GetArgument(name)); break; default: - throw new TexError(COMPONENT, 'BreakType', parser.currentCS); + texError(COMPONENT, 'BreakType', parser.currentCS); } }, @@ -1044,7 +1044,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { } if (!node || !node.isToken) { // @test Token Illegal Type, Token Wrong Type - throw new TexError(COMPONENT, 'NotMathMLToken', kind); + texError(COMPONENT, 'NotMathMLToken', kind); } while (attr !== '') { const match = attr.match( @@ -1052,7 +1052,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { ); if (!match) { // @test Token Invalid Attribute - throw new TexError( + texError( COMPONENT, 'InvalidMathMLAttr', attr.split(/[\s\n=]/)[0] @@ -1060,7 +1060,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { } if (!node.attributes.hasDefault(match[1]) && !MmlTokenAllow[match[1]]) { // @test Token Unknown Attribute, Token Wrong Attribute - throw new TexError(COMPONENT, 'UnknownAttrForElement', match[1], kind); + texError(COMPONENT, 'UnknownAttrForElement', match[1], kind); } let value: string | boolean = ParseUtil.mmlFilterAttribute( parser, @@ -1513,7 +1513,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const c = parser.GetNext(); if (c === '') { // @test Matrix Error - throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); + texError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } if (c === '{') { // @test Matrix Braces, Matrix Columns, Matrix Rows. @@ -1623,7 +1623,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // Extra alignment tabs are not allowed in cases // // @test ExtraAlignTab - throw new TexError(COMPONENT, 'ExtraAlignTab'); + texError(COMPONENT, 'ExtraAlignTab'); } else if (c === '\\') { // // If the macro is \cr or \\, end the search, otherwise skip the macro @@ -1703,7 +1703,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Custom Linebreak if (dim && !value) { // @test Dimension Error - throw new TexError(COMPONENT, 'BracketMustBeDimension', name); + texError(COMPONENT, 'BracketMustBeDimension', name); } n = value + unit; } @@ -1747,7 +1747,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); if (!(top instanceof sitem.ArrayItem) || top.Size()) { // @test Misplaced hline - throw new TexError(TEX_COMPONENT, 'Misplaced', parser.currentCS); + texError(TEX_COMPONENT, 'Misplaced', parser.currentCS); } if (!top.table.length) { // @test Enclosed top, Enclosed top bottom @@ -1778,7 +1778,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { top.hfill.push(top.Size()); } else { // @test UnsupportedHFill - throw new TexError(COMPONENT, 'UnsupportedHFill', parser.currentCS); + texError(COMPONENT, 'UnsupportedHFill', parser.currentCS); } }, @@ -1793,10 +1793,10 @@ const BaseMethods: { [key: string]: ParseMethod } = { const n = parser.GetBrackets(name, '0'); const macro = parser.GetArgument(name); if (c.length !== 1) { - throw new TexError(COMPONENT, 'BadColumnName', c); + texError(COMPONENT, 'BadColumnName', c); } if (!n.match(/^\d+$/)) { - throw new TexError(COMPONENT, 'PositiveIntegerArg', n); + texError(COMPONENT, 'PositiveIntegerArg', n); } const cparser = parser.configuration.columnParser; cparser.columnHandler[c] = (state: ColumnState) => @@ -1819,7 +1819,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { const env = parser.GetArgument(name); if (env.match(/\\/)) { // @test InvalidEnv - throw new TexError(COMPONENT, 'InvalidEnv', env); + texError(COMPONENT, 'InvalidEnv', env); } const macro = parser.configuration.handlers .get(HandlerType.ENVIRONMENT) @@ -1956,14 +1956,14 @@ const BaseMethods: { [key: string]: ParseMethod } = { (shift && !UnitUtil.matchDimen(shift)[0]) || (last && !UnitUtil.matchDimen(last)[0]) ) { - throw new TexError(COMPONENT, 'BracketMustBeDimension', name); + texError(COMPONENT, 'BracketMustBeDimension', name); } // // Get the indentalign values, if any // const lcr = parser.GetArgument(name); if (lcr && !lcr.match(/^([lcr]{1,3})?$/)) { - throw new TexError(COMPONENT, 'BadAlignment'); + texError(COMPONENT, 'BadAlignment'); } const align = [...lcr].map( (c) => ({ l: 'left', c: 'center', r: 'right' })[c] @@ -2105,7 +2105,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { // @test Label, Ref, Ref Unknown if (parser.tags.label) { // @test Double Label Error - throw new TexError(COMPONENT, 'MultipleCommand', parser.currentCS); + texError(COMPONENT, 'MultipleCommand', parser.currentCS); } parser.tags.label = label; if ( @@ -2113,7 +2113,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { !parser.options['ignoreDuplicateLabels'] ) { // @ Duplicate Label Error - throw new TexError(COMPONENT, 'MultipleLabel', label); + texError(COMPONENT, 'MultipleLabel', label); } // TODO: This should be set in the tags structure! parser.tags.labels[label] = new Label(); // will be replaced by tag value later diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index a4966f242..00dc06941 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -26,7 +26,7 @@ import { Configuration } from '../Configuration.js'; import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; @@ -52,7 +52,7 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Padding if (def) { // @test Bbox-Padding-Error - throw new TexError( + texError( COMPONENT, 'MultipleBBoxProperty', 'Padding', @@ -73,7 +73,7 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Background if (background) { // @test Bbox-Background-Error - throw new TexError( + texError( COMPONENT, 'MultipleBBoxProperty', 'Background', @@ -85,12 +85,12 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Frame if (style) { // @test Bbox-Frame-Error - throw new TexError(COMPONENT, 'MultipleBBoxProperty', 'Style', name); + texError(COMPONENT, 'MultipleBBoxProperty', 'Style', name); } style = BBoxStyle(part); } else if (part !== '') { // @test Bbox-General-Error - throw new TexError(COMPONENT, 'InvalidBBoxProperty', part); + texError(COMPONENT, 'InvalidBBoxProperty', part); } } if (def) { diff --git a/ts/input/tex/begingroup/BegingroupMethods.ts b/ts/input/tex/begingroup/BegingroupMethods.ts index 83e7366e5..e0b050a4e 100644 --- a/ts/input/tex/begingroup/BegingroupMethods.ts +++ b/ts/input/tex/begingroup/BegingroupMethods.ts @@ -23,7 +23,7 @@ import { CommandMap } from '../TokenMap.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { COMPONENT } from './__locales__/Component.js'; import BaseMethods from '../base/BaseMethods.js'; @@ -85,7 +85,7 @@ export const BegingroupMethods = { // Check that \global can be used with the following CS // if (!parser.options.begingroup.allowGlobal.includes(cs)) { - throw new TexError(COMPONENT, 'IllegalGlobal', parser.currentCS); + texError(COMPONENT, 'IllegalGlobal', parser.currentCS); } parser.stack.env.isGlobal = true; }, diff --git a/ts/input/tex/begingroup/BegingroupStack.ts b/ts/input/tex/begingroup/BegingroupStack.ts index d338b1ac4..1443da966 100644 --- a/ts/input/tex/begingroup/BegingroupStack.ts +++ b/ts/input/tex/begingroup/BegingroupStack.ts @@ -31,7 +31,7 @@ import { } from '../TokenMap.js'; import { Token } from '../Token.js'; import { MapHandler, SubHandlers } from '../MapHandler.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { COMPONENT } from './__locales__/Component.js'; import { @@ -172,7 +172,7 @@ export class BegingroupStack { */ public pop() { if (this.i === this.base) { - throw new TexError(COMPONENT, 'MissingBegingroup'); + texError(COMPONENT, 'MissingBegingroup'); } this.handlers.remove(BegingroupStack.handlerConfig, {}); // diff --git a/ts/input/tex/bussproofs/BussproofsItems.ts b/ts/input/tex/bussproofs/BussproofsItems.ts index ca52d5b3b..29b465475 100644 --- a/ts/input/tex/bussproofs/BussproofsItems.ts +++ b/ts/input/tex/bussproofs/BussproofsItems.ts @@ -21,7 +21,7 @@ * @author v.sorge@mathjax.org (Volker Sorge) */ -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { BaseItem, CheckType, StackItem } from '../StackItem.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import Stack from '../Stack.js'; @@ -63,7 +63,7 @@ export class ProofTreeItem extends BaseItem { return [[this.factory.create('mml', node), item], true]; } if (item.isKind('stop')) { - throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); + texError(COMPONENT, 'EnvMissingEnd', this.getName()); } this.innerStack.Push(item); return BaseItem.fail; diff --git a/ts/input/tex/bussproofs/BussproofsMethods.ts b/ts/input/tex/bussproofs/BussproofsMethods.ts index ccd6d3577..f67176707 100644 --- a/ts/input/tex/bussproofs/BussproofsMethods.ts +++ b/ts/input/tex/bussproofs/BussproofsMethods.ts @@ -22,7 +22,7 @@ */ import { ParseMethod } from '../Types.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import TexParser from '../TexParser.js'; import { ParseUtil } from '../ParseUtil.js'; import { UnitUtil } from '../UnitUtil.js'; @@ -138,12 +138,12 @@ function createRule( function parseFCenterLine(parser: TexParser, name: string): MmlNode { const dollar = parser.GetNext(); if (dollar !== '$') { - throw new TexError(COMPONENT, 'IllegalUseOfCommand', name); + texError(COMPONENT, 'IllegalUseOfCommand', name); } parser.i++; const axiom = parser.GetUpTo(name, '$'); if (!axiom.includes('\\fCenter')) { - throw new TexError(COMPONENT, 'MissingProofCommand', '\\fCenter', name); + texError(COMPONENT, 'MissingProofCommand', '\\fCenter', name); } // Check for fCenter and throw error? const [prem, conc] = axiom.split('\\fCenter'); @@ -209,7 +209,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // TODO: Label error if (top.kind !== 'proofTree') { - throw new TexError(COMPONENT, 'IllegalProofCommand'); + texError(COMPONENT, 'IllegalProofCommand'); } const content = paddedContent(parser, parser.GetArgument(name)); BussproofsUtil.setProperty(content, 'axiom', true); @@ -226,10 +226,10 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { Inference(parser: TexParser, name: string, n: number) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError(COMPONENT, 'IllegalProofCommand'); + texError(COMPONENT, 'IllegalProofCommand'); } if (top.Size() < n) { - throw new TexError(COMPONENT, 'BadProofTree'); + texError(COMPONENT, 'BadProofTree'); } const rootAtTop = top.getProperty('rootAtTop') as boolean; const childCount = n === 1 && !top.Peek()[0].childNodes.length ? 0 : n; @@ -281,7 +281,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // Label error if (top.kind !== 'proofTree') { - throw new TexError(COMPONENT, 'IllegalProofCommand'); + texError(COMPONENT, 'IllegalProofCommand'); } const content = ParseUtil.internalMath(parser, parser.GetArgument(name), 0); const label = @@ -303,7 +303,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { const top = parser.stack.Top(); // Label error if (top.kind !== 'proofTree') { - throw new TexError(COMPONENT, 'IllegalProofCommand'); + texError(COMPONENT, 'IllegalProofCommand'); } top.setProperty('currentLine', style); if (always) { @@ -321,7 +321,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { RootAtTop(parser: TexParser, _name: string, where: boolean) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError(COMPONENT, 'IllegalProofCommand'); + texError(COMPONENT, 'IllegalProofCommand'); } top.setProperty('rootAtTop', where); }, @@ -335,7 +335,7 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { AxiomF(parser: TexParser, name: string) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError(COMPONENT, 'IllegalProofCommand'); + texError(COMPONENT, 'IllegalProofCommand'); } const line = parseFCenterLine(parser, name); BussproofsUtil.setProperty(line, 'axiom', true); @@ -360,10 +360,10 @@ const BussproofsMethods: { [key: string]: ParseMethod } = { InferenceF(parser: TexParser, name: string, n: number) { const top = parser.stack.Top(); if (top.kind !== 'proofTree') { - throw new TexError(COMPONENT, 'IllegalProofCommand'); + texError(COMPONENT, 'IllegalProofCommand'); } if (top.Size() < n) { - throw new TexError(COMPONENT, 'BadProofTree'); + texError(COMPONENT, 'BadProofTree'); } const rootAtTop = top.getProperty('rootAtTop') as boolean; const childCount = n === 1 && !top.Peek()[0].childNodes.length ? 0 : n; diff --git a/ts/input/tex/cases/CasesConfiguration.ts b/ts/input/tex/cases/CasesConfiguration.ts index e93ae1ce4..802e636d8 100644 --- a/ts/input/tex/cases/CasesConfiguration.ts +++ b/ts/input/tex/cases/CasesConfiguration.ts @@ -5,7 +5,7 @@ import { ParseResult, ParseMethod } from '../Types.js'; import { ParseUtil } from '../ParseUtil.js'; import BaseMethods from '../base/BaseMethods.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { BeginItem, EqnArrayItem } from '../base/BaseItems.js'; import { AmsTags } from '../ams/AmsConfiguration.js'; import { StackItem, CheckType } from '../StackItem.js'; @@ -183,7 +183,7 @@ export const CasesMethods = { // // Extra alignment tabs are not allowed in cases // - throw new TexError(COMPONENT, 'ExtraCasesAlignTab'); + texError(COMPONENT, 'ExtraCasesAlignTab'); } else if (c === '\\' && braces === 0) { // // If the macro is \cr or \\, end the search, otherwise skip the macro diff --git a/ts/input/tex/color/ColorUtil.ts b/ts/input/tex/color/ColorUtil.ts index 3f0d9261e..97f5e0615 100644 --- a/ts/input/tex/color/ColorUtil.ts +++ b/ts/input/tex/color/ColorUtil.ts @@ -21,7 +21,7 @@ * @author i@omardo.com (Omar Al-Ithawi) */ -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { COLORS } from './ColorConstants.js'; import { COMPONENT } from './__locales__/Component.js'; @@ -51,7 +51,7 @@ export class ColorModel { private normalizeColor(model: string, def: string): string { if (!model || model === 'named') { if (def.match(/;/)) { - throw new TexError(COMPONENT, 'BadColorValue'); + texError(COMPONENT, 'BadColorValue'); } // Allow to define colors directly by using the CSS format e.g. `#888` return def; @@ -61,7 +61,7 @@ export class ColorModel { return modelProcessor(def); } - throw new TexError(COMPONENT, 'UndefinedColorModel', model); + texError(COMPONENT, 'UndefinedColorModel', model); } /** @@ -99,7 +99,7 @@ export class ColorModel { return COLORS.get(name); } if (name.match(/;/)) { - throw new TexError(COMPONENT, 'BadColorValue', 'Invalid color value'); + texError(COMPONENT, 'BadColorValue', 'Invalid color value'); } // Pass the color name as-is to CSS return name; @@ -131,17 +131,17 @@ ColorModelProcessors.set('rgb', function (rgb: string): string { let RGB: string = '#'; if (rgbParts.length !== 3) { - throw new TexError(COMPONENT, 'ModelArg1', 'rgb'); + texError(COMPONENT, 'ModelArg1', 'rgb'); } for (const rgbPart of rgbParts) { if (!rgbPart.match(/^(\d+(\.\d*)?|\.\d+)$/)) { - throw new TexError(COMPONENT, 'InvalidDecimalNumber'); + texError(COMPONENT, 'InvalidDecimalNumber'); } const n = parseFloat(rgbPart); if (n < 0 || n > 1) { - throw new TexError(COMPONENT, 'ModelArg2', 'rgb', '0', '1'); + texError(COMPONENT, 'ModelArg2', 'rgb', '0', '1'); } let pn = Math.floor(n * 255).toString(16); @@ -166,17 +166,17 @@ ColorModelProcessors.set('RGB', function (rgb: string): string { let RGB = '#'; if (rgbParts.length !== 3) { - throw new TexError(COMPONENT, 'ModelArg1', 'RGB'); + texError(COMPONENT, 'ModelArg1', 'RGB'); } for (const rgbPart of rgbParts) { if (!rgbPart.match(/^\d+$/)) { - throw new TexError(COMPONENT, 'InvalidNumber'); + texError(COMPONENT, 'InvalidNumber'); } const n = parseInt(rgbPart); if (n > 255) { - throw new TexError(COMPONENT, 'ModelArg2', 'RGB', '0', '255'); + texError(COMPONENT, 'ModelArg2', 'RGB', '0', '255'); } let pn = n.toString(16); @@ -196,12 +196,12 @@ ColorModelProcessors.set('RGB', function (rgb: string): string { */ ColorModelProcessors.set('gray', function (gray: string): string { if (!gray.match(/^\s*(\d+(\.\d*)?|\.\d+)\s*$/)) { - throw new TexError(COMPONENT, 'InvalidDecimalNumber'); + texError(COMPONENT, 'InvalidDecimalNumber'); } const n: number = parseFloat(gray); if (n < 0 || n > 1) { - throw new TexError(COMPONENT, 'ModelArg2', 'gray', '0', '1'); + texError(COMPONENT, 'ModelArg2', 'gray', '0', '1'); } let pn = Math.floor(n * 255).toString(16); if (pn.length < 2) { diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts index c753d7432..02143cc4c 100644 --- a/ts/input/tex/colortbl/ColortblConfiguration.ts +++ b/ts/input/tex/colortbl/ColortblConfiguration.ts @@ -30,7 +30,7 @@ import { } from '../Configuration.js'; import { CommandMap } from '../TokenMap.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { TeX } from '../../tex.js'; import { COMPONENT } from './__locales__/Component.js'; @@ -132,14 +132,14 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) { // const top = parser.stack.Top() as ColorArrayItem; if (!(top instanceof ColorArrayItem)) { - throw new TexError(COMPONENT, 'UnsupportedTableColor', parser.currentCS); + texError(COMPONENT, 'UnsupportedTableColor', parser.currentCS); } // // Check the position of the macro and save the color. // if (type === 'col') { if (top.table.length && top.color.col[top.row.length] !== color) { - throw new TexError(COMPONENT, 'ColumnColorNotTop', name); + texError(COMPONENT, 'ColumnColorNotTop', name); } top.color.col[top.row.length] = color; // @@ -151,7 +151,7 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) { } else { top.color[type] = color; if (type === 'row' && (top.Size() || top.row.length)) { - throw new TexError(COMPONENT, 'RowColorNotFirst', name); + texError(COMPONENT, 'RowColorNotFirst', name); } } } diff --git a/ts/input/tex/empheq/EmpheqConfiguration.ts b/ts/input/tex/empheq/EmpheqConfiguration.ts index 7c872bb07..613fe36c5 100644 --- a/ts/input/tex/empheq/EmpheqConfiguration.ts +++ b/ts/input/tex/empheq/EmpheqConfiguration.ts @@ -26,7 +26,7 @@ import { Configuration } from '../Configuration.js'; import { CommandMap, EnvironmentMap } from '../TokenMap.js'; import { ParseUtil } from '../ParseUtil.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { BeginItem } from '../base/BaseItems.js'; import { EmpheqUtil } from './EmpheqUtil.js'; import ParseMethods from '../ParseMethods.js'; @@ -64,7 +64,7 @@ export const EmpheqMethods = { .GetArgument('\\begin{' + begin.getName() + '}') .split(/=/); if (!EmpheqUtil.checkEnv(env)) { - throw new TexError(COMPONENT, 'EmpheqInvalidEnv', env, begin.getName()); + texError(COMPONENT, 'EmpheqInvalidEnv', env, begin.getName()); } begin.setProperty('nestStart', true); if (opts) { diff --git a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts index dbf0f6426..b1d5b0f40 100644 --- a/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts +++ b/ts/input/tex/extpfeil/ExtpfeilConfiguration.ts @@ -30,7 +30,7 @@ import { ParseMethod } from '../Types.js'; import { AmsMethods } from '../ams/AmsMethods.js'; import { NewcommandUtil } from '../newcommand/NewcommandUtil.js'; import { NewcommandConfig } from '../newcommand/NewcommandConfiguration.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; @@ -47,13 +47,13 @@ const ExtpfeilMethods: { [key: string]: ParseMethod } = { const space = parser.GetArgument(name); const chr = parser.GetArgument(name); if (!cs.match(/^\\([a-z]+|.)$/i)) { - throw new TexError(COMPONENT, 'NewextarrowArg1', name); + texError(COMPONENT, 'NewextarrowArg1', name); } if (!space.match(/^(\d+),(\d+)$/)) { - throw new TexError(COMPONENT, 'NewextarrowArg2', name); + texError(COMPONENT, 'NewextarrowArg2', name); } if (!chr.match(/^(\d+|0x[0-9A-F]+)$/i)) { - throw new TexError(COMPONENT, 'NewextarrowArg3', name); + texError(COMPONENT, 'NewextarrowArg3', name); } cs = cs.substring(1); const spaces = space.split(','); diff --git a/ts/input/tex/html/HtmlMethods.ts b/ts/input/tex/html/HtmlMethods.ts index c27a56106..10c9b38e6 100644 --- a/ts/input/tex/html/HtmlMethods.ts +++ b/ts/input/tex/html/HtmlMethods.ts @@ -26,7 +26,7 @@ import { ParseMethod } from '../Types.js'; import NodeUtil from '../NodeUtil.js'; import { ParseUtil } from '../ParseUtil.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { COMPONENT } from './__locales__/Component.js'; @@ -65,7 +65,7 @@ const HtmlMethods: { [key: string]: ParseMethod } = { for (const key in data) { // remove illegal attribute names if (!isLegalAttributeName(key)) { - throw new TexError(COMPONENT, 'InvalidHTMLAttr', `data-${key}`); + texError(COMPONENT, 'InvalidHTMLAttr', `data-${key}`); } NodeUtil.setAttribute(arg, `data-${key}`, data[key]); } diff --git a/ts/input/tex/mathtools/MathtoolsMethods.ts b/ts/input/tex/mathtools/MathtoolsMethods.ts index c725073ad..7045bcee8 100644 --- a/ts/input/tex/mathtools/MathtoolsMethods.ts +++ b/ts/input/tex/mathtools/MathtoolsMethods.ts @@ -29,7 +29,7 @@ import { ParseMethod, ParseResult } from '../Types.js'; import { AmsMethods } from '../ams/AmsMethods.js'; import BaseMethods from '../base/BaseMethods.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import NodeUtil from '../NodeUtil.js'; import { TEXCLASS } from '../../../core/MmlTree/MmlNode.js'; import { length2em, em } from '../../../util/lengths.js'; @@ -137,7 +137,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { width = arg; } if (width && !UnitUtil.matchDimen(width)[0]) { - throw new TexError(COMPONENT, 'BadWidth', name); + texError(COMPONENT, 'BadWidth', name); } } parser.Push(begin); @@ -165,10 +165,10 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { HandleShove(parser: TexParser, name: string, shove: string) { const top = parser.stack.Top(); if (top.kind !== 'multline' && top.kind !== 'multlined') { - throw new TexError(COMPONENT, 'CommandInMultlined', name); + texError(COMPONENT, 'CommandInMultlined', name); } if (top.Size()) { - throw new TexError(COMPONENT, 'CommandAtTheBeginingOfLine', name); + texError(COMPONENT, 'CommandAtTheBeginingOfLine', name); } top.setProperty('shove', shove); const shift = parser.GetBrackets(name); @@ -458,7 +458,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { const box = NewcommandUtil.GetCSname(parser, name + '\\' + cs); const handlers = parser.configuration.handlers; if (handlers.get(HandlerType.MACRO).lookup(cs)) { - throw new TexError(COMPONENT, 'AlreadyDefined', '\\' + cs); + texError(COMPONENT, 'AlreadyDefined', '\\' + cs); } const handler = handlers.retrieve( NewcommandTables.NEW_COMMAND @@ -476,7 +476,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { ArrowBetweenLines(parser: TexParser, name: string) { const top = MathtoolsUtil.checkAlignment(parser, name); if (top.Size() || top.row.length) { - throw new TexError(COMPONENT, 'BetweenLines', name); + texError(COMPONENT, 'BetweenLines', name); } const star = parser.GetStar(); const symbol = parser.GetBrackets(name, '\\Updownarrow'); @@ -926,17 +926,17 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { NewTagForm(parser: TexParser, name: string, renew: boolean = false) { const tags = parser.tags as MathtoolsTags; if (!('mtFormats' in tags)) { - throw new TexError(COMPONENT, 'TagsNotMT', name); + texError(COMPONENT, 'TagsNotMT', name); } const id = parser.GetArgument(name).trim(); if (!id) { - throw new TexError(COMPONENT, 'InvalidTagFormID'); + texError(COMPONENT, 'InvalidTagFormID'); } const format = parser.GetBrackets(name, ''); const left = parser.GetArgument(name); const right = parser.GetArgument(name); if (!renew && tags.mtFormats.has(id)) { - throw new TexError(COMPONENT, 'DuplicateTagForm', id); + texError(COMPONENT, 'DuplicateTagForm', id); } tags.mtFormats.set(id, [left, right, format]); parser.Push(parser.itemFactory.create('null')); @@ -951,7 +951,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { UseTagForm(parser: TexParser, name: string) { const tags = parser.tags as MathtoolsTags; if (!('mtFormats' in tags)) { - throw new TexError(COMPONENT, 'TagsNotMT', name); + texError(COMPONENT, 'TagsNotMT', name); } const id = parser.GetArgument(name).trim(); if (!id) { @@ -960,7 +960,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { return; } if (!tags.mtFormats.has(id)) { - throw new TexError(COMPONENT, 'UndefinedTagForm', id); + texError(COMPONENT, 'UndefinedTagForm', id); } tags.mtCurrent = tags.mtFormats.get(id); parser.Push(parser.itemFactory.create('null')); @@ -975,7 +975,7 @@ export const MathtoolsMethods: { [key: string]: ParseMethod } = { SetOptions(parser: TexParser, name: string) { const options = parser.options.mathtools; if (!options['allow-mathtoolsset']) { - throw new TexError(COMPONENT, 'ForbiddenMathtoolsSet', name); + texError(COMPONENT, 'ForbiddenMathtoolsSet', name); } const allowed = {} as { [id: string]: number }; Object.keys(options).forEach((id) => { diff --git a/ts/input/tex/mathtools/MathtoolsTags.ts b/ts/input/tex/mathtools/MathtoolsTags.ts index 22c8ec693..13c18a317 100644 --- a/ts/input/tex/mathtools/MathtoolsTags.ts +++ b/ts/input/tex/mathtools/MathtoolsTags.ts @@ -20,7 +20,7 @@ * @author dpvc@mathjax.org (Davide P. Cervone) */ -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { ParserConfiguration } from '../Configuration.js'; import { TeX } from '../../tex.js'; import { AbstractTags, TagsFactory } from '../Tags.js'; @@ -90,7 +90,7 @@ export function MathtoolsTagFormat( const forms = jax.parseOptions.options.mathtools.tagforms; for (const form of Object.keys(forms)) { if (!Array.isArray(forms[form]) || forms[form].length !== 3) { - throw new TexError(COMPONENT, 'InvalidTagFormDef', form); + texError(COMPONENT, 'InvalidTagFormDef', form); } this.mtFormats.set(form, forms[form] as [string, string, string]); } diff --git a/ts/input/tex/mathtools/MathtoolsUtil.ts b/ts/input/tex/mathtools/MathtoolsUtil.ts index 1d724e9e3..99ac61db7 100644 --- a/ts/input/tex/mathtools/MathtoolsUtil.ts +++ b/ts/input/tex/mathtools/MathtoolsUtil.ts @@ -23,7 +23,7 @@ import { EqnArrayItem } from '../base/BaseItems.js'; import { UnitUtil } from '../UnitUtil.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { lookup } from '../../../util/Options.js'; import { MmlNode } from '../../../core/MmlTree/MmlNode.js'; import { HandlerType } from '../HandlerTypes.js'; @@ -71,7 +71,7 @@ export const MathtoolsUtil = { checkAlignment(parser: TexParser, name: string): EqnArrayItem { const top = parser.stack.Top() as EqnArrayItem; if (top.kind !== EqnArrayItem.prototype.kind) { - throw new TexError(COMPONENT, 'NotInAlignment', name); + texError(COMPONENT, 'NotInAlignment', name); } return top; }, @@ -88,7 +88,7 @@ export const MathtoolsUtil = { */ addPairedDelims(parser: TexParser, cs: string, args: string[]) { if (parser.configuration.handlers.get(HandlerType.MACRO).contains(cs)) { - throw new TexError(COMPONENT, 'CommadExists', `\\${cs}`); + texError(COMPONENT, 'CommadExists', `\\${cs}`); } NewcommandUtil.addMacro( parser, @@ -125,7 +125,7 @@ export const MathtoolsUtil = { plusOrMinus(name: string, n: string): string { n = n.trim(); if (!n.match(/^[-+]?(?:\d+(?:\.\d*)?|\.\d+)$/)) { - throw new TexError(COMPONENT, 'NotANumber', name); + texError(COMPONENT, 'NotANumber', name); } return n.match(/^[-+]/) ? n : '+' + n; }, diff --git a/ts/input/tex/mhchem/MhchemConfiguration.ts b/ts/input/tex/mhchem/MhchemConfiguration.ts index 4923008a1..3b610ad74 100644 --- a/ts/input/tex/mhchem/MhchemConfiguration.ts +++ b/ts/input/tex/mhchem/MhchemConfiguration.ts @@ -26,7 +26,7 @@ import { Configuration } from '../Configuration.js'; import { CommandMap, CharacterMap } from '../TokenMap.js'; import { Token } from '../Token.js'; import { ParseMethod } from '../Types.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import TexParser from '../TexParser.js'; import BaseMethods from '../base/BaseMethods.js'; import { AmsMethods } from '../ams/AmsMethods.js'; @@ -105,7 +105,7 @@ export const MhchemMethods: { [key: string]: ParseMethod } = { tex = tex.replace(pattern, name as string); } } catch (err) { - throw new TexError(null, err[0], err[1]); + texError(null, err[0], err[1]); } parser.string = tex + parser.string.substring(parser.i); parser.i = 0; diff --git a/ts/input/tex/newcommand/NewcommandItems.ts b/ts/input/tex/newcommand/NewcommandItems.ts index 10482c83b..d8985e312 100644 --- a/ts/input/tex/newcommand/NewcommandItems.ts +++ b/ts/input/tex/newcommand/NewcommandItems.ts @@ -21,7 +21,7 @@ * @author v.sorge@mathjax.org (Volker Sorge) */ -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { CheckType, BaseItem, StackItem } from '../StackItem.js'; import { COMPONENT } from './__locales__/Component.js'; @@ -54,7 +54,7 @@ export class BeginEnvItem extends BaseItem { // @test Newenvironment Empty, Newenvironment Align if (item.getName() !== this.getName()) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc\end{equation} - throw new TexError( + texError( COMPONENT, 'EnvBadEnd', this.getName(), @@ -65,7 +65,7 @@ export class BeginEnvItem extends BaseItem { } if (item.isKind('stop')) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc - throw new TexError(COMPONENT, 'EnvMissingEnd', this.getName()); + texError(COMPONENT, 'EnvMissingEnd', this.getName()); } // @test Newenvironment Empty, Newenvironment Align return super.checkItem(item); diff --git a/ts/input/tex/newcommand/NewcommandMethods.ts b/ts/input/tex/newcommand/NewcommandMethods.ts index 4ad4dff38..d43ce9c8f 100644 --- a/ts/input/tex/newcommand/NewcommandMethods.ts +++ b/ts/input/tex/newcommand/NewcommandMethods.ts @@ -23,7 +23,7 @@ import { HandlerType } from '../HandlerTypes.js'; import { ParseResult, ParseMethod } from '../Types.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import TexParser from '../TexParser.js'; import * as sm from '../TokenMap.js'; import { Token } from '../Token.js'; @@ -217,7 +217,7 @@ const NewcommandMethods: { [key: string]: ParseMethod } = { parser.GetNext(); if (params[0] && !NewcommandUtil.MatchParam(parser, params[0])) { // @test Missing Arguments - throw new TexError(COMPONENT, 'MismatchUseDef', name); + texError(COMPONENT, 'MismatchUseDef', name); } if (argCount) { for (let i = 0; i < argCount; i++) { diff --git a/ts/input/tex/newcommand/NewcommandUtil.ts b/ts/input/tex/newcommand/NewcommandUtil.ts index fef773426..bb7ff956d 100644 --- a/ts/input/tex/newcommand/NewcommandUtil.ts +++ b/ts/input/tex/newcommand/NewcommandUtil.ts @@ -24,7 +24,7 @@ import { HandlerType } from '../HandlerTypes.js'; import { SubHandler } from '../MapHandler.js'; import { UnitUtil } from '../UnitUtil.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import TexParser from '../TexParser.js'; import { Macro, Token } from '../Token.js'; import { Args, Attributes, ParseMethod } from '../Types.js'; @@ -59,7 +59,7 @@ export const NewcommandUtil = { const c = parser.GetNext(); if (c !== '\\') { // @test No CS - throw new TexError(COMPONENT, 'MissingCS', cmd); + texError(COMPONENT, 'MissingCS', cmd); } const cs = UnitUtil.trimSpaces(parser.GetArgument(cmd)).substring(1); this.checkProtectedMacros(parser, cs); @@ -81,7 +81,7 @@ export const NewcommandUtil = { } if (!cs.match(/^(.|[a-z]+)$/i)) { // @test Illegal CS - throw new TexError(COMPONENT, 'IllegalControlSequenceName', name); + texError(COMPONENT, 'IllegalControlSequenceName', name); } this.checkProtectedMacros(parser, cs); return cs; @@ -102,7 +102,7 @@ export const NewcommandUtil = { n = UnitUtil.trimSpaces(n); if (!n.match(/^[0-9]+$/)) { // @test Illegal Argument Number - throw new TexError(COMPONENT, 'IllegalParamNumber', name); + texError(COMPONENT, 'IllegalParamNumber', name); } } return n; @@ -135,11 +135,11 @@ export const NewcommandUtil = { c = parser.string.charAt(++parser.i); if (!c.match(/^[1-9]$/)) { // @test Illegal Hash - throw new TexError(COMPONENT, 'CantUseHash2', cs); + texError(COMPONENT, 'CantUseHash2', cs); } if (parseInt(c) !== ++n) { // @test No Sequence - throw new TexError(COMPONENT, 'SequentialParam', cs); + texError(COMPONENT, 'SequentialParam', cs); } i = parser.i + 1; } else if (c === '{') { @@ -166,7 +166,7 @@ export const NewcommandUtil = { parser.i++; } // @test No Replacement - throw new TexError(COMPONENT, 'MissingReplacementString', cmd); + texError(COMPONENT, 'MissingReplacementString', cmd); }, /** @@ -220,7 +220,7 @@ export const NewcommandUtil = { } } // @test Runaway Argument - throw new TexError(COMPONENT, 'RunawayArgument', name); + texError(COMPONENT, 'RunawayArgument', name); }, /** @@ -284,7 +284,7 @@ export const NewcommandUtil = { */ checkProtectedMacros(parser: TexParser, cs: string) { if (parser.options.protectedMacros?.includes(cs)) { - throw new TexError(COMPONENT, 'ProtectedMacro', `\\${cs}`); + texError(COMPONENT, 'ProtectedMacro', `\\${cs}`); } }, diff --git a/ts/input/tex/physics/PhysicsMethods.ts b/ts/input/tex/physics/PhysicsMethods.ts index e6146504f..2c5216a0b 100644 --- a/ts/input/tex/physics/PhysicsMethods.ts +++ b/ts/input/tex/physics/PhysicsMethods.ts @@ -25,7 +25,7 @@ import { HandlerType } from '../HandlerTypes.js'; import { ParseMethod, ParseResult } from '../Types.js'; import BaseMethods from '../base/BaseMethods.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { TEXCLASS, MmlNode } from '../../../core/MmlTree/MmlNode.js'; import { ParseUtil } from '../ParseUtil.js'; import NodeUtil from '../NodeUtil.js'; @@ -246,7 +246,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { } let right = pairs[next]; if (arg && next !== '{') { - throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); + texError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } if (!right) { const empty = parser.create('node', 'mrow'); @@ -344,12 +344,12 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { big = parser.GetCS(); if (!big.match(biggs)) { // Actually a commutator error arg1 error. - throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); + texError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } next = parser.GetNext(); } if (next !== '{') { - throw new TexError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); + texError(TEX_COMPONENT, 'MissingArgFor', parser.currentCS); } const arg1 = parser.GetArgument(name); const arg2 = parser.GetArgument(name); @@ -879,7 +879,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { const arg = parser.GetArgument(name); const size = parseInt(arg, 10); if (isNaN(size)) { - throw new TexError(COMPONENT, 'InvalidNumber'); + texError(COMPONENT, 'InvalidNumber'); } if (size <= 1) { parser.string = '1' + parser.string.slice(parser.i); @@ -916,7 +916,7 @@ const PhysicsMethods: { [key: string]: ParseMethod } = { m.toString() !== arg3 || n.toString() !== arg2 ) { - throw new TexError(COMPONENT, 'InvalidNumber'); + texError(COMPONENT, 'InvalidNumber'); } n = n < 1 ? 1 : n; m = m < 1 ? 1 : m; diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 88cb08bc9..95e3e6356 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -30,7 +30,7 @@ import { import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { TeX } from '../../tex.js'; import { MathJax } from '../../../components/startup.js'; @@ -172,7 +172,7 @@ export function RequireLoad(parser: TexParser, name: string) { ? allow[name] : options.defaultAllow; if (!allowed) { - throw new TexError(COMPONENT, 'BadRequire', extension); + texError(COMPONENT, 'BadRequire', extension); } const data = Package.packages.get(extension); if (!data) { @@ -183,7 +183,7 @@ export function RequireLoad(parser: TexParser, name: string) { ); } if (data.hasFailed) { - throw new TexError(COMPONENT, 'RequireFail', name); + texError(COMPONENT, 'RequireFail', name); } const require = LOADERCONFIG[extension]?.rendererExtensions; const menu = (MathJax.startup.document as MenuMathDocument)?.menu; @@ -233,7 +233,7 @@ export const RequireMethods: { [key: string]: ParseMethod } = { Require(parser: TexParser, name: string) { const required = parser.GetArgument(name); if (required.match(/[^_a-zA-Z0-9]/) || required === '') { - throw new TexError(COMPONENT, 'BadPackageName', name); + texError(COMPONENT, 'BadPackageName', name); } RequireLoad(parser, required); parser.Push(parser.itemFactory.create('null')); diff --git a/ts/input/tex/setoptions/SetOptionsConfiguration.ts b/ts/input/tex/setoptions/SetOptionsConfiguration.ts index 969d1cf0c..b33595ed1 100644 --- a/ts/input/tex/setoptions/SetOptionsConfiguration.ts +++ b/ts/input/tex/setoptions/SetOptionsConfiguration.ts @@ -30,7 +30,7 @@ import { import { TeX } from '../../tex.js'; import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { ParseUtil } from '../ParseUtil.js'; import { Macro } from '../Token.js'; import BaseMethods from '../base/BaseMethods.js'; @@ -49,7 +49,7 @@ export const SetOptionsUtil = { */ filterPackage(parser: TexParser, extension: string): boolean { if (extension !== 'tex' && !ConfigurationHandler.get(extension)) { - throw new TexError(COMPONENT, 'NotAPackage', extension); + texError(COMPONENT, 'NotAPackage', extension); } const config = parser.options.setoptions; const options = config.allowOptions[extension]; @@ -57,7 +57,7 @@ export const SetOptionsUtil = { (options === undefined && !config.allowPackageDefault) || options === false ) { - throw new TexError(COMPONENT, 'PackageNotSettable', extension); + texError(COMPONENT, 'PackageNotSettable', extension); } return true; }, @@ -80,17 +80,17 @@ export const SetOptionsUtil = { : null; if (allow === false || (allow === null && !config.allowOptionsDefault)) { if (isTex) { - throw new TexError(COMPONENT, 'TeXOptionNotSettable', option); + texError(COMPONENT, 'TeXOptionNotSettable', option); } else { - throw new TexError(COMPONENT, 'OptionNotSettable', option, extension); + texError(COMPONENT, 'OptionNotSettable', option, extension); } } const extOptions = isTex ? parser.options : parser.options[extension]; if (!extOptions || !Object.hasOwn(extOptions, option)) { if (isTex) { - throw new TexError(COMPONENT, 'InvalidTexOption', option); + texError(COMPONENT, 'InvalidTexOption', option); } else { - throw new TexError(COMPONENT, 'InvalidOptionKey', option, extension); + texError(COMPONENT, 'InvalidOptionKey', option, extension); } } return true; diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index ce5a34686..53e23eff0 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -27,7 +27,7 @@ import TexParser from '../TexParser.js'; import { MacroMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import ParseOptions from '../ParseOptions.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { HTMLDocument } from '../../../handlers/html/HTMLDocument.js'; import { HtmlNode } from '../../../core/MmlTree/MmlNodes/HtmlNode.js'; import { HTMLDomStrings } from '../../../handlers/html/HTMLDomStrings.js'; @@ -60,7 +60,7 @@ export const HtmlNodeMethods: { [key: string]: ParseMethod } = { const end = (match[1] ? `` : '') + ''; const i = parser.string.slice(parser.i).indexOf(end); if (i < 0) { - throw new TexError( + texError( COMPONENT, 'TokenNotFoundForCommand', end, diff --git a/ts/input/tex/textmacros/TextParser.ts b/ts/input/tex/textmacros/TextParser.ts index 339fd5eb9..e364fe736 100644 --- a/ts/input/tex/textmacros/TextParser.ts +++ b/ts/input/tex/textmacros/TextParser.ts @@ -22,7 +22,7 @@ */ import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import ParseOptions from '../ParseOptions.js'; import { ParseUtil } from '../ParseUtil.js'; import { StackItem } from '../StackItem.js'; @@ -237,6 +237,6 @@ export class TextParser extends TexParser { * @param {string[]} args Any substitution args for the message */ public Error(component: string, id: string, ...args: string[]) { - throw new TexError(component, id, ...args); + texError(component, id, ...args); } } diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index 9c82bfea5..f0f9243ee 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -25,7 +25,7 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { EnvList } from '../StackItem.js'; import TexParser from '../TexParser.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; import { UnitUtil } from '../UnitUtil.js'; @@ -61,11 +61,11 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } } if (font.match(/;/)) { - throw new TexError(COMPONENT, 'BadFont', parser.currentCS); + texError(COMPONENT, 'BadFont', parser.currentCS); } const n = UnitUtil.trimSpaces(parser.GetArgument(name)).replace(/^0x/, 'x'); if (!n.match(/^(x[0-9A-Fa-f]+|[0-9]+)$/)) { - throw new TexError(COMPONENT, 'BadUnicode', parser.currentCS); + texError(COMPONENT, 'BadUnicode', parser.currentCS); } const N = parseInt(n.match(/^x/) ? '0' + n : n); if (!UnicodeCache[N]) { @@ -106,7 +106,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { RawUnicode(parser: TexParser, name: string) { const hex = parser.GetArgument(name).trim(); if (!hex.match(/^[0-9A-F]{1,6}$/)) { - throw new TexError(TEX_COMPONENT, 'BadRawUnicode', parser.currentCS); + texError(TEX_COMPONENT, 'BadRawUnicode', parser.currentCS); } const n = parseInt(hex, 16); parser.string = String.fromCodePoint(n) + parser.string.substring(parser.i); @@ -147,7 +147,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { parser.i += 2; const cs = [...parser.GetCS()]; if (cs.length > 1) { - throw new TexError( + texError( COMPONENT, 'InvalidAlphanumeric', parser.currentCS @@ -164,7 +164,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { } } if (!c) { - throw new TexError(COMPONENT, 'MissingNumber', parser.currentCS); + texError(COMPONENT, 'MissingNumber', parser.currentCS); } parser.i += match[0].length; if (c >= '0' && c <= '9') { diff --git a/ts/input/tex/verb/VerbConfiguration.ts b/ts/input/tex/verb/VerbConfiguration.ts index 7a4994068..905193cb2 100644 --- a/ts/input/tex/verb/VerbConfiguration.ts +++ b/ts/input/tex/verb/VerbConfiguration.ts @@ -27,7 +27,7 @@ import { TexConstant } from '../TexConstants.js'; import TexParser from '../TexParser.js'; import { CommandMap } from '../TokenMap.js'; import { ParseMethod } from '../Types.js'; -import TexError from '../TexError.js'; +import { texError } from '../TexError.js'; import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; @@ -44,7 +44,7 @@ const VerbMethods: { [key: string]: ParseMethod } = { const c = parser.GetNext(); const start = ++parser.i; if (c === '') { - throw new TexError(TEX_COMPONENT, 'MissingArgFor', name); + texError(TEX_COMPONENT, 'MissingArgFor', name); } while ( parser.i < parser.string.length && @@ -53,7 +53,7 @@ const VerbMethods: { [key: string]: ParseMethod } = { parser.i++; } if (parser.i === parser.string.length) { - throw new TexError(COMPONENT, 'NoClosingDelim', parser.currentCS); + texError(COMPONENT, 'NoClosingDelim', parser.currentCS); } const text = parser.string.slice(start, parser.i).replace(/ /g, '\u00A0'); parser.i++; From fcf47d91c07e2666f64e1c968a323c7d4f06f4b1 Mon Sep 17 00:00:00 2001 From: zorkow Date: Tue, 19 May 2026 13:55:46 +0200 Subject: [PATCH 54/95] fix old TexError and add tests for texError --- testsuite/tests/input/tex/Tex.test.ts | 26 ++++++++++++++++++++++---- ts/util/Locale.ts | 7 ++++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/testsuite/tests/input/tex/Tex.test.ts b/testsuite/tests/input/tex/Tex.test.ts index a13a21551..a085b0bdf 100644 --- a/testsuite/tests/input/tex/Tex.test.ts +++ b/testsuite/tests/input/tex/Tex.test.ts @@ -24,6 +24,7 @@ import { HandlerType, ConfigurationType } from '#js/input/tex/HandlerTypes.js'; import { CommandMap } from '#js/input/tex/TokenMap.js'; import { Token } from '#js/input/tex/Token.js'; import { TagsFactory } from '#js/input/tex/Tags.js'; +import { texError } from '#js/input/tex/TexError.js'; import TexError from '#js/input/tex/TexError.js'; import { ParseUtil, @@ -138,26 +139,43 @@ describe('Tags', () => { describe('TexError', () => { test('Number argument', () => { - const err = new TexError(null, 'test', 'Number: %1', 1 as any); + const err = new TexError('test', 'Number: %1', 1 as any); expect(err.message).toBe('Number: 1'); }); test('Braced insertion', () => { - const err = new TexError(null, 'test', 'Msg: %{1}, Number: %{2}', 'OK', 2 as any); + const err = new TexError('test', 'Msg: %{1}, Number: %{2}', 'OK', 2 as any); expect(err.message).toBe('Msg: OK, Number: 2'); }); test.skip('Plural', () => { - const err = new TexError(null, 'test', '%{plural:%1|abc}', 'apple'); + const err = new TexError('test', '%{plural:%1|abc}', 'apple'); expect(err.message).toBe('%{plural:%1|abc}'); }); test('Percent', () => { - const err = new TexError(null, 'test', '10%%'); + const err = new TexError('test', '10%%'); expect(err.message).toBe('10%'); }); }); +describe('texError', () => { + test('Number argument', () => { + expect(() => texError(null, 'test', 'Number: %1', '1')) + .toThrow('Number: 1'); + }); + + test('Braced insertion', () => { + expect(() => texError(null, 'test', 'Msg: %{1}, Number: %{2}', 'OK', '2')) + .toThrow('Msg: OK, Number: 2'); + }); + + test('Percent', () => { + expect(() => texError(null, 'test', '10%%')) + .toThrow('10%'); + }); +}); + /**********************************************************************************/ setupComponents({ diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 7c8cdf330..ffb04e671 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -141,7 +141,7 @@ export class Locale { if (typeof data !== 'string') { return ''; } - return this.processMessage(message, args[0], ...args.slice(1)); + return this.processMessage(data, ...args); } /** @@ -152,14 +152,15 @@ export class Locale { * @param {string | namedData = {}} data The first argument or the object of * names arguments * @param {string[]} ...args Additional arguments (if data is a string) + * @param {...any} args * @returns {string} The processed message string with arguments substituted */ public static processMessage( message: string, data: string | namedData = {}, ...args: string[] - ): string { - if (typeof data === 'string') { + ): string { + if (typeof data !== 'object') { data = { 1: data }; for (let i = 0; i < args.length; i++) { data[i + 2] = args[i]; From 3bb0f9713644d12abcc9cfa2528085884d0f7468 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 08:05:33 -0400 Subject: [PATCH 55/95] Add German menu locale, and move loading of locales earlier so menu is propelry localized --- components/mjs/dependencies.js | 3 +- components/mjs/loader/loader.js | 13 ++- components/mjs/startup/init.js | 6 +- ts/components/startup.ts | 2 +- ts/ui/menu/MJContextMenu.ts | 5 +- ts/ui/menu/Menu.ts | 40 ++++++++- ts/ui/menu/__locales__/de.json | 146 ++++++++++++++++++++++++++++++++ ts/ui/menu/__locales__/en.json | 3 + ts/ui/menu/locales.ts | 27 ++++++ ts/util/Locale.ts | 8 +- 10 files changed, 241 insertions(+), 12 deletions(-) create mode 100644 ts/ui/menu/__locales__/de.json create mode 100644 ts/ui/menu/locales.ts diff --git a/components/mjs/dependencies.js b/components/mjs/dependencies.js index 55a80c100..7efddddb1 100644 --- a/components/mjs/dependencies.js +++ b/components/mjs/dependencies.js @@ -72,7 +72,8 @@ export const paths = { }; export const provides = { - 'startup': ['loader'], + 'startup': ['loader', 'core'], + 'loader': ['core'], 'input/tex': [ 'input/tex-base', '[tex]/ams', diff --git a/components/mjs/loader/loader.js b/components/mjs/loader/loader.js index de1d47cd4..f83c2b205 100644 --- a/components/mjs/loader/loader.js +++ b/components/mjs/loader/loader.js @@ -1,13 +1,20 @@ import './lib/loader.js'; +import '../core/core.js'; import {Loader, CONFIG} from '#js/components/loader.js'; import {combineDefaults} from '#js/components/global.js'; import {dependencies, paths, provides} from '../dependencies.js'; +import {Locale} from '#js/util/Locale.js'; + +Loader.preLoaded('loader', 'core'); combineDefaults(MathJax.config.loader, 'dependencies', dependencies); combineDefaults(MathJax.config.loader, 'paths', paths); combineDefaults(MathJax.config.loader, 'provides', provides); -Loader.load(...CONFIG.load) - .then(() => CONFIG.ready()) - .catch((message, name) => CONFIG.failed(message, name)); +let locale = MathJax.config.locale ?? Locale.current; +try { locale = localStorage.getitem('MathJax-locale') ?? locale; } catch (_err) {} +Locale.setLocale(locale) + .then(() => Loader.load(...CONFIG.load)) + .then(() => CONFIG.ready()) + .catch((message, name) => CONFIG.failed(message, name)); diff --git a/components/mjs/startup/init.js b/components/mjs/startup/init.js index 14c91abdb..4da1e1770 100644 --- a/components/mjs/startup/init.js +++ b/components/mjs/startup/init.js @@ -5,6 +5,7 @@ import '../core/core.js'; import {combineDefaults} from '#js/components/global.js'; import {dependencies, paths, provides, compatibility} from '../dependencies.js'; import {Loader, CONFIG} from '#js/components/loader.js'; +import {Locale} from '#js/util/Locale.js'; Loader.preLoaded('loader', 'startup', 'core'); @@ -14,7 +15,10 @@ combineDefaults(MathJax.config.loader, 'provides', provides); combineDefaults(MathJax.config.loader, 'source', compatibility); export function startup(ready) { - return Loader.load(...CONFIG.load) + let locale = MathJax.config.locale ?? Locale.current; + try { locale = localStorage.getItem('MathJax-locale') ?? locale; } catch (_err) {} + return Locale.setLocale(locale) + .then(() => Loader.load(...CONFIG.load)) .then(() => (ready || function () {})()) .then(() => CONFIG.ready()) .catch(error => CONFIG.failed(error)); diff --git a/ts/components/startup.ts b/ts/components/startup.ts index 7bcd89a07..20c5fe4fe 100644 --- a/ts/components/startup.ts +++ b/ts/components/startup.ts @@ -345,7 +345,7 @@ export abstract class Startup { * @returns {Promise} A promise for when the locale is loaded and ready. */ public static setLocale(): Promise { - return Locale.setLocale(MathJax.config.locale || 'en'); + return Locale.setLocale(MathJax.config.locale ?? Locale.current); } /** diff --git a/ts/ui/menu/MJContextMenu.ts b/ts/ui/menu/MJContextMenu.ts index ebebc79eb..066a74a3d 100644 --- a/ts/ui/menu/MJContextMenu.ts +++ b/ts/ui/menu/MJContextMenu.ts @@ -24,6 +24,7 @@ import { MathItem } from '../../core/MathItem.js'; import { OptionList } from '../../util/Options.js'; import { JaxList } from './Menu.js'; +import { localize } from './__locales__/Component.js'; import { ExplorerMathItem } from '../../a11y/explorer.js'; import { @@ -167,7 +168,9 @@ export class MJContextMenu extends ContextMenu { const input = this.mathItem.inputJax.name; const original = this.findID('Show', 'Original'); original.content = - input === 'MathML' ? 'Original MathML' : input + ' Commands'; + input === 'MathML' + ? localize('OriginalMathML') + : localize('Commands', input); const clipboard = this.findID('Copy', 'Original'); clipboard.content = original.content; } diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts index ecc766a40..e2606ccc9 100644 --- a/ts/ui/menu/Menu.ts +++ b/ts/ui/menu/Menu.ts @@ -46,9 +46,11 @@ import { RadioCompare } from './RadioCompare.js'; import { MmlVisitor } from './MmlVisitor.js'; import { MenuMathDocument } from './MenuHandler.js'; import * as MenuUtil from './MenuUtil.js'; +import { locales } from './locales.js'; import { Parser, Rule, CssStyles, Submenu } from './mj-context-menu.js'; +import { Locale } from '../../util/Locale.js'; import { COMPONENT, localize } from './__locales__/Component.js'; export { COMPONENT }; @@ -103,6 +105,7 @@ export interface MenuSettings { infoType: boolean; inTabOrder: boolean; locale: string; + language: string; magnification: string; magnify: string; speech: boolean; @@ -133,6 +136,11 @@ export class Menu { */ public static MENU_STORAGE = 'MathJax-Menu-Settings'; + /** + * The key for the localStorage for the locale settings + */ + public static LOCALE_STORAGE = 'MathJax-locale'; + /** * The options for the menu, including the default settings, the various output jax * and the list of annotation types and their encodings @@ -146,6 +154,7 @@ export class Menu { zoom: 'NoZoom', zscale: '200%', renderer: 'CHTML', + language: 'en', alt: true, cmd: false, ctrl: false, @@ -546,6 +555,7 @@ export class Menu { */ protected initSettings() { this.settings = this.options.settings; + this.settings.language = MathJax.config.locale ?? Locale.current; this.jax = this.options.jax; const jax = this.document.outputJax; this.jax[jax.name] = jax; @@ -587,6 +597,7 @@ export class Menu { this.variable('overflow', (overflow) => this.setOverflow(overflow) ), + this.variable('language', (locale) => this.setLanguage(locale)), this.variable('breakInline', (breaks) => this.setInlineBreaks(breaks) ), @@ -716,7 +727,7 @@ export class Menu { this.checkbox('texHints', 'texHints'), this.checkbox('semantics', 'semantics'), ]), - this.submenu('Language'), + this.submenu('Language', this.languageSubmenu()), this.rule(), this.submenu('ZoomTrigger', [ this.command('ZoomNow', () => this.zoom(null, '')), @@ -972,6 +983,7 @@ export class Menu { } else { localStorage.removeItem(Menu.MENU_STORAGE); } + localStorage.setItem(Menu.LOCALE_STORAGE, this.settings.language); } catch (err) { console.log(localize('StorageError', err.message)); } @@ -1290,6 +1302,16 @@ export class Menu { this.rerender(STATE.COMPILED); } + /** + * @param {string} locale The interface language locale + */ + protected setLanguage(locale: string) { + Locale.setLocale(locale).then(() => { + this.initMenu(); + this.rerender(); + }); + } + /** * Rerender when the role description changes */ @@ -1874,6 +1896,22 @@ export class Menu { }; } + /** + * Create the Languages submenu entries. + * + * @returns {object[]} The submenu definitions + */ + public languageSubmenu(): object[] { + return (locales as [string, string][]).map(([locale, name]) => { + return { + type: 'radio', + id: locale, + content: `${name} (${locale})`, + variable: 'language', + }; + }); + } + /** * Create JSON for a submenu item * diff --git a/ts/ui/menu/__locales__/de.json b/ts/ui/menu/__locales__/de.json new file mode 100644 index 000000000..0badab345 --- /dev/null +++ b/ts/ui/menu/__locales__/de.json @@ -0,0 +1,146 @@ +{ + "150%": "150%", + "175%": "175%", + "200%": "200%", + "250%": "250%", + "300%": "300%", + "400%": "400%", + "500%": "500%", + "A11yLanguage": "Sprache", + "About": "Über MathJax", + "Accessibility": "\u00A0\u00A0 Barrierefreiheit:", + "Alt": "Alt", + "AssistiveMml": "Verstecktes MathML einbeziehen", + "AutoCollapse": "Automatisches Ausblenden", + "AutoVoicing": "Automatische Sprachausgabe", + "Background": "Hintergrund", + "Black": "Schwarz", + "Blue": "Blau", + "Braille": "\u00A0 \u00A0 Braille", + "BrailleCode": "Braille-Code", + "BrailleCombine": "Mit Sprachausgabe kombinieren", + "BrailleSpeech": "Sprachausgabe ersetzen", + "BreakInline": "Inline-Zeilenumbrüche zulassen", + "CHTML": "CHTML", + "Clearspeak": "Clearspeak", + "Click": "Klicken", + "Code": "Code-Format:", + "Collapsible": "Zusammenklappbare Mathematik", + "Command": "Befehl", + "Control": "Steuerelement", + "Copy": "In Zwischenablage kopieren", + "CopyAnnotation": "Anmerkung", + "Cyan": "Cyan", + "DoubleClick": "Doppelklick", + "Elide": "Elide", + "Enrich": "Semantische Anreicherung", + "Error": "Fehlermeldung", + "Explorer": " \u00A0 \u00A0 Explorer", + "Flame": "Flame", + "Foreground": "Foreground", + "Generate": "Generate", + "Green": "Green", + "Help": "MathJax-Hilfe", + "Highlight": "Highlight", + "Hover": "Hover", + "InTabOrder": "In Tab-Reihenfolge einbeziehen", + "Keyboard": "Tastatur", + "Language": "Sprache", + "Linebreak": "Zeilenumbruch", + "Magenta": "Magenta", + "Magnification": "Vergrößerung", + "MathHelp": "Hilfemeldung bei Fokus", + "MathJax": "MathJax", + "MathJax expression": "MathJax-Ausdruck", + "MathMLcode": "MathML-Code", + "MathmlIncludes": "MathML/SVG enthält", + "Mathspeak": "Mathspeak", + "Mouse": "Maus", + "NoZoom": "Kein Zoom", + "None": "Keine", + "Option": "Option", + "Options": "\u00A0 \u00A0 Optionen", + "Original": "Originalform", + "Overflow": "Überlauf", + "Prefix": "Präfix", + "Rot": "Rot", + "Renderer": "Mathematik-Renderer", + "Reset": "Auf Standardwerte zurücksetzen", + "Role": "Rolle", + "RoleDescription": "Mathematik beschreiben als", + "Rules": "Regeln:", + "SVG": "SVG", + "Scale": "Skalierung", + "ScaleAllMath": "Alle mathematischen Formeln skalieren...", + "Scroll": "Scrollen", + "SemanticInfo": "Semantische Informationen", + "Settings": "Einstellungen für mathematische Formeln", + "Shift": "Umschalt", + "Show": "Mathematik anzeigen als", + "ShowAnnotation": "Anmerkung", + "Speech": "\u00A0 \u00A0 Sprache", + "SpeechText": "Sprechtext", + "Subtitles": "Untertitel anzeigen", + "SvgImage": "SVG-Bild", + "TabSelects": "Tabulator-Fokus auf", + "TreeColoring": "Baumfärbung", + "TriggerRequires": "Trigger erfordert:", + "Truncate": "Kürzen", + "Type": "Typ", + "White": "Weiß", + "WideExpressions": "Breite Ausdrücke", + "Yellow": "Gelb", + "ZoomFactor": "Zoomfaktor", + "ZoomNow": "Jetzt einmal zoomen", + "ZoomTrigger": "Zoom-Auslöser", + "all": "Gesamter Ausdruck", + "clearspeak-default": "Auto", + "clickable math": "anklickbare Mathematik", + "euro": "Euro", + "explorable math": "Erkundbare Mathematik", + "last": "Zuletzt erkundeter Knoten", + "math": "Mathematik", + "mathspeak-brief": "Kurz", + "mathspeak-default": "Ausführlich", + "mathspeak-sbrief": "Superkurz", + "nemeth": "Nemeth", + "none": "none", + "semantics": "Original als Anmerkung", + "showSRE": "Semantische Attribute", + "showTex": "LaTeX-Attribute", + "texHints": "TeX-Hinweise", + "ueb": "UEB", + + "OriginalMathML": "Original MathML", + "Commands": "%1 Befehle", + + "InputJax": "Input Jax: %1", + "OutputJax": "Output Jax: %1", + "DocType": "Dokumenttyp: %1", + "Modules": "Geladene Module:", + + "HelpTitle": "MathJax-Hilfe", + "HelpMessage": "

MathJax ist eine JavaScript-Bibliothek, die es Seitenautoren ermöglicht, mathematische Formeln in ihre Webseiten einzubinden. Als Leser müssen Sie nichts tun, um dies zu nutzen.

Browser: MathJax funktioniert mit allen modernen Browsern, einschließlich Edge, Firefox, Chrome, Safari, Opera und den meisten mobilen Browsern.

Mathematik-Menü: MathJax fügt den Formeln ein Kontextmenü hinzu. Klicken Sie mit der rechten Maustaste oder bei gedrückter STRG-Taste auf eine beliebige mathematische Formel, um das Menü aufzurufen.

Mathematik anzeigen als: Mit diesen Optionen können Sie den Quellcode der Formel (als MathML oder im Originalformat) anzeigen.

In die Zwischenablage kopieren: Diese Optionen kopieren den Quellcode der Formel als MathML oder im Originalformat in die Zwischenablage (in Browsern, die dies unterstützen).

Mathematik-Einstellungen: Hiermit können Sie Funktionen von MathJax steuern, wie z. B. die Größe der mathematischen Ausdrücke, den Mechanismus zur Darstellung von Gleichungen und den Umgang mit zu breiten Gleichungen, sowie die Sprache, die für die Menüs und Fehlermeldungen von MathJax verwendet werden soll (in Version 4 noch nicht implementiert).

Barrierefreiheit: MathJax kann mit Bildschirmleseprogrammen zusammenarbeiten, um Mathematik für Sehbehinderte zugänglich zu machen. Aktivieren Sie die Sprach- oder Braille-Generierung, um die Erstellung von Sprachausgaben und die Möglichkeit zur interaktiven Untersuchung von Ausdrücken zu ermöglichen. Sie können den Stil des Explorers über dessen Menü steuern.

Mathematik-Zoom: Wenn Sie Schwierigkeiten haben, eine Gleichung zu lesen, MathJax kann die Darstellung vergrößern, damit Sie sie besser erkennen können, oder Sie können alle mathematischen Formeln auf der Seite vergrößern. Aktivieren Sie diese Funktionen im Menü Mathematik-Einstellungen.

Einstellungen: MathJax nutzt die localStorage-Datenbank Ihres Browsers, um die über dieses Menü festgelegten Einstellungen lokal in Ihrem Browser zu speichern. Diese werden nicht dazu verwendet, Sie zu verfolgen, und werden von MathJax in keiner Weise übertragen oder aus der Ferne genutzt.

", + + "MmlTitle": "MathJax-MathML-Ausdruck", + "SourceTitle": "MathJax-Originalquelle", + "AnnotationTitle": "MathJax-Anmerkungstext", + "SvgTitle": "MathJax-SVG-Bild", + "SpeechTitle": "MathJax-Sprechtext", + "BrailleTitle": "MathJax-Braille-Text", + "ErrorTitle": "MathJax-Fehlermeldung", + "ZoomTitle": "MathJax-vergrößerter Ausdruck", + + "StorageError": "MathJax-localStorage-Fehler: %1", + "ComponentNotLoaded": "Komponente %1 nicht geladen", + "ScalePrompt": "Alle mathematischen Formeln (im Vergleich zum umgebenden Text) um skalieren", + "ScaleNonZero": "Der Skalierungsfaktor darf nicht Null sein", + "ScalePercent": "Der Skalierungsfaktor muss ein Prozentsatz sein (z. B. 120 %)", + "NoSvgProduced": "SVG kann nicht erzeugt werden.
Versuchen Sie zunächst, zur SVG-Ausgabe zu wechseln.", + + "ClearspeakTitle": "Clearspeak-Einstellungen", + "SelectPrefs": "Einstellungen auswählen", + "NoPrefs": "Keine Einstellungen", + "CurrentPrefs": "Aktuelle Einstellungen", + "PrefsFor": "Einstellungen für %1" +} diff --git a/ts/ui/menu/__locales__/en.json b/ts/ui/menu/__locales__/en.json index ee0525172..83b2af7ea 100644 --- a/ts/ui/menu/__locales__/en.json +++ b/ts/ui/menu/__locales__/en.json @@ -111,6 +111,9 @@ "texHints": "TeX hints", "ueb": "UEB", + "OriginalMathML": "Original MathML", + "Commands": "%1 Commands", + "InputJax": "Input Jax: %1", "OutputJax": "Outut Jax: %1", "DocType": "Document Type: %1", diff --git a/ts/ui/menu/locales.ts b/ts/ui/menu/locales.ts new file mode 100644 index 000000000..97784faad --- /dev/null +++ b/ts/ui/menu/locales.ts @@ -0,0 +1,27 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Lists the locales available in the Language menu. + * + * @author dpvc@mathjax.org (Davide Cervone) + */ + +export const locales = [ + ['en', 'English'], + ['de', 'Deutsch'], +]; diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 1ac72a89d..db5172039 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -73,7 +73,7 @@ export class Locale { * The locale files to load for each locale (as registered by the components) */ protected static locations: { [component: string]: [string, Set] } = - {}; + Object.create(null); /** * Registers a given component's locale directory @@ -97,7 +97,7 @@ export class Locale { * * @param {string} component The component's name (e.g., [tex]/bbox) * @param {string} locale The locale for the messages - * @param {messageData} data The messages indexed byu their IDs + * @param {messageData} data The messages indexed by their IDs */ public static registerMessages( component: string, @@ -105,11 +105,11 @@ export class Locale { data: messageData ) { if (!this.data[component]) { - this.data[component] = {}; + this.data[component] = Object.create(null); } const cdata = this.data[component]; if (!cdata[locale]) { - cdata[locale] = {}; + cdata[locale] = Object.create(null); } Object.assign(cdata[locale], data); } From 31cfb2d87cf7d3661b5fc8f0e320616ab9a0b182 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 15:19:52 -0400 Subject: [PATCH 56/95] Have loader set the locale so any new locale files will be loaded. --- ts/components/loader.ts | 7 +++++++ ts/input/tex/require/RequireConfiguration.ts | 7 +------ ts/ui/menu/Menu.ts | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ts/components/loader.ts b/ts/components/loader.ts index 4ebd2ef48..77a94c9be 100644 --- a/ts/components/loader.ts +++ b/ts/components/loader.ts @@ -41,6 +41,7 @@ import { import { FunctionList } from '../util/FunctionList.js'; import { mjxRoot } from '#root/root.js'; import { context } from '../util/context.js'; +import { Locale } from '../util/Locale.js'; /** * Function used to determine path to a given package. @@ -255,6 +256,12 @@ export const Loader = { // this.nestedLoads.splice(this.nestedLoads.indexOf(nested), 1); return result; + }).then(async (result) => { + // + // If any of the components registered localization files, load them. + // + await Locale.setLocale(); + return result; }); // // Add this load promise to the lists for any parent load() call that are diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 88cb08bc9..a44178a30 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -39,7 +39,6 @@ import { Loader, CONFIG as LOADERCONFIG } from '../../../components/loader.js'; import { mathjax } from '../../../mathjax.js'; import { expandable } from '../../../util/Options.js'; import { MenuMathDocument } from '../../../ui/menu/MenuHandler.js'; -import { Locale } from '../../../util/Locale.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; @@ -176,11 +175,7 @@ export function RequireLoad(parser: TexParser, name: string) { } const data = Package.packages.get(extension); if (!data) { - mathjax.retryAfter( - Loader.load(extension) - .then(() => Locale.setLocale()) - .catch((_) => {}) - ); + mathjax.retryAfter(Loader.load(extension).catch((_) => {})); } if (data.hasFailed) { throw new TexError(COMPONENT, 'RequireFail', name); diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts index e2606ccc9..a7aebd3b6 100644 --- a/ts/ui/menu/Menu.ts +++ b/ts/ui/menu/Menu.ts @@ -1308,7 +1308,7 @@ export class Menu { protected setLanguage(locale: string) { Locale.setLocale(locale).then(() => { this.initMenu(); - this.rerender(); + this.rerender(STATE.COMPILED); }); } From 81bb6bf63d8aed372c7a658c66af0dea1c33b287 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 15:35:17 -0400 Subject: [PATCH 57/95] Fixed typo in jsdoc. --- components/bin/copy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/bin/copy b/components/bin/copy index ea0db6520..78abd3d3f 100755 --- a/components/bin/copy +++ b/components/bin/copy @@ -70,11 +70,11 @@ const bundleDir = path.resolve(parent, bundle); /** * Copy a file or directory tree * - * @param {string} from The directory to copy from - * @param {string} to The directory to copy to - * @param {string} name The name of the file or directory to copy - * @param {string[]} eclude The files to exclude - * @param {string} space The indentation for output + * @param {string} from The directory to copy from + * @param {string} to The directory to copy to + * @param {string} name The name of the file or directory to copy + * @param {string[]} excludes The files to exclude + * @param {string} space The indentation for output */ function copyFile(from, to, name, excludes, space = '') { !fs.existsSync(to) && fs.mkdirSync(to, {recursive: true}); From fb21ba803a9dc655aa21f50e03dbc0e15cccb71e Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 15:39:27 -0400 Subject: [PATCH 58/95] Update ts/input/tex/mhchem/__locales__/Component.ts Co-authored-by: Volker Sorge --- ts/input/tex/mhchem/__locales__/Component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/input/tex/mhchem/__locales__/Component.ts b/ts/input/tex/mhchem/__locales__/Component.ts index 98a270a40..b4a1f111b 100644 --- a/ts/input/tex/mhchem/__locales__/Component.ts +++ b/ts/input/tex/mhchem/__locales__/Component.ts @@ -25,4 +25,4 @@ import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/mhchem'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/bbox'); +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mhchem); From a7b43172c689c461214a91bd8515ac70f07e1682 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 16:11:24 -0400 Subject: [PATCH 59/95] Remove setLocale from startup defaultReady, since it will already have been done by the loader --- ts/components/startup.ts | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/ts/components/startup.ts b/ts/components/startup.ts index 20c5fe4fe..00e7be451 100644 --- a/ts/components/startup.ts +++ b/ts/components/startup.ts @@ -43,7 +43,6 @@ import { DOMAdaptor } from '../core/DOMAdaptor.js'; import { PrioritizedList } from '../util/PrioritizedList.js'; import { OptionList, OPTIONS } from '../util/Options.js'; import { context } from '../util/context.js'; -import { Locale } from '../util/Locale.js'; import { TeX } from '../input/tex.js'; @@ -308,8 +307,7 @@ export abstract class Startup { public static defaultReady() { Startup.getComponents(); Startup.makeMethods(); - Startup.setLocale() - .then(() => Startup.pagePromise) + Startup.pagePromise .then(() => CONFIG.pageReady()) // usually the initial typesetting call .then(() => Startup.promiseResolve()) .catch((err) => Startup.promiseReject(err)); @@ -339,15 +337,6 @@ export abstract class Startup { .then(() => Startup.promiseResolve()); } - /** - * Set the locale and load any needed locale data files. - * - * @returns {Promise} A promise for when the locale is loaded and ready. - */ - public static setLocale(): Promise { - return Locale.setLocale(MathJax.config.locale ?? Locale.current); - } - /** * The default OptionError function */ From 323fe88880132c466d26a82a358c1595b13973eb Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 16:29:35 -0400 Subject: [PATCH 60/95] Fixes for prettier --- ts/components/loader.ts | 122 ++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 60 deletions(-) diff --git a/ts/components/loader.ts b/ts/components/loader.ts index 77a94c9be..d29382859 100644 --- a/ts/components/loader.ts +++ b/ts/components/loader.ts @@ -202,67 +202,69 @@ export const Loader = { // // Create a promise for this load() call // - const promise = Promise.resolve().then(async () => { - // - // Collect the promises for all the named packages, - // creating the package if needed, and add checks - // for the version numbers used in the components. - // - const promises = []; - for (const name of names) { - let extension = Package.packages.get(name); - if (!extension) { - extension = new Package(name); - extension.provides(CONFIG.provides[name]); + const promise = Promise.resolve() + .then(async () => { + // + // Collect the promises for all the named packages, + // creating the package if needed, and add checks + // for the version numbers used in the components. + // + const promises = []; + for (const name of names) { + let extension = Package.packages.get(name); + if (!extension) { + extension = new Package(name); + extension.provides(CONFIG.provides[name]); + } + extension.checkNoLoad(); + promises.push( + extension.promise.then(() => { + if ( + CONFIG.versionWarnings && + extension.isLoaded && + !Loader.versions.has(Package.resolvePath(name)) + ) { + console.warn( + `No version information available for component ${name}` + ); + } + return extension.result; + }) as Promise + ); } - extension.checkNoLoad(); - promises.push( - extension.promise.then(() => { - if ( - CONFIG.versionWarnings && - extension.isLoaded && - !Loader.versions.has(Package.resolvePath(name)) - ) { - console.warn( - `No version information available for component ${name}` - ); - } - return extension.result; - }) as Promise - ); - } - // - // Load everything that was requested and wait for - // them to be loaded. - // - Package.loadAll(); - const result = await Promise.all(promises); - // - // If any other loads occurred while we were waiting, - // Wait for those promises, and clear the list so that - // if even MORE loads occur while waiting for those, - // we can wait for them, too. Keep doing that until - // no additional loads occurred, in which case we are - // now done. - // - while (nested.length) { - const promise = Promise.all(nested); - nested = this.nestedLoads[this.nestedLoads.indexOf(nested)] = []; - await promise; - } - // - // Remove the (empty) list from the nested list, - // and return the result. - // - this.nestedLoads.splice(this.nestedLoads.indexOf(nested), 1); - return result; - }).then(async (result) => { - // - // If any of the components registered localization files, load them. - // - await Locale.setLocale(); - return result; - }); + // + // Load everything that was requested and wait for + // them to be loaded. + // + Package.loadAll(); + const result = await Promise.all(promises); + // + // If any other loads occurred while we were waiting, + // Wait for those promises, and clear the list so that + // if even MORE loads occur while waiting for those, + // we can wait for them, too. Keep doing that until + // no additional loads occurred, in which case we are + // now done. + // + while (nested.length) { + const promise = Promise.all(nested); + nested = this.nestedLoads[this.nestedLoads.indexOf(nested)] = []; + await promise; + } + // + // Remove the (empty) list from the nested list, + // and return the result. + // + this.nestedLoads.splice(this.nestedLoads.indexOf(nested), 1); + return result; + }) + .then(async (result) => { + // + // If any of the components registered localization files, load them. + // + await Locale.setLocale(); + return result; + }); // // Add this load promise to the lists for any parent load() call that are // pending when this load() was performed, then return the load promise. From bf6db9eef8383184139257ae5469c04b1ecf4347 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 19:50:34 -0400 Subject: [PATCH 61/95] Remove unneeded copy blocks from braket and texhtml component config files --- .../mjs/input/tex/extensions/braket/config.json | 13 ------------- .../mjs/input/tex/extensions/texhtml/config.json | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/components/mjs/input/tex/extensions/braket/config.json b/components/mjs/input/tex/extensions/braket/config.json index 8eafcec10..b548fd447 100644 --- a/components/mjs/input/tex/extensions/braket/config.json +++ b/components/mjs/input/tex/extensions/braket/config.json @@ -6,19 +6,6 @@ "input/tex/braket" ] }, - "copy": { - "to": "[bundle]/input/tex/extensions/braket", - "from": "[ts]/input/tex/braket", - "copy": [ - "__locales__" - ] - }, - "copy": { - "to": "[bundle]/input/tex/extensions/braket", - "from": "[ts]/input/tex/braket", - "copy": ["__locales__"], - "excludes": ["__locales__/Component.ts"] - }, "webpack": { "name": "input/tex/extensions/braket", "libs": [ diff --git a/components/mjs/input/tex/extensions/texhtml/config.json b/components/mjs/input/tex/extensions/texhtml/config.json index 177b1bd19..ec464a094 100644 --- a/components/mjs/input/tex/extensions/texhtml/config.json +++ b/components/mjs/input/tex/extensions/texhtml/config.json @@ -6,19 +6,6 @@ "input/tex/texhtml" ] }, - "copy": { - "to": "[bundle]/input/tex/extensions/texhtml", - "from": "[ts]/input/tex/texhtml", - "copy": [ - "__locales__" - ] - }, - "copy": { - "to": "[bundle]/input/tex/extensions/texhtml", - "from": "[ts]/input/tex/texhtml", - "copy": ["__locales__"], - "excludes": ["__locales__/Component.ts"] - }, "webpack": { "name": "input/tex/extensions/texhtml", "libs": [ From a09a1fab829bfa5ac0de0306f593f0059104c94f Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 20:08:55 -0400 Subject: [PATCH 62/95] Fix braket and texhtml loading wrong locale component files --- ts/input/tex/braket/BraketConfiguration.ts | 1 - ts/input/tex/texhtml/TexHtmlConfiguration.ts | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ts/input/tex/braket/BraketConfiguration.ts b/ts/input/tex/braket/BraketConfiguration.ts index 3e2d755e2..344e88e52 100644 --- a/ts/input/tex/braket/BraketConfiguration.ts +++ b/ts/input/tex/braket/BraketConfiguration.ts @@ -25,7 +25,6 @@ import { HandlerType, ConfigurationType } from '../HandlerTypes.js'; import { Configuration } from '../Configuration.js'; import { BraketItem } from './BraketItems.js'; import './BraketMappings.js'; -export { COMPONENT } from './__locales__/Component.js'; export const BraketConfiguration = Configuration.create('braket', { [ConfigurationType.HANDLER]: { diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 422cd580e..ce5a34686 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -32,8 +32,7 @@ import { HTMLDocument } from '../../../handlers/html/HTMLDocument.js'; import { HtmlNode } from '../../../core/MmlTree/MmlNodes/HtmlNode.js'; import { HTMLDomStrings } from '../../../handlers/html/HTMLDomStrings.js'; import { DOMAdaptor } from '../../../core/DOMAdaptor.js'; -import { COMPONENT } from './__locales__/Component.js'; -export { COMPONENT }; +import { COMPONENT } from '../__locales__/Component.js'; export const HtmlNodeMethods: { [key: string]: ParseMethod } = { /** From ab7ffb62daa6f8b20077d5a32e330ef21cf5d835 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 19 May 2026 20:29:33 -0400 Subject: [PATCH 63/95] Fix component for error message and add missing quote --- ts/input/tex/mhchem/MhchemConfiguration.ts | 2 +- ts/input/tex/mhchem/__locales__/Component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/input/tex/mhchem/MhchemConfiguration.ts b/ts/input/tex/mhchem/MhchemConfiguration.ts index cc00be68b..9d75ba4c8 100644 --- a/ts/input/tex/mhchem/MhchemConfiguration.ts +++ b/ts/input/tex/mhchem/MhchemConfiguration.ts @@ -119,7 +119,7 @@ export const MhchemMethods: { [key: string]: ParseMethod } = { throw new TexError(COMPONENT, 'MhchemBug', id.charAt(9)); } } - throw new TexError('[tex]/base', id); + throw new TexError('input/tex', id); } parser.string = tex + parser.string.substring(parser.i); parser.i = 0; diff --git a/ts/input/tex/mhchem/__locales__/Component.ts b/ts/input/tex/mhchem/__locales__/Component.ts index b4a1f111b..66593a0d3 100644 --- a/ts/input/tex/mhchem/__locales__/Component.ts +++ b/ts/input/tex/mhchem/__locales__/Component.ts @@ -25,4 +25,4 @@ import { Locale } from '../../../../util/Locale.js'; export const COMPONENT = '[tex]/mhchem'; -Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mhchem); +Locale.registerLocaleFiles(COMPONENT, '../ts/input/tex/mhchem'); From b6a586b533aed41f2cd8944d61d52127483b1f75 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 20 May 2026 12:45:46 -0400 Subject: [PATCH 64/95] Update node-main to initialize the locale, and properly find the locale json files --- components/mjs/node-main/node-main.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/components/mjs/node-main/node-main.js b/components/mjs/node-main/node-main.js index 025e243a4..a3cb093a0 100644 --- a/components/mjs/node-main/node-main.js +++ b/components/mjs/node-main/node-main.js @@ -27,6 +27,9 @@ import {context} from '#js/util/context.js'; import '../core/core.js'; import '../adaptors/liteDOM/liteDOM.js'; import {source} from '../source.js'; +import {mathjax} from '#js/mathjax.js'; +import {Locale} from '#js/util/Locale.js'; +import {Package} from '#js/components/package.js'; const REQUIRE = eval('require'); // get require from node, not webpack const path = REQUIRE("path"); @@ -63,11 +66,10 @@ if (path.basename(dir) === 'node-main') { /* * Set the asynchronous loader to handle json files */ -MathJax._.mathjax.mathjax.asyncLoad = function (name) { - const file = resolvePath(name, (name) => path.resolve(CONFIG.paths.mathjax, name)); - return file.match(/\.json$/) - ? fs.readFile(REQUIRE.resolve(file)).then((json) => JSON.parse(json)) - : REQUIRE(file); +mathjax.asyncLoad = function (name) { + return name.match(/.json$/) + ? fs.readFile(Package.resolvePath(name)).then((json) => JSON.parse(json)) + : REQUIRE(resolvePath(name, (name) => path.resolve(CONFIG.paths.mathjax, name))); }; /* @@ -86,7 +88,8 @@ MathJax._.mathjax.mathjax.asyncLoad = function (name) { */ const init = MathJax.init = (config = {}) => { combineConfig(MathJax.config, config); - return Loader.load(...CONFIG.load) + return Locale.setLocale(MathJax.config.locale ?? Locale.current) + .then(() => Loader.load(...CONFIG.load)) .then(() => CONFIG.ready()) .then(() => MathJax.startup.promise) // Wait for MathJax to finish starting up .then(() => MathJax) // Pass MathJax global as argument to subsequent .then() calls From d519298b94cc939910c713b4526ef3c5c3c99da1 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 20 May 2026 16:07:08 -0400 Subject: [PATCH 65/95] Use REQUIRE for both json and other files, and mark it as synchronous --- components/mjs/node-main/node-main.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/components/mjs/node-main/node-main.js b/components/mjs/node-main/node-main.js index a3cb093a0..bbb67b9ab 100644 --- a/components/mjs/node-main/node-main.js +++ b/components/mjs/node-main/node-main.js @@ -33,7 +33,6 @@ import {Package} from '#js/components/package.js'; const REQUIRE = eval('require'); // get require from node, not webpack const path = REQUIRE("path"); -const fs = REQUIRE("fs").promises; const dir = context.path(MathJax.config.__dirname); // set up by node-main.mjs or node-main.cjs /* @@ -67,10 +66,15 @@ if (path.basename(dir) === 'node-main') { * Set the asynchronous loader to handle json files */ mathjax.asyncLoad = function (name) { - return name.match(/.json$/) - ? fs.readFile(Package.resolvePath(name)).then((json) => JSON.parse(json)) - : REQUIRE(resolvePath(name, (name) => path.resolve(CONFIG.paths.mathjax, name))); + return REQUIRE( + resolvePath( + name, + (name) => path.resolve(CONFIG.paths.mathjax, name), + (name) => Package.resolvePath(name) + ) + ); }; +mathjax.asyncIsSynchronous = true; /* * The initialization function. Use as: From 1f8c356f2a015b67521dc33d060ecfdc89e074fc Mon Sep 17 00:00:00 2001 From: zorkow Date: Thu, 21 May 2026 14:10:08 +0200 Subject: [PATCH 66/95] linting --- ts/input/tex/TexError.ts | 6 ++++- ts/input/tex/TexParser.ts | 7 +----- ts/input/tex/ams/AmsMethods.ts | 12 ++-------- ts/input/tex/base/BaseItems.ts | 8 +------ ts/input/tex/base/BaseMethods.ts | 24 ++++---------------- ts/input/tex/bbox/BboxConfiguration.ts | 14 ++---------- ts/input/tex/newcommand/NewcommandItems.ts | 7 +----- ts/input/tex/physics/PhysicsItems.ts | 5 ---- ts/input/tex/texhtml/TexHtmlConfiguration.ts | 7 +----- ts/input/tex/unicode/UnicodeConfiguration.ts | 6 +---- ts/util/Locale.ts | 3 +-- 11 files changed, 19 insertions(+), 80 deletions(-) diff --git a/ts/input/tex/TexError.ts b/ts/input/tex/TexError.ts index 20bbb7e48..e5b75e973 100644 --- a/ts/input/tex/TexError.ts +++ b/ts/input/tex/TexError.ts @@ -45,7 +45,11 @@ export default class TexError { * @param {string} id message id * @param {string[]} args substitution arguments */ -export function texError(component: string, id: string, ...args: string[]): never { +export function texError( + component: string, + id: string, + ...args: string[] +): never { const message = Locale.message(component, id, ...args); throw new TexError(id, message, ...args); } diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index 360921ffe..48f151972 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -510,12 +510,7 @@ export default class TexParser { } } // @test TokenNotFoundForCommand - texError( - COMPONENT, - 'TokenNotFoundForCommand', - token, - this.currentCS - ); + texError(COMPONENT, 'TokenNotFoundForCommand', token, this.currentCS); } /** diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts index 4f215e947..9b0254645 100644 --- a/ts/input/tex/ams/AmsMethods.ts +++ b/ts/input/tex/ams/AmsMethods.ts @@ -149,11 +149,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { const n = parser.GetArgument('\\begin{' + name + '}'); if (n.match(/[^0-9]/)) { // @test PositiveIntegerArg - texError( - COMPONENT, - 'PositiveIntegerArg', - '\\begin{' + name + '}' - ); + texError(COMPONENT, 'PositiveIntegerArg', '\\begin{' + name + '}'); } let count = parseInt(n, 10); while (count > 0) { @@ -630,11 +626,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = { } if (top.Size()) { // @test Shove Error (Top|Middle|Bottom) - texError( - COMPONENT, - 'CommandAtTheBeginingOfLine', - parser.currentCS - ); + texError(COMPONENT, 'CommandAtTheBeginingOfLine', parser.currentCS); } top.setProperty('shove', shove); }, diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts index 4dea07592..133450956 100644 --- a/ts/input/tex/base/BaseItems.ts +++ b/ts/input/tex/base/BaseItems.ts @@ -220,7 +220,6 @@ export class PrimeItem extends BaseItem { * expression. */ export class SubsupItem extends BaseItem { - /** * @override */ @@ -588,12 +587,7 @@ export class BeginItem extends BaseItem { if (item.isKind('end')) { if (item.getName() !== this.getName()) { // @test EnvBadEnd - texError( - COMPONENT, - 'EnvBadEnd', - this.getName(), - item.getName() - ); + texError(COMPONENT, 'EnvBadEnd', this.getName(), item.getName()); } // @test Hfill const node = this.toMml(); diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts index c4e1819bd..3621f8f04 100644 --- a/ts/input/tex/base/BaseMethods.ts +++ b/ts/input/tex/base/BaseMethods.ts @@ -990,31 +990,19 @@ const BaseMethods: { [key: string]: ParseMethod } = { switch (type) { case 'c': if (top.First) { - texError( - COMPONENT, - 'BreakFirstInEntry', - parser.currentCS + '{c}' - ); + texError(COMPONENT, 'BreakFirstInEntry', parser.currentCS + '{c}'); } top.breakAlign.cell = splitAlignArray(parser.GetArgument(name), 1); break; case 'r': if (top.row.length || top.First) { - texError( - COMPONENT, - 'BreakFirstInRow', - parser.currentCS + '{r}' - ); + texError(COMPONENT, 'BreakFirstInRow', parser.currentCS + '{r}'); } top.breakAlign.row = splitAlignArray(parser.GetArgument(name)); break; case 't': if (top.table.length || top.row.length || top.First) { - texError( - COMPONENT, - 'BreakFirstInTable', - parser.currentCS + '{t}' - ); + texError(COMPONENT, 'BreakFirstInTable', parser.currentCS + '{t}'); } top.breakAlign.table = splitAlignArray(parser.GetArgument(name)); break; @@ -1052,11 +1040,7 @@ const BaseMethods: { [key: string]: ParseMethod } = { ); if (!match) { // @test Token Invalid Attribute - texError( - COMPONENT, - 'InvalidMathMLAttr', - attr.split(/[\s\n=]/)[0] - ); + texError(COMPONENT, 'InvalidMathMLAttr', attr.split(/[\s\n=]/)[0]); } if (!node.attributes.hasDefault(match[1]) && !MmlTokenAllow[match[1]]) { // @test Token Unknown Attribute, Token Wrong Attribute diff --git a/ts/input/tex/bbox/BboxConfiguration.ts b/ts/input/tex/bbox/BboxConfiguration.ts index 00dc06941..7700752e6 100644 --- a/ts/input/tex/bbox/BboxConfiguration.ts +++ b/ts/input/tex/bbox/BboxConfiguration.ts @@ -52,12 +52,7 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Padding if (def) { // @test Bbox-Padding-Error - texError( - COMPONENT, - 'MultipleBBoxProperty', - 'Padding', - name - ); + texError(COMPONENT, 'MultipleBBoxProperty', 'Padding', name); } const pad = BBoxPadding(match[1] + match[3]); if (pad) { @@ -73,12 +68,7 @@ const BboxMethods: { [key: string]: ParseMethod } = { // @test Bbox-Background if (background) { // @test Bbox-Background-Error - texError( - COMPONENT, - 'MultipleBBoxProperty', - 'Background', - name - ); + texError(COMPONENT, 'MultipleBBoxProperty', 'Background', name); } background = part; } else if (part.match(/^[-a-z]+:/i)) { diff --git a/ts/input/tex/newcommand/NewcommandItems.ts b/ts/input/tex/newcommand/NewcommandItems.ts index d8985e312..11d6870a3 100644 --- a/ts/input/tex/newcommand/NewcommandItems.ts +++ b/ts/input/tex/newcommand/NewcommandItems.ts @@ -54,12 +54,7 @@ export class BeginEnvItem extends BaseItem { // @test Newenvironment Empty, Newenvironment Align if (item.getName() !== this.getName()) { // @test (missing) \newenvironment{env}{aa}{bb}\begin{env}cc\end{equation} - texError( - COMPONENT, - 'EnvBadEnd', - this.getName(), - item.getName() - ); + texError(COMPONENT, 'EnvBadEnd', this.getName(), item.getName()); } return [[this.factory.create('mml', this.toMml())], true]; } diff --git a/ts/input/tex/physics/PhysicsItems.ts b/ts/input/tex/physics/PhysicsItems.ts index e877a59bb..ede292204 100644 --- a/ts/input/tex/physics/PhysicsItems.ts +++ b/ts/input/tex/physics/PhysicsItems.ts @@ -42,11 +42,6 @@ export class AutoOpen extends BaseItem { */ public openCount: number = 0; - /** - * @override - */ - protected component = COMPONENT; - /** * @override */ diff --git a/ts/input/tex/texhtml/TexHtmlConfiguration.ts b/ts/input/tex/texhtml/TexHtmlConfiguration.ts index 53e23eff0..adb05ce32 100644 --- a/ts/input/tex/texhtml/TexHtmlConfiguration.ts +++ b/ts/input/tex/texhtml/TexHtmlConfiguration.ts @@ -60,12 +60,7 @@ export const HtmlNodeMethods: { [key: string]: ParseMethod } = { const end = (match[1] ? `` : '') + ''; const i = parser.string.slice(parser.i).indexOf(end); if (i < 0) { - texError( - COMPONENT, - 'TokenNotFoundForCommand', - end, - '<' + match[0] - ); + texError(COMPONENT, 'TokenNotFoundForCommand', end, '<' + match[0]); } const html = parser.string.substring(parser.i, parser.i + i).trim(); parser.i += i + 11 + (match[1] ? 3 + match[1].length : 0); diff --git a/ts/input/tex/unicode/UnicodeConfiguration.ts b/ts/input/tex/unicode/UnicodeConfiguration.ts index f0f9243ee..786e10443 100644 --- a/ts/input/tex/unicode/UnicodeConfiguration.ts +++ b/ts/input/tex/unicode/UnicodeConfiguration.ts @@ -147,11 +147,7 @@ const UnicodeMethods: { [key: string]: ParseMethod } = { parser.i += 2; const cs = [...parser.GetCS()]; if (cs.length > 1) { - texError( - COMPONENT, - 'InvalidAlphanumeric', - parser.currentCS - ); + texError(COMPONENT, 'InvalidAlphanumeric', parser.currentCS); } c = cs[0]; match = ['']; diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index ffb04e671..75f955662 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -133,9 +133,8 @@ export class Locale { data: string | namedData = {}, ...args: string[] ): string { - let message = ''; if (component) { - message = this.lookupMessage(component, id); + const message = this.lookupMessage(component, id); return this.processMessage(message, data, ...args); } if (typeof data !== 'string') { From 82017d71968cd33ca198f3fc745c46cfedd2ba6c Mon Sep 17 00:00:00 2001 From: zorkow Date: Thu, 21 May 2026 14:17:17 +0200 Subject: [PATCH 67/95] makes tag error a tex error --- ts/input/tex/Tags.ts | 4 +++- ts/input/tex/TexParser.ts | 1 - ts/input/tex/__locales__/de.json | 3 ++- ts/input/tex/__locales__/en.json | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ts/input/tex/Tags.ts b/ts/input/tex/Tags.ts index 0f62b716a..74ded1d7b 100644 --- a/ts/input/tex/Tags.ts +++ b/ts/input/tex/Tags.ts @@ -22,10 +22,12 @@ */ import TexParser from './TexParser.js'; +import { texError } from './TexError.js'; import { MmlNode } from '../../core/MmlTree/MmlNode.js'; import { MathItem } from '../../core/MathItem.js'; import { EnvList } from './StackItem.js'; import ParseOptions from './ParseOptions.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Simple class for label objects. @@ -696,7 +698,7 @@ export const TagsFactory = { create(name: string): Tags { const constr = tagsMapping.get(name) || tagsMapping.get(defaultTags); if (!constr) { - throw Error('Unknown tags class'); + texError(COMPONENT, 'UnknownTag'); } return new constr(); }, diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts index 48f151972..ba11b419a 100644 --- a/ts/input/tex/TexParser.ts +++ b/ts/input/tex/TexParser.ts @@ -35,7 +35,6 @@ import { BaseItem, StackItem, EnvList } from './StackItem.js'; import { Token } from './Token.js'; import { OptionList } from '../../util/Options.js'; import { TexConstant } from './TexConstants.js'; - import { COMPONENT } from './__locales__/Component.js'; /** diff --git a/ts/input/tex/__locales__/de.json b/ts/input/tex/__locales__/de.json index 9ff75dcf1..ff5024281 100644 --- a/ts/input/tex/__locales__/de.json +++ b/ts/input/tex/__locales__/de.json @@ -26,5 +26,6 @@ "MissingLeftExtraRight": "Missing \\left or extra \\right", "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", "MissingScript": "Fehlendes Argument für Hoch- oder Tiefstellung", - "TokenNotFoundForCommand": "Could not find %1 for %2" + "TokenNotFoundForCommand": "Could not find %1 for %2", + "UnknownTag": "Unbekannte Bezeichner Klasse" } diff --git a/ts/input/tex/__locales__/en.json b/ts/input/tex/__locales__/en.json index bc4903f58..c822ef075 100644 --- a/ts/input/tex/__locales__/en.json +++ b/ts/input/tex/__locales__/en.json @@ -26,5 +26,6 @@ "MissingLeftExtraRight": "Missing \\left or extra \\right", "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", "MissingScript": "Missing superscript or subscript argument", - "TokenNotFoundForCommand": "Could not find %1 for %2" + "TokenNotFoundForCommand": "Could not find %1 for %2", + "UnknownTag": "Unknown tags class" } From 858e0e39ba422d3f1ade0010b30adf2e46fbe499 Mon Sep 17 00:00:00 2001 From: zorkow Date: Fri, 22 May 2026 10:22:16 +0200 Subject: [PATCH 68/95] undoes Tags TexError and fixes spacing --- ts/input/tex/Tags.ts | 4 +--- ts/util/Locale.ts | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ts/input/tex/Tags.ts b/ts/input/tex/Tags.ts index 74ded1d7b..0f62b716a 100644 --- a/ts/input/tex/Tags.ts +++ b/ts/input/tex/Tags.ts @@ -22,12 +22,10 @@ */ import TexParser from './TexParser.js'; -import { texError } from './TexError.js'; import { MmlNode } from '../../core/MmlTree/MmlNode.js'; import { MathItem } from '../../core/MathItem.js'; import { EnvList } from './StackItem.js'; import ParseOptions from './ParseOptions.js'; -import { COMPONENT } from './__locales__/Component.js'; /** * Simple class for label objects. @@ -698,7 +696,7 @@ export const TagsFactory = { create(name: string): Tags { const constr = tagsMapping.get(name) || tagsMapping.get(defaultTags); if (!constr) { - texError(COMPONENT, 'UnknownTag'); + throw Error('Unknown tags class'); } return new constr(); }, diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index 75f955662..8ae96cdd0 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -148,10 +148,9 @@ export class Locale { * can be positional, or a data mapping of names to values. * * @param {string} message The message string to process. - * @param {string | namedData = {}} data The first argument or the object of + * @param {string| namedData} data The first argument or the object of * names arguments - * @param {string[]} ...args Additional arguments (if data is a string) - * @param {...any} args + * @param {string[]} args Additional arguments (if data is a string) * @returns {string} The processed message string with arguments substituted */ public static processMessage( From 43af25e9a4c23cccacd829f3b7b8448d78ceac10 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sun, 24 May 2026 06:28:00 -0400 Subject: [PATCH 69/95] Add Locale.warn() and Locale.throw(), add tests for them, and use them in several TeX packages. Move test trap functions into separate src file. --- testsuite/package.json | 1 + testsuite/src/index.ts | 1 + testsuite/src/setupTex.ts | 100 +++--------------- testsuite/src/traps.ts | 103 +++++++++++++++++++ testsuite/tests/input/tex/Tex.test.ts | 6 +- testsuite/tests/util/Locale.test.ts | 29 ++++-- ts/input/tex/Configuration.ts | 19 ++-- ts/input/tex/MapHandler.ts | 13 +-- ts/input/tex/Tags.ts | 4 +- ts/input/tex/__locales__/de.json | 15 +-- ts/input/tex/__locales__/en.json | 5 +- ts/input/tex/bussproofs/BussproofsUtil.ts | 7 +- ts/input/tex/bussproofs/__locales__/de.json | 3 +- ts/input/tex/bussproofs/__locales__/en.json | 3 +- ts/input/tex/require/RequireConfiguration.ts | 3 +- ts/input/tex/require/__locales__/de.json | 1 + ts/input/tex/require/__locales__/en.json | 1 + ts/util/Locale.ts | 21 +++- 18 files changed, 195 insertions(+), 140 deletions(-) create mode 100644 testsuite/src/traps.ts diff --git a/testsuite/package.json b/testsuite/package.json index 99c79921f..db3c260e0 100644 --- a/testsuite/package.json +++ b/testsuite/package.json @@ -14,6 +14,7 @@ "#js/*": "../mjs/*", "#source/*": "../components/mjs/*", "#src/*": "./src/*", + "#helpers/*": "./js/src/*", "#helpers": "./js/src/index.js" }, "dependencies": { diff --git a/testsuite/src/index.ts b/testsuite/src/index.ts index 2d191619d..b96084423 100644 --- a/testsuite/src/index.ts +++ b/testsuite/src/index.ts @@ -1 +1,2 @@ export * from './setupTex.js'; +export * from './traps.js'; diff --git a/testsuite/src/setupTex.ts b/testsuite/src/setupTex.ts index e65ed2bf5..fe741a992 100644 --- a/testsuite/src/setupTex.ts +++ b/testsuite/src/setupTex.ts @@ -17,14 +17,16 @@ import { mathjax } from '#js/mathjax.js'; import { OptionList } from '#js/util/Options.js'; import { tmpJsonFile } from '#src/constants.js'; import * as fs from 'fs'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore import { init } from '#source/node-main/node-main.mjs'; import { expect } from '@jest/globals'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore import { source } from '#source/source.js'; import { Locale } from '#js/util/Locale.js'; +import { + trapErrors, + trapAsyncErrors, + throwTexErrors, + throwCompileErrors, +} from './traps.js'; declare const MathJax: any; type MATHITEM = MathItem; @@ -57,87 +59,6 @@ export const toMathML = (node: MmlNode) => visitor.visitTree(node); /*********************************************************************/ -/** - * Trap output produced while running code. - * - * @param {string} method The console method to trap. - * @param {Function} code The code to run. - * @returns {string} The output sent to the given method. - */ -export function trapOutput(method: string, code: () => void): string { - const saved = (console as any)[method]; - let message = ''; - (console as any)[method] = (...msg: any[]) => { - message += (message ? '\n' : '') + msg.join(' '); - }; - code(); - (console as any)[method] = saved; - return message; -} - -/** - * Trap errors produced while running code. - * - * @param {Function} code The code to run. - * @returns {string} The error message produced. - */ -export function trapErrors(code: () => void): string { - let message = '(no error)'; - reportErrors = true; - try { - code(); - } catch (e) { - message = e.message; - } - reportErrors = false; - return message; -} - -/** - * Trap errors produced while running code. - * - * @param {Function} code The code to run. - * @returns {string} The error message produced. - */ -export async function trapAsyncErrors(code: () => Promise) { - let message = '(no error)'; - reportErrors = true; - await code().catch((e) => { - message = e.message; - }); - reportErrors = false; - return message; -} - -/** - * When true, errors will throw rather than produce merror elements. - */ -let reportErrors = false; - -/** - * Configuration that causes TeX errors to throw rather than - * generate merror elements, so we can trap them with trapErrors(). - */ -export const throwTexErrors = { - formatError(jax: any, err: Error) { - if (reportErrors) throw err; - return jax.formatError(err); - }, -}; - -/** - * Configuration that causes compile errors to throw rather than - * generate merror elements, so we can trap them with trapErrors(). - */ -export const throwCompileErrors = { - options: { - compileError(jax: any, math: any, err: Error) { - if (reportErrors) throw err; - return jax.compileError(math, err); - }, - }, -}; - /** * Trap TeX processing errors and return an expect() result * @@ -182,11 +103,12 @@ export function expectTypesetError( * * @param {string[]} packages The TeX packages to configure * @param {OptionList} options The TeX options to include + * @returns {Promise} The promise for when the locale is set up */ export function setupTex( packages: PackageList = ['base'], options: OptionList = {} -) { +): Promise { const parserOptions = Object.assign( {}, { packages }, @@ -206,11 +128,12 @@ export function setupTex( * * @param {string[]} packages The TeX packages to configure * @param {OptionList} options The TeX options to include + * @returns {Promise} The promise for when the locale is set up */ export function setupTexRender( packages: PackageList = ['base'], options: OptionList = {} -) { +): Promise { const parserOptions = Object.assign( {}, { packages: packages, inlineMath: { '[+]': [['$', '$']] } }, @@ -295,11 +218,12 @@ import { SVG } from '#js/output/svg.js'; * * @param {string[]} packages The TeX packages to configure * @param {OptionList} options The TeX options to include + * @returns {Promise} The promise for when the locale is set up */ export function setupTexWithOutput( packages: string[] = ['base'], options: OptionList = {} -) { +): Promise { const parserOptions = Object.assign({}, { packages: packages }, options); const tex = new TeX(parserOptions); const html = new HTMLDocument('', adaptor, { diff --git a/testsuite/src/traps.ts b/testsuite/src/traps.ts new file mode 100644 index 000000000..75298ae68 --- /dev/null +++ b/testsuite/src/traps.ts @@ -0,0 +1,103 @@ +/** + * Trap output produced while running code. + * + * @param {string} method The console method to trap. + * @param {Function} code The code to run. + * @returns {string} The output sent to the given method. + */ +export function trapOutput(method: string, code: () => void): string { + const saved = (console as any)[method]; + let message = ''; + (console as any)[method] = (...msg: any[]) => { + message += (message ? '\n' : '') + msg.join(' '); + }; + code(); + (console as any)[method] = saved; + return message; +} + +/** + * Trap errors produced while running code. + * + * @param {Function} code The code to run. + * @returns {string} The error message produced. + */ +export function trapErrors(code: () => void): string { + let message = '(no error)'; + reportErrors = true; + try { + code(); + } catch (e) { + message = e.message; + } + reportErrors = false; + return message; +} + +/** + * Trap output produced while running async code. + * + * @param {string} method The console method to trap. + * @param {Function} code The code to run. + * @returns {string} The output sent to the given method. + */ +export async function trapAsyncOutput( + method: string, + code: () => Promise +): Promise { + const saved = (console as any)[method]; + let message = ''; + (console as any)[method] = (...msg: any[]) => { + message += (message ? '\n' : '') + msg.join(' '); + }; + await code(); + (console as any)[method] = saved; + return message; +} + +/** + * Trap errors produced while running async code. + * + * @param {Function} code The code to run. + * @returns {string} The error message produced. + */ +export async function trapAsyncErrors( + code: () => Promise +): Promise { + let message = '(no error)'; + reportErrors = true; + await code().catch((e) => { + message = e.message; + }); + reportErrors = false; + return message; +} + +/** + * When true, errors will throw rather than produce merror elements. + */ +let reportErrors = false; + +/** + * Configuration that causes TeX errors to throw rather than + * generate merror elements, so we can trap them with trapErrors(). + */ +export const throwTexErrors = { + formatError(jax: any, err: Error) { + if (reportErrors) throw err; + return jax.formatError(err); + }, +}; + +/** + * Configuration that causes compile errors to throw rather than + * generate merror elements, so we can trap them with trapErrors(). + */ +export const throwCompileErrors = { + options: { + compileError(jax: any, math: any, err: Error) { + if (reportErrors) throw err; + return jax.compileError(math, err); + }, + }, +}; diff --git a/testsuite/tests/input/tex/Tex.test.ts b/testsuite/tests/input/tex/Tex.test.ts index a085b0bdf..763bdedcb 100644 --- a/testsuite/tests/input/tex/Tex.test.ts +++ b/testsuite/tests/input/tex/Tex.test.ts @@ -275,7 +275,7 @@ describe('Configuration', () => { () => new TeX({ packages: ['base', 'undefined'] }) ); expect(message).toBe( - "MathJax Warning: Package 'undefined' not found. Omitted." + "Package 'undefined' not found. Omitted." ); }); }); @@ -290,11 +290,11 @@ describe('MapHandler', () => { }, }); const message = trapOutput( - 'log', + 'warn', () => new TeX({ packages: ['base', 'BadHandler'] }) ); expect(message).toBe( - "TexParser Warning: Configuration 'undefindHandler' not found! Omitted." + "Configuration 'undefindHandler' not found. Omitted." ); }); diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index aaa1299e4..dd1e0ddb2 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -1,4 +1,5 @@ import { describe, test, expect } from '@jest/globals'; +import { trapOutput, trapAsyncOutput } from '#helpers/traps.js'; import { Locale } from '#js/util/Locale.js'; import '#js/util/asyncLoad/esm.js'; @@ -70,7 +71,7 @@ describe('Locale', () => { expect(Locale.message('undefined', 'Id1')).toBe( "MathJax(Locale): No localized or default version for message with id 'Id1' from 'undefined'" ); - expect(() => Locale.error('component', 'error', 'x')).toThrow('Error in x'); + expect(() => Locale.throw('component', 'error', 'x')).toThrow('Error in x'); Locale.current = 'de'; expect(Locale.message('undefined', 'Id1')).toBe( "MathJax(Locale): Keine lokalisierte oder Standardversion für die Meldung mit der ID 'Id1' aus 'undefined'" @@ -106,17 +107,25 @@ describe('Locale', () => { test('Locale error falls back to default locale', async () => { const locale = Locale as any; Locale.registerLocaleFiles('fallback', '../testsuite/lib/component'); + const message = await trapAsyncOutput('error', async () => { + await locale.localeError( + 'fallback', + 'xy', + new Error('xy.json not found') + ); + }); + expect(message).toContain("MathJax(fallback): Can't load 'xy.json'"); + expect(locale.data.fallback?.en).toEqual({ Id1: 'Test of %1 in %2' }); + }); - const errors: string[] = []; - const origError = console.error; - console.error = (msg: string) => errors.push(msg); - - await locale.localeError('fallback', 'xy', new Error('xy.json not found')); - - console.error = origError; + /********************************************************************************/ - expect(errors[0]).toContain("MathJax(fallback): Can't load 'xy.json'"); - expect(locale.data.fallback?.en).toEqual({ Id1: 'Test of %1 in %2' }); + test('Locale warn', async () => { + Locale.registerLocaleFiles('component', '../testsuite/lib/component'); + const message = trapOutput('warn', () => + Locale.warn('component', 'test2', 'warn') + ); + expect(message).toEqual('Has warn one'); }); /********************************************************************************/ diff --git a/ts/input/tex/Configuration.ts b/ts/input/tex/Configuration.ts index 50fc8c862..631131f3e 100644 --- a/ts/input/tex/Configuration.ts +++ b/ts/input/tex/Configuration.ts @@ -31,7 +31,9 @@ import { FunctionList } from '../../util/FunctionList.js'; import { TeX } from '../tex.js'; import { PrioritizedList } from '../../util/PrioritizedList.js'; import { TagsFactory } from './Tags.js'; -export { COMPONENT } from './__locales__/Component.js'; +import { Locale} from '../../util/Locale.js'; +import { COMPONENT } from './__locales__/Component.js'; +export { COMPONENT }; export type StackItemConfig = { [kind: string]: StackItemClass }; export type TagsConfig = { [kind: string]: TagsClass }; @@ -433,15 +435,15 @@ export class ParserConfiguration { * Find a package and check that it is for the targeted parser * * @param {string} name The name of the package to check - * @returns {Configuration} The configuration for the package + * @returns {Configuration} The configuration for the package */ protected getPackage(name: string): Configuration { const config = ConfigurationHandler.get(name); if (config && !this.parsers.includes(config.parser)) { - throw Error(`Package '${name}' doesn't target the proper parser`); + Locale.throw(COMPONENT, 'WrongParser', name); } if (!config) { - this.warn(`Package '${name}' not found. Omitted.`); + Locale.warn(COMPONENT, 'PackageNotFound', name); } return config; } @@ -481,13 +483,4 @@ export class ParserConfiguration { jax.postFilters.add(post, priority); } } - - /** - * Prints a warning message. - * - * @param {string} message The warning. - */ - private warn(message: string) { - console.warn('MathJax Warning: ' + message); - } } diff --git a/ts/input/tex/MapHandler.ts b/ts/input/tex/MapHandler.ts index bea7df24e..7aee3c4a2 100644 --- a/ts/input/tex/MapHandler.ts +++ b/ts/input/tex/MapHandler.ts @@ -26,6 +26,8 @@ import { AbstractTokenMap, TokenMap, CharacterMap } from './TokenMap.js'; import { ParseInput, ParseResult, ParseMethod } from './Types.js'; import { PrioritizedList } from '../../util/PrioritizedList.js'; import { FunctionList } from '../../util/FunctionList.js'; +import { Locale } from '../../util/Locale.js'; +import { COMPONENT } from './__locales__/Component.js'; export type HandlerConfig = { [P in HandlerType]?: string[] }; export type FallbackConfig = { [P in HandlerType]?: ParseMethod }; @@ -79,7 +81,7 @@ export class SubHandler { for (const name of maps.slice().reverse()) { const map = MapHandler.getMap(name); if (!map) { - this.warn(`Configuration '${name}' not found! Omitted.`); + Locale.warn(COMPONENT, 'ConfigNotFound', name); return; } this._configuration.add(map, priority); @@ -195,15 +197,6 @@ export class SubHandler { } return null; } - - /** - * Prints a warning message. - * - * @param {string} message The warning. - */ - private warn(message: string) { - console.log('TexParser Warning: ' + message); - } } export class SubHandlers { diff --git a/ts/input/tex/Tags.ts b/ts/input/tex/Tags.ts index 0f62b716a..7e4f87749 100644 --- a/ts/input/tex/Tags.ts +++ b/ts/input/tex/Tags.ts @@ -26,6 +26,8 @@ import { MmlNode } from '../../core/MmlTree/MmlNode.js'; import { MathItem } from '../../core/MathItem.js'; import { EnvList } from './StackItem.js'; import ParseOptions from './ParseOptions.js'; +import { Locale } from '../../util/Locale.js'; +import { COMPONENT } from './__locales__/Component.js'; /** * Simple class for label objects. @@ -696,7 +698,7 @@ export const TagsFactory = { create(name: string): Tags { const constr = tagsMapping.get(name) || tagsMapping.get(defaultTags); if (!constr) { - throw Error('Unknown tags class'); + Locale.throw(COMPONENT, 'UnknownTag'); } return new constr(); }, diff --git a/ts/input/tex/__locales__/de.json b/ts/input/tex/__locales__/de.json index ff5024281..bc859713d 100644 --- a/ts/input/tex/__locales__/de.json +++ b/ts/input/tex/__locales__/de.json @@ -2,6 +2,7 @@ "BadPreamToken": "Ungültiges Pream-Token (%1)", "BadRawUnicode": "Das Argument für %1 muss eine hexadezimale Zahl mit 1 bis 6 Ziffern sein", "ColArgNotNum": "Das erste Argument für den Spaltenbezeichner %1 muss eine Zahl sein", + "ConfigNotFound": "Konfiguration '%1' nicht gefunden. Wird übersprungen.", "ErroneousNestingEq": "Fehlerhafte Verschachtelung von Gleichungsstrukturen", "ExtraCloseLooking": "Überflüssige schließende Klammer bei der Suche nach %1", "ExtraCloseMissingOpen": "Überflüssige schließende Klammer oder fehlende öffnende Klammer", @@ -21,11 +22,13 @@ "MissingBeginExtraEnd": "Fehlendes \\begin{%1} oder zusätzliches \\end{%1}", "MissingCloseBrace": "Fehlende schließende Klammer", "MissingCloseBracket": "Schließendes ']' für Argument zu %1 nicht gefunden", - "MissingColumnDimOrUnits": "Missing dimension or its units for %1 column declaration", - "MissingDimOrUnits": "Missing dimension or its units for %1", - "MissingLeftExtraRight": "Missing \\left or extra \\right", - "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", + "MissingColumnDimOrUnits": "Bei der Spaltendeklaration von %1 fehlt die Dimension oder deren Einheiten", + "MissingDimOrUnits": "Für %1 fehlt die Dimension oder deren Einheiten", + "MissingLeftExtraRight": "Fehlendes \\left oder überflüssiges \\right", + "MissingOrUnrecognizedDelim": "Fehlendes oder nicht erkanntes Trennzeichen für %1", "MissingScript": "Fehlendes Argument für Hoch- oder Tiefstellung", - "TokenNotFoundForCommand": "Could not find %1 for %2", - "UnknownTag": "Unbekannte Bezeichner Klasse" + "PackageNotFound": "Paket '%1' nicht gefunden. Wird übersprungen.", + "TokenNotFoundForCommand": "%1 für %2 konnte nicht gefunden werden", + "UnknownTag": "Unbekannte Bezeichner Klasse", + "WrongParser": "Das Paket '%1' ist nicht auf den richtigen Parser ausgerichtet" } diff --git a/ts/input/tex/__locales__/en.json b/ts/input/tex/__locales__/en.json index c822ef075..c182ba087 100644 --- a/ts/input/tex/__locales__/en.json +++ b/ts/input/tex/__locales__/en.json @@ -2,6 +2,7 @@ "BadPreamToken": "Illegal pream-token (%1)", "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", "ColArgNotNum": "First argument to %1 column specifier must be a number", + "ConfigNotFound": "Configuration '%1' not found. Omitted.", "ErroneousNestingEq": "Erroneous nesting of equation structures", "ExtraCloseLooking": "Extra close brace while looking for %1", "ExtraCloseMissingOpen": "Extra close brace or missing open brace", @@ -26,6 +27,8 @@ "MissingLeftExtraRight": "Missing \\left or extra \\right", "MissingOrUnrecognizedDelim": "Missing or unrecognized delimiter for %1", "MissingScript": "Missing superscript or subscript argument", + "PackageNotFound": "Package '%1' not found. Omitted.", "TokenNotFoundForCommand": "Could not find %1 for %2", - "UnknownTag": "Unknown tags class" + "UnknownTag": "Unknown tags class", + "WrongParser": "Package '%1' doesn't target the proper parser" } diff --git a/ts/input/tex/bussproofs/BussproofsUtil.ts b/ts/input/tex/bussproofs/BussproofsUtil.ts index 701460b16..ff708c0be 100644 --- a/ts/input/tex/bussproofs/BussproofsUtil.ts +++ b/ts/input/tex/bussproofs/BussproofsUtil.ts @@ -30,6 +30,9 @@ import { Property } from '../../../core/Tree/Node.js'; import { MathItem } from '../../../core/MathItem.js'; import { MathDocument } from '../../../core/MathDocument.js'; +import { Locale } from '../../../util/Locale.js'; +import { COMPONENT } from './__locales__/Component.js'; + type MATHITEM = MathItem; type MATHDOCUMENT = MathDocument; @@ -651,9 +654,7 @@ export const makeBsprAttributes = function (arg: FilterData) { export const saveDocument = function (arg: FilterData) { doc = arg.document; if (!('getBBox' in doc.outputJax)) { - throw Error( - 'The bussproofs extension requires an output jax with a getBBox() method' - ); + Locale.throw(COMPONENT, 'RequiresOutputJax'); } }; diff --git a/ts/input/tex/bussproofs/__locales__/de.json b/ts/input/tex/bussproofs/__locales__/de.json index 76dfe1782..d4ad37c19 100644 --- a/ts/input/tex/bussproofs/__locales__/de.json +++ b/ts/input/tex/bussproofs/__locales__/de.json @@ -3,5 +3,6 @@ "EnvMissingEnd": "\\end{%1} fehlt", "IllegalProofCommand": "Beweisbefehle sind nur in der prooftree-Umgebung zulässig.", "IllegalUseOfCommand": "Die Verwendung von %1 entspricht nicht seiner Definition.", - "MissingProofCommand": "%1 fehlt in %2." + "MissingProofCommand": "%1 fehlt in %2.", + "RequiresOutputJax": "Die Erweiterung bussproofs benötigt eine OutputJax mit einer getBBox() Methode" } diff --git a/ts/input/tex/bussproofs/__locales__/en.json b/ts/input/tex/bussproofs/__locales__/en.json index 8ecb97ba4..4f38c28d7 100644 --- a/ts/input/tex/bussproofs/__locales__/en.json +++ b/ts/input/tex/bussproofs/__locales__/en.json @@ -3,5 +3,6 @@ "EnvMissingEnd": "Missing \\end{%1}", "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", "IllegalUseOfCommand": "Use of %1 does not match its definition.", - "MissingProofCommand": "Missing %1 in %2." + "MissingProofCommand": "Missing %1 in %2.", + "RequiresOutputJax": "The bussproofs extension requires an output jax with a getBBox() method"; } diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 5f7bdf785..673e687d5 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -40,6 +40,7 @@ import { mathjax } from '../../../mathjax.js'; import { expandable } from '../../../util/Options.js'; import { MenuMathDocument } from '../../../ui/menu/MenuHandler.js'; +import { Locale } from '../../../util/Locale.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; @@ -207,7 +208,7 @@ function config(_config: ParserConfiguration, jax: TeX) { const options = jax.parseOptions.options.require; const prefix = options.prefix; if (prefix.match(/[^_a-zA-Z0-9]/)) { - throw Error('Illegal characters used in \\require prefix'); + Locale.throw(COMPONENT, 'IllegalChar'); } if (!LOADERCONFIG.paths[prefix]) { LOADERCONFIG.paths[prefix] = '[mathjax]/input/tex/extensions'; diff --git a/ts/input/tex/require/__locales__/de.json b/ts/input/tex/require/__locales__/de.json index 017eff802..a3c40afaa 100644 --- a/ts/input/tex/require/__locales__/de.json +++ b/ts/input/tex/require/__locales__/de.json @@ -1,5 +1,6 @@ { "BadPackageName": "Das Argument für %1 ist kein gültiger Paketname", "BadRequire": "Die Erweiterung \"%1\" darf nicht geladen werden", + "IllegalChar": "Im Präfix für \\require wurden ungültige Zeichen verwendet", "RequireFail": "Die Erweiterung \"%1\" konnte nicht geladen werden" } diff --git a/ts/input/tex/require/__locales__/en.json b/ts/input/tex/require/__locales__/en.json index 590ebf565..dee302d6b 100644 --- a/ts/input/tex/require/__locales__/en.json +++ b/ts/input/tex/require/__locales__/en.json @@ -1,5 +1,6 @@ { "BadPackageName": "Argument for %1 is not a valid package name", "BadRequire": "Extension \"%1\" is not allowed to be loaded", + "IllegalChar": "Illegal characters used in \\require prefix", "RequireFail": "Extension \"%1\" failed to load" } diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index c65083059..e7b5ade36 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -215,15 +215,32 @@ export class Locale { * @param {string|namedData} data The first argument or the object of names arguments * @param {string[]} args Any additional string arguments (if data is a string) */ - public static error( + public static throw( component: string, id: string, - data: string | namedData, + data: string | namedData = {}, ...args: string[] ) { throw Error(this.message(component, id, data, ...args)); } + /** + * Report a warning with a given string substituting the given parameters + * + * @param {string} component The component whose message is requested + * @param {string} id The id of the message + * @param {string|namedData} data The first argument or the object of names arguments + * @param {string[]} args Any additional string arguments (if data is a string) + */ + public static warn( + component: string, + id: string, + data: string | namedData = {}, + ...args: string[] + ) { + console.warn(this.message(component, id, data, ...args)); + } + /** * Set the locale to the given one (or use the current one), and load * any needed files (or newly registered files for the current locale). From 0fc1d46f07a770ffe17dc3c5223ff3a6ae4a4fe0 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 02:57:51 -0400 Subject: [PATCH 70/95] Fix formatting --- ts/input/tex/Configuration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/input/tex/Configuration.ts b/ts/input/tex/Configuration.ts index 631131f3e..e2d2401fb 100644 --- a/ts/input/tex/Configuration.ts +++ b/ts/input/tex/Configuration.ts @@ -31,7 +31,7 @@ import { FunctionList } from '../../util/FunctionList.js'; import { TeX } from '../tex.js'; import { PrioritizedList } from '../../util/PrioritizedList.js'; import { TagsFactory } from './Tags.js'; -import { Locale} from '../../util/Locale.js'; +import { Locale } from '../../util/Locale.js'; import { COMPONENT } from './__locales__/Component.js'; export { COMPONENT }; From 3412d8f69db178df2beb80d5733183398c33de9c Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 03:17:08 -0400 Subject: [PATCH 71/95] Convert console.log to Locale.warn or console.warn --- ts/ui/menu/Menu.ts | 6 +++--- ts/ui/menu/MenuHandler.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts index a7aebd3b6..d6e4a8d89 100644 --- a/ts/ui/menu/Menu.ts +++ b/ts/ui/menu/Menu.ts @@ -963,7 +963,7 @@ export class Menu { Object.assign(this.settings, settings); this.setA11y(settings); } catch (err) { - console.log(localize('StorageError', err.message)); + Locale.warn(COMPONENT, 'StorageError', err.message); } } @@ -985,7 +985,7 @@ export class Menu { } localStorage.setItem(Menu.LOCALE_STORAGE, this.settings.language); } catch (err) { - console.log(localize('StorageError', err.message)); + Locale.warn(COMPONENT, 'StorageError', err.message); } } @@ -1483,7 +1483,7 @@ export class Menu { Menu._loadingPromise = null; Menu._loadingFailed(err); } else { - console.log(err); + console.warn(err); } }); Menu.loadingPromises.set(name, promise); diff --git a/ts/ui/menu/MenuHandler.ts b/ts/ui/menu/MenuHandler.ts index a3639d526..8baf28194 100644 --- a/ts/ui/menu/MenuHandler.ts +++ b/ts/ui/menu/MenuHandler.ts @@ -207,8 +207,8 @@ export function MenuMathDocumentMixin( enableExplorer: true, enableExplorerHelp: true, enrichSpeech: 'none', - enrichError: (_doc: MenuMathDocument, _math: MenuMathItem, err: Error) => - console.warn('Enrichment Error:', err), + enrichError: (doc: MenuMathDocument, math: MenuMathItem, err: Error) => + doc.enrichError(doc, math, err), ...BaseDocument.OPTIONS, MenuClass: Menu, menuOptions: Menu.OPTIONS, @@ -306,7 +306,7 @@ export function MenuMathDocumentMixin( public _checkLoading(): MenuMathDocument { if (this.menu.isLoading) { mathjax.retryAfter( - this.menu.loadingPromise.catch((err) => console.log(err)) + this.menu.loadingPromise.catch((err) => console.warn(err)) ); } if (this.options.enableComplexity) { From ddbfb3486357a30a8368c4be4799e09a24b6ce09 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sun, 24 May 2026 06:32:39 -0400 Subject: [PATCH 72/95] Prettify test files --- testsuite/tests/input/tex/Mhchem.test.ts | 4 +++- testsuite/tests/input/tex/Newcommand.test.ts | 12 +++++++++--- testsuite/tests/input/tex/Physics.test.ts | 8 ++------ testsuite/tests/input/tex/Tex.test.ts | 17 ++++++++--------- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/testsuite/tests/input/tex/Mhchem.test.ts b/testsuite/tests/input/tex/Mhchem.test.ts index 562d9bdcb..3a2ca8558 100644 --- a/testsuite/tests/input/tex/Mhchem.test.ts +++ b/testsuite/tests/input/tex/Mhchem.test.ts @@ -491,7 +491,9 @@ describe('Mhchem-Ams', () => { }); it('Mhchem Brace Error', () => { - expectTexError('\\ce{{x^${x}}}').toBe('Extra close brace or missing open brace'); + expectTexError('\\ce{{x^${x}}}').toBe( + 'Extra close brace or missing open brace' + ); }); it('Mhchem stretchy <-', () => { diff --git a/testsuite/tests/input/tex/Newcommand.test.ts b/testsuite/tests/input/tex/Newcommand.test.ts index d482ff370..0ba47ba1a 100644 --- a/testsuite/tests/input/tex/Newcommand.test.ts +++ b/testsuite/tests/input/tex/Newcommand.test.ts @@ -228,13 +228,19 @@ describe('Newcommand', () => { }); it('Def significant spaces 1', () => { - expectTexError('\\def\\x#1 #2{[#1,#2]} \\x{a}{b}').toBe('Runaway argument for \\x?'); + expectTexError('\\def\\x#1 #2{[#1,#2]} \\x{a}{b}').toBe( + 'Runaway argument for \\x?' + ); expect(tex2mml('\\def\\x#1 #2{[#1,#2]} \\x{a} {b}')).toMatchSnapshot(); }); it('Def significant spaces 2', () => { - expectTexError('\\def\\x#1 #2 {[#1,#2]} \\x{a}{b}').toBe('Runaway argument for \\x?'); - expectTexError('\\def\\x#1 #2 {[#1,#2]} \\x{a} {b}').toBe('Runaway argument for \\x?'); + expectTexError('\\def\\x#1 #2 {[#1,#2]} \\x{a}{b}').toBe( + 'Runaway argument for \\x?' + ); + expectTexError('\\def\\x#1 #2 {[#1,#2]} \\x{a} {b}').toBe( + 'Runaway argument for \\x?' + ); expect(tex2mml('\\def\\x#1 #2{[#1,#2]} \\x{a} {b} ')).toMatchSnapshot(); }); }); diff --git a/testsuite/tests/input/tex/Physics.test.ts b/testsuite/tests/input/tex/Physics.test.ts index 7f0987202..d61a3f9da 100644 --- a/testsuite/tests/input/tex/Physics.test.ts +++ b/testsuite/tests/input/tex/Physics.test.ts @@ -2474,15 +2474,11 @@ describe('Physics Errors', () => { }); it('Missing Closing Delimiter', () => { - expect( - tex2mml('\\sin(1\\over2') - ).toMatchSnapshot(); + expect(tex2mml('\\sin(1\\over2')).toMatchSnapshot(); }); it('Extra Open Delimiter', () => { - expect( - tex2mml('\\sin((1\\over2)') - ).toMatchSnapshot(); + expect(tex2mml('\\sin((1\\over2)')).toMatchSnapshot(); }); }); diff --git a/testsuite/tests/input/tex/Tex.test.ts b/testsuite/tests/input/tex/Tex.test.ts index 763bdedcb..5cb0250ef 100644 --- a/testsuite/tests/input/tex/Tex.test.ts +++ b/testsuite/tests/input/tex/Tex.test.ts @@ -161,18 +161,19 @@ describe('TexError', () => { describe('texError', () => { test('Number argument', () => { - expect(() => texError(null, 'test', 'Number: %1', '1')) - .toThrow('Number: 1'); + expect(() => texError(null, 'test', 'Number: %1', '1')).toThrow( + 'Number: 1' + ); }); test('Braced insertion', () => { - expect(() => texError(null, 'test', 'Msg: %{1}, Number: %{2}', 'OK', '2')) - .toThrow('Msg: OK, Number: 2'); + expect(() => + texError(null, 'test', 'Msg: %{1}, Number: %{2}', 'OK', '2') + ).toThrow('Msg: OK, Number: 2'); }); test('Percent', () => { - expect(() => texError(null, 'test', '10%%')) - .toThrow('10%'); + expect(() => texError(null, 'test', '10%%')).toThrow('10%'); }); }); @@ -274,9 +275,7 @@ describe('Configuration', () => { 'warn', () => new TeX({ packages: ['base', 'undefined'] }) ); - expect(message).toBe( - "Package 'undefined' not found. Omitted." - ); + expect(message).toBe("Package 'undefined' not found. Omitted."); }); }); From 795bab9f461320aa2e677280287cf0ef5482153e Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 02:50:34 -0400 Subject: [PATCH 73/95] Produce message if locale isn't set when using direct access to MathJax modules. --- ts/core/MathDocument.ts | 5 +++++ ts/util/Locale.ts | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ts/core/MathDocument.ts b/ts/core/MathDocument.ts index aa250aed7..d8f48781d 100644 --- a/ts/core/MathDocument.ts +++ b/ts/core/MathDocument.ts @@ -37,6 +37,7 @@ import { DOMAdaptor } from '../core/DOMAdaptor.js'; import { BitField, BitFieldClass } from '../util/BitField.js'; import { PrioritizedList } from '../util/PrioritizedList.js'; import { handleRetriesFor } from '../util/Retries.js'; +import { Locale } from '../util/Locale.js'; /*****************************************************************/ @@ -771,6 +772,10 @@ export abstract class AbstractMathDocument implements MathDocument< * @class */ constructor(document: D, adaptor: DOMAdaptor, options: OptionList) { + if (!Locale.initialized) { + // FIXME: add URL when we have one. + console.error('MathJax locales not loaded. You may receive cryptic error messages.'); + } const CLASS = this.constructor as typeof AbstractMathDocument; this.document = document; this.options = userOptions(defaultOptions({}, CLASS.OPTIONS), options); diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index e7b5ade36..ae1628717 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -35,6 +35,10 @@ export type namedData = { [name: string | number]: string }; * The Locale class for handling localized messages */ export class Locale { + /** + * Whether setLocale() has been called or not. + */ + public static initialized = false; /** * The current locale */ @@ -251,6 +255,7 @@ export class Locale { public static async setLocale( locale: string = this.current ): Promise { + this.initialized = true; this.current = locale; const promises = []; for (const [component, [directory, loaded]] of Object.entries( From 1264b87a90e906ae412dcf221b1cba5860c301dd Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 03:23:53 -0400 Subject: [PATCH 74/95] Add localization for loader and startup via core/__locales__ --- components/mjs/core/config.json | 6 ++++++ components/mjs/loader/loader.js | 1 + components/mjs/startup/init.js | 1 + package.json | 8 +++++--- ts/components/loader.ts | 20 +++++++++----------- ts/components/package.ts | 14 ++++++++++++-- ts/components/startup.ts | 18 ++++++------------ ts/core/__locales__/Component.ts | 28 ++++++++++++++++++++++++++++ ts/core/__locales__/de.json | 9 +++++++++ ts/core/__locales__/en.json | 9 +++++++++ 10 files changed, 86 insertions(+), 28 deletions(-) create mode 100644 ts/core/__locales__/Component.ts create mode 100644 ts/core/__locales__/de.json create mode 100644 ts/core/__locales__/en.json diff --git a/components/mjs/core/config.json b/components/mjs/core/config.json index 87e95dc00..bdf45f334 100644 --- a/components/mjs/core/config.json +++ b/components/mjs/core/config.json @@ -18,6 +18,12 @@ "util/entities" ] }, + "copy": { + "to": "[bundle]/core", + "from": "[ts]/core", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "core" } diff --git a/components/mjs/loader/loader.js b/components/mjs/loader/loader.js index f83c2b205..51f00bf9b 100644 --- a/components/mjs/loader/loader.js +++ b/components/mjs/loader/loader.js @@ -1,3 +1,4 @@ +import '../core/locale.js'; import './lib/loader.js'; import '../core/core.js'; diff --git a/components/mjs/startup/init.js b/components/mjs/startup/init.js index 4da1e1770..e51fbf1a4 100644 --- a/components/mjs/startup/init.js +++ b/components/mjs/startup/init.js @@ -1,4 +1,5 @@ import './hasown.js'; // Can be removed with ES2024 implementation of Object.hasown +import '../core/locale.js'; import './lib/startup.js'; import '../core/core.js'; diff --git a/package.json b/package.json index 01e89b577..9a87c4847 100644 --- a/package.json +++ b/package.json @@ -80,11 +80,13 @@ "clean:lib": "clean() { pnpm -s log:single \"Cleaning $1 component libs\"; pnpm rimraf -g components/$1'/**/lib'; }; clean", "clean:mod": "clean() { pnpm -s log:comp \"Cleaning $1 module\"; pnpm -s clean:dir $1 && pnpm -s clean:lib $1; }; clean", "=============================================================================== copy": "", - "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { pnpm -s copy:locales $1 && pnpm -s copy:mj2 $1 && pnpm -s copy:mml3 $1 && pnpm -s copy:html $1; }; copy", + "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { for name in locales mj2 mml3 html; do pnpm -s copy:$name ${1:-mjs}; done; }; copy", + "copy:bundle": "copy() { components/bin/makeAll --copy --terse components/mjs/${1:-}; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", - "copy:locales": "copy() { pnpm -s copy:locales:menu $1; pnpm -s copy:locales:tex $1; }; copy ", + "copy:locales": "copy() { for name in core tex menu; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ", + "copy:locales:core": "pnpm -s log:single 'Copying core locales'; copy() { pnpm copyfiles -u 1 'ts/core/__locales__/*.json' $1; }; copy", "copy:locales:menu": "pnpm -s log:single 'Copying menu locales'; copy() { pnpm copyfiles -u 1 'ts/ui/menu/__locales__/*.json' $1; }; copy", - "copy:locales:tex": "pnpm -s log:single 'Copying TeX extension locales'; copy() { pnpm copyfiles -u 1 'ts/input/tex/__locales__/*.json' $1 && pnpm copyfiles -u 3 'ts/input/tex/*/__locales__/*.json' $1/input/tex/extensions; }; copy", + "copy:locales:tex": "pnpm -s log:single 'Copying TeX locales'; copy() { pnpm copyfiles -u 1 'ts/input/tex/__locales__/*.json' $1 && pnpm copyfiles -u 3 'ts/input/tex/*/__locales__/*.json' $1/input/tex/extensions; }; copy", "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy", "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy", "copy:pkg": "copy() { pnpm -s log:single \"Copying package.json to $1\"; pnpm copyfiles -u 2 components/bin/package.json $1; }; copy", diff --git a/ts/components/loader.ts b/ts/components/loader.ts index d29382859..a7b84664a 100644 --- a/ts/components/loader.ts +++ b/ts/components/loader.ts @@ -43,6 +43,8 @@ import { mjxRoot } from '#root/root.js'; import { context } from '../util/context.js'; import { Locale } from '../util/Locale.js'; +import { COMPONENT } from '../core/__locales__/Component.js'; + /** * Function used to determine path to a given package. */ @@ -187,7 +189,7 @@ export const Loader = { /** * Load the named packages and return a promise that is resolved when they are all loaded * - * @param {string[]} names The packages to load + * @param {string[]} names The packages to load * @returns {Promise} A promise that resolves when all the named packages are ready */ load(...names: string[]): Promise { @@ -224,9 +226,7 @@ export const Loader = { extension.isLoaded && !Loader.versions.has(Package.resolvePath(name)) ) { - console.warn( - `No version information available for component ${name}` - ); + Locale.warn(COMPONENT, 'NoVersionFor', name); } return extension.result; }) as Promise @@ -346,15 +346,13 @@ export const Loader = { * * @param {string} name The name of the extension being checked * @param {string} version The version of the extension to check - * @param {string} _type The type of extension (future code may use this to check ranges of versions) - * @returns {boolean} True if there was a mismatch, false otherwise + * @param {string} _type The type of extension (future code may use this to check ranges of versions) + * @returns {boolean} True if there was a mismatch, false otherwise */ checkVersion(name: string, version: string, _type?: string): boolean { this.saveVersion(name); if (CONFIG.versionWarnings && version !== VERSION) { - console.warn( - `Component ${name} uses ${version} of MathJax; version in use is ${VERSION}` - ); + Locale.warn(COMPONENT, 'WrongVersion', name, version, VERSION); return true; } return false; @@ -363,7 +361,7 @@ export const Loader = { /** * Set the version of an extension (used for combined components so they can be loaded) * - * @param {string} name The name of the extension being checked + * @param {string} name The name of the extension being checked */ saveVersion(name: string) { Loader.versions.set(Package.resolvePath(name), VERSION); @@ -407,7 +405,7 @@ if (typeof MathJax.loader === 'undefined') { load: [], ready: Loader.defaultReady.bind(Loader), failed: (error: PackageError) => - console.log(`MathJax(${error.package || '?'}): ${error.message}`), + console.warn(`MathJax(${error.package || '?'}): ${error.message}`), require: null, json: null, pathFilters: [], diff --git a/ts/components/package.ts b/ts/components/package.ts index c853c554c..3a9eecae4 100644 --- a/ts/components/package.ts +++ b/ts/components/package.ts @@ -24,6 +24,8 @@ import { CONFIG, Loader } from './loader.js'; import { context } from '../util/context.js'; +import { Locale } from '../util/Locale.js'; +import { COMPONENT } from '../core/__locales__/Component.js'; /** * A map of package names to Package instances @@ -323,7 +325,14 @@ export class Package { .then((result) => (this.result = result)) .then(() => this.checkLoad()) .catch((err) => - this.failed('Can\'t load "' + url + '"\n' + err.message.trim()) + this.failed( + Locale.message( + COMPONENT, + 'CantLoad', + url, + ':\n' + err.message.trim() + ) + ) ); } else { this.result = result; @@ -344,7 +353,8 @@ export class Package { script.src = url; script.charset = 'UTF-8'; script.onload = (_event) => this.checkLoad(); - script.onerror = (_event) => this.failed('Can\'t load "' + url + '"'); + script.onerror = (_event) => + this.failed(Locale.message(COMPONENT, 'CantLoad', url, '')); // FIXME: Should there be a timeout failure as well? context.document.head.appendChild(script); } diff --git a/ts/components/startup.ts b/ts/components/startup.ts index 00e7be451..24ffd0821 100644 --- a/ts/components/startup.ts +++ b/ts/components/startup.ts @@ -43,6 +43,8 @@ import { DOMAdaptor } from '../core/DOMAdaptor.js'; import { PrioritizedList } from '../util/PrioritizedList.js'; import { OptionList, OPTIONS } from '../util/Options.js'; import { context } from '../util/context.js'; +import { Locale } from '../util/Locale.js'; +import { COMPONENT } from '../core/__locales__/Component.js'; import { TeX } from '../input/tex.js'; @@ -527,9 +529,7 @@ export abstract class Startup { jax[name] = new inputClass(MathJax.config[name]); jax.push(jax[name]); } else { - throw Error( - 'Input Jax "' + name + '" is not defined (has it been loaded?)' - ); + Locale.throw(COMPONENT, 'InputJaxNotDefined', name); } } return jax; @@ -543,9 +543,7 @@ export abstract class Startup { if (!name) return null; const outputClass = Startup.constructors[name]; if (!outputClass) { - throw Error( - 'Output Jax "' + name + '" is not defined (has it been loaded?)' - ); + Locale.throw(COMPONENT, 'OutputJaxNotDefined', name); } return new outputClass(MathJax.config[name]); } @@ -559,9 +557,7 @@ export abstract class Startup { if (!name || name === 'none') return null; const adaptor = Startup.constructors[name]; if (!adaptor) { - throw Error( - 'DOMAdaptor "' + name + '" is not defined (has it been loaded?)' - ); + Locale.throw(COMPONENT, 'AdaptorNotDefined', name); } return adaptor(MathJax.config[name]); } @@ -574,9 +570,7 @@ export abstract class Startup { if (!name || name === 'none' || !Startup.adaptor) return null; const handlerClass = Startup.constructors[name]; if (!handlerClass) { - throw Error( - 'Handler "' + name + '" is not defined (has it been loaded?)' - ); + Locale.throw(COMPONENT, 'HandlerNotDefined', name); } let handler = new handlerClass(Startup.adaptor, 5); for (const extend of Startup.extensions) { diff --git a/ts/core/__locales__/Component.ts b/ts/core/__locales__/Component.ts new file mode 100644 index 000000000..a32c85952 --- /dev/null +++ b/ts/core/__locales__/Component.ts @@ -0,0 +1,28 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for core component + * + * @author v.sorge@mathjax.org (Volker Sorge) + */ + +import { Locale } from '../../util/Locale.js'; + +export const COMPONENT = 'core'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/core'); diff --git a/ts/core/__locales__/de.json b/ts/core/__locales__/de.json new file mode 100644 index 000000000..0bdd11348 --- /dev/null +++ b/ts/core/__locales__/de.json @@ -0,0 +1,9 @@ +{ + "NoVersionFor": "Für die Komponente '%1' liegen keine Versionsinformationen vor", + "WrongVersion": "Die Komponente %1 verwendet Version %2 von MathJax; die verwendete Version ist %3", + "CantLoad": "'%1' kann nicht geladen werden%2", + "InputJaxNotDefined": "Input Jax '%1' ist nicht definiert (wurde es geladen?)", + "OutputJaxNotDefined": "Output Jax '%1' ist nicht definiert (wurde es geladen?)", + "AdaptorNotDefined": "DOMAdaptor '%1' ist nicht definiert (wurde es geladen?)", + "HandlerNotDefined": "Handler '%1' ist nicht definiert (wurde es geladen?)" +} diff --git a/ts/core/__locales__/en.json b/ts/core/__locales__/en.json new file mode 100644 index 000000000..54af9d217 --- /dev/null +++ b/ts/core/__locales__/en.json @@ -0,0 +1,9 @@ +{ + "NoVersionFor": "No version information available for component '%1'", + "WrongVersion": "Component %1 uses version %2 of MathJax; version in use is %3", + "CantLoad": "Can't load '%1'%2", + "InputJaxNotDefined": "Input Jax '%1' is not defined (has it been loaded?)", + "OutputJaxNotDefined": "Output Jax '%1' is not defined (has it been loaded?)", + "AdaptorNotDefined": "DOMAdaptor '%1' is not defined (has it been loaded?)", + "HandlerNotDefined": "Handler '%1' is not defined (has it been loaded?)" +} From 6ce29b132dba495b15ba59e81f8b97e05f16b296 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 09:32:40 -0400 Subject: [PATCH 75/95] Fix error in bussproofs en.json --- ts/input/tex/bussproofs/__locales__/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/input/tex/bussproofs/__locales__/en.json b/ts/input/tex/bussproofs/__locales__/en.json index 4f38c28d7..c5ba4ceb6 100644 --- a/ts/input/tex/bussproofs/__locales__/en.json +++ b/ts/input/tex/bussproofs/__locales__/en.json @@ -4,5 +4,5 @@ "IllegalProofCommand": "Proof commands only allowed in prooftree environment.", "IllegalUseOfCommand": "Use of %1 does not match its definition.", "MissingProofCommand": "Missing %1 in %2.", - "RequiresOutputJax": "The bussproofs extension requires an output jax with a getBBox() method"; + "RequiresOutputJax": "The bussproofs extension requires an output jax with a getBBox() method" } From b0c5677fdf3aeeabdaf709b4e2fead53e0fc0b3e Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 11:02:18 -0400 Subject: [PATCH 76/95] Update menu localization IDs (as per our developers' meeting) and sort them --- ts/a11y/speech/SpeechMenu.ts | 10 ++--- ts/ui/menu/Menu.ts | 44 ++++++++++---------- ts/ui/menu/__locales__/de.json | 73 ++++++++++++++-------------------- ts/ui/menu/__locales__/en.json | 71 ++++++++++++++------------------- 4 files changed, 86 insertions(+), 112 deletions(-) diff --git a/ts/a11y/speech/SpeechMenu.ts b/ts/a11y/speech/SpeechMenu.ts index 5a19f96c7..30f1fd2ae 100644 --- a/ts/a11y/speech/SpeechMenu.ts +++ b/ts/a11y/speech/SpeechMenu.ts @@ -128,7 +128,7 @@ function csSelectionBox(menu: MJContextMenu, locale: string): object { }); } const sb = new SelectionDialog( - localize('ClearspeakTitle'), + localize('.Clearspeak/Title'), '', items, SelectionOrder.ALPHABETICAL, @@ -138,7 +138,7 @@ function csSelectionBox(menu: MJContextMenu, locale: string): object { return { type: 'command', id: 'ClearspeakPreferences', - content: localize('SelectPrefs'), + content: localize('.Clearspeak/SelectPrefs'), action: () => sb.post(), }; } @@ -160,13 +160,13 @@ function basePreferences(previous: string): object[] { const items = [ { type: 'radio', - content: localize('NoPrefs'), + content: localize('.Clearspeak/NoPrefs'), id: 'clearspeak-default', variable: 'speechRules', }, { type: 'radio', - content: localize('CurrentPrefs'), + content: localize('.Clearspeak/CurrentPrefs'), id: 'clearspeak-' + previous, variable: 'speechRules', }, @@ -192,7 +192,7 @@ function smartPreferences( ): object[] { const loc = localePreferences.get(locale); const items = [ - { type: 'label', content: localize('PrefsFor', smart) }, + { type: 'label', content: localize('.Clearspeak/PrefsFor', smart) }, { type: 'rule' }, ]; return items.concat( diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts index d6e4a8d89..6b784875e 100644 --- a/ts/ui/menu/Menu.ts +++ b/ts/ui/menu/Menu.ts @@ -315,17 +315,17 @@ export class Menu { // lines.push( localize( - 'InputJax', + '.About/InputJax', this.document.inputJax.map((jax) => jax.name).join(', ') ), - localize('OutputJax', this.document.outputJax.name), - localize('DocType', this.document.kind) + localize('.About/OutputJax', this.document.outputJax.name), + localize('.About/DocType', this.document.kind) ); // // Add the loaded packages and their versions // if (MathJax && MathJax.loader) { - lines.push('
' + localize('Modules')); + lines.push('
' + localize('.About/Modules')); const Package = MathJax._.components.package.Package; const versions = (MathJax as any).loader.versions; for (const name of Array.from(Package.packages.keys()).sort( @@ -406,8 +406,8 @@ export class Menu { */ protected help() { InfoDialog.post({ - title: localize('HelpTitle'), - message: localize('HelpMessage'), + title: localize('.Help/Title'), + message: localize('.Help/Message'), adaptor: this.document.adaptor, extraNodes: [ this.document.adaptor.node( @@ -424,7 +424,7 @@ export class Menu { */ protected mathMLCode() { CopyDialog.post({ - title: localize('MmlTitle'), + title: localize('.Mml/Title'), message: this.menu.mathItem ? this.toMML(this.menu.mathItem) : '', adaptor: this.document.adaptor, code: true, @@ -436,7 +436,7 @@ export class Menu { */ protected originalText() { CopyDialog.post({ - title: localize('SourceTitle'), + title: localize('.Source/Title'), message: this.menu.mathItem?.math ?? '', adaptor: this.document.adaptor, code: true, @@ -448,7 +448,7 @@ export class Menu { */ protected annotationBox() { CopyDialog.post({ - title: localize('AnnotationTitle'), + title: localize('.Annotation/Title'), message: AnnotationMenu.annotation, adaptor: this.document.adaptor, code: true, @@ -460,7 +460,7 @@ export class Menu { */ public async svgImage() { CopyDialog.post({ - title: localize('SvgTitle'), + title: localize('.Svg/Title'), message: await this.toSVG(this.menu.mathItem), adaptor: this.document.adaptor, code: true, @@ -472,7 +472,7 @@ export class Menu { */ protected speechText() { CopyDialog.post({ - title: localize('SpeechTitle'), + title: localize('.Speech/Title'), message: this.menu.mathItem?.outputData?.speech ?? '', adaptor: this.document.adaptor, code: true, @@ -484,7 +484,7 @@ export class Menu { */ protected brailleText() { CopyDialog.post({ - title: localize('BrailleTitle'), + title: localize('.Braille/Title'), message: this.menu.mathItem?.outputData?.braille ?? '', adaptor: this.document.adaptor, code: true, @@ -496,7 +496,7 @@ export class Menu { */ protected errorMessage() { CopyDialog.post({ - title: localize('ErrorTitle'), + title: localize('.Error/Title'), message: this.menu.mathItem ? this.menu.errorMsg : '', adaptor: this.document.adaptor, code: true, @@ -517,7 +517,7 @@ export class Menu { text = `
${zoom.outerHTML}
`; } InfoDialog.post({ - title: localize('ZoomTitle'), + title: localize('.Zoom/Title'), message: text, adaptor: this.document.adaptor, styles: { @@ -963,7 +963,7 @@ export class Menu { Object.assign(this.settings, settings); this.setA11y(settings); } catch (err) { - Locale.warn(COMPONENT, 'StorageError', err.message); + Locale.warn(COMPONENT, '.Warn/StorageError', err.message); } } @@ -985,7 +985,7 @@ export class Menu { } localStorage.setItem(Menu.LOCALE_STORAGE, this.settings.language); } catch (err) { - Locale.warn(COMPONENT, 'StorageError', err.message); + Locale.warn(COMPONENT, '.Warn/StorageError', err.message); } } @@ -1090,7 +1090,7 @@ export class Menu { this.loadComponent('output/' + name, () => { const startup = MathJax.startup; if (!(name in startup.constructors)) { - return fail(new Error(localize('ComponentNotLoaded', name))); + return fail(new Error(localize('.Warn/ComponentNotLoaded', name))); } startup.useOutput(name, true); startup.output = this.applyRendererOptions(startup.getOutputJax()); @@ -1397,7 +1397,7 @@ export class Menu { const scale = (parseFloat(this.settings.scale) * 100) .toFixed(1) .replace(/.0$/, ''); - const percent = prompt(localize('ScalePrompt'), scale + '%'); + const percent = prompt(localize('.Scale/Prompt'), scale + '%'); if (this.current) { const speech = (this.menu.mathItem as ExplorerMathItem).explorers.speech; speech.refocus = this.current; @@ -1409,10 +1409,10 @@ export class Menu { if (scale) { this.menu.pool.lookup('scale').setValue(String(scale)); } else { - alert(localize('ScaleNonZero')); + alert(localize('.Scale/NonZero')); } } else { - alert(localize('ScalePercent')); + alert(localize('.Scale/Percent', '120%')); } } } @@ -1573,7 +1573,7 @@ export class Menu { protected async toSVG(math: HTMLMATHITEM): Promise { const jax = this.jax.SVG; if (!jax) { - return localize('NoSvgProduced'); + return localize('.Svg/NotProduced'); } const adaptor = jax.adaptor; const cache = jax.options.fontCache; @@ -1989,7 +1989,7 @@ export class Menu { * @returns {object} The JSON for the radio button item */ public radio(id: string, variable: string, other: object = {}): object { - const content = localize(id); + const content = id.match(/^\d+%$/) ? id : localize(id); return Object.assign({ type: 'radio', id, content, variable }, other); } diff --git a/ts/ui/menu/__locales__/de.json b/ts/ui/menu/__locales__/de.json index 0badab345..506d35771 100644 --- a/ts/ui/menu/__locales__/de.json +++ b/ts/ui/menu/__locales__/de.json @@ -1,11 +1,29 @@ { - "150%": "150%", - "175%": "175%", - "200%": "200%", - "250%": "250%", - "300%": "300%", - "400%": "400%", - "500%": "500%", + ".About/DocType": "Dokumenttyp: %1", + ".About/InputJax": "Input Jax: %1", + ".About/Modules": "Geladene Module:", + ".About/OutputJax": "Output Jax: %1", + ".Annotation/Title": "MathJax-Anmerkungstext", + ".Braille/Title": "MathJax-Braille-Text", + ".Clearspeak/CurrentPrefs": "Aktuelle Einstellungen", + ".Clearspeak/NoPrefs": "Keine Einstellungen", + ".Clearspeak/PrefsFor": "Einstellungen für %1", + ".Clearspeak/SelectPrefs": "Einstellungen auswählen", + ".Clearspeak/Title": "Clearspeak-Einstellungen", + ".Error/Title": "MathJax-Fehlermeldung", + ".Help/Message": "

MathJax ist eine JavaScript-Bibliothek, die es Seitenautoren ermöglicht, mathematische Formeln in ihre Webseiten einzubinden. Als Leser müssen Sie nichts tun, um dies zu nutzen.

Browser: MathJax funktioniert mit allen modernen Browsern, einschließlich Edge, Firefox, Chrome, Safari, Opera und den meisten mobilen Browsern.

Mathematik-Menü: MathJax fügt den Formeln ein Kontextmenü hinzu. Klicken Sie mit der rechten Maustaste oder bei gedrückter STRG-Taste auf eine beliebige mathematische Formel, um das Menü aufzurufen.

Mathematik anzeigen als: Mit diesen Optionen können Sie den Quellcode der Formel (als MathML oder im Originalformat) anzeigen.

In die Zwischenablage kopieren: Diese Optionen kopieren den Quellcode der Formel als MathML oder im Originalformat in die Zwischenablage (in Browsern, die dies unterstützen).

Mathematik-Einstellungen: Hiermit können Sie Funktionen von MathJax steuern, wie z. B. die Größe der mathematischen Ausdrücke, den Mechanismus zur Darstellung von Gleichungen und den Umgang mit zu breiten Gleichungen, sowie die Sprache, die für die Menüs und Fehlermeldungen von MathJax verwendet werden soll (in Version 4 noch nicht implementiert).

Barrierefreiheit: MathJax kann mit Bildschirmleseprogrammen zusammenarbeiten, um Mathematik für Sehbehinderte zugänglich zu machen. Aktivieren Sie die Sprach- oder Braille-Generierung, um die Erstellung von Sprachausgaben und die Möglichkeit zur interaktiven Untersuchung von Ausdrücken zu ermöglichen. Sie können den Stil des Explorers über dessen Menü steuern.

Mathematik-Zoom: Wenn Sie Schwierigkeiten haben, eine Gleichung zu lesen, MathJax kann die Darstellung vergrößern, damit Sie sie besser erkennen können, oder Sie können alle mathematischen Formeln auf der Seite vergrößern. Aktivieren Sie diese Funktionen im Menü Mathematik-Einstellungen.

Einstellungen: MathJax nutzt die localStorage-Datenbank Ihres Browsers, um die über dieses Menü festgelegten Einstellungen lokal in Ihrem Browser zu speichern. Diese werden nicht dazu verwendet, Sie zu verfolgen, und werden von MathJax in keiner Weise übertragen oder aus der Ferne genutzt.

", + ".Help/Title": "MathJax-Hilfe", + ".Mml/Title": "MathJax-MathML-Ausdruck", + ".Scale/NonZero": "Der Skalierungsfaktor darf nicht Null sein", + ".Scale/Percent": "Der Skalierungsfaktor muss ein Prozentsatz sein (z. B. %1)", + ".Scale/Prompt": "Alle mathematischen Formeln (im Vergleich zum umgebenden Text) um skalieren", + ".Source/Title": "MathJax-Originalquelle", + ".Speech/Title": "MathJax-Sprechtext", + ".Svg/NotProduced": "SVG kann nicht erzeugt werden.
Versuchen Sie zunächst, zur SVG-Ausgabe zu wechseln.", + ".Svg/Title": "MathJax-SVG-Bild", + ".Warn/ComponentNotLoaded": "Komponente %1 nicht geladen", + ".Warn/StorageError": "MathJax-localStorage-Fehler: %1", + ".Zoom/Title": "MathJax-vergrößerter Ausdruck", "A11yLanguage": "Sprache", "About": "Über MathJax", "Accessibility": "\u00A0\u00A0 Barrierefreiheit:", @@ -27,6 +45,7 @@ "Code": "Code-Format:", "Collapsible": "Zusammenklappbare Mathematik", "Command": "Befehl", + "Commands": "%1 Befehle", "Control": "Steuerelement", "Copy": "In Zwischenablage kopieren", "CopyAnnotation": "Anmerkung", @@ -50,8 +69,8 @@ "Magenta": "Magenta", "Magnification": "Vergrößerung", "MathHelp": "Hilfemeldung bei Fokus", - "MathJax": "MathJax", "MathJax expression": "MathJax-Ausdruck", + "MathJax": "MathJax", "MathMLcode": "MathML-Code", "MathmlIncludes": "MathML/SVG enthält", "Mathspeak": "Mathspeak", @@ -61,13 +80,14 @@ "Option": "Option", "Options": "\u00A0 \u00A0 Optionen", "Original": "Originalform", + "OriginalMathML": "Original MathML", "Overflow": "Überlauf", "Prefix": "Präfix", - "Rot": "Rot", "Renderer": "Mathematik-Renderer", "Reset": "Auf Standardwerte zurücksetzen", "Role": "Rolle", "RoleDescription": "Mathematik beschreiben als", + "Rot": "Rot", "Rules": "Regeln:", "SVG": "SVG", "Scale": "Skalierung", @@ -109,38 +129,5 @@ "showSRE": "Semantische Attribute", "showTex": "LaTeX-Attribute", "texHints": "TeX-Hinweise", - "ueb": "UEB", - - "OriginalMathML": "Original MathML", - "Commands": "%1 Befehle", - - "InputJax": "Input Jax: %1", - "OutputJax": "Output Jax: %1", - "DocType": "Dokumenttyp: %1", - "Modules": "Geladene Module:", - - "HelpTitle": "MathJax-Hilfe", - "HelpMessage": "

MathJax ist eine JavaScript-Bibliothek, die es Seitenautoren ermöglicht, mathematische Formeln in ihre Webseiten einzubinden. Als Leser müssen Sie nichts tun, um dies zu nutzen.

Browser: MathJax funktioniert mit allen modernen Browsern, einschließlich Edge, Firefox, Chrome, Safari, Opera und den meisten mobilen Browsern.

Mathematik-Menü: MathJax fügt den Formeln ein Kontextmenü hinzu. Klicken Sie mit der rechten Maustaste oder bei gedrückter STRG-Taste auf eine beliebige mathematische Formel, um das Menü aufzurufen.

Mathematik anzeigen als: Mit diesen Optionen können Sie den Quellcode der Formel (als MathML oder im Originalformat) anzeigen.

In die Zwischenablage kopieren: Diese Optionen kopieren den Quellcode der Formel als MathML oder im Originalformat in die Zwischenablage (in Browsern, die dies unterstützen).

Mathematik-Einstellungen: Hiermit können Sie Funktionen von MathJax steuern, wie z. B. die Größe der mathematischen Ausdrücke, den Mechanismus zur Darstellung von Gleichungen und den Umgang mit zu breiten Gleichungen, sowie die Sprache, die für die Menüs und Fehlermeldungen von MathJax verwendet werden soll (in Version 4 noch nicht implementiert).

Barrierefreiheit: MathJax kann mit Bildschirmleseprogrammen zusammenarbeiten, um Mathematik für Sehbehinderte zugänglich zu machen. Aktivieren Sie die Sprach- oder Braille-Generierung, um die Erstellung von Sprachausgaben und die Möglichkeit zur interaktiven Untersuchung von Ausdrücken zu ermöglichen. Sie können den Stil des Explorers über dessen Menü steuern.

Mathematik-Zoom: Wenn Sie Schwierigkeiten haben, eine Gleichung zu lesen, MathJax kann die Darstellung vergrößern, damit Sie sie besser erkennen können, oder Sie können alle mathematischen Formeln auf der Seite vergrößern. Aktivieren Sie diese Funktionen im Menü Mathematik-Einstellungen.

Einstellungen: MathJax nutzt die localStorage-Datenbank Ihres Browsers, um die über dieses Menü festgelegten Einstellungen lokal in Ihrem Browser zu speichern. Diese werden nicht dazu verwendet, Sie zu verfolgen, und werden von MathJax in keiner Weise übertragen oder aus der Ferne genutzt.

", - - "MmlTitle": "MathJax-MathML-Ausdruck", - "SourceTitle": "MathJax-Originalquelle", - "AnnotationTitle": "MathJax-Anmerkungstext", - "SvgTitle": "MathJax-SVG-Bild", - "SpeechTitle": "MathJax-Sprechtext", - "BrailleTitle": "MathJax-Braille-Text", - "ErrorTitle": "MathJax-Fehlermeldung", - "ZoomTitle": "MathJax-vergrößerter Ausdruck", - - "StorageError": "MathJax-localStorage-Fehler: %1", - "ComponentNotLoaded": "Komponente %1 nicht geladen", - "ScalePrompt": "Alle mathematischen Formeln (im Vergleich zum umgebenden Text) um skalieren", - "ScaleNonZero": "Der Skalierungsfaktor darf nicht Null sein", - "ScalePercent": "Der Skalierungsfaktor muss ein Prozentsatz sein (z. B. 120 %)", - "NoSvgProduced": "SVG kann nicht erzeugt werden.
Versuchen Sie zunächst, zur SVG-Ausgabe zu wechseln.", - - "ClearspeakTitle": "Clearspeak-Einstellungen", - "SelectPrefs": "Einstellungen auswählen", - "NoPrefs": "Keine Einstellungen", - "CurrentPrefs": "Aktuelle Einstellungen", - "PrefsFor": "Einstellungen für %1" + "ueb": "UEB" } diff --git a/ts/ui/menu/__locales__/en.json b/ts/ui/menu/__locales__/en.json index 83b2af7ea..d51ccf18b 100644 --- a/ts/ui/menu/__locales__/en.json +++ b/ts/ui/menu/__locales__/en.json @@ -1,11 +1,29 @@ { - "150%": "150%", - "175%": "175%", - "200%": "200%", - "250%": "250%", - "300%": "300%", - "400%": "400%", - "500%": "500%", + ".About/DocType": "Document Type: %1", + ".About/InputJax": "Input Jax: %1", + ".About/Modules": "Modules Loaded:", + ".About/OutputJax": "Outut Jax: %1", + ".Annotation/Title": "MathJax Annotation Text", + ".Braille/Title": "MathJax Braille Text", + ".Clearspeak/CurrentPrefs": "Current Preferences", + ".Clearspeak/NoPrefs": "No Preferences", + ".Clearspeak/PrefsFor": "Preferences for %1", + ".Clearspeak/SelectPrefs": "Select Preferences", + ".Clearspeak/Title": "Clearspeak Preferences", + ".Error/Title": "MathJax Error Message", + ".Help/Message": "

MathJax is a JavaScript library that allows page authors to include mathematics within their web pages. As a reader, you don't need to do anything to make that happen.

Browsers: MathJax works with all modern browsers including Edge, Firefox, Chrome, Safari, Opera, and most mobile browsers.

Math Menu: MathJax adds a contextual menu to equations. Right-click or CTRL-click on any mathematics to access the menu.

Show Math As: These options allow you to view the formula's source markup (as MathML or in its original format).

Copy to Clipboard: These options copy the formula's source markup, as MathML or in its original format, to the clipboard (in browsers that support that).

Math Settings: These give you control over features of MathJax, such the size of the mathematics, the mechanism used to display equations, how to handle equations that are too wide, and the language to use for MathJax's menus and error messages (not yet implemented in v4).

Accessibility: MathJax can work with screen readers to make mathematics accessible to the visually impaired. Turn on speech or braille generation to enable creation of speech strings and the ability to investigate expressions interactively. You can control the style of the explorer in its menu.

Math Zoom: If you are having difficulty reading an equation, MathJax can enlarge it to help you see it better, or you can scale all the math on the page to make it larger. Turn these features on in the Math Settings menu.

Preferences: MathJax uses your browser's localStorage database to save the preferences set via this menu locally in your browser. These are not used to track you, and are not transferred or used remotely by MathJax in any way.

", + ".Help/Title": "MathJax Help", + ".Mml/Title": "MathJax MathML Expression", + ".Scale/NonZero": "The scale should not be zero", + ".Scale/Percent": "The scale should be a percentage (e.g., %1)", + ".Scale/Prompt": "Scale all mathematics (compared to surrounding text) by", + ".Source/Title": "MathJax Original Source", + ".Speech/Title": "MathJax Speech Text", + ".Svg/NotProduced": "SVG can't be produced.
Try switching to SVG output first.", + ".Svg/Title": "MathJax SVG Image", + ".Warn/ComponentNotLoaded": "Component %1 not loaded", + ".Warn/StorageError": "MathJax localStorage error: %1", + ".Zoom/Title": "MathJax Zoomed Expression", "A11yLanguage": "Language", "About": "About MathJax", "Accessibility": "\u00A0\u00A0 Accessibility:", @@ -27,6 +45,7 @@ "Code": "Code Format:", "Collapsible": "Collapsible Math", "Command": "Command", + "Commands": "%1 Commands", "Control": "Control", "Copy": "Copy to Clipboard", "CopyAnnotation": "Annotation", @@ -50,8 +69,8 @@ "Magenta": "Magenta", "Magnification": "Magnification", "MathHelp": "Help message on focus", - "MathJax": "MathJax", "MathJax expression": "MathJax expression", + "MathJax": "MathJax", "MathMLcode": "MathML Code", "MathmlIncludes": "MathML/SVG has", "Mathspeak": "Mathspeak", @@ -61,6 +80,7 @@ "Option": "Option", "Options": "\u00A0 \u00A0 Options", "Original": "Original Form", + "OriginalMathML": "Original MathML", "Overflow": "Overflow", "Prefix": "Prefix", "Red": "Red", @@ -109,38 +129,5 @@ "showSRE": "Semantic attributes", "showTex": "LaTeX attributes", "texHints": "TeX hints", - "ueb": "UEB", - - "OriginalMathML": "Original MathML", - "Commands": "%1 Commands", - - "InputJax": "Input Jax: %1", - "OutputJax": "Outut Jax: %1", - "DocType": "Document Type: %1", - "Modules": "Modules Loaded:", - - "HelpTitle": "MathJax Help", - "HelpMessage": "

MathJax is a JavaScript library that allows page authors to include mathematics within their web pages. As a reader, you don't need to do anything to make that happen.

Browsers: MathJax works with all modern browsers including Edge, Firefox, Chrome, Safari, Opera, and most mobile browsers.

Math Menu: MathJax adds a contextual menu to equations. Right-click or CTRL-click on any mathematics to access the menu.

Show Math As: These options allow you to view the formula's source markup (as MathML or in its original format).

Copy to Clipboard: These options copy the formula's source markup, as MathML or in its original format, to the clipboard (in browsers that support that).

Math Settings: These give you control over features of MathJax, such the size of the mathematics, the mechanism used to display equations, how to handle equations that are too wide, and the language to use for MathJax's menus and error messages (not yet implemented in v4).

Accessibility: MathJax can work with screen readers to make mathematics accessible to the visually impaired. Turn on speech or braille generation to enable creation of speech strings and the ability to investigate expressions interactively. You can control the style of the explorer in its menu.

Math Zoom: If you are having difficulty reading an equation, MathJax can enlarge it to help you see it better, or you can scale all the math on the page to make it larger. Turn these features on in the Math Settings menu.

Preferences: MathJax uses your browser's localStorage database to save the preferences set via this menu locally in your browser. These are not used to track you, and are not transferred or used remotely by MathJax in any way.

", - - "MmlTitle": "MathJax MathML Expression", - "SourceTitle": "MathJax Original Source", - "AnnotationTitle": "MathJax Annotation Text", - "SvgTitle": "MathJax SVG Image", - "SpeechTitle": "MathJax Speech Text", - "BrailleTitle": "MathJax Braille Text", - "ErrorTitle": "MathJax Error Message", - "ZoomTitle": "MathJax Zoomed Expression", - - "StorageError": "MathJax localStorage error: %1", - "ComponentNotLoaded": "Component %1 not loaded", - "ScalePrompt": "Scale all mathematics (compared to surrounding text) by", - "ScaleNonZero": "The scale should not be zero", - "ScalePercent": "The scale should be a percentage (e.g., 120%)", - "NoSvgProduced": "SVG can't be produced.
Try switching to SVG output first.", - - "ClearspeakTitle": "Clearspeak Preferences", - "SelectPrefs": "Select Preferences", - "NoPrefs": "No Preferences", - "CurrentPrefs": "Current Preferences", - "PrefsFor": "Preferences for %1" + "ueb": "UEB" } From 0ed9392d5d55daad4dba988167fea546549595aa Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 14:09:49 -0400 Subject: [PATCH 77/95] sort locale files --- ts/core/__locales__/de.json | 8 ++++---- ts/core/__locales__/en.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ts/core/__locales__/de.json b/ts/core/__locales__/de.json index 0bdd11348..ed79631af 100644 --- a/ts/core/__locales__/de.json +++ b/ts/core/__locales__/de.json @@ -1,9 +1,9 @@ { - "NoVersionFor": "Für die Komponente '%1' liegen keine Versionsinformationen vor", - "WrongVersion": "Die Komponente %1 verwendet Version %2 von MathJax; die verwendete Version ist %3", + "AdaptorNotDefined": "DOMAdaptor '%1' ist nicht definiert (wurde es geladen?)", "CantLoad": "'%1' kann nicht geladen werden%2", + "HandlerNotDefined": "Handler '%1' ist nicht definiert (wurde es geladen?)" "InputJaxNotDefined": "Input Jax '%1' ist nicht definiert (wurde es geladen?)", + "NoVersionFor": "Für die Komponente '%1' liegen keine Versionsinformationen vor", "OutputJaxNotDefined": "Output Jax '%1' ist nicht definiert (wurde es geladen?)", - "AdaptorNotDefined": "DOMAdaptor '%1' ist nicht definiert (wurde es geladen?)", - "HandlerNotDefined": "Handler '%1' ist nicht definiert (wurde es geladen?)" + "WrongVersion": "Die Komponente %1 verwendet Version %2 von MathJax; die verwendete Version ist %3", } diff --git a/ts/core/__locales__/en.json b/ts/core/__locales__/en.json index 54af9d217..372526d9e 100644 --- a/ts/core/__locales__/en.json +++ b/ts/core/__locales__/en.json @@ -1,9 +1,9 @@ { - "NoVersionFor": "No version information available for component '%1'", - "WrongVersion": "Component %1 uses version %2 of MathJax; version in use is %3", + "AdaptorNotDefined": "DOMAdaptor '%1' is not defined (has it been loaded?)", "CantLoad": "Can't load '%1'%2", + "HandlerNotDefined": "Handler '%1' is not defined (has it been loaded?)" "InputJaxNotDefined": "Input Jax '%1' is not defined (has it been loaded?)", + "NoVersionFor": "No version information available for component '%1'", "OutputJaxNotDefined": "Output Jax '%1' is not defined (has it been loaded?)", - "AdaptorNotDefined": "DOMAdaptor '%1' is not defined (has it been loaded?)", - "HandlerNotDefined": "Handler '%1' is not defined (has it been loaded?)" + "WrongVersion": "Component %1 uses version %2 of MathJax; version in use is %3", } From c54df41e49a132f213d3c85b34ab5bedeb3334d9 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 14:19:15 -0400 Subject: [PATCH 78/95] Add a localize() method for core --- ts/components/package.ts | 15 +++------------ ts/core/__locales__/Component.ts | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ts/components/package.ts b/ts/components/package.ts index 3a9eecae4..0948fe599 100644 --- a/ts/components/package.ts +++ b/ts/components/package.ts @@ -24,8 +24,7 @@ import { CONFIG, Loader } from './loader.js'; import { context } from '../util/context.js'; -import { Locale } from '../util/Locale.js'; -import { COMPONENT } from '../core/__locales__/Component.js'; +import { localize } from '../core/__locales__/Component.js'; /** * A map of package names to Package instances @@ -325,14 +324,7 @@ export class Package { .then((result) => (this.result = result)) .then(() => this.checkLoad()) .catch((err) => - this.failed( - Locale.message( - COMPONENT, - 'CantLoad', - url, - ':\n' + err.message.trim() - ) - ) + this.failed(localize('CantLoad', url, ':\n' + err.message.trim())) ); } else { this.result = result; @@ -353,8 +345,7 @@ export class Package { script.src = url; script.charset = 'UTF-8'; script.onload = (_event) => this.checkLoad(); - script.onerror = (_event) => - this.failed(Locale.message(COMPONENT, 'CantLoad', url, '')); + script.onerror = (_event) => this.failed(localize('CantLoad', url, '')); // FIXME: Should there be a timeout failure as well? context.document.head.appendChild(script); } diff --git a/ts/core/__locales__/Component.ts b/ts/core/__locales__/Component.ts index a32c85952..030026917 100644 --- a/ts/core/__locales__/Component.ts +++ b/ts/core/__locales__/Component.ts @@ -18,11 +18,22 @@ /** * @file Locale component registration for core component * - * @author v.sorge@mathjax.org (Volker Sorge) + * @author dpvc@mathjax.org (Davide P. Cervone) */ -import { Locale } from '../../util/Locale.js'; +import { Locale, namedData } from '../../util/Locale.js'; export const COMPONENT = 'core'; Locale.registerLocaleFiles(COMPONENT, '../ts/core'); + +/** + * Get a localized message for this component + * + * @param {string} id The id of the message + * @param {(string|namedData)[]} args The replacement arguments for the message, if any + * @returns {string} The localized message + */ +export function localize(id: string, ...args: (string | namedData)[]): string { + return Locale.message(COMPONENT, id, ...args); +} From ce5c107f3486b87b62b76992568f86b0d47255bd Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 14:23:22 -0400 Subject: [PATCH 79/95] Fix sorted locale files --- ts/core/__locales__/de.json | 4 ++-- ts/core/__locales__/en.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/core/__locales__/de.json b/ts/core/__locales__/de.json index ed79631af..067e6ea88 100644 --- a/ts/core/__locales__/de.json +++ b/ts/core/__locales__/de.json @@ -1,9 +1,9 @@ { "AdaptorNotDefined": "DOMAdaptor '%1' ist nicht definiert (wurde es geladen?)", "CantLoad": "'%1' kann nicht geladen werden%2", - "HandlerNotDefined": "Handler '%1' ist nicht definiert (wurde es geladen?)" + "HandlerNotDefined": "Handler '%1' ist nicht definiert (wurde es geladen?)", "InputJaxNotDefined": "Input Jax '%1' ist nicht definiert (wurde es geladen?)", "NoVersionFor": "Für die Komponente '%1' liegen keine Versionsinformationen vor", "OutputJaxNotDefined": "Output Jax '%1' ist nicht definiert (wurde es geladen?)", - "WrongVersion": "Die Komponente %1 verwendet Version %2 von MathJax; die verwendete Version ist %3", + "WrongVersion": "Die Komponente %1 verwendet Version %2 von MathJax; die verwendete Version ist %3" } diff --git a/ts/core/__locales__/en.json b/ts/core/__locales__/en.json index 372526d9e..2e186973a 100644 --- a/ts/core/__locales__/en.json +++ b/ts/core/__locales__/en.json @@ -1,9 +1,9 @@ { "AdaptorNotDefined": "DOMAdaptor '%1' is not defined (has it been loaded?)", "CantLoad": "Can't load '%1'%2", - "HandlerNotDefined": "Handler '%1' is not defined (has it been loaded?)" + "HandlerNotDefined": "Handler '%1' is not defined (has it been loaded?)", "InputJaxNotDefined": "Input Jax '%1' is not defined (has it been loaded?)", "NoVersionFor": "No version information available for component '%1'", "OutputJaxNotDefined": "Output Jax '%1' is not defined (has it been loaded?)", - "WrongVersion": "Component %1 uses version %2 of MathJax; version in use is %3", + "WrongVersion": "Component %1 uses version %2 of MathJax; version in use is %3" } From 4902c2599e741f91780b0106e9026421683a7984 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Mon, 25 May 2026 19:22:22 -0400 Subject: [PATCH 80/95] Fix format for prettier --- ts/core/MathDocument.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/core/MathDocument.ts b/ts/core/MathDocument.ts index d8f48781d..60d722759 100644 --- a/ts/core/MathDocument.ts +++ b/ts/core/MathDocument.ts @@ -774,7 +774,9 @@ export abstract class AbstractMathDocument implements MathDocument< constructor(document: D, adaptor: DOMAdaptor, options: OptionList) { if (!Locale.initialized) { // FIXME: add URL when we have one. - console.error('MathJax locales not loaded. You may receive cryptic error messages.'); + console.error( + 'MathJax locales not loaded. You may receive cryptic error messages.' + ); } const CLASS = this.constructor as typeof AbstractMathDocument; this.document = document; From e880b1cd5ff5d1132499ab841acb6e53342f6cd6 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 29 May 2026 18:00:16 -0400 Subject: [PATCH 81/95] Add message for error during copying (missed in initial menu localization branch) --- ts/ui/menu/MenuUtil.ts | 3 ++- ts/ui/menu/__locales__/de.json | 1 + ts/ui/menu/__locales__/en.json | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ts/ui/menu/MenuUtil.ts b/ts/ui/menu/MenuUtil.ts index 0eaa58c74..0e25d632b 100644 --- a/ts/ui/menu/MenuUtil.ts +++ b/ts/ui/menu/MenuUtil.ts @@ -22,6 +22,7 @@ */ import { context } from '../../util/context.js'; +import { localize } from './__locales__/Component.js'; /** * True when platform is a Mac (so we can enable CMD menu item for zoom trigger) @@ -43,7 +44,7 @@ export function copyToClipboard(text: string) { try { document.execCommand('copy'); } catch (error) { - alert(`Can't copy to clipboard: ${error.message}`); + alert(localize('.Warn/CantCopy', error.message)); } document.body.removeChild(input); } diff --git a/ts/ui/menu/__locales__/de.json b/ts/ui/menu/__locales__/de.json index 506d35771..5858d331a 100644 --- a/ts/ui/menu/__locales__/de.json +++ b/ts/ui/menu/__locales__/de.json @@ -21,6 +21,7 @@ ".Speech/Title": "MathJax-Sprechtext", ".Svg/NotProduced": "SVG kann nicht erzeugt werden.
Versuchen Sie zunächst, zur SVG-Ausgabe zu wechseln.", ".Svg/Title": "MathJax-SVG-Bild", + ".Warn/CantCopy": "Kann nicht in die Zwischenablage kopiert werden: %1", ".Warn/ComponentNotLoaded": "Komponente %1 nicht geladen", ".Warn/StorageError": "MathJax-localStorage-Fehler: %1", ".Zoom/Title": "MathJax-vergrößerter Ausdruck", diff --git a/ts/ui/menu/__locales__/en.json b/ts/ui/menu/__locales__/en.json index d51ccf18b..ad96c702b 100644 --- a/ts/ui/menu/__locales__/en.json +++ b/ts/ui/menu/__locales__/en.json @@ -21,6 +21,7 @@ ".Speech/Title": "MathJax Speech Text", ".Svg/NotProduced": "SVG can't be produced.
Try switching to SVG output first.", ".Svg/Title": "MathJax SVG Image", + ".Warn/CantCopy": "Can't copy to clipboard: %1", ".Warn/ComponentNotLoaded": "Component %1 not loaded", ".Warn/StorageError": "MathJax localStorage error: %1", ".Zoom/Title": "MathJax Zoomed Expression", From d9400c2f0b0097ab48256e2aee1cb867510465e8 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sun, 31 May 2026 07:03:53 -0400 Subject: [PATCH 82/95] Add localization for remaining core functions and add tests --- testsuite/src/locale.ts | 5 + testsuite/src/setupTex.ts | 19 ++-- testsuite/tests/input/tex/Base.test.ts | 2 +- .../tex/__snapshots__/Noerrors.test.ts.snap | 2 +- testsuite/tests/util/BitField.test.ts | 1 + testsuite/tests/util/Locale.test.ts | 98 ++++++++++++++++++- testsuite/tests/util/Options.test.ts | 3 +- ts/adaptors/HTMLAdaptor.ts | 4 +- ts/core/HandlerList.ts | 8 +- ts/core/MathDocument.ts | 5 +- ts/core/MathItem.ts | 4 +- ts/core/MmlTree/MmlNode.ts | 41 ++++---- ts/core/MmlTree/MmlNodes/HtmlNode.ts | 2 +- ts/core/MmlTree/MmlNodes/math.ts | 2 +- ts/core/MmlTree/MmlNodes/mglyph.ts | 6 +- ts/core/MmlTree/MmlNodes/mmultiscripts.ts | 28 +----- ts/core/MmlTree/MmlNodes/mo.ts | 2 +- ts/core/MmlTree/MmlNodes/mrow.ts | 2 +- ts/core/MmlTree/MmlNodes/mtable.ts | 3 +- ts/core/MmlTree/MmlNodes/mtd.ts | 6 +- ts/core/MmlTree/MmlNodes/mtr.ts | 8 +- ts/core/__locales__/de.json | 28 ++++++ ts/core/__locales__/en.json | 28 ++++++ ts/input/mathml/MathMLCompile.ts | 3 +- ts/input/tex/__locales__/de.json | 2 +- ts/input/tex/__locales__/en.json | 2 +- ts/input/tex/color/ColorUtil.ts | 2 +- ts/output/common/FontData.ts | 23 +++-- ts/output/common/Wrapper.ts | 4 +- ts/util/AsyncLoad.ts | 5 +- ts/util/BitField.ts | 9 +- ts/util/Locale.ts | 34 ++++++- ts/util/Options.ts | 11 ++- ts/util/Retries.ts | 7 +- 34 files changed, 296 insertions(+), 113 deletions(-) create mode 100644 testsuite/src/locale.ts diff --git a/testsuite/src/locale.ts b/testsuite/src/locale.ts new file mode 100644 index 000000000..b3e18ccd4 --- /dev/null +++ b/testsuite/src/locale.ts @@ -0,0 +1,5 @@ +import { Locale } from '#js/util/Locale.js'; +import '#js/util/asyncLoad/esm.js'; +import '#js/core/__locales__/Component.js'; + +Locale.setLocale(); diff --git a/testsuite/src/setupTex.ts b/testsuite/src/setupTex.ts index fe741a992..6af7e0fe9 100644 --- a/testsuite/src/setupTex.ts +++ b/testsuite/src/setupTex.ts @@ -21,6 +21,7 @@ import { init } from '#source/node-main/node-main.mjs'; import { expect } from '@jest/globals'; import { source } from '#source/source.js'; import { Locale } from '#js/util/Locale.js'; +import { asyncLoad } from '#js/util/AsyncLoad.js'; import { trapErrors, trapAsyncErrors, @@ -32,6 +33,9 @@ declare const MathJax: any; type MATHITEM = MathItem; type PackageList = (string | [string, number])[]; +Locale.asyncLoad = asyncLoad; +Locale.syncLoad = mathjax.asyncLoad; + /** * The various conversion functions (set up in setupTex... function below). */ @@ -103,12 +107,11 @@ export function expectTypesetError( * * @param {string[]} packages The TeX packages to configure * @param {OptionList} options The TeX options to include - * @returns {Promise} The promise for when the locale is set up */ export function setupTex( packages: PackageList = ['base'], options: OptionList = {} -): Promise { +) { const parserOptions = Object.assign( {}, { packages }, @@ -116,10 +119,10 @@ export function setupTex( options ); const tex = new TeX(parserOptions); + Locale.setLocale(); const html = new HTMLDocument('', adaptor, { InputJax: tex }); convert = (expr: string, display: boolean) => toMathML(html.convert(expr, { display: display, end: STATE.CONVERT })); - return Locale.setLocale(); } /** @@ -128,12 +131,11 @@ export function setupTex( * * @param {string[]} packages The TeX packages to configure * @param {OptionList} options The TeX options to include - * @returns {Promise} The promise for when the locale is set up */ export function setupTexRender( packages: PackageList = ['base'], options: OptionList = {} -): Promise { +) { const parserOptions = Object.assign( {}, { packages: packages, inlineMath: { '[+]': [['$', '$']] } }, @@ -148,7 +150,7 @@ export function setupTexRender( html.findMath().compile(); return toMathML((Array.from(html.math)[0] as MATHITEM).root); }; - return Locale.setLocale(); + Locale.setLocale(); } /** @@ -218,12 +220,12 @@ import { SVG } from '#js/output/svg.js'; * * @param {string[]} packages The TeX packages to configure * @param {OptionList} options The TeX options to include - * @returns {Promise} The promise for when the locale is set up */ export function setupTexWithOutput( packages: string[] = ['base'], options: OptionList = {} -): Promise { +) { + Locale.setLocale(); const parserOptions = Object.assign({}, { packages: packages }, options); const tex = new TeX(parserOptions); const html = new HTMLDocument('', adaptor, { @@ -234,7 +236,6 @@ export function setupTexWithOutput( const toMathML = (node: MmlNode) => visitor.visitTree(node); convert = (expr: string, display: boolean) => toMathML(html.convert(expr, { display: display, end: STATE.CONVERT })); - return Locale.setLocale(); } /*********************************************************************/ diff --git a/testsuite/tests/input/tex/Base.test.ts b/testsuite/tests/input/tex/Base.test.ts index ac6aa539c..c8402c80a 100644 --- a/testsuite/tests/input/tex/Base.test.ts +++ b/testsuite/tests/input/tex/Base.test.ts @@ -4003,7 +4003,7 @@ describe('Complete Array', () => { }); it('BadPreamToken', () => { - expectTexError('\\begin{array}a').toBe('Illegal pream-token (a)'); + expectTexError('\\begin{array}a').toBe('Illegal preamble token: a'); }); it('Template Without End', () => { diff --git a/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap index 2cf6cc091..ce76f1ab2 100644 --- a/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap +++ b/testsuite/tests/input/tex/__snapshots__/Noerrors.test.ts.snap @@ -90,7 +90,7 @@ exports[`NoError EnvBadEnd 1`] = ` exports[`NoError EnvMissingEnd Array 1`] = ` " - + \\begin{array}a " diff --git a/testsuite/tests/util/BitField.test.ts b/testsuite/tests/util/BitField.test.ts index 615259502..8fc885227 100644 --- a/testsuite/tests/util/BitField.test.ts +++ b/testsuite/tests/util/BitField.test.ts @@ -1,4 +1,5 @@ import { describe, test, expect } from '@jest/globals'; +import '#helpers/locale.js'; import { BitField, BitFieldClass } from '#js/util/BitField.js'; const MAXBIT = (BitField as any).MAXBIT; diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index dd1e0ddb2..e3a96c09b 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -1,5 +1,7 @@ import { describe, test, expect } from '@jest/globals'; import { trapOutput, trapAsyncOutput } from '#helpers/traps.js'; +import { mathjax } from '#js/mathjax.js'; +import { asyncLoad } from '#js/util/AsyncLoad.js'; import { Locale } from '#js/util/Locale.js'; import '#js/util/asyncLoad/esm.js'; @@ -33,10 +35,10 @@ describe('Locale', () => { throw message; }; await expect(Locale.setLocale('xy')).rejects.toContain( - "MathJax(component): Can't load 'xy.json': ENOENT: no such file or directory" + "Can't load 'xy.json': ENOENT: no such file or directory" ); await expect(Locale.setLocale('de')).rejects.toContain( - "MathJax(component): 'de.json' kann nicht geladen werden: ENOENT: no such file or directory" + "'de.json' kann nicht geladen werden: ENOENT: no such file or directory" ); console.error = error; await Locale.setLocale('en'); @@ -51,7 +53,9 @@ describe('Locale', () => { test('Messages', async () => { Locale.registerLocaleFiles('component', '../testsuite/lib/component'); await Locale.setLocale('en'); // load English backups - await Locale.setLocale('test'); + await trapAsyncOutput('error', async () => { + await Locale.setLocale('test'); + }); expect(Locale.message('component', 'test1')).toBe('Has % percent'); expect(Locale.message('component', 'test2', 'x')).toBe('Has x one'); expect(Locale.message('component', 'test3', 'a', 'b')).toBe( @@ -129,6 +133,94 @@ describe('Locale', () => { }); /********************************************************************************/ + + test('Locale sync', () => { + const locale = Locale as any; + Locale.registerLocaleFiles('sync', '../testsuite/lib/component'); + + // + // Save environment + // + const sync = Locale.syncLoad; + const error = console.error; + + // + // Test synchronous loading failure + // + Locale.syncLoad = () => { + throw Error('failed!'); + }; + + const log: string[] = []; + console.error = (msg) => log.push(msg); + + locale.getLocaleData('sync', 'en', 'en.json').catch(() => {}); + expect(log).toEqual(["MathJax(sync): Can't load 'en.json': failed!"]); + + // + // Test synchronous loading success + // + Locale.syncLoad = () => { + return { test: 'A test' }; + }; + + locale.getLocaleData('sync', 'en', 'en.json'); + expect(Locale.message('sync', 'test')).toBe('A test'); + + // + // Restore environment + // + Locale.syncLoad = sync; + console.error = error; + }); + + /********************************************************************************/ + + test('Locale setup', async () => { + Locale.registerLocaleFiles('sync', '../testsuite/lib/component'); + + // + // Save environment + // + const [sync, async] = [Locale.syncLoad, Locale.asyncLoad]; + const [load, isSync] = [mathjax.asyncLoad, mathjax.asyncIsSynchronous]; + + // + // Test synchronous setup + // + mathjax.asyncLoad = (_file) => { + return {}; + }; + mathjax.asyncIsSynchronous = true; + Locale.asyncLoad = Locale.syncLoad = null; + + await Locale.setLocale(); + expect(Locale.asyncLoad).toBe(null); + expect(Locale.syncLoad).toEqual(mathjax.asyncLoad); + + // + // Test asynchronous setup + // + mathjax.asyncLoad = (_file) => { + return {}; + }; + mathjax.asyncIsSynchronous = false; + Locale.asyncLoad = Locale.syncLoad = null; + + await Locale.setLocale(); + expect(Locale.asyncLoad).toEqual(asyncLoad); + expect(Locale.syncLoad).toBe(null); + + // + // Restore environment + // + Locale.asyncLoad = async; + Locale.syncLoad = sync; + mathjax.asyncLoad = load; + mathjax.asyncIsSynchronous = isSync; + }); + + /********************************************************************************/ }); /**********************************************************************************/ diff --git a/testsuite/tests/util/Options.test.ts b/testsuite/tests/util/Options.test.ts index c5aa72cad..71bd055bb 100644 --- a/testsuite/tests/util/Options.test.ts +++ b/testsuite/tests/util/Options.test.ts @@ -1,4 +1,5 @@ import { describe, test, expect } from '@jest/globals'; +import '#helpers/locale.js'; import * as Options from '#js/util/Options.js'; const SYMB = Symbol('symbol'); @@ -348,7 +349,7 @@ describe('Options utility', () => { try { copy = Options.userOptions({}, { a: 1 }); } catch (err) { - expect(err.message).toBe('Invalid option "a" (no default value).'); + expect(err.message).toBe(`Invalid option 'a' (no default value).`); } expect(copy).toEqual(undefined); diff --git a/ts/adaptors/HTMLAdaptor.ts b/ts/adaptors/HTMLAdaptor.ts index 8c10b3b23..d77f5648a 100644 --- a/ts/adaptors/HTMLAdaptor.ts +++ b/ts/adaptors/HTMLAdaptor.ts @@ -28,6 +28,8 @@ import { DOMAdaptor, PageBBox, } from '../core/DOMAdaptor.js'; +import { Locale } from '../util/Locale.js'; +import { COMPONENT } from '../core/__locales__/Component.js'; /*****************************************************************/ /** @@ -572,7 +574,7 @@ export class HTMLAdaptor< try { node.sheet.insertRule(rule, node.sheet.cssRules.length); } catch (e) { - console.warn(`MathJax: can't insert css rule '${rule}': ${e.message}`); + Locale.warn(COMPONENT, 'CantInsertCSS', rule, e.message); } } } diff --git a/ts/core/HandlerList.ts b/ts/core/HandlerList.ts index 5d4054134..a4ff9970a 100644 --- a/ts/core/HandlerList.ts +++ b/ts/core/HandlerList.ts @@ -25,6 +25,8 @@ import { PrioritizedList } from '../util/PrioritizedList.js'; import { OptionList } from '../util/Options.js'; import { Handler } from './Handler.js'; import { MathDocument } from './MathDocument.js'; +import { Locale } from '../util/Locale.js'; +import { COMPONENT } from '../core/__locales__/Component.js'; /*****************************************************************/ /** @@ -55,8 +57,8 @@ export class HandlerList extends PrioritizedList> { } /** - * @param {any} document The document (string, window, DOM element, etc) to be handled - * @returns {Handler} The handler from the list that can process the given document + * @param {any} document The document (string, window, DOM element, etc) to be handled + * @returns {Handler} The handler from the list that can process the given document */ public handlesDocument(document: any): Handler { for (const item of this) { @@ -65,7 +67,7 @@ export class HandlerList extends PrioritizedList> { return handler; } } - throw new Error(`Can't find handler for document`); + return Locale.throw(COMPONENT, 'NoHandler'); } /** diff --git a/ts/core/MathDocument.ts b/ts/core/MathDocument.ts index aa250aed7..dd810be39 100644 --- a/ts/core/MathDocument.ts +++ b/ts/core/MathDocument.ts @@ -37,6 +37,7 @@ import { DOMAdaptor } from '../core/DOMAdaptor.js'; import { BitField, BitFieldClass } from '../util/BitField.js'; import { PrioritizedList } from '../util/PrioritizedList.js'; import { handleRetriesFor } from '../util/Retries.js'; +import { localize } from './__locales__/Component.js'; /*****************************************************************/ @@ -1060,7 +1061,7 @@ export abstract class AbstractMathDocument implements MathDocument< [ this.mmlFactory.create('mtext', null, [ (this.mmlFactory.create('text') as TextNode).setText( - 'Math input error' + localize('InputError') ), ]), ] @@ -1118,7 +1119,7 @@ export abstract class AbstractMathDocument implements MathDocument< 'line-height': 'normal', }, }, - [this.adaptor.text('Math output error')] + [this.adaptor.text(localize('OutputError'))] ), ] ); diff --git a/ts/core/MathItem.ts b/ts/core/MathItem.ts index 34b03a2c3..ff131eed4 100644 --- a/ts/core/MathItem.ts +++ b/ts/core/MathItem.ts @@ -25,6 +25,8 @@ import { MathDocument } from './MathDocument.js'; import { InputJax } from './InputJax.js'; import { OptionList } from '../util/Options.js'; import { MmlNode } from './MmlTree/MmlNode.js'; +import { Locale } from '../util/Locale.js'; +import { COMPONENT } from './__locales__/Component.js'; /*****************************************************************/ /** @@ -492,7 +494,7 @@ export const STATE: { [state: string]: number } = { */ export function newState(name: string, state: number) { if (name in STATE) { - throw Error('State ' + name + ' already exists'); + Locale.throw(COMPONENT, 'StateExists', name); } STATE[name] = state; } diff --git a/ts/core/MmlTree/MmlNode.ts b/ts/core/MmlTree/MmlNode.ts index 316adbe84..8efe5204b 100644 --- a/ts/core/MmlTree/MmlNode.ts +++ b/ts/core/MmlTree/MmlNode.ts @@ -32,6 +32,8 @@ import { } from '../Tree/Node.js'; import { MmlFactory } from './MmlFactory.js'; import { DOMAdaptor } from '../DOMAdaptor.js'; +import { Locale } from '../../util/Locale.js'; +import { COMPONENT } from '../__locales__/Component.js'; /** * Used in setInheritedAttributes() to pass originating node kind as well as property value @@ -260,12 +262,18 @@ export interface MmlNode extends Node { /** * Replace the current node with an error message (or the name of the node) * - * @param {string} message The error message to use + * @param {string} id The id of the error message to use + * @param {string[]} args The data to insert into the message * @param {PropertyList} options The options telling how much to verify * @param {boolean} short True means use just the kind if not using full errors - * @returns {MmlNode} The construted merror + * @returns {MmlNode} The constructed merror */ - mError(message: string, options: PropertyList, short?: boolean): MmlNode; + mError( + id: string, + args: string[], + options: PropertyList, + short?: boolean + ): MmlNode; /** * Check integrity of MathML structure @@ -916,11 +924,7 @@ export abstract class AbstractMmlNode ((arity === 1 && this.childNodes.length === 0) || (arity !== 1 && this.childNodes.length !== arity)) ) { - this.mError( - 'Wrong number of children for "' + this.kind + '" node', - options, - true - ); + this.mError('MML/Arity', [this.kind], options, true); } } this.verifyChildren(options); @@ -947,10 +951,7 @@ export abstract class AbstractMmlNode // FIXME: add ability to check attribute values? } if (bad.length) { - this.mError( - 'Unknown attributes for ' + this.kind + ' node: ' + bad.join(', '), - options - ); + this.mError('MML/BadAttr', [this.kind, bad.join(', ')], options); } } if (options.checkMathvariants) { @@ -960,7 +961,7 @@ export abstract class AbstractMmlNode !MATHVARIANTS.has(variant) && !this.getProperty('ignore-variant') ) { - this.mError(`Invalid mathvariant: ${variant}`, options, true); + this.mError('MML/BadVariant', [variant], options, true); } } } @@ -979,19 +980,22 @@ export abstract class AbstractMmlNode /** * Replace the current node with an error message (or the name of the node) * - * @param {string} message The error message to use + * @param {string} id The id of the error message to use + * @param {string[]} args The data to insert into the message * @param {PropertyList} options The options telling how much to verify * @param {boolean} short True means use just the kind if not using full errors - * @returns {MmlNode} The constructed merror + * @returns {MmlNode} The constructed merror */ public mError( - message: string, + id: string, + args: string[], options: PropertyList, short: boolean = false ): MmlNode { if (this.parent && this.parent.isKind('merror')) { return null; } + const message = Locale.message(COMPONENT, id, ...args); const merror = this.factory.create('merror'); merror.attributes.set('data-mjx-message', message); if (options.fullErrors || short) { @@ -1420,7 +1424,8 @@ export abstract class AbstractMmlEmptyNode * @override */ public mError( - _message: string, + _id: string, + _args: string[], _options: PropertyList, _short: boolean = false ) { @@ -1455,7 +1460,7 @@ export class TextNode extends AbstractMmlEmptyNode { /** * @param {string} text The text to use for the node - * @returns {TextNode} The text node (for chaining of method calls) + * @returns {TextNode} The text node (for chaining of method calls) */ public setText(text: string): TextNode { this.text = text; diff --git a/ts/core/MmlTree/MmlNodes/HtmlNode.ts b/ts/core/MmlTree/MmlNodes/HtmlNode.ts index d0fb1cb8e..838d88176 100644 --- a/ts/core/MmlTree/MmlNodes/HtmlNode.ts +++ b/ts/core/MmlTree/MmlNodes/HtmlNode.ts @@ -95,7 +95,7 @@ export class HtmlNode extends XMLNode { */ public verifyTree(options: PropertyList) { if (this.parent && !this.parent.isToken) { - this.mError('HTML can only be a child of a token element', options, true); + this.mError('MML/TokenChild', ['HTML'], options, true); return; } } diff --git a/ts/core/MmlTree/MmlNodes/math.ts b/ts/core/MmlTree/MmlNodes/math.ts index 7002bc6e3..128e3e550 100644 --- a/ts/core/MmlTree/MmlNodes/math.ts +++ b/ts/core/MmlTree/MmlNodes/math.ts @@ -126,7 +126,7 @@ export class MmlMath extends AbstractMmlLayoutNode { public verifyTree(options: PropertyList = null) { super.verifyTree(options); if (this.parent) { - this.mError('Improper nesting of math tags', options, true); + this.mError('MML/BadNesting', [], options, true); } } } diff --git a/ts/core/MmlTree/MmlNodes/mglyph.ts b/ts/core/MmlTree/MmlNodes/mglyph.ts index 81c9d987f..ecf3935c0 100644 --- a/ts/core/MmlTree/MmlNodes/mglyph.ts +++ b/ts/core/MmlTree/MmlNodes/mglyph.ts @@ -65,11 +65,7 @@ export class MmlMglyph extends AbstractMmlTokenNode { 'index' ); if (src === '' && (fontfamily === '' || index === '')) { - this.mError( - 'mglyph must have either src or fontfamily and index attributes', - options, - true - ); + this.mError('MML/mglyphAttr', [], options, true); } else { super.verifyAttributes(options); } diff --git a/ts/core/MmlTree/MmlNodes/mmultiscripts.ts b/ts/core/MmlTree/MmlNodes/mmultiscripts.ts index 470f0227c..0b4b504a5 100644 --- a/ts/core/MmlTree/MmlNodes/mmultiscripts.ts +++ b/ts/core/MmlTree/MmlNodes/mmultiscripts.ts @@ -116,27 +116,17 @@ export class MmlMmultiscripts extends MmlMsubsup { const child = this.childNodes[i]; if (child.isKind('mprescripts')) { if (prescripts) { - child.mError( - child.kind + ' can only appear once in ' + this.kind, - options, - true - ); + child.mError('MML/OnlyOnce', [child.kind, this.kind], options, true); } else { prescripts = true; if (i % 2 === 0 && !fix) { - this.mError( - 'There must be an equal number of prescripts of each type', - options - ); + this.mError('MML/EqualPrescripts', [], options); } } } } if (this.childNodes.length % 2 === (prescripts ? 1 : 0) && !fix) { - this.mError( - 'There must be an equal number of scripts of each type', - options - ); + this.mError('MML/EqualScripts', [], options); } super.verifyChildren(options); } @@ -177,11 +167,7 @@ export class MmlMprescripts extends AbstractMmlNode { public verifyTree(options: PropertyList) { super.verifyTree(options); if (this.parent && !this.parent.isKind('mmultiscripts')) { - this.mError( - this.kind + ' must be a child of mmultiscripts', - options, - true - ); + this.mError('MML/mmultiscriptsChild', [this.kind], options, true); } } } @@ -221,11 +207,7 @@ export class MmlNone extends AbstractMmlNode { public verifyTree(options: PropertyList) { super.verifyTree(options); if (this.parent && !this.parent.isKind('mmultiscripts')) { - this.mError( - this.kind + ' must be a child of mmultiscripts', - options, - true - ); + this.mError('MML/mmultiscriptsChild', [this.kind], options, true); } } } diff --git a/ts/core/MmlTree/MmlNodes/mo.ts b/ts/core/MmlTree/MmlNodes/mo.ts index 29b958379..ded0a5c03 100644 --- a/ts/core/MmlTree/MmlNodes/mo.ts +++ b/ts/core/MmlTree/MmlNodes/mo.ts @@ -186,7 +186,7 @@ export class MmlMo extends AbstractMmlTokenNode { * * @returns {number} The TeX class. */ - public get texClass() { + public get texClass(): number { if (this._texClass === null) { return this.getOperatorDef(this.getText())[2]; } diff --git a/ts/core/MmlTree/MmlNodes/mrow.ts b/ts/core/MmlTree/MmlNodes/mrow.ts index d23b3550b..5607bde20 100644 --- a/ts/core/MmlTree/MmlNodes/mrow.ts +++ b/ts/core/MmlTree/MmlNodes/mrow.ts @@ -220,7 +220,7 @@ export class MmlInferredMrow extends MmlMrow { * * @returns {string} The child nodes string */ - public toString() { + public toString(): string { return '[' + this.childNodes.join(',') + ']'; } } diff --git a/ts/core/MmlTree/MmlNodes/mtable.ts b/ts/core/MmlTree/MmlNodes/mtable.ts index 54ba26258..bb05e4583 100644 --- a/ts/core/MmlTree/MmlNodes/mtable.ts +++ b/ts/core/MmlTree/MmlNodes/mtable.ts @@ -192,7 +192,8 @@ export class MmlMtable extends AbstractMmlNode { mtr.appendChild(factory.create('mtd')); } const merror = child.mError( - 'Children of ' + this.kind + ' must be mtr or mlabeledtr', + 'MML/mtableChildren', + [this.kind], options, isMtd ); diff --git a/ts/core/MmlTree/MmlNodes/mtd.ts b/ts/core/MmlTree/MmlNodes/mtd.ts index bd9ae27a4..92d92a3e6 100644 --- a/ts/core/MmlTree/MmlNodes/mtd.ts +++ b/ts/core/MmlTree/MmlNodes/mtd.ts @@ -83,11 +83,7 @@ export class MmlMtd extends AbstractMmlBaseNode { */ protected verifyChildren(options: PropertyList) { if (this.parent && !this.parent.isKind('mtr')) { - this.mError( - this.kind + ' can only be a child of an mtr or mlabeledtr', - options, - true - ); + this.mError('MML/mtrChild', [this.kind], options, true); return; } super.verifyChildren(options); diff --git a/ts/core/MmlTree/MmlNodes/mtr.ts b/ts/core/MmlTree/MmlNodes/mtr.ts index 6f2d88785..8c1e5fa61 100644 --- a/ts/core/MmlTree/MmlNodes/mtr.ts +++ b/ts/core/MmlTree/MmlNodes/mtr.ts @@ -112,11 +112,7 @@ export class MmlMtr extends AbstractMmlNode { */ protected verifyChildren(options: PropertyList) { if (this.parent && !this.parent.isKind('mtable')) { - this.mError( - this.kind + ' can only be a child of an mtable', - options, - true - ); + this.mError('MML/mtableChild', [this.kind], options, true); return; } for (const child of this.childNodes) { @@ -124,7 +120,7 @@ export class MmlMtr extends AbstractMmlNode { const mtd = this.replaceChild(this.factory.create('mtd'), child); mtd.appendChild(child); if (!options['fixMtables']) { - child.mError('Children of ' + this.kind + ' must be mtd', options); + child.mError('MML/mtrChildren', [], options); } } } diff --git a/ts/core/__locales__/de.json b/ts/core/__locales__/de.json index 067e6ea88..9ad878f04 100644 --- a/ts/core/__locales__/de.json +++ b/ts/core/__locales__/de.json @@ -1,9 +1,37 @@ { "AdaptorNotDefined": "DOMAdaptor '%1' ist nicht definiert (wurde es geladen?)", + "Bit/Exists": "Bit bereits für %1 zugewiesen", + "Bit/Max": "Maximale Anzahl bereits zugewiesener Bits", + "Bit/Unknown": "Unbekannter Name des Bitfelds: %1", + "CantInsertCSS": "Die CSS-Regel '%1' kann nicht eingefügt werden: %2", "CantLoad": "'%1' kann nicht geladen werden%2", + "FontData/BadAsync": "MathJax(%1): %2 muss angegeben und synchron sein\n Versuchen Sie, %3 und %4 zu importieren", + "FontData/CantLoad": "Die dynamische Datei '%1' konnte nicht geladen werden", + "FontData/NoData": "Für %1 wurden keine Zeichendaten geladen", "HandlerNotDefined": "Handler '%1' ist nicht definiert (wurde es geladen?)", + "InputError": "Fehler bei der mathematischen Eingabe", "InputJaxNotDefined": "Input Jax '%1' ist nicht definiert (wurde es geladen?)", + "MML/Arity": "Falsche Anzahl von untergeordneten Elementen für den Knoten '%1'", + "MML/BadAttr": "Unbekannte Attribute für den Knoten '%1': %2", + "MML/BadNesting": "Falsche Verschachtelung von Math-Tags", + "MML/BadVariant": "Ungültige mathvariant: %1", + "MML/EqualPrescripts": "Es muss eine gleiche Anzahl von Vorzeichen jedes Typs vorhanden sein", + "MML/EqualScripts": "Es muss eine gleiche Anzahl von Skripten jedes Typs vorhanden sein", + "MML/NoVariant": "Es sollten keine untergeordneten Elemente für '%1'-Knoten vorhanden sein", + "MML/OnlyOnce": "%1 darf in %2 nur einmal vorkommen", + "MML/TokenChild": "%1 darf nur ein untergeordnetes Element eines Token-Elements sein", + "MML/mglyphAttr": "mglyph muss entweder die Attribute src oder fontfamily sowie das Attribut index aufweisen", + "MML/mmultscriptsChild": "%1 muss ein untergeordnetes Element von mmultiscripts sein", + "MML/mtableChild": "%1 kann nur ein Kind von mtable sein", + "MML/mtableChildren": "Kinder von '%1' müssen mtr oder mlabeledtr sein", + "MML/mtrChild": "%1 kann nur ein Kind von mtr oder mlabeledtr sein", + "MML/mtrChildren": "Kinder von '%1' müssen mtd sein", + "NoAsync": "Kann '%1' nicht laden: Es wurde keine %2-Methode angegeben", "NoVersionFor": "Für die Komponente '%1' liegen keine Versionsinformationen vor", + "Option/Invalid": "Ungültige Option '%1' (kein Standardwert).", + "OutputError": "Fehler bei der mathematischen Ausgabe", "OutputJaxNotDefined": "Output Jax '%1' ist nicht definiert (wurde es geladen?)", + "RetryError": "MathJax Wiederholungsversuch -- es ist eine asynchrone Aktion erforderlich; versuche es mit einer der Promise-basierten Funktionen und warte auf deren Ergebnis.", + "StateExists": "Der Zustand %1 existiert bereits", "WrongVersion": "Die Komponente %1 verwendet Version %2 von MathJax; die verwendete Version ist %3" } diff --git a/ts/core/__locales__/en.json b/ts/core/__locales__/en.json index 2e186973a..ea851838d 100644 --- a/ts/core/__locales__/en.json +++ b/ts/core/__locales__/en.json @@ -1,9 +1,37 @@ { "AdaptorNotDefined": "DOMAdaptor '%1' is not defined (has it been loaded?)", + "Bit/Exists": "Bit already allocated for %1", + "Bit/Max": "Maximum number of bits already allocated", + "Bit/Unknown": "Unknown bit-field name: %1", + "CantInsertCSS": "Can't insert CSS rule '%1': %2", "CantLoad": "Can't load '%1'%2", + "FontData/BadAsync": "MathJax(%1): %2 must be specified and synchronous\n Try importing %3 and %4", + "FontData/CantLoad": "Dynamic file '%1' failed to load", + "FontData/NoData": "Character data hasn't been loaded for %1", "HandlerNotDefined": "Handler '%1' is not defined (has it been loaded?)", + "InputError": "Math input error", "InputJaxNotDefined": "Input Jax '%1' is not defined (has it been loaded?)", + "MML/Arity": "Wrong number of children for '%1' node", + "MML/BadAttr": "Unknown attributes for '%1' node: %2", + "MML/BadNesting": "Improper nesting of math tags", + "MML/BadVariant": "Invalid mathvariant: %1", + "MML/EqualPrescripts": "There must be an equal number of prescripts of each type", + "MML/EqualScripts": "There must be an equal number of scripts of each type", + "MML/NoVariant": "There should not be children for '%1' nodes", + "MML/OnlyOnce": "%1 can only appear once in %2", + "MML/TokenChild": "%1 can only be a child of a token element", + "MML/mglyphAttr": "mglyph must have either src or fontfamily and index attributes", + "MML/mmultscriptsChild": "%1 must be a child of mmultiscripts", + "MML/mtableChild": "%1 can only be a child of an mtable", + "MML/mtableChildren": "Children of '%1' must be mtr or mlabeledtr", + "MML/mtrChild": "%1 can only be a child of an mtr or mlabeledtr", + "MML/mtrChildren": "Children of '%1' must be mtd", + "NoAsync": "Can't load '%1': No %2 method specified", "NoVersionFor": "No version information available for component '%1'", + "Option/Invalid": "Invalid option '%1' (no default value).", + "OutputError": "Math output error", "OutputJaxNotDefined": "Output Jax '%1' is not defined (has it been loaded?)", + "RetryError": "MathJax retry -- an asynchronous action is required; try using one of the promise-based functions and await its resolution.", + "StateExists": "State %1 already exists", "WrongVersion": "Component %1 uses version %2 of MathJax; version in use is %3" } diff --git a/ts/input/mathml/MathMLCompile.ts b/ts/input/mathml/MathMLCompile.ts index 2a9ad34fd..22de535e4 100644 --- a/ts/input/mathml/MathMLCompile.ts +++ b/ts/input/mathml/MathMLCompile.ts @@ -299,7 +299,8 @@ export class MathMLCompile { this.addChildren(mml, child); } else { childMml.mError( - 'There should not be children for ' + childMml.kind + ' nodes', + 'MML/NoChildren', + [childMml.kind], this.options['verify'], true ); diff --git a/ts/input/tex/__locales__/de.json b/ts/input/tex/__locales__/de.json index bc859713d..187334ac5 100644 --- a/ts/input/tex/__locales__/de.json +++ b/ts/input/tex/__locales__/de.json @@ -1,5 +1,5 @@ { - "BadPreamToken": "Ungültiges Pream-Token (%1)", + "BadPreamToken": "Ungültiges Preamble Token: %1", "BadRawUnicode": "Das Argument für %1 muss eine hexadezimale Zahl mit 1 bis 6 Ziffern sein", "ColArgNotNum": "Das erste Argument für den Spaltenbezeichner %1 muss eine Zahl sein", "ConfigNotFound": "Konfiguration '%1' nicht gefunden. Wird übersprungen.", diff --git a/ts/input/tex/__locales__/en.json b/ts/input/tex/__locales__/en.json index c182ba087..d80b7b597 100644 --- a/ts/input/tex/__locales__/en.json +++ b/ts/input/tex/__locales__/en.json @@ -1,5 +1,5 @@ { - "BadPreamToken": "Illegal pream-token (%1)", + "BadPreamToken": "Illegal preamble token: %1", "BadRawUnicode": "Argument to %1 must a hexadecimal number with 1 to 6 digits", "ColArgNotNum": "First argument to %1 column specifier must be a number", "ConfigNotFound": "Configuration '%1' not found. Omitted.", diff --git a/ts/input/tex/color/ColorUtil.ts b/ts/input/tex/color/ColorUtil.ts index 97f5e0615..f61d3b5ea 100644 --- a/ts/input/tex/color/ColorUtil.ts +++ b/ts/input/tex/color/ColorUtil.ts @@ -99,7 +99,7 @@ export class ColorModel { return COLORS.get(name); } if (name.match(/;/)) { - texError(COMPONENT, 'BadColorValue', 'Invalid color value'); + texError(COMPONENT, 'BadColorValue'); } // Pass the color name as-is to CSS return name; diff --git a/ts/output/common/FontData.ts b/ts/output/common/FontData.ts index a74e341c3..6056e29bd 100644 --- a/ts/output/common/FontData.ts +++ b/ts/output/common/FontData.ts @@ -27,6 +27,8 @@ import { OptionList, defaultOptions, userOptions } from '../../util/Options.js'; import { StyleJson } from '../../util/StyleJson.js'; import { asyncLoad } from '../../util/AsyncLoad.js'; import { retryAfter } from '../../util/Retries.js'; +import { Locale } from '../../util/Locale.js'; +import { COMPONENT, localize } from '../../core/__locales__/Component.js'; import { DIRECTION } from './Direction.js'; export { DIRECTION } from './Direction.js'; @@ -750,8 +752,10 @@ export class FontData< ): CharOptions { const char = font[n]; if (!Array.isArray(char)) { - throw Error( - `Character data hasn't been loaded for 0x${n.toString(16).toUpperCase()}` + Locale.throw( + COMPONENT, + 'FontData/NoData', + `0x${n.toString(16).toUpperCase()}` ); } if (char.length === 3) { @@ -1241,10 +1245,11 @@ export class FontData< * @returns {Promise} The promise that is resolved when the file is loaded */ public async loadDynamicFile(dynamic: DynamicFile): Promise { - if (dynamic.failed) + if (dynamic.failed) { return Promise.reject( - new Error(`dynamic file '${dynamic.file}' failed to load`) + new Error(localize('FontData/CantLoad', dynamic.file)) ); + } if (!dynamic.promise) { dynamic.promise = asyncLoad(this.dynamicFileName(dynamic)).catch( (err) => { @@ -1282,9 +1287,13 @@ export class FontData< */ public loadDynamicFilesSync() { if (!mathjax.asyncIsSynchronous) { - throw Error( - 'MathJax(loadDynamicFilesSync): mathjax.asyncLoad must be specified and synchronous\n' + - ' Try importing #js/../components/require.mjs and #js/util/asyncLoad/node.js' + Locale.throw( + COMPONENT, + 'FontData/BadAsync', + 'loadDynamicFileSync', + 'mathjax.asyncLoad', + '@mathjax/src/components/require.mjs', + '@mathjax/src/js/util/asyncLoad/node.js' ); } const dynamicFiles = this.CLASS.dynamicFiles; diff --git a/ts/output/common/Wrapper.ts b/ts/output/common/Wrapper.ts index cab7274c8..5ab07c7f8 100644 --- a/ts/output/common/Wrapper.ts +++ b/ts/output/common/Wrapper.ts @@ -55,6 +55,8 @@ import { DIRECTION, NOSTRETCH, } from './FontData.js'; +import { Locale } from '../../util/Locale.js'; +import { COMPONENT } from '../../core/__locales__/Component.js'; /*****************************************************************/ @@ -928,7 +930,7 @@ export class CommonWrapper< let variant = attributes.get('mathvariant') as string; if (attributes.hasExplicit('mathvariant')) { if (!this.font.getVariant(variant)) { - console.warn(`Invalid variant: ${variant}`); + Locale.warn(COMPONENT, 'MML/BadVariant', variant); variant = 'normal'; } } else { diff --git a/ts/util/AsyncLoad.ts b/ts/util/AsyncLoad.ts index 958ba70c5..fdd59f1bc 100644 --- a/ts/util/AsyncLoad.ts +++ b/ts/util/AsyncLoad.ts @@ -22,6 +22,7 @@ */ import { mathjax } from '../mathjax.js'; +import { localize } from '../core/__locales__/Component.js'; /** * Load a file asynchronously using the mathjax.asynchLoad method, if there is one @@ -31,9 +32,7 @@ import { mathjax } from '../mathjax.js'; */ export function asyncLoad(name: string): Promise { if (!mathjax.asyncLoad) { - return Promise.reject( - `Can't load '${name}': No mathjax.asyncLoad method specified` - ); + return Promise.reject(localize('NoAsync', name, 'mathjax.asyncLoad')); } return new Promise((ok, fail) => { const result = mathjax.asyncLoad(name); diff --git a/ts/util/BitField.ts b/ts/util/BitField.ts index da28254c0..f8f0390d7 100644 --- a/ts/util/BitField.ts +++ b/ts/util/BitField.ts @@ -21,6 +21,9 @@ * @author dpvc@mathjax.org (Davide Cervone) */ +import { Locale } from './Locale.js'; +import { COMPONENT } from '../core/__locales__/Component.js'; + export class BitField { /** * The largest bit available @@ -48,10 +51,10 @@ export class BitField { public static allocate(...names: string[]) { for (const name of names) { if (this.has(name)) { - throw new Error('Bit already allocated for ' + name); + Locale.throw(COMPONENT, 'Bit/Exists', name); } if (this.next === BitField.MAXBIT) { - throw new Error('Maximum number of bits already allocated'); + Locale.throw(COMPONENT, 'Bit/Max'); } this.names.set(name, this.next); this.next <<= 1; @@ -102,7 +105,7 @@ export class BitField { protected getBit(name: string): number { const bit = (this.constructor as typeof BitField).names.get(name); if (!bit) { - throw new Error('Unknown bit-field name: ' + name); + Locale.throw(COMPONENT, 'Bit/Unknown', name); } return bit; } diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index e7b5ade36..395fb56d5 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -21,8 +21,6 @@ * @author dpvc@mathjax.org (Davide Cervone) */ -import { asyncLoad } from './AsyncLoad.js'; - /** * The various object map types */ @@ -50,6 +48,13 @@ export class Locale { */ public static isComponent: boolean = false; + /** + * util/AsyncLoad.js must be loaded via import() to avoid cyclical imports + * that would cause a ReferenceError for Locale. + */ + public static asyncLoad: (file: string) => Promise; + public static syncLoad: (file: string) => any; + /** * The localized message strings, per component and locale, * with the default message for localeError() below. @@ -220,7 +225,7 @@ export class Locale { id: string, data: string | namedData = {}, ...args: string[] - ) { + ): never { throw Error(this.message(component, id, data, ...args)); } @@ -251,6 +256,15 @@ export class Locale { public static async setLocale( locale: string = this.current ): Promise { + this.initialized = true; + if (!this.syncLoad && !this.asyncLoad) { + const { mathjax } = await import('../mathjax.js'); + if (mathjax.asyncIsSynchronous) { + this.syncLoad = mathjax.asyncLoad; + } else if (!this.asyncLoad) { + this.asyncLoad = (await import('./AsyncLoad.js')).asyncLoad; + } + } this.current = locale; const promises = []; for (const [component, [directory, loaded]] of Object.entries( @@ -279,7 +293,19 @@ export class Locale { locale: string, file: string ): Promise { - return asyncLoad(file) + if (this.syncLoad) { + try { + this.registerMessages( + component, + locale, + this.syncLoad(file) as any as messageData + ); + } catch (error) { + await this.localeError(component, locale, error); + } + return; + } + return this.asyncLoad(file) .then((data: messageData) => this.registerMessages(component, locale, data) ) diff --git a/ts/util/Options.ts b/ts/util/Options.ts index 3536fa2be..cfc4d08cb 100644 --- a/ts/util/Options.ts +++ b/ts/util/Options.ts @@ -21,7 +21,11 @@ * @author dpvc@mathjax.org (Davide Cervone) */ +import { Locale } from './Locale.js'; +import { COMPONENT } from '../core/__locales__/Component.js'; + /*****************************************************************/ + const OBJECT = {}.constructor; /** @@ -85,9 +89,9 @@ export const OPTIONS = { */ optionError: (message: string, _key: string) => { if (OPTIONS.invalidOption === 'fatal') { - throw new Error(message); + throw Error(message); } - console.warn('MathJax: ' + message); + console.warn(message); }, }; @@ -192,7 +196,8 @@ export function insert( if (typeof key === 'symbol') { key = (key as symbol).toString(); } - OPTIONS.optionError(`Invalid option "${key}" (no default value).`, key); + const message = Locale.message(COMPONENT, 'Option/Invalid', key); + OPTIONS.optionError(message, key); continue; } // diff --git a/ts/util/Retries.ts b/ts/util/Retries.ts index 75e1564df..ba95894e0 100644 --- a/ts/util/Retries.ts +++ b/ts/util/Retries.ts @@ -21,6 +21,8 @@ * @author dpvc@mathjax.org (Davide Cervone) */ +import { localize } from '../core/__locales__/Component.js'; + /*****************************************************************/ /* * The legacy MathJax object (FIXME: remove this after all v2 code is gone) @@ -113,10 +115,7 @@ export function handleRetriesFor(code: () => any): Promise { * actions will continue */ export function retryAfter(promise: Promise) { - const err = new Error( - 'MathJax retry -- an asynchronous action is required; ' + - 'try using one of the promise-based functions and await its resolution.' - ) as RetryError; + const err = new Error(localize('RetryError')) as RetryError; err.retry = promise; throw err; } From a706edf11df6df2a3002a5da803a260fc74724a8 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 29 May 2026 07:05:30 -0400 Subject: [PATCH 83/95] Localize dialogs --- ts/core/__locales__/de.json | 6 +++++ ts/core/__locales__/en.json | 6 +++++ ts/ui/dialog/CopyDialog.ts | 3 ++- ts/ui/dialog/DraggableDialog.ts | 47 +++++---------------------------- 4 files changed, 20 insertions(+), 42 deletions(-) diff --git a/ts/core/__locales__/de.json b/ts/core/__locales__/de.json index 9ad878f04..7a9a20afc 100644 --- a/ts/core/__locales__/de.json +++ b/ts/core/__locales__/de.json @@ -5,6 +5,12 @@ "Bit/Unknown": "Unbekannter Name des Bitfelds: %1", "CantInsertCSS": "Die CSS-Regel '%1' kann nicht eingefügt werden: %2", "CantLoad": "'%1' kann nicht geladen werden%2", + "Dialog/Btn/Close": "Dialogfeld schließen", + "Dialog/Btn/Help": "Dialoghilfe", + "Dialog/CantCopy": "Kann nicht in die Zwischenablage kopiert werden: %1", + "Dialog/CopyToClip": "In die Zwischenablage kopieren", + "Dialog/Help/Message": "

Die Dialogfelder in MathJax lassen sich verschieben und in der Größe anpassen.

\n

Mausbenutzer können durch Ziehen an einer der Kanten das Dialogfeld vergrößern oder verkleinern, indem sie diese Seite verschieben. Durch Ziehen an einer der Ecken werden die beiden Seiten verändert, die an dieser Ecke aufeinandertreffen. Durch Ziehen an einer anderen Stelle des Dialograhmens wird das Dialogfeld verschoben, ohne seine Größe zu verändern.

\n

Für Tastaturbenutzer gibt es zwei Möglichkeiten, die Position und Größe des Dialogfelds anzupassen. Zunächst halten Sie die Taste Alt oder Option gedrückt und drücken eine der Pfeiltasten, um das Dialogfeld in die gewünschte Richtung zu verschieben. Halten Sie die Taste Win oder Command gedrückt und drücken Sie eine der Pfeiltasten, um das Dialogfeld zu vergrößern oder zu verkleinern. Mit den Pfeiltasten nach links und rechts verschieben Sie den rechten Rand des Dialogfelds, mit den Pfeiltasten nach oben und unten den unteren Rand des Dialogfelds.

\n

Da es für manche Benutzer schwierig sein kann, zwei Tasten gleichzeitig gedrückt zu halten, besteht die zweite Möglichkeit darin, die Tasten m zu drücken, um den „Verschiebungsmodus“ zu starten, und dann das Dialogfeld mit den Pfeiltasten in die gewünschte Richtung zu verschieben. Drücken Sie erneut m, um die Bewegung des Dialogfelds zu beenden. Drücken Sie ebenfalls s, um den „Größenänderungsmodus“ zu starten und zu beenden, in dem die Pfeiltasten die Größe des Dialogfelds ändern.

\n

Wenn Sie bei beiden oben beschriebenen Methoden die Umschalt--Taste zusammen mit der Pfeiltaste gedrückt halten, werden größere Änderungen an der Größe oder Position vorgenommen.

\n

Verwenden Sie die Tabulatortaste, um zwischen Text, Schaltflächen und Links innerhalb des Dialogfelds zu wechseln. Die Eingabetaste oder die Leertaste aktiviert das aktuell ausgewählte Element. Die Esc-Taste schließt das Dialogfeld, ebenso wie ein Klick außerhalb des Dialogfelds oder ein Klick auf das Symbol „\u00D7“ in der oberen rechten Ecke des Dialogfelds.

", + "Dialog/Help/Title": "MathJax Dialog Hilfe", "FontData/BadAsync": "MathJax(%1): %2 muss angegeben und synchron sein\n Versuchen Sie, %3 und %4 zu importieren", "FontData/CantLoad": "Die dynamische Datei '%1' konnte nicht geladen werden", "FontData/NoData": "Für %1 wurden keine Zeichendaten geladen", diff --git a/ts/core/__locales__/en.json b/ts/core/__locales__/en.json index ea851838d..420e7f651 100644 --- a/ts/core/__locales__/en.json +++ b/ts/core/__locales__/en.json @@ -5,6 +5,12 @@ "Bit/Unknown": "Unknown bit-field name: %1", "CantInsertCSS": "Can't insert CSS rule '%1': %2", "CantLoad": "Can't load '%1'%2", + "Dialog/CantCopy": "Can't copy to clipboard: %1", + "Dialog/Btn/Close": "Close Dialog Box", + "Dialog/Btn/Help": "Dialog Help", + "Dialog/CopyToClip": "Copy to Clipboard", + "Dialog/Help/Message": "

The dialog boxes in MathJax are movable and sizeable.

\n

For mouse users, dragging any of the edges will enlarge or shrink the dialog box by moving that side. Dragging any of the corners changes the two sides that meet at that corner. Dragging elsewhere on the dialog frame will move the dialog without changing its size.

\n

For keyboard users, there are two ways to adjust the position and size of the dialog box. The first is to hold the Alt or Option key and press any of the arrow keys to move the dialog box in the given direction. Hold the Win or Command key and press any of the arrow keys to enlarge or shrink the dialog box. Left and right move the right-hand edge of the dialog, while up and down move the bottom edge of the dialog.

\n

For some users, holding two keys down at once may be difficult, so the second way is to press the m to start \"move\" mode, then use the arrow keys to move the dialog box in the given direction. Press m again to stop moving the dialog. Similarly, press s to start and stop \"sizing\" mode, where the arrows will change the size of the dialog box.

\n

Holding a shift key along with the arrow key will make larger changes in the size or position, for either method described above.

\n

Use Tab to move among the text, buttons, and links within the dialog. The Enter or Space key activates the focused item. The Escape key closes the dialog, as does clicking outside the dialog box, or clicking the \"\u00D7\" icon in the upper right-hand corner of the dialog.

", + "Dialog/Help/Title": "MathJax Dialog Help", "FontData/BadAsync": "MathJax(%1): %2 must be specified and synchronous\n Try importing %3 and %4", "FontData/CantLoad": "Dynamic file '%1' failed to load", "FontData/NoData": "Character data hasn't been loaded for %1", diff --git a/ts/ui/dialog/CopyDialog.ts b/ts/ui/dialog/CopyDialog.ts index 29f9b59e8..ef12467af 100644 --- a/ts/ui/dialog/CopyDialog.ts +++ b/ts/ui/dialog/CopyDialog.ts @@ -22,6 +22,7 @@ */ import { InfoDialog, InfoDialogArgs } from './InfoDialog.js'; +import { localize } from '../../core/__locales__/Component.js'; /** * The args for a CopyDialog @@ -49,7 +50,7 @@ export class CopyDialog extends InfoDialog { args.extraNodes ??= []; const copy = args.adaptor.node('input', { type: 'button', - value: 'Copy to Clipboard', + value: localize('Dialog/CopyToClip'), 'data-drag': 'none', }); copy.addEventListener('click', this.copyToClipboard.bind(this)); diff --git a/ts/ui/dialog/DraggableDialog.ts b/ts/ui/dialog/DraggableDialog.ts index 901b14b72..bb23cd1f8 100644 --- a/ts/ui/dialog/DraggableDialog.ts +++ b/ts/ui/dialog/DraggableDialog.ts @@ -24,6 +24,7 @@ import { DOMAdaptor } from '../../core/DOMAdaptor.js'; import { StyleJson, StyleJsonSheet } from '../../util/StyleJson.js'; import { context } from '../../util/context.js'; +import { localize } from '../../core/__locales__/Component.js'; export type ADAPTOR = DOMAdaptor; @@ -450,42 +451,6 @@ export class DraggableDialog { }, }; - protected static helpMessage: string = ` -

The dialog boxes in MathJax are movable and sizeable.

- -

For mouse users, dragging any of the edges will enlarge or shrink - the dialog box by moving that side. Dragging any of the corners - changes the two sides that meet at that corner. Dragging elsewhere on - the dialog frame will move the dialog without changing its size.

- -

For keyboard users, there are two ways to adjust the position - and size of the dialog box. The first is to hold the - Alt or Option key and press any of the arrow - keys to move the dialog box in the given direction. Hold the - Win or Command key and press any of the - arrow keys to enlarge or shrink the dialog box. Left and right - move the right-hand edge of the dialog, while up and down move the - bottom edge of the dialog. -

- -

For some users, holding two keys down at once may be difficult, - so the second way is to press the m to start "move" - mode, then use the arrow keys to move the dialog box in the given - direction. Press m again to stop moving the dialog. - Similarly, press s to start and stop "sizing" mode, - where the arrows will change the size of the dialog box.

- -

Holding a shift key along with the arrow key will - make larger changes in the size or position, for either method - described above.

- -

Use Tab to move among the text, buttons, and links - within the dialog. The Enter or Space key - activates the focused item. The Escape key closes the - dialog, as does clicking outside the dialog box, or clicking the - "\u00D7" icon in the upper right-hand corner of the dialog.

- `; - /** * When moving/sizing by keyboard, this gives which is being adjusted. */ @@ -623,7 +588,7 @@ export class DraggableDialog { 'data-drag': 'none', tabIndex: 0, role: 'button', - 'aria-label': 'Dialog Help', + 'aria-label': localize('Dialog/Btn/Help'), }, [ adaptor.node('mjx-dialog-icon', { 'aria-hidden': true }, [ @@ -638,7 +603,7 @@ export class DraggableDialog { 'data-drag': 'none', tabIndex: 0, role: 'button', - 'aria-label': 'Close Dialog Box', + 'aria-label': localize('Dialog/Btn/Close'), }, [ adaptor.node('mjx-dialog-icon', { 'aria-hidden': true }, [ @@ -1030,7 +995,7 @@ export class DraggableDialog { try { document.execCommand('copy'); } catch (err) { - alert(`Can't copy to clipboard: ${err.message}`); + alert(localize('Dialog/CantCopy', err.message)); } document.getSelection().removeAllRanges(); } @@ -1109,8 +1074,8 @@ export class DraggableDialog { */ protected helpDialog(adaptor: ADAPTOR, event: Event) { const help = new DraggableDialog({ - title: 'MathJax Dialog Help', - message: (this.constructor as typeof DraggableDialog).helpMessage, + title: localize('Dialog/Help/Title'), + message: localize('Dialog/Help/Message'), adaptor: adaptor, className: 'mjx-dialog-help', styles: { From c4b1beb6fc12c3e1023c7e1051fe1524ad9c7b0a Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 30 May 2026 18:27:52 -0400 Subject: [PATCH 84/95] Localize the MathML input jax --- components/mjs/input/mml/config.json | 6 ++++ package.json | 3 +- ts/input/mathml.ts | 9 +++--- ts/input/mathml/MathMLCompile.ts | 13 +++++--- ts/input/mathml/__locales__/Component.ts | 39 ++++++++++++++++++++++++ ts/input/mathml/__locales__/de.json | 8 +++++ ts/input/mathml/__locales__/en.json | 8 +++++ ts/input/mathml/mml3/mml3-node.ts | 9 ++++-- ts/input/tex/__locales__/Component.ts | 2 +- 9 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 ts/input/mathml/__locales__/Component.ts create mode 100644 ts/input/mathml/__locales__/de.json create mode 100644 ts/input/mathml/__locales__/en.json diff --git a/components/mjs/input/mml/config.json b/components/mjs/input/mml/config.json index 444a4919b..5cde6feee 100644 --- a/components/mjs/input/mml/config.json +++ b/components/mjs/input/mml/config.json @@ -7,6 +7,12 @@ ], "excludeSubdirs": true }, + "copy": { + "to": "[bundle]/input/mml", + "from": "[ts]/input/mathml", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "input/mml", "libs": ["components/src/core/lib"] diff --git a/package.json b/package.json index 9a87c4847..b6959575b 100644 --- a/package.json +++ b/package.json @@ -83,9 +83,10 @@ "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { for name in locales mj2 mml3 html; do pnpm -s copy:$name ${1:-mjs}; done; }; copy", "copy:bundle": "copy() { components/bin/makeAll --copy --terse components/mjs/${1:-}; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", - "copy:locales": "copy() { for name in core tex menu; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ", + "copy:locales": "copy() { for name in core tex mml menu; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ", "copy:locales:core": "pnpm -s log:single 'Copying core locales'; copy() { pnpm copyfiles -u 1 'ts/core/__locales__/*.json' $1; }; copy", "copy:locales:menu": "pnpm -s log:single 'Copying menu locales'; copy() { pnpm copyfiles -u 1 'ts/ui/menu/__locales__/*.json' $1; }; copy", + "copy:locales:mml": "pnpm -s log:single 'Copying MathML locales'; copy() { pnpm copyfiles -u 1 'ts/input/mathml/__locales__/*.json' $1; }; copy", "copy:locales:tex": "pnpm -s log:single 'Copying TeX locales'; copy() { pnpm copyfiles -u 1 'ts/input/tex/__locales__/*.json' $1 && pnpm copyfiles -u 3 'ts/input/tex/*/__locales__/*.json' $1/input/tex/extensions; }; copy", "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy", "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy", diff --git a/ts/input/mathml.ts b/ts/input/mathml.ts index 42a90799e..dc5e5ce8e 100644 --- a/ts/input/mathml.ts +++ b/ts/input/mathml.ts @@ -35,6 +35,7 @@ import { MmlFactory } from '../core/MmlTree/MmlFactory.js'; import { FindMathML } from './mathml/FindMathML.js'; import { MathMLCompile } from './mathml/MathMLCompile.js'; +import { localize } from './mathml/__locales__/Component.js'; /*****************************************************************/ /** @@ -165,14 +166,12 @@ export class MathML extends AbstractInputJax { ); const body = this.adaptor.body(doc); if (this.adaptor.childNodes(body).length !== 1) { - this.error('MathML must consist of a single element'); + this.error(localize('SingleNode')); } mml = this.adaptor.remove(this.adaptor.firstChild(body)) as N; if (this.adaptor.kind(mml).replace(/^[a-z]+:/, '') !== 'math') { this.error( - 'MathML must be formed by a element, not <' + - this.adaptor.kind(mml) + - '>' + localize('MathNode', '', `<${this.adaptor.kind(mml)}>`) ); } } @@ -193,7 +192,7 @@ export class MathML extends AbstractInputJax { const err = this.adaptor.tags(this.adaptor.body(doc), 'parsererror')[0]; if (err) { if (this.adaptor.textContent(err) === '') { - this.error('Error processing MathML'); + this.error(localize('MmlError')); } this.options['parseError'].call(this, err); } diff --git a/ts/input/mathml/MathMLCompile.ts b/ts/input/mathml/MathMLCompile.ts index 22de535e4..a4fae0760 100644 --- a/ts/input/mathml/MathMLCompile.ts +++ b/ts/input/mathml/MathMLCompile.ts @@ -34,6 +34,8 @@ import { HtmlNode } from '../../core/MmlTree/MmlNodes/HtmlNode.js'; import { userOptions, defaultOptions, OptionList } from '../../util/Options.js'; import * as Entities from '../../util/Entities.js'; import { DOMAdaptor } from '../../core/DOMAdaptor.js'; +import { Locale } from '../../util/Locale.js'; +import { COMPONENT } from './__locales__/Component.js'; /********************************************************************/ /** @@ -186,7 +188,7 @@ export class MathMLCompile { this.adaptor ); } - this.error('Unknown node type "' + type + '"'); + this.error('BadNode', type); return null; } @@ -262,7 +264,7 @@ export class MathMLCompile { * @param {string[]} list The list of class names to filter * @returns {string[]} The list of filtered class names */ - protected filterClassList(list: string[]) { + protected filterClassList(list: string[]): string[] { return list; } @@ -328,7 +330,7 @@ export class MathMLCompile { } mml.appendChild((this.factory.create('text') as TextNode).setText(text)); } else if (text.match(/\S/)) { - this.error('Unexpected text node "' + text + '"'); + this.error('BadText', text); } } @@ -422,8 +424,9 @@ export class MathMLCompile { } /** * @param {string} message The error message to produce + * @param {string[]} args The substitution arguments */ - protected error(message: string) { - throw new Error(message); + protected error(message: string, ...args: string[]) { + Locale.throw(COMPONENT, message, ...args); } } diff --git a/ts/input/mathml/__locales__/Component.ts b/ts/input/mathml/__locales__/Component.ts new file mode 100644 index 000000000..6363338df --- /dev/null +++ b/ts/input/mathml/__locales__/Component.ts @@ -0,0 +1,39 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for input/mml + * + * @author dpvc@mathjax.org (Davide P. Cervone) + */ + +import { Locale, namedData } from '../../../util/Locale.js'; + +export const COMPONENT = 'input/mml'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/input/mathml'); + +/** + * Get a localized message for this component + * + * @param {string} id The id of the message + * @param {(string|namedData)[]} args The replacement arguments for the message, if any + * @returns {string} The localized message + */ +export function localize(id: string, ...args: (string | namedData)[]): string { + return Locale.message(COMPONENT, id, ...args); +} diff --git a/ts/input/mathml/__locales__/de.json b/ts/input/mathml/__locales__/de.json new file mode 100644 index 000000000..67f7edab4 --- /dev/null +++ b/ts/input/mathml/__locales__/de.json @@ -0,0 +1,8 @@ +{ + "BadNode": "Unbekannter Knotentyp '%1'", + "BadText": "Unerwarteter Textknoten '%1'", + "MathNode": "MathML muss aus einem %1-Element bestehen, nicht aus %2", + "MmlError": "Fehler bei der Verarbeitung von MathML", + "SaxonNotFound": "#1 nicht gefunden. Führen Sie den Befehl aus:\n %2\nund versuchen Sie es erneut.", + "SingleNode": "MathML muss aus einem einzigen Element bestehen" +} diff --git a/ts/input/mathml/__locales__/en.json b/ts/input/mathml/__locales__/en.json new file mode 100644 index 000000000..4fa0286bb --- /dev/null +++ b/ts/input/mathml/__locales__/en.json @@ -0,0 +1,8 @@ +{ + "BadNode": "Unknown node type '%1'", + "BadText": "Unexpected text node '%1'", + "MathNode": "MathML must be formed by a %1 element, not %2", + "MmlError": "Error processing MathML", + "SaxonNotFound": "#1 not found. Run the command:\n %2\nand try again.", + "SingleNode": "MathML must consist of a single element" +} diff --git a/ts/input/mathml/mml3/mml3-node.ts b/ts/input/mathml/mml3/mml3-node.ts index 21b6e82f2..7a446dd0d 100644 --- a/ts/input/mathml/mml3/mml3-node.ts +++ b/ts/input/mathml/mml3/mml3-node.ts @@ -24,6 +24,8 @@ import { MathDocument } from '../../../core/MathDocument.js'; import { mjxRoot } from '#root/root.js'; +import { Locale } from '../../../util/Locale.js'; +import { COMPONENT } from '../__locales__/Component.js'; /** * Create the transform function that uses Saxon-js to perform the @@ -45,8 +47,11 @@ export function createTransform(): ( // check if saxon-js is installed. nodeRequire.resolve('saxon-js'); } catch (_err) { - throw Error( - 'Saxon-js not found. Run the command:\n npm install saxon-js\nand try again.' + Locale.throw( + COMPONENT, + 'SaxonNotFound', + 'Saxon-js', + ' pnpm install saxons-js' ); } // dynamically load Saxon-JS. diff --git a/ts/input/tex/__locales__/Component.ts b/ts/input/tex/__locales__/Component.ts index 214ebf114..5c31f45db 100644 --- a/ts/input/tex/__locales__/Component.ts +++ b/ts/input/tex/__locales__/Component.ts @@ -16,7 +16,7 @@ */ /** - * @file Locale component registration for [tex] + * @file Locale component registration for input/tex * * @author v.sorge@mathjax.org (Volker Sorge) */ From d09b67941f6c5d964487baddf80be0e90397cc38 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 30 May 2026 16:09:28 -0400 Subject: [PATCH 85/95] Localize a11y/semantic-enrich --- .../mjs/a11y/semantic-enrich/config.json | 6 ++++ package.json | 3 +- ts/a11y/semantic-enrich.ts | 4 ++- .../semantic-enrich/__locales__/Component.ts | 28 +++++++++++++++++++ ts/a11y/semantic-enrich/__locales__/de.json | 3 ++ ts/a11y/semantic-enrich/__locales__/en.json | 3 ++ 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 ts/a11y/semantic-enrich/__locales__/Component.ts create mode 100644 ts/a11y/semantic-enrich/__locales__/de.json create mode 100644 ts/a11y/semantic-enrich/__locales__/en.json diff --git a/components/mjs/a11y/semantic-enrich/config.json b/components/mjs/a11y/semantic-enrich/config.json index 8889b4fb7..339f3c70b 100644 --- a/components/mjs/a11y/semantic-enrich/config.json +++ b/components/mjs/a11y/semantic-enrich/config.json @@ -5,6 +5,12 @@ "a11y/semantic-enrich.ts" ] }, + "copy": { + "to": "[bundle]/a11y/semantic-enrich", + "from": "[ts]/a11y/semantic-enrich", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "a11y/semantic-enrich", "libs": [ diff --git a/package.json b/package.json index b6959575b..e239d98ca 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,8 @@ "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { for name in locales mj2 mml3 html; do pnpm -s copy:$name ${1:-mjs}; done; }; copy", "copy:bundle": "copy() { components/bin/makeAll --copy --terse components/mjs/${1:-}; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", - "copy:locales": "copy() { for name in core tex mml menu; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ", + "copy:locales": "copy() { for name in core tex mml menu a11y; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ", + "copy:locales:a11y": "pnpm -s log:single 'Copying a11y locales'; copy() { pnpm copyfiles -u 1 'ts/a11y/*/__locales__/*.json' $1; }; copy", "copy:locales:core": "pnpm -s log:single 'Copying core locales'; copy() { pnpm copyfiles -u 1 'ts/core/__locales__/*.json' $1; }; copy", "copy:locales:menu": "pnpm -s log:single 'Copying menu locales'; copy() { pnpm copyfiles -u 1 'ts/ui/menu/__locales__/*.json' $1; }; copy", "copy:locales:mml": "pnpm -s log:single 'Copying MathML locales'; copy() { pnpm copyfiles -u 1 'ts/input/mathml/__locales__/*.json' $1; }; copy", diff --git a/ts/a11y/semantic-enrich.ts b/ts/a11y/semantic-enrich.ts index 5dcb26eaa..1158f24a0 100644 --- a/ts/a11y/semantic-enrich.ts +++ b/ts/a11y/semantic-enrich.ts @@ -39,6 +39,8 @@ import { MathML } from '../input/mathml.js'; import { SerializedMmlVisitor } from '../core/MmlTree/SerializedMmlVisitor.js'; import { OptionList, expandable } from '../util/Options.js'; import * as Sre from './sre.js'; +import { Locale } from '../util/Locale.js'; +import { COMPONENT } from './semantic-enrich/__locales__/Component.js'; /*==========================================================================*/ @@ -399,7 +401,7 @@ export function EnrichedMathDocumentMixin< _math: EnrichedMathItem, err: Error ) { - console.warn('Enrichment error:', err); + console.warn(Locale.message(COMPONENT, 'EnrichError'), err); } /** diff --git a/ts/a11y/semantic-enrich/__locales__/Component.ts b/ts/a11y/semantic-enrich/__locales__/Component.ts new file mode 100644 index 000000000..f96c25b90 --- /dev/null +++ b/ts/a11y/semantic-enrich/__locales__/Component.ts @@ -0,0 +1,28 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for a11y/semantic-enrich + * + * @author dpvc@mathjax.org (Davide P. Cervone) + */ + +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = 'a11y/semantic-enrich'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/a11y/semantic-enrich'); diff --git a/ts/a11y/semantic-enrich/__locales__/de.json b/ts/a11y/semantic-enrich/__locales__/de.json new file mode 100644 index 000000000..791ed98c7 --- /dev/null +++ b/ts/a11y/semantic-enrich/__locales__/de.json @@ -0,0 +1,3 @@ +{ + "EnrichError": "Anreicherungsfehler:" +} diff --git a/ts/a11y/semantic-enrich/__locales__/en.json b/ts/a11y/semantic-enrich/__locales__/en.json new file mode 100644 index 000000000..244c61309 --- /dev/null +++ b/ts/a11y/semantic-enrich/__locales__/en.json @@ -0,0 +1,3 @@ +{ + "EnrichError": "Enrichment error:" +} From 1db393e9e599a5d5eaa2e2cc96ab3ae620477cef Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 30 May 2026 15:59:15 -0400 Subject: [PATCH 86/95] Localize a11y/speech --- components/mjs/a11y/speech/config.json | 6 ++++ ts/a11y/speech.ts | 3 +- ts/a11y/speech/SpeechUtil.ts | 4 ++- ts/a11y/speech/WebWorker.ts | 14 +++++---- ts/a11y/speech/__locales__/Component.ts | 39 +++++++++++++++++++++++++ ts/a11y/speech/__locales__/de.json | 8 +++++ ts/a11y/speech/__locales__/en.json | 8 +++++ 7 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 ts/a11y/speech/__locales__/Component.ts create mode 100644 ts/a11y/speech/__locales__/de.json create mode 100644 ts/a11y/speech/__locales__/en.json diff --git a/components/mjs/a11y/speech/config.json b/components/mjs/a11y/speech/config.json index c9f0dfdbd..7946f46f3 100644 --- a/components/mjs/a11y/speech/config.json +++ b/components/mjs/a11y/speech/config.json @@ -4,6 +4,12 @@ "targets": ["a11y/speech.ts", "a11y/speech"], "exclude": ["a11y/speech/SpeechMenu.ts"] }, + "copy": { + "to": "[bundle]/a11y/speech", + "from": "[ts]/a11y/speech", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "a11y/speech", "libs": [ diff --git a/ts/a11y/speech.ts b/ts/a11y/speech.ts index 2457818e1..5a593bb0b 100644 --- a/ts/a11y/speech.ts +++ b/ts/a11y/speech.ts @@ -34,6 +34,7 @@ import { OptionList, expandable } from '../util/Options.js'; import { GeneratorPool } from './speech/GeneratorPool.js'; import { WorkerHandler } from './speech/WebWorker.js'; import { sreRoot } from '#root/sre-root.js'; +import { localize } from './speech/__locales__/Component.js'; /*==========================================================================*/ @@ -317,7 +318,7 @@ export function SpeechMathDocumentMixin< _math: SpeechMathItem, err: Error ) { - console.warn('Speech generation error:', err); + console.warn(localize('SpeechError'), err); } /** diff --git a/ts/a11y/speech/SpeechUtil.ts b/ts/a11y/speech/SpeechUtil.ts index e7ecd567c..786244e4e 100644 --- a/ts/a11y/speech/SpeechUtil.ts +++ b/ts/a11y/speech/SpeechUtil.ts @@ -22,6 +22,8 @@ */ import * as Sre from '../sre.js'; +import { Locale } from '../../util/Locale.js'; +import { COMPONENT } from './__locales__/Component.js'; const ProsodyKeys = ['pitch', 'rate', 'volume']; @@ -162,7 +164,7 @@ const prosodyRegexp = /([+-]?)([0-9]+)%/; function extractProsody(attr: string): [string, string] { const match = attr.match(prosodyRegexp); if (!match) { - console.warn('Something went wrong with the prosody matching.'); + Locale.warn(COMPONENT, 'ProsodyError'); return ['', '100']; } return [match[1], match[2]]; diff --git a/ts/a11y/speech/WebWorker.ts b/ts/a11y/speech/WebWorker.ts index 88650da80..fd5fca20a 100644 --- a/ts/a11y/speech/WebWorker.ts +++ b/ts/a11y/speech/WebWorker.ts @@ -26,6 +26,8 @@ import { OptionList } from '../../util/Options.js'; import { Message, ClientCommand, Structure } from './MessageTypes.js'; import { SpeechMathItem } from '../speech.js'; import { SemAttr } from './SpeechUtil.js'; +import { Locale } from '../../util/Locale.js'; +import { localize, COMPONENT } from './__locales__/Component.js'; /** * Class for relevant task information. @@ -77,7 +79,9 @@ export class WorkerHandler { * This starts the worker. */ public async Start() { - if (this.ready) throw Error('Worker already started'); + if (this.ready) { + Locale.throw(COMPONENT, 'Worker/Started'); + } this.worker = await this.adaptor.createWorker( this.Listener.bind(this), this.options @@ -155,7 +159,7 @@ export class WorkerHandler { public Cancel(item: SpeechMathItem) { const i = this.tasks.findIndex((task) => task.item === item); if (i > 0) { - this.tasks[i].reject(`Task ${this.tasks[i].cmd.cmd} cancelled`); + this.tasks[i].reject(localize('Worker/Cancelled', this.tasks[i].cmd.cmd)); this.tasks.splice(i, 1); } } @@ -499,9 +503,7 @@ export class WorkerHandler { public Terminate(): Promise | void { this.debug('Terminating pending tasks'); for (const task of this.tasks) { - task.reject( - `${task.cmd.data.cmd} cancelled by WorkerHandler termination` - ); + task.reject(localize('Worker/Terminate', task.cmd.data.cmd)); } this.tasks = []; this.debug('Terminating worker'); @@ -514,7 +516,7 @@ export class WorkerHandler { */ public async Stop() { if (!this.worker) { - throw Error('Worker has not been started'); + Locale.throw(COMPONENT, 'Worker/NotStarted'); } await this.Terminate(); this.worker = null; diff --git a/ts/a11y/speech/__locales__/Component.ts b/ts/a11y/speech/__locales__/Component.ts new file mode 100644 index 000000000..1d319065e --- /dev/null +++ b/ts/a11y/speech/__locales__/Component.ts @@ -0,0 +1,39 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for a11y/speech + * + * @author dpvc@mathjax.org (Davide P. Cervone) + */ + +import { Locale, namedData } from '../../../util/Locale.js'; + +export const COMPONENT = 'a11y/speech'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/a11y/speech'); + +/** + * Get a localized message for this component + * + * @param {string} id The id of the message + * @param {(string|namedData)[]} args The replacement arguments for the message, if any + * @returns {string} The localized message + */ +export function localize(id: string, ...args: (string | namedData)[]): string { + return Locale.message(COMPONENT, id, ...args); +} diff --git a/ts/a11y/speech/__locales__/de.json b/ts/a11y/speech/__locales__/de.json new file mode 100644 index 000000000..ce68da969 --- /dev/null +++ b/ts/a11y/speech/__locales__/de.json @@ -0,0 +1,8 @@ +{ + "ProsodyError": "Beim Prosody-Abgleich ist ein Fehler aufgetreten", + "SpeechError": "Fehler bei der Sprachgenerierung:", + "Worker/Cancelled": "Aufgabe %1 abgebrochen", + "Worker/NotStarted": "Worker wurde nicht gestartet", + "Worker/Started": "Worker bereits gestartet", + "Worker/Terminate": "%1 durch Beendigung des WorkerHandlers abgebrochen" +} diff --git a/ts/a11y/speech/__locales__/en.json b/ts/a11y/speech/__locales__/en.json new file mode 100644 index 000000000..874246021 --- /dev/null +++ b/ts/a11y/speech/__locales__/en.json @@ -0,0 +1,8 @@ +{ + "ProsodyError": "Something went wrong with the prosody matching", + "SpeechError": "Speech generation error:", + "Worker/Cancelled": "Task %1 cancelled", + "Worker/NotStarted": "Worker has not been started", + "Worker/Started": "Worker already started", + "Worker/Terminate": "%1 cancelled by WorkerHandler termination" +} From e20bebc991dc098e8164c0273f12f659dd908615 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 30 May 2026 16:02:13 -0400 Subject: [PATCH 87/95] Localize a11y/explorer --- components/mjs/a11y/explorer/config.json | 6 + ts/a11y/explorer/KeyExplorer.ts | 190 ++++------------------ ts/a11y/explorer/__locales__/Component.ts | 39 +++++ ts/a11y/explorer/__locales__/de.json | 17 ++ ts/a11y/explorer/__locales__/en.json | 17 ++ 5 files changed, 108 insertions(+), 161 deletions(-) create mode 100644 ts/a11y/explorer/__locales__/Component.ts create mode 100644 ts/a11y/explorer/__locales__/de.json create mode 100644 ts/a11y/explorer/__locales__/en.json diff --git a/components/mjs/a11y/explorer/config.json b/components/mjs/a11y/explorer/config.json index 7ed079980..7289b5c04 100644 --- a/components/mjs/a11y/explorer/config.json +++ b/components/mjs/a11y/explorer/config.json @@ -3,6 +3,12 @@ "component": "a11y/explorer", "targets": ["a11y/explorer.ts", "a11y/explorer"] }, + "copy": { + "to": "[bundle]/a11y/explorer", + "from": "[ts]/a11y/explorer", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "a11y/explorer", "libs": [ diff --git a/ts/a11y/explorer/KeyExplorer.ts b/ts/a11y/explorer/KeyExplorer.ts index 2e14fef34..6c2f57b98 100644 --- a/ts/a11y/explorer/KeyExplorer.ts +++ b/ts/a11y/explorer/KeyExplorer.ts @@ -31,6 +31,7 @@ import { honk, SemAttr } from '../speech/SpeechUtil.js'; import { GeneratorPool } from '../speech/GeneratorPool.js'; import { context } from '../../util/context.js'; import { InfoDialog } from '../../ui/dialog/InfoDialog.js'; +import { localize } from './__locales__/Component.js'; /**********************************************************************/ @@ -129,172 +130,39 @@ export class SpeechExplorer /** * Creates a customized help dialog * - * @param {string} title The title to use for the message - * @param {string} select Additional ways to select the typeset math - * @param {string} braille Additional Braille information - * @returns {string} The customized message + * @param {string} title The title to use for the message + * @param {string} separator Period or comma used before select string + * @param {string} select Additional ways to select the typeset math + * @param {string} braille Additional Braille information + * @returns {string} The customized message */ protected static helpMessage( title: string, + separator: string, select: string, braille: string ): string { - return ` -

Exploring expressions ${title}

- -

The mathematics on this page is being rendered by MathJax, which - generates both the text spoken by screen readers, as well as the - visual layout for sighted users.

- -

Expressions typeset by MathJax can be explored interactively, and - are focusable. You can use the Tab key to move to a typeset - expression${select}. Initially, the expression will be read in full, - but you can use the following keys to explore the expression - further:

- -
    - -
  • Down Arrow moves one level deeper into the - expression to allow you to explore the current subexpression term by - term.
    • - -
  • Up Arrow moves back up a level within the - expression.
    • - -
  • Right Arrow moves to the next term in the - current subexpression.
    • - -
  • Left Arrow moves to the next term in the - current subexpression.
    • - -
  • Shift+Arrow moves to a - neighboring cell within a table.
    • - -
  • 0-9+0-9 jumps to a cell - by its index in the table, where 0 = 10.
    • - -
  • Home takes you to the top of the - expression.
    • - -
  • Enter or Return clicks a - link or activates an active subexpression.
    • - -
  • Space opens the MathJax contextual menu - where you can view or copy the source format of the expression, or - modify MathJax's settings.
    • - -
  • Escape exits the expression - explorer.
    • - -
  • x gives a summary of the current - subexpression.
    • - -
  • z gives the full text of a collapsed - expression.
    • - -
  • d gives the current depth within the - expression.
    • - -
  • s starts or stops auto-voicing with - synchronized highlighting.
    • - -
  • v marks the current position in the - expression.
    • - -
  • p cycles through the marked positions in - the expression.
    • - -
  • u clears all marked positions and returns - to the starting position.
    • - -
  • > cycles through the available speech - rule sets (MathSpeak, ClearSpeak).
    • - -
  • < cycles through the verbosity levels - for the current rule set.
    • - -
  • b toggles whether Braille notation is combined - with speech text for tactile Braille devices, as discussed - below. - -
  • h produces this help listing.
    • -
- -

The MathJax contextual menu allows you to enable or disable speech - or Braille generation for mathematical expressions, the language to - use for the spoken mathematics, and other features of MathJax. In - particular, the Explorer submenu allows you to specify how the - mathematics should be identified in the page (e.g., by saying "math" - when the expression is spoken), and whether or not to include a - message about the letter "h" bringing up this dialog box. Turning off - speech and Braille will disable the expression explorer, its - highlighting, and its help icon.

- -

Support for tactile Braille devices varies across screen readers, - browsers, and operative systems. If you are using a Braille output - device, you may need to select the "Combine with Speech" option in the - contextual menu's Braille submenu in order to obtain Nemeth or Euro - Braille output rather than the speech text on your Braille - device. ${braille}

- -

The contextual menu also provides options for viewing or copying a - MathML version of the expression or its original source format, - creating an SVG version of the expression, and viewing various other - information.

- -

Finally, selecting the "Insert Hidden MathML" item from the options - submenu will turn of MathJax's speech and Braille generation and - instead use visually hidden MathML that some screen readers can voice, - though support for this is not universal across all screen readers and - operating systems. Selecting speech or Braille generation in their - submenus will remove the hidden MathML again.

- -

For more help, see the MathJax accessibility documentation.

- `; + return [ + localize( + 'Help/Text1', + title ? localize(title) : '', + select ? separator + localize(select) : '' + ), + localize('Help/Keys'), + localize('Help/Text2', braille ? localize(braille) : ''), + ].join('\n'); } /** * Help for the different OS versions */ - protected static helpData: Map = new Map([ - [ - 'MacOS', - [ - 'on MacOS and iOS using VoiceOver', - ', or the VoiceOver arrow keys to select an expression', - '', - ], - ], - [ - 'Windows', - [ - 'in Windows using NVDA or JAWS', - `. The screen reader should enter focus or forms mode automatically - when the expression gets the browser focus, but if not, you can toggle - focus mode using NVDA+space in NVDA; for JAWS, Enter should start - forms mode while Numpad Plus leaves it. Also note that you can use - the NVDA or JAWS key plus the arrow keys to explore the expression - even in browse mode, and you can use NVDA+shift+arrow keys to - navigate out of an expression that has the focus in NVDA`, - `NVDA users need to select this option, while JAWS users should be able - to get Braille output without changing this setting.`, - ], - ], - [ - 'Unix', - [ - 'in Unix using Orca', - `, and Orca should enter focus mode automatically. If not, use the - Orca+a key to toggle focus mode on or off. Also note that you can use - Orca+arrow keys to explore expressions even in browse mode`, - '', - ], - ], - ['unknown', ['with a Screen Reader.', '', '']], - ]); + protected static helpData: Map = + new Map([ + ['MacOS', ['Mac/Title', ', ', 'Mac/Select', '']], + ['Windows', ['Win/Title', '. ', 'Win/Select', 'Win/Braille']], + ['Unix', ['Unix/Title', '; ', 'Unix/Select', 'Unix/Braille']], + ['unknown', ['Unknown/Title', '', '', '']], + ]); /* * The explorer key mapping @@ -937,7 +805,7 @@ export class SpeechExplorer } else { this.currentMark = this.marks.length - 1; this.marks.push(this.current); - this.speak('Position marked'); + this.speak(localize('PositionMarked')); } } @@ -1010,7 +878,7 @@ export class SpeechExplorer setTimeout(() => this.setCurrent(cell), 500); } else { this.pendingIndex = [null, n]; - this.speak(`Jump to row ${n} and column`); + this.speak(localize('JumpTo', String(n))); } } @@ -1135,10 +1003,10 @@ export class SpeechExplorer return; } const CLASS = this.constructor as typeof SpeechExplorer; - const [title, select, braille] = CLASS.helpData.get(context.os); + const [title, separator, select, braille] = CLASS.helpData.get(context.os); InfoDialog.post({ - title: 'MathJax Expression Explorer Help', - message: CLASS.helpMessage(title, select, braille), + title: localize('Help/Title'), + message: CLASS.helpMessage(title, separator, select, braille), node: this.node, adaptor: this.document.adaptor, styles: { @@ -1312,7 +1180,7 @@ export class SpeechExplorer this.document.options.a11y.help && this.document.options.enableExplorerHelp ) { - description += ', press h for help'; + description += ', ' + localize('ForHelp'); } speech += description; } diff --git a/ts/a11y/explorer/__locales__/Component.ts b/ts/a11y/explorer/__locales__/Component.ts new file mode 100644 index 000000000..9df7f4dda --- /dev/null +++ b/ts/a11y/explorer/__locales__/Component.ts @@ -0,0 +1,39 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for a11y/explorer + * + * @author dpvc@mathjax.org (Davide P. Cervone) + */ + +import { Locale, namedData } from '../../../util/Locale.js'; + +export const COMPONENT = 'a11y/explorer'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/a11y/explorer'); + +/** + * Get a localized message for this component + * + * @param {string} id The id of the message + * @param {(string|namedData)[]} args The replacement arguments for the message, if any + * @returns {string} The localized message + */ +export function localize(id: string, ...args: (string | namedData)[]): string { + return Locale.message(COMPONENT, id, ...args); +} diff --git a/ts/a11y/explorer/__locales__/de.json b/ts/a11y/explorer/__locales__/de.json new file mode 100644 index 000000000..df1f68841 --- /dev/null +++ b/ts/a11y/explorer/__locales__/de.json @@ -0,0 +1,17 @@ +{ + "ForHelp": "Drücke h für Hilfe", + "Help/Keys": "
    \n\n
  • Pfeil nach unten springt eine Ebene tiefer in den Ausdruck, damit Sie den aktuellen Teilausdruck Term für Term untersuchen können.
    • \n\n
  • Pfeil nach oben springt eine Ebene höher innerhalb des Ausdrucks.
  • Pfeil nach rechts springt zum nächsten Term im aktuellen Teilausdruck.
    • \n\n
  • Pfeil nach links springt zum nächsten Term im aktuellen Teilausdruck.
    • \n\n
  • Umschalt+Pfeil springt zu einer benachbarten Zelle innerhalb einer Tabelle.
    • \n\n
  • 0-9+0-9 springt anhand des Indexes in der Tabelle zu einer Zelle, wobei 0 = 10 ist.
    • \n\n
  • Home bringt Sie an den Anfang des Ausdrucks.
    • \n\n
  • Enter oder Return klickt auf einen Link oder aktiviert einen aktiven Teilausdruck.
    • \n\n
  • Leertaste öffnet das MathJax-Kontextmenü, in dem Sie das Quellformat des Ausdrucks anzeigen oder kopieren oder die MathJax-Einstellungen ändern können.
    • \n\n
  • Esc verlässt den Ausdrucks-Explorer.
    • \n\n
  • x Zeigt eine Zusammenfassung des aktuellen Teilausdrucks an.
    • \n\n
  • z Zeigt den vollständigen Text eines ausgeblendeten Ausdrucks an.
    • \n\n
  • d Zeigt die aktuelle Tiefe innerhalb des Ausdrucks an.
    • \n\n
  • s startet oder stoppt die automatische Voicing-Anzeige mit synchronisierter Hervorhebung.
    • \n\n
  • v markiert die aktuelle Position im Ausdruck.
    • \n\n
  • p wechselt zwischen den markierten Positionen im Ausdruck hin und her.
    • \n\n
  • uLöscht alle markierten Positionen und kehrt zur Startposition zurück.
    • \n\n
  • > Wechselt zwischen den verfügbaren Sprachregelsätzen (MathSpeak, ClearSpeak).
    • \n\n
  • < Wechselt zwischen den Ausführlichkeitsstufen für den aktuellen Regelsatz.
    • \n\n
  • b schaltet um, ob Braille-Notation mit Sprachtext für taktile Braille-Geräte kombiniert wird, wie unten beschrieben.
    • \n\n
  • h zeigt diese Hilfeauflistung an.
    • \n\n
", + "Help/Text1": "

Ausdrücke mit %1 erkunden

\n\n

Die mathematischen Formeln auf dieser Seite werden von MathJax dargestellt, das sowohl den von Bildschirmleseprogrammen vorgelesenen Text als auch das visuelle Layout für sehende Nutzer generiert.

\n\n

Von MathJax gesetzte Ausdrücke können interaktiv erkundet werden und sind fokussierbar. Sie können die Tab-Taste verwenden, um zu einem gesetzten Ausdruck zu springen%2%3. Zunächst wird der Ausdruck vollständig vorgelesen, aber Sie können die folgenden Tasten verwenden, um den Ausdruck weiter zu erkunden:

", + "Help/Text2": "

Über das MathJax-Kontextmenü können Sie die Sprach- oder Braille-Ausgabe für mathematische Ausdrücke aktivieren oder deaktivieren, die Sprache für die Sprachausgabe festlegen sowie weitere Funktionen von MathJax einstellen. Insbesondere können Sie im Untermenü „Explorer“ festlegen, wie die mathematischen Ausdrücke auf der Seite gekennzeichnet werden sollen (z. B. durch die Ansage „math“, wenn der Ausdruck vorgelesen wird) und ob eine Meldung darüber angezeigt werden soll, dass der Buchstabe „h“ dieses Dialogfeld öffnet. Wenn Sie die Sprachausgabe und die Braille-Anzeige deaktivieren, werden der Ausdrucks-Explorer, dessen Hervorhebung und das Hilfe-Symbol deaktiviert.

\n\n

Die Unterstützung für taktile Braille-Geräte variiert je nach Screenreader, Browser und Betriebssystem. Wenn Sie ein Braille-Ausgabegerät verwenden, müssen Sie möglicherweise die Option „Mit Sprachausgabe kombinieren“ im Untermenü „Braille“ des Kontextmenüs auswählen, um anstelle der Sprachausgabe auf Ihrem Braille-Gerät eine Nemeth- oder Euro-Braille-Ausgabe zu erhalten. %1

\n\n

Das Kontextmenü bietet außerdem Optionen zum Anzeigen oder Kopieren einer MathML-Version des Ausdrucks oder seines ursprünglichen Quellformats, zum Erstellen einer SVG-Version des Ausdrucks sowie zum Anzeigen verschiedener weiterer Informationen.

\n\n

Wenn Sie schließlich im Untermenü der Optionen den Eintrag „Insert Hidden MathML“ auswählen, wird die Sprach- und Braille-Generierung von MathJax deaktiviert und stattdessen visuell unsichtbares MathML verwendet, das von einigen Bildschirmleseprogrammen vorgelesen werden kann, wobei diese Funktion nicht von allen Bildschirmleseprogrammen und Betriebssystemen unterstützt wird. Durch Auswahl der Sprach- oder Braille-Generierung in den entsprechenden Untermenüs wird das unsichtbare MathML wieder entfernt.

\n\n

Weitere Hilfe finden Sie in der MathJax-Dokumentation zur Barrierefreiheit.

", + "Help/Title": "Hilfe zum MathJax Expression Explorer", + "Mac/Select": "oder die VoiceOver-Pfeiltasten, um einen Ausdruck auszuwählen", + "Mac/Title": "macOS und iOS mit VoiceOver", + "JumpTo": "Springe zu Zeile %1 und Spalte", + "PositionMarked": "Position markiert", + "Unix/Select": "Orca sollte automatisch in den Fokusmodus wechseln. Ist dies nicht der Fall, kannst du den Fokusmodus mit der Tastenkombination „Orca+a“ ein- oder ausschalten. Beachte außerdem, dass du mit „Orca+Pfeiltasten“ Ausdrücke auch im Durchsichtmodus untersuchen kannst.", + "Unix/Title": "Unix mit Orca", + "Unknown/Title": "ein Bildschirmleseprogramm", + "Win/Braille": "NVDA-Benutzer müssen diese Option auswählen, während JAWS-Benutzer die Braille-Ausgabe erhalten sollten, ohne diese Einstellung zu ändern.", + "Win/Select": "Der Screenreader sollte automatisch in den Fokus- oder Formularmodus wechseln, sobald der Ausdruck den Browserfokus erhält. Ist dies nicht der Fall, können Sie den Fokusmodus in NVDA mit NVDA+Leertaste umschalten; bei JAWS sollte die Eingabetaste den Formularmodus aktivieren, während die Plus-Taste des Ziffernblocks ihn beendet. Beachten Sie außerdem, dass Sie die NVDA- oder JAWS-Taste zusammen mit den Pfeiltasten verwenden können, um den Ausdruck auch im Browse-Modus zu erkunden, und dass Sie mit NVDA+Umschalt+Pfeiltasten aus einem Ausdruck herausnavigieren können, der in NVDA den Fokus hat.", + "Win/Title": "Windows mit NVDA oder JAWS" +} diff --git a/ts/a11y/explorer/__locales__/en.json b/ts/a11y/explorer/__locales__/en.json new file mode 100644 index 000000000..39ca9e662 --- /dev/null +++ b/ts/a11y/explorer/__locales__/en.json @@ -0,0 +1,17 @@ +{ + "ForHelp": "press h for help", + "Help/Keys": "
    \n\n
  • Down Arrow moves one level deeper into the expression to allow you to explore the current subexpression term by term.
    • \n\n
  • Up Arrow moves back up a level within the expression.
  • Right Arrow moves to the next term in the current subexpression.
    • \n\n
  • Left Arrow moves to the next term in the current subexpression.
    • \n\n
  • Shift+Arrow moves to a neighboring cell within a table.
    • \n\n
  • 0-9+0-9 jumps to a cell by its index in the table, where 0 = 10.
    • \n\n
  • Home takes you to the top of the expression.
    • \n\n
  • Enter or Return clicks a link or activates an active subexpression.
    • \n\n
  • Space opens the MathJax contextual menu where you can view or copy the source format of the expression, or modify MathJax's settings.
    • \n\n
  • Escape exits the expression explorer.
    • \n\n
  • x gives a summary of the current subexpression.
    • \n\n
  • z gives the full text of a collapsed expression.
    • \n\n
  • d gives the current depth within the expression.
    • \n\n
  • s starts or stops auto-voicing with synchronized highlighting.
    • \n\n
  • v marks the current position in the expression.
    • \n\n
  • p cycles through the marked positions in the expression.
    • \n\n
  • u clears all marked positions and returns to the starting position.
    • \n\n
  • > cycles through the available speech rule sets (MathSpeak, ClearSpeak).
    • \n\n
  • < cycles through the verbosity levels for the current rule set.
    • \n\n
  • b toggles whether Braille notation is combined with speech text for tactile Braille devices, as discussed below.
    • \n\n
  • h produces this help listing.
    • \n\n
", + "Help/Text1": "

Exploring expressions with %1

\n\n

The mathematics on this page is being rendered by MathJax, which generates both the text spoken by screen readers, as well as the visual layout for sighted users.

\n\n

Expressions typeset by MathJax can be explored interactively, and are focusable. You can use the Tab key to move to a typeset expression%2%3. Initially, the expression will be read in full, but you can use the following keys to explore the expression further:

", + "Help/Text2": "

The MathJax contextual menu allows you to enable or disable speech or Braille generation for mathematical expressions, the language to use for the spoken mathematics, and other features of MathJax. In particular, the Explorer submenu allows you to specify how the mathematics should be identified in the page (e.g., by saying \"math\" when the expression is spoken), and whether or not to include a message about the letter \"h\" bringing up this dialog box. Turning off speech and Braille will disable the expression explorer, its highlighting, and its help icon.

\n\n

Support for tactile Braille devices varies across screen readers, browsers, and operative systems. If you are using a Braille output device, you may need to select the \"Combine with Speech\" option in the contextual menu's Braille submenu in order to obtain Nemeth or Euro Braille output rather than the speech text on your Braille device. %1

\n\n

The contextual menu also provides options for viewing or copying a MathML version of the expression or its original source format, creating an SVG version of the expression, and viewing various other information.

\n\n

Finally, selecting the \"Insert Hidden MathML\" item from the options submenu will turn of MathJax's speech and Braille generation and instead use visually hidden MathML that some screen readers can voice, though support for this is not universal across all screen readers and operating systems. Selecting speech or Braille generation in their submenus will remove the hidden MathML again.

\n\n

For more help, see the MathJax accessibility documentation.

", + "Help/Title": "MathJax Expression Explorer Help", + "Mac/Select": "or the VoiceOver arrow keys to select an expression", + "Mac/Title": "MacOS and iOS using VoiceOver", + "JumpTo": "Jump to row %1 and column", + "PositionMarked": "Position marked", + "Unix/Select": "Orca should enter focus mode automatically. If not, use the Orca+a key to toggle focus mode on or off. Also note that you can use Orca+arrow keys to explore expressions even in browse mode", + "Unix/Title": "Unix using Orca", + "Unknown/Title": "a Screen Reader", + "Win/Braille": "NVDA users need to select this option, while JAWS users should be able to get Braille output without changing this setting.", + "Win/Select": "The screen reader should enter focus or forms mode automatically when the expression gets the browser focus, but if not, you can toggle focus mode using NVDA+space in NVDA; for JAWS, Enter should start forms mode while Numpad Plus leaves it. Also note that you can use the NVDA or JAWS key plus the arrow keys to explore the expression even in browse mode, and you can use NVDA+shift+arrow keys to navigate out of an expression that has the focus in NVDA", + "Win/Title": "Windows using NVDA or JAWS" +} From 780ca456cc68da2cd29f23a29e29fd0cd77d892b Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 30 May 2026 16:07:30 -0400 Subject: [PATCH 88/95] Localize adaptors/linkedom --- components/mjs/adaptors/linkedom/config.json | 6 ++++ package.json | 3 +- ts/adaptors/linkedom/__locales__/Component.ts | 28 +++++++++++++++++++ ts/adaptors/linkedom/__locales__/de.json | 3 ++ ts/adaptors/linkedom/__locales__/en.json | 3 ++ ts/adaptors/linkedomAdaptor.ts | 4 ++- 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 ts/adaptors/linkedom/__locales__/Component.ts create mode 100644 ts/adaptors/linkedom/__locales__/de.json create mode 100644 ts/adaptors/linkedom/__locales__/en.json diff --git a/components/mjs/adaptors/linkedom/config.json b/components/mjs/adaptors/linkedom/config.json index 02c61e63e..c082341df 100644 --- a/components/mjs/adaptors/linkedom/config.json +++ b/components/mjs/adaptors/linkedom/config.json @@ -3,6 +3,12 @@ "component": "adaptors/linkedom", "targets": ["adaptors/linkedomAdaptor.ts"] }, + "copy": { + "to": "[bundle]/adaptors/linkedom", + "from": "[ts]/adaptors/linkedom", + "copy": ["__locales__"], + "excludes": ["__locales__/Component.ts"] + }, "webpack": { "name": "adaptors/linkedom", "libs": ["components/src/core/lib"] diff --git a/package.json b/package.json index e239d98ca..1257e7b2f 100644 --- a/package.json +++ b/package.json @@ -83,8 +83,9 @@ "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { for name in locales mj2 mml3 html; do pnpm -s copy:$name ${1:-mjs}; done; }; copy", "copy:bundle": "copy() { components/bin/makeAll --copy --terse components/mjs/${1:-}; }; copy", "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy", - "copy:locales": "copy() { for name in core tex mml menu a11y; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ", + "copy:locales": "copy() { for name in core tex mml menu a11y adaptors; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ", "copy:locales:a11y": "pnpm -s log:single 'Copying a11y locales'; copy() { pnpm copyfiles -u 1 'ts/a11y/*/__locales__/*.json' $1; }; copy", + "copy:locales:adaptors": "pnpm -s log:single 'Copying DOMAdaptor locales'; copy() { pnpm copyfiles -u 1 'ts/adaptors/*/__locales__/*.json' $1; }; copy", "copy:locales:core": "pnpm -s log:single 'Copying core locales'; copy() { pnpm copyfiles -u 1 'ts/core/__locales__/*.json' $1; }; copy", "copy:locales:menu": "pnpm -s log:single 'Copying menu locales'; copy() { pnpm copyfiles -u 1 'ts/ui/menu/__locales__/*.json' $1; }; copy", "copy:locales:mml": "pnpm -s log:single 'Copying MathML locales'; copy() { pnpm copyfiles -u 1 'ts/input/mathml/__locales__/*.json' $1; }; copy", diff --git a/ts/adaptors/linkedom/__locales__/Component.ts b/ts/adaptors/linkedom/__locales__/Component.ts new file mode 100644 index 000000000..fd2ae87c2 --- /dev/null +++ b/ts/adaptors/linkedom/__locales__/Component.ts @@ -0,0 +1,28 @@ +/************************************************************* + * + * Copyright (c) 2026 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file Locale component registration for linkedom component + * + * @author dpvc@mathjax.org (Davide P. Cervone) + */ + +import { Locale } from '../../../util/Locale.js'; + +export const COMPONENT = 'adaptors/linkedom'; + +Locale.registerLocaleFiles(COMPONENT, '../ts/adaptors/linkedom'); diff --git a/ts/adaptors/linkedom/__locales__/de.json b/ts/adaptors/linkedom/__locales__/de.json new file mode 100644 index 000000000..224938922 --- /dev/null +++ b/ts/adaptors/linkedom/__locales__/de.json @@ -0,0 +1,3 @@ +{ + "BadIndex": "Fehler bei der Indexgröße" +} diff --git a/ts/adaptors/linkedom/__locales__/en.json b/ts/adaptors/linkedom/__locales__/en.json new file mode 100644 index 000000000..abd8d0d49 --- /dev/null +++ b/ts/adaptors/linkedom/__locales__/en.json @@ -0,0 +1,3 @@ +{ + "BadIndex": "Index size error" +} diff --git a/ts/adaptors/linkedomAdaptor.ts b/ts/adaptors/linkedomAdaptor.ts index 94d5559c0..185458274 100644 --- a/ts/adaptors/linkedomAdaptor.ts +++ b/ts/adaptors/linkedomAdaptor.ts @@ -24,6 +24,8 @@ import { HTMLAdaptor } from './HTMLAdaptor.js'; import { NodeMixin, Constructor } from './NodeMixin.js'; import { OptionList } from '../util/Options.js'; +import { Locale } from '../util/Locale.js'; +import { COMPONENT } from './linkedom/__locales__/Component.js'; /** * The constructor for an HTMLAdaptor @@ -85,7 +87,7 @@ export function linkedomAdaptor( window.Text.prototype.splitText = function (offset: number) { const text = this.data; if (offset > text.length) { - throw Error('Index Size Error'); + Locale.throw(COMPONENT, 'BadIndex'); } const newNode = window.document.createTextNode(text.substring(offset)); this.parentNode.insertBefore(newNode, this.nextSibling); From e70f4ccf80b8cf489d7ffa09911e84087f394e9d Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 11 Jun 2026 11:10:00 -0400 Subject: [PATCH 89/95] Update ts/core/__locales__/de.json Co-authored-by: Volker Sorge --- ts/core/__locales__/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/core/__locales__/de.json b/ts/core/__locales__/de.json index 9ad878f04..b90b36214 100644 --- a/ts/core/__locales__/de.json +++ b/ts/core/__locales__/de.json @@ -21,7 +21,7 @@ "MML/OnlyOnce": "%1 darf in %2 nur einmal vorkommen", "MML/TokenChild": "%1 darf nur ein untergeordnetes Element eines Token-Elements sein", "MML/mglyphAttr": "mglyph muss entweder die Attribute src oder fontfamily sowie das Attribut index aufweisen", - "MML/mmultscriptsChild": "%1 muss ein untergeordnetes Element von mmultiscripts sein", + "MML/mmultiscriptsChild": "%1 muss ein untergeordnetes Element von mmultiscripts sein", "MML/mtableChild": "%1 kann nur ein Kind von mtable sein", "MML/mtableChildren": "Kinder von '%1' müssen mtr oder mlabeledtr sein", "MML/mtrChild": "%1 kann nur ein Kind von mtr oder mlabeledtr sein", From cbdb75d9c60f2861ad29ac94cfc1c9b81cb52899 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 11 Jun 2026 11:10:10 -0400 Subject: [PATCH 90/95] Update ts/core/__locales__/en.json Co-authored-by: Volker Sorge --- ts/core/__locales__/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/core/__locales__/en.json b/ts/core/__locales__/en.json index ea851838d..92b55e723 100644 --- a/ts/core/__locales__/en.json +++ b/ts/core/__locales__/en.json @@ -21,7 +21,7 @@ "MML/OnlyOnce": "%1 can only appear once in %2", "MML/TokenChild": "%1 can only be a child of a token element", "MML/mglyphAttr": "mglyph must have either src or fontfamily and index attributes", - "MML/mmultscriptsChild": "%1 must be a child of mmultiscripts", + "MML/mmultiscriptsChild": "%1 must be a child of mmultiscripts", "MML/mtableChild": "%1 can only be a child of an mtable", "MML/mtableChildren": "Children of '%1' must be mtr or mlabeledtr", "MML/mtrChild": "%1 can only be a child of an mtr or mlabeledtr", From 4f16e849110b32965b1a15cde7ef6b0da2e2b6ad Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 11 Jun 2026 11:10:27 -0400 Subject: [PATCH 91/95] Update ts/core/MmlTree/MmlNodes/mtr.ts Co-authored-by: Volker Sorge --- ts/core/MmlTree/MmlNodes/mtr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/core/MmlTree/MmlNodes/mtr.ts b/ts/core/MmlTree/MmlNodes/mtr.ts index 8c1e5fa61..2b7aacd73 100644 --- a/ts/core/MmlTree/MmlNodes/mtr.ts +++ b/ts/core/MmlTree/MmlNodes/mtr.ts @@ -120,7 +120,7 @@ export class MmlMtr extends AbstractMmlNode { const mtd = this.replaceChild(this.factory.create('mtd'), child); mtd.appendChild(child); if (!options['fixMtables']) { - child.mError('MML/mtrChildren', [], options); + child.mError('MML/mtrChildren', [this.kind], options); } } } From 4dc65ffa4265c2be84cd9f67998dd65778e0c6b6 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 11 Jun 2026 11:19:47 -0400 Subject: [PATCH 92/95] Fix issues identified by Volker in review. --- ts/core/__locales__/de.json | 2 +- ts/core/__locales__/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/core/__locales__/de.json b/ts/core/__locales__/de.json index b90b36214..4d3562596 100644 --- a/ts/core/__locales__/de.json +++ b/ts/core/__locales__/de.json @@ -17,7 +17,7 @@ "MML/BadVariant": "Ungültige mathvariant: %1", "MML/EqualPrescripts": "Es muss eine gleiche Anzahl von Vorzeichen jedes Typs vorhanden sein", "MML/EqualScripts": "Es muss eine gleiche Anzahl von Skripten jedes Typs vorhanden sein", - "MML/NoVariant": "Es sollten keine untergeordneten Elemente für '%1'-Knoten vorhanden sein", + "MML/NoChildren": "Es sollten keine untergeordneten Elemente für '%1'-Knoten vorhanden sein", "MML/OnlyOnce": "%1 darf in %2 nur einmal vorkommen", "MML/TokenChild": "%1 darf nur ein untergeordnetes Element eines Token-Elements sein", "MML/mglyphAttr": "mglyph muss entweder die Attribute src oder fontfamily sowie das Attribut index aufweisen", diff --git a/ts/core/__locales__/en.json b/ts/core/__locales__/en.json index 92b55e723..6d69e0b59 100644 --- a/ts/core/__locales__/en.json +++ b/ts/core/__locales__/en.json @@ -17,7 +17,7 @@ "MML/BadVariant": "Invalid mathvariant: %1", "MML/EqualPrescripts": "There must be an equal number of prescripts of each type", "MML/EqualScripts": "There must be an equal number of scripts of each type", - "MML/NoVariant": "There should not be children for '%1' nodes", + "MML/NoChildren": "There should not be children for '%1' nodes", "MML/OnlyOnce": "%1 can only appear once in %2", "MML/TokenChild": "%1 can only be a child of a token element", "MML/mglyphAttr": "mglyph must have either src or fontfamily and index attributes", From a6d99815dc1d63a71f1f186ecf7229b6db64b375 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 11 Jun 2026 11:30:04 -0400 Subject: [PATCH 93/95] Update ts/util/Locale.ts Co-authored-by: Volker Sorge --- ts/util/Locale.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/util/Locale.ts b/ts/util/Locale.ts index e7b5ade36..1258fefcb 100644 --- a/ts/util/Locale.ts +++ b/ts/util/Locale.ts @@ -229,7 +229,7 @@ export class Locale { * * @param {string} component The component whose message is requested * @param {string} id The id of the message - * @param {string|namedData} data The first argument or the object of names arguments + * @param {string|namedData} data The first argument or the object of named arguments * @param {string[]} args Any additional string arguments (if data is a string) */ public static warn( From e3d01e3092a2bf2eee694f49e7c0b25f0e998368 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 11 Jun 2026 14:07:51 -0400 Subject: [PATCH 94/95] Use jest.spyOn() to mock console methods, as suggested by Volker in review. --- testsuite/src/traps.ts | 38 ++++++++++++++++------------ testsuite/tests/util/Locale.test.ts | 9 +++---- testsuite/tests/util/Options.test.ts | 7 +++-- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/testsuite/src/traps.ts b/testsuite/src/traps.ts index 75298ae68..1f5761f0f 100644 --- a/testsuite/src/traps.ts +++ b/testsuite/src/traps.ts @@ -1,3 +1,7 @@ +import {jest} from '@jest/globals'; + +type consoleMethod = 'log' | 'warn' | 'error'; + /** * Trap output produced while running code. * @@ -6,14 +10,15 @@ * @returns {string} The output sent to the given method. */ export function trapOutput(method: string, code: () => void): string { - const saved = (console as any)[method]; - let message = ''; - (console as any)[method] = (...msg: any[]) => { - message += (message ? '\n' : '') + msg.join(' '); - }; - code(); - (console as any)[method] = saved; - return message; + const messages: string[] = []; + const spy = jest.spyOn(console, method as consoleMethod) + .mockImplementation((...msg) => messages.push(msg.join(' '))); + try { + code(); + } finally { + spy.mockRestore(); + } + return messages.join('\n'); } /** @@ -45,14 +50,15 @@ export async function trapAsyncOutput( method: string, code: () => Promise ): Promise { - const saved = (console as any)[method]; - let message = ''; - (console as any)[method] = (...msg: any[]) => { - message += (message ? '\n' : '') + msg.join(' '); - }; - await code(); - (console as any)[method] = saved; - return message; + const messages: string[] = []; + const spy = jest.spyOn(console, method as consoleMethod) + .mockImplementation((...msg) => messages.push(msg.join(' '))); + try { + await code(); + } finally { + spy.mockRestore(); + } + return messages.join('\n'); } /** diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index dd1e0ddb2..3fb5b7730 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -1,4 +1,4 @@ -import { describe, test, expect } from '@jest/globals'; +import { describe, test, expect, jest } from '@jest/globals'; import { trapOutput, trapAsyncOutput } from '#helpers/traps.js'; import { Locale } from '#js/util/Locale.js'; import '#js/util/asyncLoad/esm.js'; @@ -28,17 +28,14 @@ describe('Locale', () => { '../testsuite/lib/component/__locales__', new Set(), ]); - const error = console.error; - console.error = (message) => { - throw message; - }; + const spy = jest.spyOn(console, 'error').mockImplementation((msg) => {throw msg}); await expect(Locale.setLocale('xy')).rejects.toContain( "MathJax(component): Can't load 'xy.json': ENOENT: no such file or directory" ); await expect(Locale.setLocale('de')).rejects.toContain( "MathJax(component): 'de.json' kann nicht geladen werden: ENOENT: no such file or directory" ); - console.error = error; + spy.mockRestore(); await Locale.setLocale('en'); expect(locale.data.component).toEqual({ en: { Id1: 'Test of %1 in %2' } }); expect(Locale.message('component', 'Id1', 'message', 'Locale')).toBe( diff --git a/testsuite/tests/util/Options.test.ts b/testsuite/tests/util/Options.test.ts index c5aa72cad..7be38431f 100644 --- a/testsuite/tests/util/Options.test.ts +++ b/testsuite/tests/util/Options.test.ts @@ -1,4 +1,4 @@ -import { describe, test, expect } from '@jest/globals'; +import { describe, test, expect, jest } from '@jest/globals'; import * as Options from '#js/util/Options.js'; const SYMB = Symbol('symbol'); @@ -355,8 +355,7 @@ describe('Options utility', () => { // // Warn does not throw an error // - const warn = console.warn; - console.warn = () => {}; + const spy = jest.spyOn(console, 'warn').mockImplementation(() => {}); OPTIONS.invalidOption = 'warn'; try { copy = Options.userOptions({}, { a: 1 }); @@ -364,7 +363,7 @@ describe('Options utility', () => { // Should not throw an error } expect(copy).toEqual({}); - console.warn = warn; + spy.mockRestore(); }); test('makeArray()', () => { From 46ff33f4496bca8609b9b520a966a6f46e3748e2 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 11 Jun 2026 14:17:18 -0400 Subject: [PATCH 95/95] Format for prettier and use spy.mock.calls for message collection --- testsuite/src/traps.ts | 22 +++++++++++++--------- testsuite/tests/util/Locale.test.ts | 4 +++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/testsuite/src/traps.ts b/testsuite/src/traps.ts index 1f5761f0f..f8079d5ff 100644 --- a/testsuite/src/traps.ts +++ b/testsuite/src/traps.ts @@ -1,4 +1,4 @@ -import {jest} from '@jest/globals'; +import { jest } from '@jest/globals'; type consoleMethod = 'log' | 'warn' | 'error'; @@ -10,15 +10,17 @@ type consoleMethod = 'log' | 'warn' | 'error'; * @returns {string} The output sent to the given method. */ export function trapOutput(method: string, code: () => void): string { - const messages: string[] = []; - const spy = jest.spyOn(console, method as consoleMethod) - .mockImplementation((...msg) => messages.push(msg.join(' '))); + const spy = jest + .spyOn(console, method as consoleMethod) + .mockImplementation(() => {}); + let message = '(no message)'; try { code(); + message = spy.mock.calls.map((msg: string[]) => msg.join(' ')).join('\n'); } finally { spy.mockRestore(); } - return messages.join('\n'); + return message; } /** @@ -50,15 +52,17 @@ export async function trapAsyncOutput( method: string, code: () => Promise ): Promise { - const messages: string[] = []; - const spy = jest.spyOn(console, method as consoleMethod) - .mockImplementation((...msg) => messages.push(msg.join(' '))); + const spy = jest + .spyOn(console, method as consoleMethod) + .mockImplementation(() => {}); + let message = '(no message)'; try { await code(); + message = spy.mock.calls.map((msg: string[]) => msg.join(' ')).join('\n'); } finally { spy.mockRestore(); } - return messages.join('\n'); + return message; } /** diff --git a/testsuite/tests/util/Locale.test.ts b/testsuite/tests/util/Locale.test.ts index 3fb5b7730..d5ad9c3e7 100644 --- a/testsuite/tests/util/Locale.test.ts +++ b/testsuite/tests/util/Locale.test.ts @@ -28,7 +28,9 @@ describe('Locale', () => { '../testsuite/lib/component/__locales__', new Set(), ]); - const spy = jest.spyOn(console, 'error').mockImplementation((msg) => {throw msg}); + const spy = jest.spyOn(console, 'error').mockImplementation((msg) => { + throw msg; + }); await expect(Locale.setLocale('xy')).rejects.toContain( "MathJax(component): Can't load 'xy.json': ENOENT: no such file or directory" );