Merge branch 'master' of github.com:arnog/mathlive

arnog · Feb 13, 2019 · 46c9140 · 46c9140
2 parents 77d7bf9 + 96c5b9a
commit 46c9140
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/addons/outputSpokenText.js b/src/addons/outputSpokenText.js
@@ -554,7 +554,7 @@ MathAtom.toSpeakableText = function(atoms, options) {
                 options.textToSpeechRulesOptions = options.textToSpeechRulesOptions || {};
                 options.textToSpeechRulesOptions.markup = options.textToSpeechMarkup;
                 if (options.textToSpeechRulesOptions.markup === 'ssml') {
-                    options.textToSpeechRulesOptions.markup = 'arno';
+                    options.textToSpeechRulesOptions.markup = 'ssml_step';
                 }
                 options.textToSpeechRulesOptions.rate = options.speechEngineRate;
             }

diff --git a/src/editor/editor-mathfield.js b/src/editor/editor-mathfield.js
@@ -2576,7 +2576,7 @@ MathField.prototype.speakSelectionWithSynchronizedHighlighting_ = function() {
         window.mathlive.readAloudMathField = this;
         this._render({forHighlighting: true});
         const options = this.config;
-        options.textToSpeechMarkup = 'ssml';
+        options.textToSpeechMarkup = (window.sre && options.textToSpeechRules === 'sre') ? 'ssml_step' : 'ssml';
         const text = MathAtom.toSpeakableText(this.mathlist.extractContents(), options)
         this._speakWithSynchronizedHighlighting(text);
     } else {
@@ -2659,7 +2659,7 @@ MathField.prototype.speakAllWithSynchronizedHighlighting_ = function() {
     window.mathlive.readAloudMathField = this;
     this._render({forHighlighting: true});
     const options = this.config;
-    options.textToSpeechMarkup = 'ssml';
+    options.textToSpeechMarkup = (window.sre && options.textToSpeechRules === 'sre') ? 'ssml_step' : 'ssml';
     const text = MathAtom.toSpeakableText(this.mathlist.root, options)
     this._speakWithSynchronizedHighlighting(text);
     return false;