[orca/570658] adding in _getTutorial in altspeechgenerator, works fine :)

[Mesar Hameed <mhameed src gnome org>]

commit bda2c5878aeab3a25875c917b5045ddbbfcd91ed
Author: Mesar Hameed <mhameed src gnome org>
Date:   Thu May 14 00:09:52 2009 +0100

    adding in _getTutorial in altspeechgenerator, works fine :)
---
 src/orca/altspeechgenerator.py |    6 ++++++
 src/orca/formatting.py         |    7 ++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/orca/altspeechgenerator.py b/src/orca/altspeechgenerator.py
index 864beda..971fad0 100755
--- a/src/orca/altspeechgenerator.py
+++ b/src/orca/altspeechgenerator.py
@@ -752,6 +752,12 @@ class AltSpeechGenerator:
 
         return result
 
+    def _getTutorial(self, obj, **args):
+        already_focused = args.get('already_focused')
+        forceMessage = args.get('forceMessage', False)
+        return self._script.tutorialGenerator.getTutorial(obj, \
+            already_focused, forceMessage)
+
     #####################################################################
     #                                                                   #
     # Tie it all together                                               #
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 94315c6..8bc2465 100755
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -89,7 +89,12 @@ defaultFormatting = {
             # voice in the format.  It should be removed when we've
             # figured that stuff out.]]]
             #
-            'unfocused': 'voice(role) + labelAndName + [voice("uppercase") + roleName]'
+            # [[[NOTE: MMH - We will only hear the tutorial string once per script,
+            # this is because the code checks if the tutorial to be spoken was the last tutorial, and this will always be true.
+            # Just putting 'tutorial' in some of the other unfocused strings should get it to behave as normally.
+            # Also r==s thing wont be true when returning tutorial msges because the old getSpeech was not responsible for tutorials, but now it is.]]]
+            #
+            'unfocused': 'voice(role) + labelAndName + [voice("uppercase") + roleName] + tutorial'
             },
         pyatspi.ROLE_RADIO_BUTTON: {
             'focused': 'radioState',