Merge pull request #285 from mathjax/a11y_explorer_corrections

Corrects some explorer problems.
mathjax · Jun 12, 2019 · d82cbac · d82cbac
2 parents 21f0e07 + 2e37dec
commit d82cbac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/mathjax3-ts/a11y/complexity/collapse.ts b/mathjax3-ts/a11y/complexity/collapse.ts
@@ -382,17 +382,26 @@ export class Collapse {
         }
     }
 
+    private idCount = 0;
+    /**
+     * @return {string} A unique id string.
+     */
+    private makeId(): string {
+        return 'mjx-collapse-' + this.idCount++;
+    }
+
     public makeAction(node: MmlNode) {
         if (node.isKind('math')) {
             node = this.addMrow(node);
         }
         const factory = this.complexity.factory;
         const marker = node.getProperty('collapse-marker') as string;
         const parent = node.parent;
-        var maction = factory.create('maction', {
+        let maction = factory.create('maction', {
             actiontype: 'toggle',
             selection: 2,
             'data-collapsible': true,
+            id: this.makeId(),
             'data-semantic-complexity': node.attributes.get('data-semantic-complexity')
         }, [
             factory.create('mtext', {mathcolor: 'blue'}, [

diff --git a/mathjax3-ts/a11y/explorer/Explorer.ts b/mathjax3-ts/a11y/explorer/Explorer.ts
@@ -225,7 +225,7 @@ export class SpeechExplorer extends AbstractKeyExplorer implements KeyExplorer {
     const jax = this.document.outputJax.name;
     this.highlighter = sre.HighlighterFactory.highlighter(
       this.background, this.foreground,
-      {renderer: jax === 'CHTML' ? 'CommonHTML' : jax}
+      {renderer: jax}
     );
     // Add speech
     this.speechGenerator = new sre.TreeSpeechGenerator();