[orca/570658] Fix bugs where arrays weren't being created, add in node level, and format to make things a little e

[William Walker <wwalker src gnome org>]

commit 99d51cf755dcc98f99fda19ce97ba131024d4a9b
Author: Willie Walker <william walker sun com>
Date:   Fri Jun 26 02:23:33 2009 -0400

    Fix bugs where arrays weren't being created, add in node level, and format to make things a little easier to read

 src/orca/formatting.py |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 68da149..dd5f924 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -73,6 +73,7 @@ formatting = {
     # Formatting for speech.                                           #
     #                                                                  #
     ####################################################################
+
     'speech': {
         'prefix': {
             'focused': '[]',
@@ -246,7 +247,8 @@ formatting = {
             'basicWhereAmI': 'labelAndName + allTextSelection + roleName + availability + noChildren'
             },
         pyatspi.ROLE_TABLE_CELL: {
-            'focused': '(tableCell2ChildLabel + tableCell2ChildToggle) or cellCheckedState + (expandableState and (expandableState + numberOfChildren))',
+            'focused': '(tableCell2ChildLabel + tableCell2ChildToggle)\
+                        or (cellCheckedState + (expandableState and (expandableState + numberOfChildren)))',
             'unfocused': 'tableCellRow',
             'basicWhereAmI': 'parentRoleName + columnHeader + rowHeader + roleName + cellCheckedState + (realActiveDescendantDisplayedText or imageDescription + image) + columnAndRow + expandableState + nodeLevel',
             'detailedWhereAmI': 'parentRoleName + columnHeader + rowHeader + roleName + cellCheckedState + (realActiveDescendantDisplayedText or imageDescription + image) + columnAndRow + tableCellRow + expandableState + nodeLevel'
@@ -257,8 +259,14 @@ formatting = {
             # read a whole row. It calls REAL_ROLE_TABLE_CELL internally.
             # maybe it can be done in a cleaner way?
             #
-            'focused': '(tableCell2ChildLabel + tableCell2ChildToggle) or (cellCheckedState + (expandableState and (expandableState + numberOfChildren)))',
-            'unfocused': '(tableCell2ChildLabel + tableCell2ChildToggle) or (columnHeaderIfToggleAndNoText + cellCheckedState + (realActiveDescendantDisplayedText or imageDescription + image) + (expandableState and (expandableState + numberOfChildren)) + required)'
+            'focused':   '(tableCell2ChildLabel + tableCell2ChildToggle)\
+                          or (cellCheckedState + (expandableState and (expandableState + numberOfChildren)))',
+            'unfocused': '(tableCell2ChildLabel + tableCell2ChildToggle)\
+                          or (columnHeaderIfToggleAndNoText\
+                              + cellCheckedState\
+                              + (realActiveDescendantDisplayedText or imageDescription + image)\
+                              + (expandableState and (expandableState + numberOfChildren))\
+                              + required)'
             },
         pyatspi.ROLE_TEAROFF_MENU_ITEM: {
             'focused': '[]',
@@ -293,14 +301,15 @@ formatting = {
     # Formatting for braille.                                          #
     #                                                                  #
     ####################################################################
+
     'braille': {
         'prefix': {
             'focused':   '[]',
             'unfocused': '[]',
             },
         'suffix': {
-            'focused':   '[]',
-            'unfocused': '[]',
+            'focused':   '(nodeLevel and [Region(" " + asString(nodeLevel))])',
+            'unfocused': '(nodeLevel and [Region(" " + asString(nodeLevel))])',
             },
         'default': {
             'focused':   '[Component(obj,\
@@ -446,8 +455,9 @@ formatting = {
                               + (columnHeaderIfToggleAndNoText and [Region(" " + asString(columnHeaderIfToggleAndNoText))])\
                               + ((realActiveDescendantDisplayedText and [Region(asString(realActiveDescendantDisplayedText))])\
                                  or (imageDescription and [Region(" " + asString(imageDescription))]))\
-                              + (expandableState and Region(" " + asString(expandableState)))\
-                              + (required and Region(" " + asString(required))))'
+                              + [Region(" " + asString(roleName))]\
+                              + (expandableState and [Region(" " + asString(expandableState))])\
+                              + (required and [Region(" " + asString(required))]))'
             },
         #pyatspi.ROLE_TABLE_COLUMN_HEADER: 'default'
         #pyatspi.ROLE_TABLE_ROW_HEADER: 'default'