[orca: 1/2] speech: Fix missing text punctuation verbalization

[Joanmarie Diggs <joanied src gnome org>]

commit 2e86fa708e9d772af4e86ae3af5b14529e961b16
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date:   Fri Jul 6 17:54:53 2018 +0200

    speech: Fix missing text punctuation verbalization
    
    Part of 30286b2c5edf ("speech: add progress marking support") was moved
    before submission, thus confusing variables. This commit restores the
    verbalization of punctuation which got ignored in the process.

 src/orca/speechdispatcherfactory.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index 4bfc1356e..e7d68b629 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -352,6 +352,7 @@ class SpeechServer(speechserver.SpeechServer):
             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:
@@ -369,8 +370,8 @@ class SpeechServer(speechserver.SpeechServer):
         text = text.replace('\n.', '\n')
 
         self._apply_acss(acss)
-        self._debug_sd_values("Speaking '%s' " % markedtext)
-        self._send_command(self._client.speak, markedtext, **kwargs)
+        self._debug_sd_values("Speaking '%s' " % text)
+        self._send_command(self._client.speak, text, **kwargs)
 
     def _say_all(self, iterator, orca_callback):
         """Process another sayAll chunk.