[orca/gnome-2-26] Revert fix for bgo#582028 and provide limited fix for bgo#575614

[William Walker <wwalker src gnome org>]

commit 73eeb5c287399f42ed3eae8b97cf08ad1a934226
Author: Willie Walker <william walker sun com>
Date:   Mon Jun 29 11:35:07 2009 -0400

    Revert fix for bgo#582028 and provide limited fix for bgo#575614
    
    We deemed 582028 to be too broad.  For example, it was turning
    Darragh � Héiligh into "Darragh O ACUTE Héiligh".  We address
    the problem in a different way by modifying the tables that tell
    us when we want to substitute words for characters.

 ChangeLog                        |   10 ++++++++++
 src/orca/chnames.py              |    6 ++++++
 src/orca/pronunciation_dict.py   |    7 ++++++-
 src/orca/punctuation_settings.py |    6 ++++--
 4 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 581f8dc..6e16c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-29
+
+        * src/orca/pronunciation_dict.py:
+	  src/orca/chnames.py:
+	  src/orca/punctuation_settings.py:
+	  Revert fix for bgo#582028 - Character pronunciations are not
+	  used when navigating by line.  Also provided a limited fix for
+	  bgo#575614 - Please add speakable characters: â?? and â?? that works
+	  within the boundaries of the string freeze for 2.26.
+
 2009-05-26  Joanmarie Diggs <joanmarie diggs gmail com>
 
         * src/orca/scripts/apps/ekiga.py:
diff --git a/src/orca/chnames.py b/src/orca/chnames.py
index bdcb57f..615e480 100644
--- a/src/orca/chnames.py
+++ b/src/orca/chnames.py
@@ -715,6 +715,12 @@ chnames[u'\u2717'] = _("x-shaped bullet")
 #
 chnames[u'\u2974'] = _("right-pointing arrow")
 
+# WDW - we reuse 'right-pointing arrow' here (see 2974 entry above) to
+# avoid a string change for 2.26.3.  In 2.27.x, this is now 'right
+# arrow'.
+#
+chnames[u'\u2192'] = chnames[u'\u2974']
+
 # Translators: this is the spoken word for the character 'â?¢' (U+27a2)
 # This symbol is included here because it can be used as a bullet in an 
 # OOo list. The goal is to inform the user of the appearance of the bullet 
diff --git a/src/orca/pronunciation_dict.py b/src/orca/pronunciation_dict.py
index f27bc5b..54d28fe 100644
--- a/src/orca/pronunciation_dict.py
+++ b/src/orca/pronunciation_dict.py
@@ -51,7 +51,12 @@ def getPronunciation(word, pronunciations=None):
         else:
             return pronunciation_dict[lowerWord][1]
     except:
-        return chnames.getCharacterName(word)
+        # If you want a character name to be spoken, treat it as a
+        # punctuation character at LEVEL_NONE in puncutation_settings.py.
+        # See, for example, the left_arrow and right_arrow characters.
+        #
+        #return chnames.getCharacterName(word)
+        return word
 
 def setPronunciation(word, replacementString, pronunciations=None):
     """Given an actual word, and a replacement string, set a key/value
diff --git a/src/orca/punctuation_settings.py b/src/orca/punctuation_settings.py
index fb70902..0a29156 100644
--- a/src/orca/punctuation_settings.py
+++ b/src/orca/punctuation_settings.py
@@ -76,7 +76,7 @@ black_circle         =  u'\u25cf'
 check_mark           =  u'\u2713'
 heavy_check_mark     =  u'\u2714'
 x_shaped_bullet      =  u'\u2717'
-right_arrow          =  u'\u2794'
+heavy_right_arrow    =  u'\u2794'
 right_arrowhead      =  u'\u27a2'
 
 # StarOffice/OOo's special-purpose bullet chararacters
@@ -116,6 +116,7 @@ prime                =  u'\u2032'
 double_prime         =  u'\u2033'
 euro                 =  u'\u20ac'
 trademark            =  u'\u2122'
+right_arrow          =  u'\u2192'
 infinity             =  u'\u221e'
 almost_equal         =  u'\u2248'
 not_equal            =  u'\u2260'
@@ -197,6 +198,7 @@ punctuation[prime]              =  [ LEVEL_SOME, PUNCTUATION_REPLACE ]
 punctuation[double_prime]       =  [ LEVEL_SOME, PUNCTUATION_REPLACE ]
 punctuation[per_mille]          =  [ LEVEL_SOME, PUNCTUATION_REPLACE ]
 
+punctuation[right_arrow]        =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[middle_dot]         =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[bullet]             =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[triangular_bullet]  =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
@@ -210,7 +212,7 @@ punctuation[black_circle]       =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[check_mark]         =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[heavy_check_mark]   =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[x_shaped_bullet]    =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
-punctuation[right_arrow]        =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
+punctuation[heavy_right_arrow]  =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[right_arrowhead]    =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[SO_black_square]    =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]
 punctuation[SO_black_diamond]   =  [ LEVEL_NONE, PUNCTUATION_REPLACE ]