[orca: 1/2] Revert progress marking support for now

[Joanmarie Diggs <joanied src gnome org>]

commit c7cda80bc198f3cd36613ded15985dafa03ec387
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Sat Jul 7 22:18:31 2018 +0000

    Revert progress marking support for now

 src/orca/speechdispatcherfactory.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index 793886101..70c95eb1e 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -148,7 +148,7 @@ class SpeechServer(speechserver.SpeechServer):
             speechd.CallbackType.BEGIN: speechserver.SayAllContext.PROGRESS,
             speechd.CallbackType.CANCEL: speechserver.SayAllContext.INTERRUPTED,
             speechd.CallbackType.END: speechserver.SayAllContext.COMPLETED,
-            speechd.CallbackType.INDEX_MARK:speechserver.SayAllContext.PROGRESS,
+           #speechd.CallbackType.INDEX_MARK:speechserver.SayAllContext.PROGRESS,
             }
 
         self._default_voice_name = guilabels.SPEECH_DEFAULT_VOICE % serverId
@@ -172,7 +172,6 @@ class SpeechServer(speechserver.SpeechServer):
         self._current_voice_properties = {}
         mode = self._PUNCTUATION_MODE_MAP[settings.verbalizePunctuationStyle]
         client.set_punctuation(mode)
-        client.set_data_mode(speechd.DataMode.SSML)
 
     def updateCapitalizationStyle(self):
         """Updates the capitalization style used by the speech server."""
@@ -344,16 +343,6 @@ class SpeechServer(speechserver.SpeechServer):
     def _speak(self, text, acss, **kwargs):
         if isinstance(text, ACSS):
             text = ''
-
-        # Mark words to get speech progression feedback.
-        # Note: we need to do it before disturbing the text offsets
-        markedtext = ""
-        for i in range(len(text)):
-            markedtext += text[i]
-            if text[i] == ' ' or text[i] == '\u00a0':
-                markedtext += '<mark name="%u"/>' % (i+1)
-        text = markedtext
-
         text = self.__addVerbalizedPunctuation(text)
         if orca_state.activeScript:
             text = orca_state.activeScript.\
@@ -369,8 +358,6 @@ class SpeechServer(speechserver.SpeechServer):
         #
         text = text.replace('\n.', '\n')
 
-        text = "<speak>" + text + "</speak>"
-
         self._apply_acss(acss)
         self._debug_sd_values("Speaking '%s' " % text)
         self._send_command(self._client.speak, text, **kwargs)