Changes according to review suggestions and discussion.

mathjax · Apr 8, 2020 · 6138f45 · 6138f45
1 parent 480591e
commit 6138f45
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/ts/a11y/explorer/KeyExplorer.ts b/ts/a11y/explorer/KeyExplorer.ts
@@ -25,7 +25,7 @@
 
 import {A11yDocument, Region} from './Region.js';
 import {Explorer, AbstractExplorer} from './Explorer.js';
-import {sreReady, SRE} from '../sre.js';
+import {sreReady} from '../sre.js';
 
 
 /**

diff --git a/ts/a11y/semantic-enrich.ts b/ts/a11y/semantic-enrich.ts
@@ -30,7 +30,7 @@ import {MathML} from '../input/mathml.js';
 import {SerializedMmlVisitor} from '../core/MmlTree/SerializedMmlVisitor.js';
 import {OptionList, expandable} from '../util/Options.js';
 
-import {SRE, sreReady} from './sre.js';
+import {sreReady} from './sre.js';
 
 /*==========================================================================*/
 

diff --git a/ts/a11y/sre-node.ts b/ts/a11y/sre-node.ts
@@ -24,13 +24,13 @@
 
 declare const require: (name: string) => any;
 
-const SRE = require('speech-rule-engine');
+const Sre = require('speech-rule-engine');
 
 declare const global: any;
 
 /**
  * The global sre with sre.Engine.isReady() and sre.toEnriched()
  */
-global.SRE = SRE;
-global.sre = Object.create(SRE);
-global.sre.Engine = {isReady() {return SRE.engineReady()}};
+global.SRE = Sre;
+global.sre = Object.create(Sre);
+global.sre.Engine = {isReady() {return Sre.engineReady()}};
diff --git a/ts/a11y/sre.ts b/ts/a11y/sre.ts
@@ -65,13 +65,3 @@ export const sreReady = function() {
     }).catch((error: Error) => reject(error.message || error));
   });
 };
-
-
-/**
- * The functions we need from SRE.
- */
-export type SRE = {
-  toEnriched(mml: string): Element;
-  setupEngine(options: OptionList): void;
-  engineSetup(): OptionList;
-};
diff --git a/ts/a11y/sre_browser.d.ts b/ts/a11y/sre_browser.d.ts
@@ -65,3 +65,9 @@ declare namespace sre.ClearspeakPreferences {
   export function smartPreferences(item: Object, locale: string): string[];
 
 }
+
+declare namespace SRE {
+  export function toEnriched(mml: string): void;
+  export function setupEngine(obj: any): void;
+  export function engineSetup(): any;
+}