"Inter-word Space"

[lyx.git] / src / debug.C

diff --git a/src/debug.C b/src/debug.C
index ffd83cfa833264842d9962c17a2e2e3226630b59..6d086ad231f89a7e01db39cbe1a4599d29a7677a 100644 (file)
--- a/src/debug.C
+++ b/src/debug.C
@@ -7,18 +7,12 @@
 *
 * ====================================================== */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
 #include "debug.h"
 #include "gettext.h"
 #include "support/lstrings.h"
 
-#include "BoostFormat.h"
-
 #include <iomanip>
 
 using std::ostream;
@@ -58,6 +52,7 @@ error_item errorTags[] = {
        { Debug::WORKAREA,  "workarea",  N_("Workarea events")},
        { Debug::INSETTEXT, "insettext", N_("Insettext/tabular messages")},
        { Debug::GRAPHICS,  "graphics",  N_("Graphics conversion and loading")},
+       { Debug::CHANGES,   "changes",   N_("Change tracking")},
        { Debug::ANY,       "any",       N_("All debugging messages")}
 };
 
@@ -73,7 +68,7 @@ Debug::type const Debug::ANY = Debug::type(
        Debug::MATHED | Debug::FONT | Debug::TCLASS | Debug::LYXVC |
        Debug::LYXSERVER | Debug::ROFF | Debug::ACTION | Debug::LYXLEX |
        Debug::DEPEND | Debug::INSETS | Debug::FILES | Debug::WORKAREA |
-       Debug::INSETTEXT | Debug::GRAPHICS);
+       Debug::INSETTEXT | Debug::GRAPHICS | Debug::CHANGES);
 
 
 Debug::type Debug::value(string const & val)
@@ -102,24 +97,25 @@ Debug::type Debug::value(string const & val)
 }
 
 
-void Debug::showLevel(ostream & o, Debug::type level)
+void Debug::showLevel(ostream & os, Debug::type level)
 {
        // Show what features are traced
-       for (int i = 0 ; i < numErrorTags ; ++i)
+       for (int i = 0; i < numErrorTags ; ++i) {
                if (errorTags[i].level != Debug::ANY
                    && errorTags[i].level != Debug::NONE
-                   && errorTags[i].level & level)
-                       o << boost::format(
-                               _("Debugging `%1$s' (%2$s)"))
-                               % errorTags[i].name
-                               % _(errorTags[i].desc)
-                         << endl;
+                   && errorTags[i].level & level) {
+                       // avoid _(...) re-entrance problem
+                       const string s = _(errorTags[i].desc);
+                       os << bformat(_("Debugging `%1$s' (%2$s)"),
+                                       errorTags[i].name, s);
+               }
+       }
 }
 
 
 void Debug::showTags(ostream & os)
 {
-       for (int i = 0 ; i < numErrorTags ; ++i)
+       for (int i = 0; i < numErrorTags ; ++i)
                os << setw(7) << errorTags[i].level
                   << setw(10) << errorTags[i].name
                   << "  " << _(errorTags[i].desc) << '\n';