From 98c0490713666f7dbbb8a69a21614384549e99a6 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 16:00:36 -0400 Subject: [PATCH 01/11] Rename tex extension directories --- ts/input/tex/{ams_cd => amscd}/AmsCdConfiguration.ts | 0 ts/input/tex/{ams_cd => amscd}/AmsCdMappings.ts | 0 ts/input/tex/{ams_cd => amscd}/AmsCdMethods.ts | 0 ts/input/tex/{color_v2 => colorv2}/ColorV2Configuration.ts | 0 .../{config_macros => configmacros}/ConfigMacrosConfiguration.ts | 0 ts/input/tex/{tag_format => tagformat}/TagFormatConfiguration.ts | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename ts/input/tex/{ams_cd => amscd}/AmsCdConfiguration.ts (100%) rename ts/input/tex/{ams_cd => amscd}/AmsCdMappings.ts (100%) rename ts/input/tex/{ams_cd => amscd}/AmsCdMethods.ts (100%) rename ts/input/tex/{color_v2 => colorv2}/ColorV2Configuration.ts (100%) rename ts/input/tex/{config_macros => configmacros}/ConfigMacrosConfiguration.ts (100%) rename ts/input/tex/{tag_format => tagformat}/TagFormatConfiguration.ts (100%) diff --git a/ts/input/tex/ams_cd/AmsCdConfiguration.ts b/ts/input/tex/amscd/AmsCdConfiguration.ts similarity index 100% rename from ts/input/tex/ams_cd/AmsCdConfiguration.ts rename to ts/input/tex/amscd/AmsCdConfiguration.ts diff --git a/ts/input/tex/ams_cd/AmsCdMappings.ts b/ts/input/tex/amscd/AmsCdMappings.ts similarity index 100% rename from ts/input/tex/ams_cd/AmsCdMappings.ts rename to ts/input/tex/amscd/AmsCdMappings.ts diff --git a/ts/input/tex/ams_cd/AmsCdMethods.ts b/ts/input/tex/amscd/AmsCdMethods.ts similarity index 100% rename from ts/input/tex/ams_cd/AmsCdMethods.ts rename to ts/input/tex/amscd/AmsCdMethods.ts diff --git a/ts/input/tex/color_v2/ColorV2Configuration.ts b/ts/input/tex/colorv2/ColorV2Configuration.ts similarity index 100% rename from ts/input/tex/color_v2/ColorV2Configuration.ts rename to ts/input/tex/colorv2/ColorV2Configuration.ts diff --git a/ts/input/tex/config_macros/ConfigMacrosConfiguration.ts b/ts/input/tex/configmacros/ConfigMacrosConfiguration.ts similarity index 100% rename from ts/input/tex/config_macros/ConfigMacrosConfiguration.ts rename to ts/input/tex/configmacros/ConfigMacrosConfiguration.ts diff --git a/ts/input/tex/tag_format/TagFormatConfiguration.ts b/ts/input/tex/tagformat/TagFormatConfiguration.ts similarity index 100% rename from ts/input/tex/tag_format/TagFormatConfiguration.ts rename to ts/input/tex/tagformat/TagFormatConfiguration.ts From 08e753a4dd30b5386efe64cf5a737fd6755a4468 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 17:47:33 -0400 Subject: [PATCH 02/11] Fix amscd name from amsCd --- ts/input/tex/AllPackages.ts | 14 +++++++------- ts/input/tex/amscd/AmsCdConfiguration.ts | 10 +++++----- ts/input/tex/amscd/AmsCdMappings.ts | 6 +++--- ts/input/tex/amscd/AmsCdMethods.ts | 4 ++-- ts/input/tex/autoload/AutoloadConfiguration.ts | 2 +- ts/input/tex/require/RequireConfiguration.ts | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ts/input/tex/AllPackages.ts b/ts/input/tex/AllPackages.ts index 377131c41..6e2b51b5a 100644 --- a/ts/input/tex/AllPackages.ts +++ b/ts/input/tex/AllPackages.ts @@ -50,14 +50,14 @@ if (typeof MathJax !== 'undefined' && MathJax.loader) { MathJax.loader.preLoad( '[tex]/action', '[tex]/ams', - '[tex]/amsCd', + '[tex]/amscd', '[tex]/bbox', '[tex]/boldsymbol', '[tex]/braket', '[tex]/bussproofs', '[tex]/cancel', '[tex]/color', - '[tex]/color_v2', + '[tex]/colorv2', '[tex]/enclose', '[tex]/extpfeil', '[tex]/html', @@ -68,8 +68,8 @@ if (typeof MathJax !== 'undefined' && MathJax.loader) { '[tex]/physics', '[tex]/unicode', '[tex]/verb', - '[tex]/configMacros', - '[tex]/tagFormat' + '[tex]/configmacros', + '[tex]/tagformat' ); } @@ -77,7 +77,7 @@ export const AllPackages: string[] = [ 'base', 'action', 'ams', - 'amsCd', + 'amscd', 'bbox', 'boldsymbol', 'braket', @@ -93,6 +93,6 @@ export const AllPackages: string[] = [ 'noundefined', 'unicode', 'verb', - 'configMacros', - 'tagFormat' + 'configmacros', + 'tagformat' ]; diff --git a/ts/input/tex/amscd/AmsCdConfiguration.ts b/ts/input/tex/amscd/AmsCdConfiguration.ts index 5df68e49d..9ff13231f 100644 --- a/ts/input/tex/amscd/AmsCdConfiguration.ts +++ b/ts/input/tex/amscd/AmsCdConfiguration.ts @@ -27,14 +27,14 @@ import './AmsCdMappings.js'; export const AmsCdConfiguration = Configuration.create( - 'amsCd', { + 'amscd', { handler: { - character: ['amsCd_special'], - macro: ['amsCd_macros'], - environment: ['amsCd_environment'] + character: ['amscd_special'], + macro: ['amscd_macros'], + environment: ['amscd_environment'] }, options: { - amsCd: { + amscd: { colspace: '5pt', rowspace: '5pt', harrowsize: '2.75em', diff --git a/ts/input/tex/amscd/AmsCdMappings.ts b/ts/input/tex/amscd/AmsCdMappings.ts index 6aa7aa155..8412105b3 100644 --- a/ts/input/tex/amscd/AmsCdMappings.ts +++ b/ts/input/tex/amscd/AmsCdMappings.ts @@ -27,12 +27,12 @@ import ParseMethods from '../ParseMethods.js'; import AmsCdMethods from './AmsCdMethods.js'; -new sm.EnvironmentMap('amsCd_environment', ParseMethods.environment, +new sm.EnvironmentMap('amscd_environment', ParseMethods.environment, {CD: 'CD'}, AmsCdMethods); -new sm.CommandMap('amsCd_macros', { +new sm.CommandMap('amscd_macros', { minCDarrowwidth: 'minCDarrowwidth', minCDarrowheight: 'minCDarrowheight', }, AmsCdMethods); -new sm.MacroMap('amsCd_special', {'@': 'arrow'}, AmsCdMethods); +new sm.MacroMap('amscd_special', {'@': 'arrow'}, AmsCdMethods); diff --git a/ts/input/tex/amscd/AmsCdMethods.ts b/ts/input/tex/amscd/AmsCdMethods.ts index 18ae10f4d..85ca64271 100644 --- a/ts/input/tex/amscd/AmsCdMethods.ts +++ b/ts/input/tex/amscd/AmsCdMethods.ts @@ -45,7 +45,7 @@ let AmsCdMethods: Record = {}; AmsCdMethods.CD = function(parser: TexParser, begin: StackItem) { parser.Push(begin); let item = parser.itemFactory.create('array') as ArrayItem; - let options = parser.configuration.options.amsCd; + let options = parser.configuration.options.amscd; item.setProperties({ minw: parser.stack.env.CD_minw || options.harrowsize, minh: parser.stack.env.CD_minh || options.varrowsize @@ -128,7 +128,7 @@ AmsCdMethods.arrow = function(parser: TexParser, name: string) { let nodeB = new TexParser(b, parser.stack.env, parser.configuration).mml(); NodeUtil.setChild(mml, mml.under, parser.create('node', 'mpadded', [nodeB], pad)); } - if (parser.configuration.options.amsCd.hideHorizontalLabels) { + if (parser.configuration.options.amscd.hideHorizontalLabels) { mml = parser.create('node', 'mpadded', mml, {depth: 0, height: '.67em'}); } } diff --git a/ts/input/tex/autoload/AutoloadConfiguration.ts b/ts/input/tex/autoload/AutoloadConfiguration.ts index 1897f8023..695198f35 100644 --- a/ts/input/tex/autoload/AutoloadConfiguration.ts +++ b/ts/input/tex/autoload/AutoloadConfiguration.ts @@ -151,7 +151,7 @@ export const AutoloadConfiguration = Configuration.create( // autoload: expandable({ action: ['toggle', 'mathtip', 'texttip'], - amsCd: [[], ['CD']], + amscd: [[], ['CD']], bbox: ['bbox'], boldsymbol: ['boldsymbol'], braket: ['bra', 'ket', 'braket', 'set', 'Bra', 'Ket', 'Braket', 'Set', 'ketbra', 'Ketbra'], diff --git a/ts/input/tex/require/RequireConfiguration.ts b/ts/input/tex/require/RequireConfiguration.ts index 6aa330da9..2f66cabe8 100644 --- a/ts/input/tex/require/RequireConfiguration.ts +++ b/ts/input/tex/require/RequireConfiguration.ts @@ -44,7 +44,7 @@ const MJCONFIG = MathJax.config; * Add an extension to the configuration, and configure its user options * * @param {TeX} jax The TeX jax whose configuration is to be modified - * @param {string} name The name of the extension being added (e.g., '[tex]/amsCd') + * @param {string} name The name of the extension being added (e.g., '[tex]/amscd') */ function RegisterExtension(jax: TeX, name: string) { const require = jax.parseOptions.options.require; From c7ba2a38d70d0e6232e0494fe00fee292938c181 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 17:50:01 -0400 Subject: [PATCH 03/11] Rename color_v2 and colorV2 to colorv2 --- ts/input/tex/AllPackages.ts | 6 +++--- ts/input/tex/colorv2/ColorV2Configuration.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ts/input/tex/AllPackages.ts b/ts/input/tex/AllPackages.ts index 6e2b51b5a..01b2efcd0 100644 --- a/ts/input/tex/AllPackages.ts +++ b/ts/input/tex/AllPackages.ts @@ -24,14 +24,14 @@ import './base/BaseConfiguration.js'; import './action/ActionConfiguration.js'; import './ams/AmsConfiguration.js'; -import './ams_cd/AmsCdConfiguration.js'; +import './amscd/AmsCdConfiguration.js'; import './bbox/BboxConfiguration.js'; import './boldsymbol/BoldsymbolConfiguration.js'; import './braket/BraketConfiguration.js'; import './bussproofs/BussproofsConfiguration.js'; import './cancel/CancelConfiguration.js'; import './color/ColorConfiguration.js'; -import './color_v2/ColorV2Configuration.js'; +import './colorv2/ColorV2Configuration.js'; import './config_macros/ConfigMacrosConfiguration.js'; import './enclose/EncloseConfiguration.js'; import './extpfeil/ExtpfeilConfiguration.js'; @@ -41,7 +41,7 @@ import './newcommand/NewcommandConfiguration.js'; import './noerrors/NoErrorsConfiguration.js'; import './noundefined/NoUndefinedConfiguration.js'; import './physics/PhysicsConfiguration.js'; -import './tag_format/TagFormatConfiguration.js'; +import './tagformat/TagFormatConfiguration.js'; import './unicode/UnicodeConfiguration.js'; import './verb/VerbConfiguration.js'; diff --git a/ts/input/tex/colorv2/ColorV2Configuration.ts b/ts/input/tex/colorv2/ColorV2Configuration.ts index c5cdab8b7..ca7ef8816 100644 --- a/ts/input/tex/colorv2/ColorV2Configuration.ts +++ b/ts/input/tex/colorv2/ColorV2Configuration.ts @@ -54,11 +54,11 @@ export const ColorV2Methods: Record = { /** * The color macros */ -new CommandMap('colorV2', {color: 'Color'}, ColorV2Methods); +new CommandMap('colorv2', {color: 'Color'}, ColorV2Methods); /** * The configuration for the color macros */ export const ColorConfiguration = Configuration.create( - 'colorV2', {handler: {macro: ['colorV2']}} + 'colorv2', {handler: {macro: ['colorv2']}} ); From 71cde3a2297875eb7a759e41ca99e2e90032535c Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 18:06:32 -0400 Subject: [PATCH 04/11] Rename config_macros and configMacros to configmacros --- ts/input/tex/AllPackages.ts | 2 +- ts/input/tex/autoload/AutoloadConfiguration.ts | 2 +- .../configmacros/ConfigMacrosConfiguration.ts | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ts/input/tex/AllPackages.ts b/ts/input/tex/AllPackages.ts index 01b2efcd0..7515cbe53 100644 --- a/ts/input/tex/AllPackages.ts +++ b/ts/input/tex/AllPackages.ts @@ -32,7 +32,7 @@ import './bussproofs/BussproofsConfiguration.js'; import './cancel/CancelConfiguration.js'; import './color/ColorConfiguration.js'; import './colorv2/ColorV2Configuration.js'; -import './config_macros/ConfigMacrosConfiguration.js'; +import './configmacros/ConfigMacrosConfiguration.js'; import './enclose/EncloseConfiguration.js'; import './extpfeil/ExtpfeilConfiguration.js'; import './html/HtmlConfiguration.js'; diff --git a/ts/input/tex/autoload/AutoloadConfiguration.ts b/ts/input/tex/autoload/AutoloadConfiguration.ts index 695198f35..0c9f1dfec 100644 --- a/ts/input/tex/autoload/AutoloadConfiguration.ts +++ b/ts/input/tex/autoload/AutoloadConfiguration.ts @@ -133,7 +133,7 @@ const AutoloadEnvironments = new AutoloadCommandMap('autoload-environments', {}, /** - * The configuration object for configMacros + * The configuration object for configmacros */ export const AutoloadConfiguration = Configuration.create( 'autoload', { diff --git a/ts/input/tex/configmacros/ConfigMacrosConfiguration.ts b/ts/input/tex/configmacros/ConfigMacrosConfiguration.ts index e058ae082..85aa3f65a 100644 --- a/ts/input/tex/configmacros/ConfigMacrosConfiguration.ts +++ b/ts/input/tex/configmacros/ConfigMacrosConfiguration.ts @@ -17,7 +17,7 @@ /** - * @fileoverview Configuration file for the config-macros package. + * @fileoverview Configuration file for the configmacros package. * * @author dpvc@mathjax.org (Davide P. Cervone) */ @@ -32,16 +32,16 @@ import {TeX} from '../../tex.js'; /** * The name to use for the macros map */ -const MACROSMAP = 'configMacrosMap'; +const MACROSMAP = 'configmacros-map'; /** * Create the command map for the macros * * @param {Configuration} config The configuration object for the input jax */ -function configMacrosInit(config: Configuration) { +function configmacrosInit(config: Configuration) { new CommandMap(MACROSMAP, {}, {}); - config.append(Configuration.create('configMacroDefinitions', {handler: {macro: [MACROSMAP]}})); + config.append(Configuration.create('configmacros-definitions', {handler: {macro: [MACROSMAP]}})); } /** @@ -50,7 +50,7 @@ function configMacrosInit(config: Configuration) { * @param {Configuration} config The configuration object for the input jax * @param {TeX} jax The TeX input jax */ -function configMacrosConfig(_config: Configuration, jax: TeX) { +function configmacrosConfig(_config: Configuration, jax: TeX) { const macrosMap = jax.parseOptions.handlers.retrieve(MACROSMAP) as CommandMap; const macros = jax.parseOptions.options.macros; for (const cs of Object.keys(macros)) { @@ -63,12 +63,12 @@ function configMacrosConfig(_config: Configuration, jax: TeX) { } /** - * The configuration object for configMacros + * The configuration object for configmacros */ export const ConfigMacrosConfiguration = Configuration.create( - 'configMacros', { - init: configMacrosInit, - config: configMacrosConfig, + 'configmacros', { + init: configmacrosInit, + config: configmacrosConfig, options: {macros: expandable({})} } ); From 8bdd74ba92457eac56965d80285fd98c85c3f311 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 18:09:04 -0400 Subject: [PATCH 05/11] Rename tag_foramt and tagFormat to tagformat --- ts/input/tex/tagformat/TagFormatConfiguration.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ts/input/tex/tagformat/TagFormatConfiguration.ts b/ts/input/tex/tagformat/TagFormatConfiguration.ts index 5eff16352..984ec9b5e 100644 --- a/ts/input/tex/tagformat/TagFormatConfiguration.ts +++ b/ts/input/tex/tagformat/TagFormatConfiguration.ts @@ -38,7 +38,7 @@ let tagID = 0; * @param {Configuration} config The configuration for the input jax * @param {TeX} jax The TeX input jax */ -export function tagFormatConfig(config: Configuration, jax: TeX) { +export function tagformatConfig(config: Configuration, jax: TeX) { /** * If the tag format is being added by one of the other extensions, @@ -67,28 +67,28 @@ export function tagFormatConfig(config: Configuration, jax: TeX) * @override */ public formatNumber(n: number) { - return jax.parseOptions.options.tagFormat.number(n); + return jax.parseOptions.options.tagformat.number(n); } /** * @override */ public formatTag(tag: string) { - return jax.parseOptions.options.tagFormat.tag(tag); + return jax.parseOptions.options.tagformat.tag(tag); } /** * @override */ public formatId(id: string) { - return jax.parseOptions.options.tagFormat.id(id); + return jax.parseOptions.options.tagformat.id(id); } /** * @override */ public formatUrl(id: string, base: string) { - return jax.parseOptions.options.tagFormat.url(id, base); + return jax.parseOptions.options.tagformat.url(id, base); } } @@ -110,11 +110,11 @@ export function tagFormatConfig(config: Configuration, jax: TeX) * The configuration object for configTags */ export const TagFormatConfiguration = Configuration.create( - 'tagFormat', { - config: tagFormatConfig, + 'tagformat', { + config: tagformatConfig, configPriority: 10, options: { - tagFormat: { + tagformat: { number: (n: number) => n.toString(), tag: (tag: string) => '(' + tag + ')', id: (id: string) => 'mjx-eqn-' + id.replace(/\s/g, '_'), From 3629166705e5f5dcf13683130e67ce50d76eaec3 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 18:12:44 -0400 Subject: [PATCH 06/11] Rename component directions for tex extensions --- components/src/input/tex/extensions/{ams_cd => amscd}/amsCd.js | 0 components/src/input/tex/extensions/{ams_cd => amscd}/build.json | 0 .../src/input/tex/extensions/{ams_cd => amscd}/webpack.config.js | 0 .../src/input/tex/extensions/{color_v2 => colorv2}/build.json | 0 .../src/input/tex/extensions/{color_v2 => colorv2}/colorV2.js | 0 .../input/tex/extensions/{color_v2 => colorv2}/webpack.config.js | 0 .../tex/extensions/{config_macros => configmacros}/build.json | 0 .../extensions/{config_macros => configmacros}/configMacros.js | 0 .../extensions/{config_macros => configmacros}/webpack.config.js | 0 .../src/input/tex/extensions/{tag_format => tagformat}/build.json | 0 .../input/tex/extensions/{tag_format => tagformat}/tagFormat.js | 0 .../tex/extensions/{tag_format => tagformat}/webpack.config.js | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename components/src/input/tex/extensions/{ams_cd => amscd}/amsCd.js (100%) rename components/src/input/tex/extensions/{ams_cd => amscd}/build.json (100%) rename components/src/input/tex/extensions/{ams_cd => amscd}/webpack.config.js (100%) rename components/src/input/tex/extensions/{color_v2 => colorv2}/build.json (100%) rename components/src/input/tex/extensions/{color_v2 => colorv2}/colorV2.js (100%) rename components/src/input/tex/extensions/{color_v2 => colorv2}/webpack.config.js (100%) rename components/src/input/tex/extensions/{config_macros => configmacros}/build.json (100%) rename components/src/input/tex/extensions/{config_macros => configmacros}/configMacros.js (100%) rename components/src/input/tex/extensions/{config_macros => configmacros}/webpack.config.js (100%) rename components/src/input/tex/extensions/{tag_format => tagformat}/build.json (100%) rename components/src/input/tex/extensions/{tag_format => tagformat}/tagFormat.js (100%) rename components/src/input/tex/extensions/{tag_format => tagformat}/webpack.config.js (100%) diff --git a/components/src/input/tex/extensions/ams_cd/amsCd.js b/components/src/input/tex/extensions/amscd/amsCd.js similarity index 100% rename from components/src/input/tex/extensions/ams_cd/amsCd.js rename to components/src/input/tex/extensions/amscd/amsCd.js diff --git a/components/src/input/tex/extensions/ams_cd/build.json b/components/src/input/tex/extensions/amscd/build.json similarity index 100% rename from components/src/input/tex/extensions/ams_cd/build.json rename to components/src/input/tex/extensions/amscd/build.json diff --git a/components/src/input/tex/extensions/ams_cd/webpack.config.js b/components/src/input/tex/extensions/amscd/webpack.config.js similarity index 100% rename from components/src/input/tex/extensions/ams_cd/webpack.config.js rename to components/src/input/tex/extensions/amscd/webpack.config.js diff --git a/components/src/input/tex/extensions/color_v2/build.json b/components/src/input/tex/extensions/colorv2/build.json similarity index 100% rename from components/src/input/tex/extensions/color_v2/build.json rename to components/src/input/tex/extensions/colorv2/build.json diff --git a/components/src/input/tex/extensions/color_v2/colorV2.js b/components/src/input/tex/extensions/colorv2/colorV2.js similarity index 100% rename from components/src/input/tex/extensions/color_v2/colorV2.js rename to components/src/input/tex/extensions/colorv2/colorV2.js diff --git a/components/src/input/tex/extensions/color_v2/webpack.config.js b/components/src/input/tex/extensions/colorv2/webpack.config.js similarity index 100% rename from components/src/input/tex/extensions/color_v2/webpack.config.js rename to components/src/input/tex/extensions/colorv2/webpack.config.js diff --git a/components/src/input/tex/extensions/config_macros/build.json b/components/src/input/tex/extensions/configmacros/build.json similarity index 100% rename from components/src/input/tex/extensions/config_macros/build.json rename to components/src/input/tex/extensions/configmacros/build.json diff --git a/components/src/input/tex/extensions/config_macros/configMacros.js b/components/src/input/tex/extensions/configmacros/configMacros.js similarity index 100% rename from components/src/input/tex/extensions/config_macros/configMacros.js rename to components/src/input/tex/extensions/configmacros/configMacros.js diff --git a/components/src/input/tex/extensions/config_macros/webpack.config.js b/components/src/input/tex/extensions/configmacros/webpack.config.js similarity index 100% rename from components/src/input/tex/extensions/config_macros/webpack.config.js rename to components/src/input/tex/extensions/configmacros/webpack.config.js diff --git a/components/src/input/tex/extensions/tag_format/build.json b/components/src/input/tex/extensions/tagformat/build.json similarity index 100% rename from components/src/input/tex/extensions/tag_format/build.json rename to components/src/input/tex/extensions/tagformat/build.json diff --git a/components/src/input/tex/extensions/tag_format/tagFormat.js b/components/src/input/tex/extensions/tagformat/tagFormat.js similarity index 100% rename from components/src/input/tex/extensions/tag_format/tagFormat.js rename to components/src/input/tex/extensions/tagformat/tagFormat.js diff --git a/components/src/input/tex/extensions/tag_format/webpack.config.js b/components/src/input/tex/extensions/tagformat/webpack.config.js similarity index 100% rename from components/src/input/tex/extensions/tag_format/webpack.config.js rename to components/src/input/tex/extensions/tagformat/webpack.config.js From 979b7281ec9891cb91025da45fb9184cfddc7d14 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 18:15:14 -0400 Subject: [PATCH 07/11] Rename more component files --- components/src/input/tex/extensions/amscd/{amsCd.js => amscd.js} | 0 .../src/input/tex/extensions/colorv2/{colorV2.js => colorv2.js} | 0 .../extensions/configmacros/{configMacros.js => configmacros.js} | 0 .../input/tex/extensions/tagformat/{tagFormat.js => tagformat.js} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename components/src/input/tex/extensions/amscd/{amsCd.js => amscd.js} (100%) rename components/src/input/tex/extensions/colorv2/{colorV2.js => colorv2.js} (100%) rename components/src/input/tex/extensions/configmacros/{configMacros.js => configmacros.js} (100%) rename components/src/input/tex/extensions/tagformat/{tagFormat.js => tagformat.js} (100%) diff --git a/components/src/input/tex/extensions/amscd/amsCd.js b/components/src/input/tex/extensions/amscd/amscd.js similarity index 100% rename from components/src/input/tex/extensions/amscd/amsCd.js rename to components/src/input/tex/extensions/amscd/amscd.js diff --git a/components/src/input/tex/extensions/colorv2/colorV2.js b/components/src/input/tex/extensions/colorv2/colorv2.js similarity index 100% rename from components/src/input/tex/extensions/colorv2/colorV2.js rename to components/src/input/tex/extensions/colorv2/colorv2.js diff --git a/components/src/input/tex/extensions/configmacros/configMacros.js b/components/src/input/tex/extensions/configmacros/configmacros.js similarity index 100% rename from components/src/input/tex/extensions/configmacros/configMacros.js rename to components/src/input/tex/extensions/configmacros/configmacros.js diff --git a/components/src/input/tex/extensions/tagformat/tagFormat.js b/components/src/input/tex/extensions/tagformat/tagformat.js similarity index 100% rename from components/src/input/tex/extensions/tagformat/tagFormat.js rename to components/src/input/tex/extensions/tagformat/tagformat.js From f9ec3cad7a81d5dff8323aa08708a02903bf1c84 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Fri, 8 May 2020 18:28:42 -0400 Subject: [PATCH 08/11] Normalize names of extensions in components/src --- components/src/dependencies.js | 15 ++++++++------- components/src/input/tex-full/build.json | 1 - components/src/input/tex/build.json | 2 +- .../src/input/tex/extensions/amscd/amscd.js | 2 +- .../src/input/tex/extensions/amscd/build.json | 4 ++-- .../input/tex/extensions/amscd/webpack.config.js | 2 +- .../src/input/tex/extensions/colorv2/build.json | 4 ++-- .../src/input/tex/extensions/colorv2/colorv2.js | 2 +- .../tex/extensions/colorv2/webpack.config.js | 2 +- .../input/tex/extensions/configmacros/build.json | 4 ++-- .../tex/extensions/configmacros/configmacros.js | 2 +- .../tex/extensions/configmacros/webpack.config.js | 2 +- .../src/input/tex/extensions/tagformat/build.json | 4 ++-- .../input/tex/extensions/tagformat/tagformat.js | 2 +- .../tex/extensions/tagformat/webpack.config.js | 2 +- components/src/input/tex/tex.js | 4 ++-- components/src/source.js | 8 ++++---- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/components/src/dependencies.js b/components/src/dependencies.js index e49aa2037..c198402d6 100644 --- a/components/src/dependencies.js +++ b/components/src/dependencies.js @@ -6,15 +6,15 @@ export const dependencies = { '[tex]/action': ['input/tex-base', '[tex]/newcommand'], '[tex]/autoload': ['input/tex-base', '[tex]/require'], '[tex]/ams': ['input/tex-base'], - '[tex]/ams_cd': ['input/tex-base'], + '[tex]/amscd': ['input/tex-base'], '[tex]/bbox': ['input/tex-base', '[tex]/ams', '[tex]/newcommand'], '[tex]/boldsymbol': ['input/tex-base'], '[tex]/braket': ['input/tex-base'], '[tex]/bussproofs': ['input/tex-base'], '[tex]/cancel': ['input/tex-base', '[tex]/enclose'], '[tex]/color': ['input/tex-base'], - '[tex]/colorV2': ['input/tex-base'], - '[tex]/configMacros': ['input/tex-base', '[tex]/newcommand'], + '[tex]/colorv2': ['input/tex-base'], + '[tex]/configmacros': ['input/tex-base', '[tex]/newcommand'], '[tex]/enclose': ['input/tex-base'], '[tex]/extpfeil': ['input/tex-base', '[tex]/newcommand', '[tex]/ams'], '[tex]/html': ['input/tex-base'], @@ -24,7 +24,7 @@ export const dependencies = { '[tex]/noundefined': ['input/tex-base'], '[tex]/physics': ['input/tex-base'], '[tex]/require': ['input/tex-base'], - '[tex]/tagFormat': ['input/tex-base'], + '[tex]/tagformat': ['input/tex-base'], '[tex]/unicode': ['input/tex-base'], '[tex]/verb': ['input/tex-base'] }; @@ -37,14 +37,14 @@ export const paths = { const allPackages = [ '[tex]/action', '[tex]/ams', - '[tex]/ams_cd', + '[tex]/amscd', '[tex]/bbox', '[tex]/boldsymbol', '[tex]/braket', '[tex]/bussproofs', '[tex]/cancel', '[tex]/color', - '[tex]/configMacros', + '[tex]/configmacros', '[tex]/enclose', '[tex]/extpfeil', '[tex]/html', @@ -54,6 +54,7 @@ const allPackages = [ '[tex]/noundefined', '[tex]/physics', '[tex]/require', + '[tex]/tagformat', '[tex]/unicode', '[tex]/verb' ]; @@ -67,7 +68,7 @@ export const provides = { '[tex]/noundefined', '[tex]/require', '[tex]/autoload', - '[tex]/configMacros' + '[tex]/configmacros' ], 'input/tex-full': [ 'input/tex-base', diff --git a/components/src/input/tex-full/build.json b/components/src/input/tex-full/build.json index c66d0436f..626fe3290 100644 --- a/components/src/input/tex-full/build.json +++ b/components/src/input/tex-full/build.json @@ -8,7 +8,6 @@ "util/entities/r.ts" ], "exclude": [ - "input/tex/tag_format", "input/tex/mhchem/mhchem_parser.d.ts" ] } diff --git a/components/src/input/tex/build.json b/components/src/input/tex/build.json index 51f939ff6..72e5b9c9b 100644 --- a/components/src/input/tex/build.json +++ b/components/src/input/tex/build.json @@ -9,7 +9,7 @@ "input/tex/noundefined", "input/tex/require", "input/tex/autoload", - "input/tex/config_macros", + "input/tex/configmacros", "util/entities/n.ts", "util/entities/p.ts", "util/entities/r.ts" diff --git a/components/src/input/tex/extensions/amscd/amscd.js b/components/src/input/tex/extensions/amscd/amscd.js index 901d237cb..7518b2c86 100644 --- a/components/src/input/tex/extensions/amscd/amscd.js +++ b/components/src/input/tex/extensions/amscd/amscd.js @@ -1 +1 @@ -import './lib/amsCd.js'; +import './lib/amscd.js'; diff --git a/components/src/input/tex/extensions/amscd/build.json b/components/src/input/tex/extensions/amscd/build.json index e5faa149b..477406992 100644 --- a/components/src/input/tex/extensions/amscd/build.json +++ b/components/src/input/tex/extensions/amscd/build.json @@ -1,4 +1,4 @@ { - "component": "input/tex/extensions/amsCd", - "targets": ["input/tex/ams_cd"] + "component": "input/tex/extensions/amscd", + "targets": ["input/tex/amscd"] } diff --git a/components/src/input/tex/extensions/amscd/webpack.config.js b/components/src/input/tex/extensions/amscd/webpack.config.js index 384626061..c4fa76238 100644 --- a/components/src/input/tex/extensions/amscd/webpack.config.js +++ b/components/src/input/tex/extensions/amscd/webpack.config.js @@ -1,7 +1,7 @@ const PACKAGE = require('../../../../../webpack.common.js'); module.exports = PACKAGE( - 'input/tex/extensions/amsCd', // the package to build + 'input/tex/extensions/amscd', // the package to build '../../../../../../js', // location of the MathJax js library [ // packages to link to 'components/src/input/tex-base/lib', diff --git a/components/src/input/tex/extensions/colorv2/build.json b/components/src/input/tex/extensions/colorv2/build.json index 4df0bc733..3923daa18 100644 --- a/components/src/input/tex/extensions/colorv2/build.json +++ b/components/src/input/tex/extensions/colorv2/build.json @@ -1,4 +1,4 @@ { - "component": "input/tex/extensions/colorV2", - "targets": ["input/tex/color_v2"] + "component": "input/tex/extensions/colorv2", + "targets": ["input/tex/colorv2"] } diff --git a/components/src/input/tex/extensions/colorv2/colorv2.js b/components/src/input/tex/extensions/colorv2/colorv2.js index 7a078f3ee..bbc7ad38d 100644 --- a/components/src/input/tex/extensions/colorv2/colorv2.js +++ b/components/src/input/tex/extensions/colorv2/colorv2.js @@ -1 +1 @@ -import './lib/colorV2.js'; +import './lib/colorv2.js'; diff --git a/components/src/input/tex/extensions/colorv2/webpack.config.js b/components/src/input/tex/extensions/colorv2/webpack.config.js index 4cb80104a..cb7959bc3 100644 --- a/components/src/input/tex/extensions/colorv2/webpack.config.js +++ b/components/src/input/tex/extensions/colorv2/webpack.config.js @@ -1,7 +1,7 @@ const PACKAGE = require('../../../../../webpack.common.js'); module.exports = PACKAGE( - 'input/tex/extensions/colorV2', // the package to build + 'input/tex/extensions/colorv2', // the package to build '../../../../../../js', // location of the MathJax js library [ // packages to link to 'components/src/input/tex-base/lib', diff --git a/components/src/input/tex/extensions/configmacros/build.json b/components/src/input/tex/extensions/configmacros/build.json index d5cfb23f9..0496ad45a 100644 --- a/components/src/input/tex/extensions/configmacros/build.json +++ b/components/src/input/tex/extensions/configmacros/build.json @@ -1,4 +1,4 @@ { - "component": "input/tex/extensions/configMacros", - "targets": ["input/tex/config_macros"] + "component": "input/tex/extensions/configmacros", + "targets": ["input/tex/configmacros"] } diff --git a/components/src/input/tex/extensions/configmacros/configmacros.js b/components/src/input/tex/extensions/configmacros/configmacros.js index a6607fb6d..0dd16952d 100644 --- a/components/src/input/tex/extensions/configmacros/configmacros.js +++ b/components/src/input/tex/extensions/configmacros/configmacros.js @@ -1 +1 @@ -import './lib/configMacros.js'; +import './lib/configmacros.js'; diff --git a/components/src/input/tex/extensions/configmacros/webpack.config.js b/components/src/input/tex/extensions/configmacros/webpack.config.js index ef79c97dd..a7b83b2e7 100644 --- a/components/src/input/tex/extensions/configmacros/webpack.config.js +++ b/components/src/input/tex/extensions/configmacros/webpack.config.js @@ -1,7 +1,7 @@ const PACKAGE = require('../../../../../webpack.common.js'); module.exports = PACKAGE( - 'input/tex/extensions/configMacros',// the package to build + 'input/tex/extensions/configmacros',// the package to build '../../../../../../js', // location of the MathJax js library [ // packages to link to 'components/src/input/tex/extensions/newcommand/lib', diff --git a/components/src/input/tex/extensions/tagformat/build.json b/components/src/input/tex/extensions/tagformat/build.json index e6597680a..9562f5403 100644 --- a/components/src/input/tex/extensions/tagformat/build.json +++ b/components/src/input/tex/extensions/tagformat/build.json @@ -1,4 +1,4 @@ { - "component": "input/tex/extensions/tagFormat", - "targets": ["input/tex/tag_format"] + "component": "input/tex/extensions/tagformat", + "targets": ["input/tex/tagformat"] } diff --git a/components/src/input/tex/extensions/tagformat/tagformat.js b/components/src/input/tex/extensions/tagformat/tagformat.js index ed7a4b6da..29b0da313 100644 --- a/components/src/input/tex/extensions/tagformat/tagformat.js +++ b/components/src/input/tex/extensions/tagformat/tagformat.js @@ -1 +1 @@ -import './lib/tagFormat.js'; +import './lib/tagformat.js'; diff --git a/components/src/input/tex/extensions/tagformat/webpack.config.js b/components/src/input/tex/extensions/tagformat/webpack.config.js index a7189e9c6..35bb113e1 100644 --- a/components/src/input/tex/extensions/tagformat/webpack.config.js +++ b/components/src/input/tex/extensions/tagformat/webpack.config.js @@ -1,7 +1,7 @@ const PACKAGE = require('../../../../../webpack.common.js'); module.exports = PACKAGE( - 'input/tex/extensions/tagFormat', // the package to build + 'input/tex/extensions/tagformat', // the package to build '../../../../../../js', // location of the MathJax js library [ // packages to link to 'components/src/input/tex-base/lib', diff --git a/components/src/input/tex/tex.js b/components/src/input/tex/tex.js index d88aa005e..d0ba3ba93 100644 --- a/components/src/input/tex/tex.js +++ b/components/src/input/tex/tex.js @@ -10,7 +10,7 @@ Loader.preLoad( '[tex]/noundefined', '[tex]/require', '[tex]/autoload', - '[tex]/configMacros' + '[tex]/configmacros' ); registerTeX([ @@ -20,5 +20,5 @@ registerTeX([ 'noundefined', 'require', 'autoload', - 'configMacros' + 'configmacros' ]); diff --git a/components/src/source.js b/components/src/source.js index 2072afa37..80e9a12a5 100644 --- a/components/src/source.js +++ b/components/src/source.js @@ -10,15 +10,15 @@ export const source = { '[tex]/all-packages': `${src}/input/tex/extensions/all-packages/all-packages.js`, '[tex]/autoload': `${src}/input/tex/extensions/autoload/autoload.js`, '[tex]/ams': `${src}/input/tex/extensions/ams/ams.js`, - '[tex]/amsCd': `${src}/input/tex/extensions/ams_cd/amsCd.js`, + '[tex]/amscd': `${src}/input/tex/extensions/amscd/amscd.js`, '[tex]/bbox': `${src}/input/tex/extensions/bbox/bbox.js`, '[tex]/boldsymbol': `${src}/input/tex/extensions/boldsymbol/boldsymbol.js`, '[tex]/braket': `${src}/input/tex/extensions/braket/braket.js`, '[tex]/bussproofs': `${src}/input/tex/extensions/bussproofs/bussproofs.js`, '[tex]/cancel': `${src}/input/tex/extensions/cancel/cancel.js`, '[tex]/color': `${src}/input/tex/extensions/color/color.js`, - '[tex]/colorV2': `${src}/input/tex/extensions/color_v2/colorV2.js`, - '[tex]/configMacros': `${src}/input/tex/extensions/config_macros/configMacros.js`, + '[tex]/colorv2': `${src}/input/tex/extensions/colorv2/colorv2.js`, + '[tex]/configmacros': `${src}/input/tex/extensions/configmacros/configmacros.js`, '[tex]/enclose': `${src}/input/tex/extensions/enclose/enclose.js`, '[tex]/extpfeil': `${src}/input/tex/extensions/extpfeil/extpfeil.js`, '[tex]/html': `${src}/input/tex/extensions/html/html.js`, @@ -28,7 +28,7 @@ export const source = { '[tex]/noundefined': `${src}/input/tex/extensions/noundefined/noundefined.js`, '[tex]/physics': `${src}/input/tex/extensions/physics/physics.js`, '[tex]/require': `${src}/input/tex/extensions/require/require.js`, - '[tex]/tagFormat': `${src}/input/tex/extensions/tag_format/tagFormat.js`, + '[tex]/tagformat': `${src}/input/tex/extensions/tagformat/tagformat.js`, '[tex]/unicode': `${src}/input/tex/extensions/unicode/unicode.js`, '[tex]/verb': `${src}/input/tex/extensions/verb/verb.js`, 'input/mml': `${src}/input/mml/mml.js`, From 194c7f23f91d28782795da60fb01cd1fb4ccb76c Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 9 May 2020 07:50:20 -0400 Subject: [PATCH 09/11] Add compatibility so old package names (and options) will still work after the renaming. --- components/src/dependencies.js | 10 ++++++++++ .../src/input/tex/extensions/amscd/amscd.js | 3 +++ .../src/input/tex/extensions/colorv2/colorv2.js | 3 +++ .../tex/extensions/configmacros/configmacros.js | 3 +++ components/src/input/tex/extensions/rename.js | 16 ++++++++++++++++ .../input/tex/extensions/tagformat/tagformat.js | 3 +++ components/src/startup/startup.js | 3 ++- 7 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 components/src/input/tex/extensions/rename.js diff --git a/components/src/dependencies.js b/components/src/dependencies.js index c198402d6..028d1f559 100644 --- a/components/src/dependencies.js +++ b/components/src/dependencies.js @@ -77,3 +77,13 @@ export const provides = { ], '[tex]/all-packages': allPackages }; + +// +// Compatibility with v3.0 names for TeX extensions +// +export const compatibility = { + '[tex]/amsCd': '[tex]/amscd', + '[tex]/colorV2': '[tex]/colorv2', + '[tex]/configMacros': '[tex]/configmacros', + '[tex]/tagFormat': '[tex]/tagformat' +}; diff --git a/components/src/input/tex/extensions/amscd/amscd.js b/components/src/input/tex/extensions/amscd/amscd.js index 7518b2c86..da1ab0a95 100644 --- a/components/src/input/tex/extensions/amscd/amscd.js +++ b/components/src/input/tex/extensions/amscd/amscd.js @@ -1 +1,4 @@ import './lib/amscd.js'; +import {rename} from '../../rename.js'; + +rename('amsCd', 'amscd', true); diff --git a/components/src/input/tex/extensions/colorv2/colorv2.js b/components/src/input/tex/extensions/colorv2/colorv2.js index bbc7ad38d..51849b591 100644 --- a/components/src/input/tex/extensions/colorv2/colorv2.js +++ b/components/src/input/tex/extensions/colorv2/colorv2.js @@ -1 +1,4 @@ import './lib/colorv2.js'; +import {rename} from '../rename.js'; + +rename('colorV2', 'colorv2', false); diff --git a/components/src/input/tex/extensions/configmacros/configmacros.js b/components/src/input/tex/extensions/configmacros/configmacros.js index 0dd16952d..8645dfee9 100644 --- a/components/src/input/tex/extensions/configmacros/configmacros.js +++ b/components/src/input/tex/extensions/configmacros/configmacros.js @@ -1 +1,4 @@ import './lib/configmacros.js'; +import {rename} from '../rename.js'; + +rename('configMacros', 'configmacros', false); diff --git a/components/src/input/tex/extensions/rename.js b/components/src/input/tex/extensions/rename.js new file mode 100644 index 000000000..1a44098f1 --- /dev/null +++ b/components/src/input/tex/extensions/rename.js @@ -0,0 +1,16 @@ +// +// Look for a package name in the package list and change it to a new name +// rhen rename tex options for it, if there are any. +// +export function rename(oname, nname, options) { + const tex = MathJax.config.tex; + if (tex && tex.packages) { + const packages = tex.packages; + const n = packages.indexOf(oname); + if (n >= 0) packages[n] = nname; + if (options && tex[oname]) { + tex[nname] = tex[oname]; + delete tex[oname]; + } + } +} diff --git a/components/src/input/tex/extensions/tagformat/tagformat.js b/components/src/input/tex/extensions/tagformat/tagformat.js index 29b0da313..17ee5137a 100644 --- a/components/src/input/tex/extensions/tagformat/tagformat.js +++ b/components/src/input/tex/extensions/tagformat/tagformat.js @@ -1 +1,4 @@ import './lib/tagformat.js'; +import {rename} from '../rename.js'; + +rename('tagFormat', 'tagformat', true); diff --git a/components/src/startup/startup.js b/components/src/startup/startup.js index cbdf49642..7472aafb5 100644 --- a/components/src/startup/startup.js +++ b/components/src/startup/startup.js @@ -2,11 +2,12 @@ import './lib/startup.js'; import {Loader, CONFIG} from '../../../js/components/loader.js'; import {combineDefaults} from '../../../js/components/global.js'; -import {dependencies, paths, provides} from '../dependencies.js'; +import {dependencies, paths, provides, compatibility} from '../dependencies.js'; combineDefaults(MathJax.config.loader, 'dependencies', dependencies); combineDefaults(MathJax.config.loader, 'paths', paths); combineDefaults(MathJax.config.loader, 'provides', provides); +combineDefaults(MathJax.config.loader, 'source', compatibility); Loader.preLoad('loader'); From ea69e81ad9e115e22b6949730d5bdfa8aaec203c Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Sat, 9 May 2020 08:15:50 -0400 Subject: [PATCH 10/11] Combine old options with new ones rather than replace new ones. --- components/src/input/tex/extensions/rename.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/src/input/tex/extensions/rename.js b/components/src/input/tex/extensions/rename.js index 1a44098f1..decff6e34 100644 --- a/components/src/input/tex/extensions/rename.js +++ b/components/src/input/tex/extensions/rename.js @@ -1,3 +1,5 @@ +import {combineConfig} from '../../../../../js/components/global.js'; + // // Look for a package name in the package list and change it to a new name // rhen rename tex options for it, if there are any. @@ -9,7 +11,7 @@ export function rename(oname, nname, options) { const n = packages.indexOf(oname); if (n >= 0) packages[n] = nname; if (options && tex[oname]) { - tex[nname] = tex[oname]; + combineConfig(tex, {[nname]: tex[oname]}); delete tex[oname]; } } From 9dae12ba1886d749528c89ad050c94d6cb72f366 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Tue, 26 May 2020 14:01:27 -0400 Subject: [PATCH 11/11] Fix comment type. --- components/src/input/tex/extensions/rename.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/src/input/tex/extensions/rename.js b/components/src/input/tex/extensions/rename.js index decff6e34..7fe40c2f4 100644 --- a/components/src/input/tex/extensions/rename.js +++ b/components/src/input/tex/extensions/rename.js @@ -2,7 +2,7 @@ import {combineConfig} from '../../../../../js/components/global.js'; // // Look for a package name in the package list and change it to a new name -// rhen rename tex options for it, if there are any. +// and rename tex options for it, if there are any. // export function rename(oname, nname, options) { const tex = MathJax.config.tex;