[orca] Don't double-present punctuation when keyecho and character echo are both enabled

[Joanmarie Diggs <joanied src gnome org>]

commit 5c27a50685d57d91b26846b90bce025a689a5829
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Jun 6 17:09:31 2014 -0400

    Don't double-present punctuation when keyecho and character echo are both enabled

 src/orca/script_utilities.py |    1 -
 src/orca/scripts/default.py  |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index d0f18e4..b905436 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -1974,7 +1974,6 @@ class Utilities:
             return False
 
         if len(event.event_string) != 1 \
-           or not event.event_string.isalnum() \
            or event.modifiers & keybindings.ORCA_CTRL_MODIFIER_MASK:
             return False
 
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index ea2ada4..e1ce333 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -2687,11 +2687,13 @@ class Script(script.Script):
                     or (_settingsManager.getSetting('enableEchoByCharacter') \
                         and string \
                         and role != pyatspi.ROLE_PASSWORD_TEXT \
-                        and len(string) == 1)
+                        and len(string.strip()) == 1)
 
         if speakThis:
             if string.isupper():
                 speech.speak(string, self.voices[settings.UPPERCASE_VOICE])
+            elif not string.isalnum():
+                speech.speakCharacter(string)
             else:
                 speech.speak(string)