[orca] Stop calling clumpUtterances() in Gecko's speakContents().



commit 65d5ce33130498d4dfee6cc271b6cadbc97bcd60
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Nov 11 18:16:11 2013 -0500

    Stop calling clumpUtterances() in Gecko's speakContents().

 src/orca/scripts/toolkits/Gecko/script.py |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index eb03bf5..0f620e1 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -3795,6 +3795,7 @@ class Script(default.Script):
         prevObj = None
         for content in contents:
             [obj, startOffset, endOffset, string] = content
+            string = self.utilities.adjustForRepeats(string)
             role = obj.getRole()
 
             # If we don't have an object, there's nothing to do. If we have
@@ -3934,11 +3935,8 @@ class Script(default.Script):
     def speakContents(self, contents, speakRole=True):
         """Speaks each string in contents using the associated voice/acss"""
         utterances = self.getUtterancesFromContents(contents, speakRole)
-        clumped = self.clumpUtterances(utterances)
-        for [element, acss] in clumped:
-            if isinstance(element, str):
-                element = self.utilities.adjustForRepeats(element)
-            speech.speak(element, acss, False)
+        for utterance in utterances:
+            speech.speak(utterance, interrupt=False)
 
     def speakCharacterAtOffset(self, obj, characterOffset):
         """Speaks the character at the given characterOffset in the


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]