orca r4469 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Wed Jan 28 13:42:35 2009
New Revision: 4469
URL: http://svn.gnome.org/viewvc/orca?rev=4469&view=rev

Log:
Final(?) fix for multicase bug #562060 - adjust the regexes used.


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	Wed Jan 28 13:42:35 2009
@@ -48,10 +48,9 @@
 
 # regular expressions for multiCaseStrings
 #
-multiCaseReg1 = re.compile("([a-z]+)([A-Z][a-z]+)")
-multiCaseReg2 = re.compile("([a-z]+)([A-Z]+)")
-multiCaseReg3 = re.compile("([A-Z]{2}[A-Z]+)([a-z]+)")
-multiCaseReg4 = re.compile("([A-Z])([A-Z][a-z]+)")
+multiCaseReg1 = re.compile("([a-z]+)([A-Z])")
+multiCaseReg2 = re.compile("([A-Z][A-Z]+)([A-Z][a-z]+)")
+multiCaseReg3 = re.compile("([A-Z])([A-Z][a-z]+)")
 
 def getSpeechServerFactories():
     """Imports all known SpeechServer factory modules.  Returns a list
@@ -378,5 +377,4 @@
     string = multiCaseReg1.sub('\\1 \\2', string)
     string = multiCaseReg2.sub('\\1 \\2', string)
     string = multiCaseReg3.sub('\\1 \\2', string)    
-    string = multiCaseReg4.sub('\\1 \\2', string)
     return string