diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 62057fa..9f8389c 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -292,8 +292,8 @@ formatting = {
             'detailedWhereAmI': 'label + readOnly + textRole + textContentWithAttributes + anyTextSelection + ' + MNEMONIC + ' + ' + TUTORIAL
             },
         pyatspi.ROLE_TEXT: {
-            'focused': 'labelOrName + readOnly + textRole + currentLineText + allTextSelection',
-            'unfocused': 'labelOrName + readOnly + textRole + currentLineText + allTextSelection + ' + MNEMONIC,
+            'focused': 'labelOrName + readOnly + textRole + textIndentation + currentLineText + allTextSelection',
+            'unfocused': 'labelOrName + readOnly + textRole + textIndentation + currentLineText + allTextSelection + ' + MNEMONIC,
             'basicWhereAmI': 'label + readOnly + textRole + textContent + anyTextSelection + ' + MNEMONIC,
             'detailedWhereAmI': 'label + readOnly + textRole + textContentWithAttributes + anyTextSelection + ' + MNEMONIC + ' + ' + TUTORIAL
             },
@@ -579,9 +579,9 @@ if settings.useExperimentalSpeechProsody:
     formatting['speech'][pyatspi.ROLE_TERMINAL]['detailedWhereAmI'] = \
         'label + readOnly + pause + textRole + pause + textContentWithAttributes + anyTextSelection + ' + MNEMONIC + ' + ' + TUTORIAL
     formatting['speech'][pyatspi.ROLE_TEXT]['focused'] = \
-        'labelOrName + readOnly + textRole + pause + currentLineText + allTextSelection'
+        'labelOrName + readOnly + textRole + pause + textIndentation + currentLineText + allTextSelection'
     formatting['speech'][pyatspi.ROLE_TEXT]['unfocused'] = \
-        'labelOrName + readOnly + textRole + pause + currentLineText + allTextSelection + ' + MNEMONIC
+        'labelOrName + readOnly + textRole + pause + textIndentation + currentLineText + allTextSelection + ' + MNEMONIC
     formatting['speech'][pyatspi.ROLE_TEXT]['basicWhereAmI'] = \
         'label + readOnly + textRole + pause + textContent + anyTextSelection + pause + ' + MNEMONIC
     formatting['speech'][pyatspi.ROLE_TEXT]['detailedWhereAmI'] = \
diff --git a/src/orca/generator.py b/src/orca/generator.py
index 9dd74e1..bca34c5 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -221,8 +221,9 @@ class Generator:
 
             debug.println(
                 debug.LEVEL_ALL,
-                "generate %s for %s (args=%s) using '%s'" \
+                "\n\n\ngenerate %s for %s %s (args=%s) using '%s'" \
                 % (self._mode,
+                   args['formatType'], 
                    debug.getAccessibleDetails(obj),
                    repr(args),
                    format))
@@ -254,6 +255,7 @@ class Generator:
         debug.println(debug.LEVEL_ALL, "generate %s results:" % self._mode)
         for element in result:
             debug.println(debug.LEVEL_ALL, "  " + str(element))
+        debug.println(debug.LEVEL_ALL, "\n\n\n")
 
         return result
 
@@ -883,6 +885,13 @@ class Generator:
         """
         return [self._script.utilities.displayedText(obj)]
 
+    def _generateTextIndentation(self, obj, **args ):
+        """Returns an array of strings for use by speech and braille
+        that represents the indentation information of the current line of text.
+        """
+        [text, caretOffset, startOffset] = self._script.getTextLineAtCaret(obj)
+        return self._script.utilities.getTextIndentation(obj, text)
+
     #####################################################################
     #                                                                   #
     # Tree interface information                                        #
