Fixed|Client|Font|RichFormat: Popping formats off the stack

When returning to an earlier format using the "." escape sequence, the tab stop and indent mark must be unaffected.
skyjake · Jun 9, 2013 · 3c9e6c0 · 3c9e6c0
1 parent 4229ac2
commit 3c9e6c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/doomsday/client/src/audio/audiodriver.cpp b/doomsday/client/src/audio/audiodriver.cpp
@@ -415,7 +415,7 @@ static void selectInterfaces(audiodriverid_t defaultDriverId)
 
 void AudioDriver_PrintInterfaces(void)
 {
-    LOG_INFO(_E("b") "Audio configuration" _E(".") " (by decreasing priority):");
+    LOG_INFO(_E("b") "Audio configuration" _E("l") " (by decreasing priority):");
 
     de::String str;
     QTextStream os(&str);
@@ -425,12 +425,12 @@ void AudioDriver_PrintInterfaces(void)
         audiointerface_t* a = &activeInterfaces[i];
         if(a->type == AUDIO_IMUSIC || a->type == AUDIO_ICD)
         {
-            os << _E("Ta") "  " << (a->type == AUDIO_IMUSIC? "Music" : "CD") << ": "
-               << _E("Tb") << Str_Text(AudioDriver_InterfaceName(a->i.any)) << "\n";
+            os << _E("Ta") _E("l") "  " << (a->type == AUDIO_IMUSIC? "Music" : "CD") << ": "
+               << _E(".") _E("Tb") << Str_Text(AudioDriver_InterfaceName(a->i.any)) << "\n";
         }
         else if(a->type == AUDIO_ISFX)
         {
-            os << _E("Ta") << "  SFX: " << _E("Tb")
+            os << _E("Ta") _E("l") << "  SFX: " << _E(".") _E("Tb")
                << Str_Text(AudioDriver_InterfaceName(a->i.sfx)) << "\n";
         }
     }

diff --git a/doomsday/libgui/src/font.cpp b/doomsday/libgui/src/font.cpp
@@ -116,7 +116,9 @@ struct Font::RichFormat::Instance
             stack.removeLast(); // ignore the one just added
             if(stack.size() > 1)
             {
-                stack.removeLast();
+                Format form = stack.takeLast();
+                stack.last().tabStop = form.tabStop; // Retain tab stop.
+                stack.last().markIndent = form.markIndent;
             }
             break;