orca r4468 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Tue Jan 27 21:44:46 2009
New Revision: 4468
URL: http://svn.gnome.org/viewvc/orca?rev=4468&view=rev

Log:
More work on bug #562060 - Speech should speak multi case strings as words.  Make speakUtterances also use pronunciations.


Modified:
   trunk/ChangeLog
   trunk/src/orca/speech.py

Modified: trunk/src/orca/speech.py
==============================================================================
--- trunk/src/orca/speech.py	(original)
+++ trunk/src/orca/speech.py	Tue Jan 27 21:44:46 2009
@@ -263,19 +263,17 @@
     i = 0
     length = len(utterances)
     while ( i < length ):
-        utterance = utterances[i]
         if settings.speakMultiCaseStringsAsWords:
-            utterance = _processMultiCaseString(utterance)
+            utterances[i] = _processMultiCaseString(utterances[i])
+        if orca_state.activeScript and orca_state.usePronunciationDictionary:
+            utterances[i] = orca_state.activeScript.adjustForPronunciation(\
+                            utterances[i])
         if settings.speakMultiCaseStringsAsWords:
-            utterances[i] = _processMultiCaseString(utterance)
-            utterance = utterances[i] 
-        if settings.speakMultiCaseStringsAsWords:
-            utterance = _processMultiCaseString(utterance)
-        i = i + 1
-        
-        logLine = "SPEECH OUTPUT: '" + utterance + "'"
+            utterances[i] = _processMultiCaseString(utterances[i])
+        logLine = "SPEECH OUTPUT: '" + utterances[i] + "'"
         debug.println(debug.LEVEL_INFO, logLine)
         log.info(logLine)
+        i = i + 1
 
     if _speechserver:
         _speechserver.speakUtterances(utterances,