[orca] Prefer the math character name when in MathML



commit 4c4fa980761a58f853779abb248ad20a729f4eb0
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri May 25 11:17:23 2018 -0700

    Prefer the math character name when in MathML

 src/orca/chnames.py          | 4 ++--
 src/orca/speech_generator.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/chnames.py b/src/orca/chnames.py
index 01635372d..a98cc897b 100644
--- a/src/orca/chnames.py
+++ b/src/orca/chnames.py
@@ -800,7 +800,7 @@ chnames['\ue00c'] = _("black diamond")
 #
 chnames['\ufffc'] = _("object replacement character")
 
-def getCharacterName(character):
+def getCharacterName(character, preferMath=False):
     """Given a character, return its name as people might refer to it
     in ordinary conversation.
 
@@ -814,7 +814,7 @@ def getCharacterName(character):
     charName = chnames.get(character)
     if not (charName or mathName):
         return character
-    if mathName and not charName:
+    if mathName and (not charName or preferMath):
         return mathName
     if charName and not mathName:
         return charName
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 1a74ce3b2..4737c1fd7 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -992,7 +992,7 @@ class SpeechGenerator(generator.Generator):
         if result:
             string = result[0].strip()
             if len(string) == 1 and self._script.utilities.isMath(obj):
-                charname = chnames.getCharacterName(string)
+                charname = chnames.getCharacterName(string, preferMath=True)
                 if charname != string:
                     result[0] = charname
 


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