Merge branch 'breaking-changes' into develop

dpvc · dpvc · commit 42f44f48e9f7 · 2021-06-10T17:20:08.000-04:00
diff --git a/components/src/input/tex-full/tex-full.js b/components/src/input/tex-full/tex-full.js
@@ -1,7 +1,6 @@
 import './lib/tex-full.js';
 
 import {registerTeX} from '../tex/register.js';
-import {rename} from '../tex/extensions/rename.js';
 import {Loader} from '../../../../js/components/loader.js';
 import {AllPackages} from '../../../../js/input/tex/AllPackages.js';
 import '../../../../js/input/tex/require/RequireConfiguration.js';
@@ -13,7 +12,3 @@ Loader.preLoad(
 );
 
 registerTeX(['require',...AllPackages]);
-rename('amsCd', 'amscd', true);
-rename('colorV2', 'colorv2', false);
-rename('configMacros', 'configmacros', false);
-rename('tagFormat', 'tagformat', true);
diff --git a/components/src/input/tex/extensions/amscd/amscd.js b/components/src/input/tex/extensions/amscd/amscd.js
@@ -1,4 +1 @@
 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
@@ -1,4 +1 @@
 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
@@ -1,4 +1 @@
 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
diff --git a/components/src/input/tex/extensions/tagformat/tagformat.js b/components/src/input/tex/extensions/tagformat/tagformat.js
@@ -1,4 +1 @@
 import './lib/tagformat.js';
-import {rename} from '../rename.js';
-
-rename('tagFormat', 'tagformat', true);
diff --git a/ts/a11y/explorer.ts b/ts/a11y/explorer.ts
@@ -284,7 +284,6 @@ export function ExplorerMathDocumentMixin<B extends MathDocumentConstructor<HTML
      * @constructor
      */
     constructor(...args: any[]) {
-      processSreOptions(args[2]);
       super(...args);
       const ProcessBits = (this.constructor as typeof BaseDocument).ProcessBits;
       if (!ProcessBits.has('explorer')) {
@@ -329,32 +328,6 @@ export function ExplorerMathDocumentMixin<B extends MathDocumentConstructor<HTML
 
 }
 
-//
-// TODO(v3.2): This is for backward compatibility of old option parameters.
-//
-/**
- * Processes old a11y options for backward compatibility.
- * @param {OptionList} options The options to process.
- */
-function processSreOptions(options: OptionList) {
-  if (!options || !options.a11y) {
-    return;
-  }
-  if (!options.sre) {
-    options.sre = {};
-  }
-  if (options.a11y.locale) {
-    options.sre.locale = options.a11y.locale;
-    delete options.a11y.locale;
-  }
-  if (options.a11y.speechRules) {
-    let [domain, style] = (options.a11y.speechRules as string).split('-');
-    options.sre.domain = domain;
-    options.sre.style = style;
-    delete options.a11y.speechRules;
-  }
-}
-
 
 /*==========================================================================*/
 
@@ -551,19 +524,6 @@ export function setA11yOption(document: HTMLDOCUMENT, option: string, value: str
       break;
     }
     break;
-  //
-  // TODO(v3.2): These two cases should be handled directly in the menu
-  //             variable actions.
-  //
-  case 'speechRules':
-      let [domain, style] = (value as string).split('-');
-      document.options.sre.domain = domain;
-      document.options.sre.style = style;
-      break;
-  case 'locale':
-      document.options.sre.locale = value;
-      SRE.setupEngine({locale: value as string});
-      break;
   default:
     document.options.a11y[option] = value;
   }
diff --git a/ts/a11y/semantic-enrich.ts b/ts/a11y/semantic-enrich.ts
@@ -276,7 +276,6 @@ export function EnrichedMathDocumentMixin<N, T, D, B extends MathDocumentConstru
      * @constructor
      */
     constructor(...args: any[]) {
-      processSreOptions(args[2]);
       super(...args);
       MmlJax.setMmlFactory(this.mmlFactory);
       const ProcessBits = (this.constructor as typeof AbstractMathDocument).ProcessBits;
@@ -362,24 +361,3 @@ export function EnrichHandler<N, T, D>(handler: Handler<N, T, D>, MmlJax: MathML
     );
   return handler;
 }
-
-
-//
-// TODO(v3.2): This is for backward compatibility of old option parameters.
-//
-/**
- * Processes old enrichment option for backward compatibility.
- * @param {OptionList} options The options to process.
- */
-function processSreOptions(options: OptionList) {
-  if (!options) {
-    return;
-  }
-  if (!options.sre) {
-    options.sre = {};
-  }
-  if (options.enrichSpeech) {
-    options.sre.speech = options.enrichSpeech;
-    delete options.enrichSpeech;
-  }
-}
diff --git a/ts/output/chtml.ts b/ts/output/chtml.ts
@@ -60,6 +60,7 @@ CommonOutputJax<N, T, D, CHTMLWrapper<N, T, D>, CHTMLWrapperFactory<N, T, D>, CH
   public static OPTIONS: OptionList = {
     ...CommonOutputJax.OPTIONS,
     adaptiveCSS: true,            // true means only produce CSS that is used in the processed equations
+    matchFontHeight: true,        // true to match ex-height of surrounding font
   };
 
   /**
diff --git a/ts/output/chtml/BBox.ts b/ts/output/chtml/BBox.ts
diff --git a/ts/output/common/BBox.ts b/ts/output/common/BBox.ts
diff --git a/ts/output/common/CssStyles.ts b/ts/output/common/CssStyles.ts
diff --git a/ts/output/common/OutputJax.ts b/ts/output/common/OutputJax.ts
@@ -86,7 +86,6 @@ export abstract class CommonOutputJax<
       ...AbstractOutputJax.OPTIONS,
     scale: 1,                      // global scaling factor for all expressions
     minScale: .5,                  // smallest scaling factor to use
-    matchFontHeight: true,         // true to match ex-height of surrounding font
     mtextInheritFont: false,       // true to make mtext elements use surrounding font
     merrorInheritFont: false,      // true to make merror text use surrounding font
     mtextFont: '',                 // font to use for mtext, if not inheriting (empty means use MathJax fonts)
diff --git a/ts/output/svg/BBox.ts b/ts/output/svg/BBox.ts
diff --git a/ts/ui/menu/Menu.ts b/ts/ui/menu/Menu.ts
@@ -402,13 +402,13 @@ export class Menu {
         this.variable<boolean>('semantics'),
         this.variable<string> ('zoom'),
         this.variable<string> ('zscale'),
-        this.variable<string> ('renderer', (jax: string) => this.setRenderer(jax)),
+        this.variable<string> ('renderer', jax => this.setRenderer(jax)),
         this.variable<boolean>('alt'),
         this.variable<boolean>('cmd'),
         this.variable<boolean>('ctrl'),
         this.variable<boolean>('shift'),
-        this.variable<string> ('scale', (scale: string) => this.setScale(scale)),
-        this.variable<boolean>('explorer', (explore: boolean) => this.setExplorer(explore)),
+        this.variable<string> ('scale', scale => this.setScale(scale)),
+        this.variable<boolean>('explorer', explore => this.setExplorer(explore)),
         this.a11yVar<string> ('highlight'),
         this.a11yVar<string> ('backgroundColor'),
         this.a11yVar<string> ('backgroundOpacity'),
@@ -418,18 +418,22 @@ export class Menu {
         this.a11yVar<boolean>('subtitles'),
         this.a11yVar<boolean>('braille'),
         this.a11yVar<boolean>('viewBraille'),
-        this.a11yVar<string>('locale'),
-        this.a11yVar<string> ('speechRules'),
+        this.a11yVar<string>('locale', value => SRE.setupEngine({locale: value as string})),
+        this.a11yVar<string> ('speechRules', value => {
+          const [domain, style] = value.split('-');
+          this.document.options.sre.domain = domain;
+          this.document.options.sre.style = style;
+        }),
         this.a11yVar<string> ('magnification'),
         this.a11yVar<string> ('magnify'),
         this.a11yVar<boolean>('treeColoring'),
         this.a11yVar<boolean>('infoType'),
         this.a11yVar<boolean>('infoRole'),
         this.a11yVar<boolean>('infoPrefix'),
         this.variable<boolean>('autocollapse'),
-        this.variable<boolean>('collapsible', (collapse: boolean) => this.setCollapsible(collapse)),
-        this.variable<boolean>('inTabOrder', (tab: boolean) => this.setTabOrder(tab)),
-        this.variable<boolean>('assistiveMml', (mml: boolean) => this.setAssistiveMml(mml))
+        this.variable<boolean>('collapsible', collapse => this.setCollapsible(collapse)),
+        this.variable<boolean>('inTabOrder', tab => this.setTabOrder(tab)),
+        this.variable<boolean>('assistiveMml', mml => this.setAssistiveMml(mml))
       ],
       items: [
         this.submenu('Show', 'Show Math As', [
@@ -864,6 +868,7 @@ export class Menu {
       this.transferMathList(document);
       this.document.processed = document.processed;
       if (!Menu._loadingPromise) {
+        this.document.outputJax.reset();
         this.rerender(component === 'complexity' || noEnrich ? STATE.COMPILED : STATE.TYPESET);
       }
     });
@@ -1001,8 +1006,8 @@ export class Menu {
     const element = math.typesetRoot;
     element.addEventListener('contextmenu', () => this.menu.mathItem = math, true);
     element.addEventListener('keydown', () => this.menu.mathItem = math, true);
-    element.addEventListener('click', (event: MouseEvent) => this.zoom(event, 'Click', math), true);
-    element.addEventListener('dblclick', (event: MouseEvent) => this.zoom(event, 'DoubleClick', math), true);
+    element.addEventListener('click', event => this.zoom(event, 'Click', math), true);
+    element.addEventListener('dblclick', event => this.zoom(event, 'DoubleClick', math), true);
     this.menu.store.insert(element);
   }
 
@@ -1044,7 +1049,7 @@ export class Menu {
    *
    * @tempate T    The type of variable being defined
    */
-  public a11yVar<T extends (string | boolean)>(name: keyof MenuSettings): Object {
+  public a11yVar<T extends (string | boolean)>(name: keyof MenuSettings, action?: (value: T) => void): Object {
     return {
       name: name,
       getter: () => this.getA11y(name),
@@ -1053,6 +1058,7 @@ export class Menu {
         let options: {[key: string]: any} = {};
         options[name] = value;
         this.setA11y(options);
+        action && action(value);
         this.saveUserSettings();
       }
     };
