X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdebug.C;h=ab90e5e3c48d2d6cfbdf371d9175d19cae6a2b8f;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=d3d672ea5f9eebf63cdf1e58432b9d99c716a06e;hpb=17c8764e0a3c5adcb970fd7803a6255cfe4bf01f;p=lyx.git

diff --git a/src/debug.C b/src/debug.C
index d3d672ea5f..ab90e5e3c4 100644
--- a/src/debug.C
+++ b/src/debug.C
@@ -13,10 +13,10 @@
 #include "gettext.h"
 #include "support/lstrings.h"
 
-#include "support/BoostFormat.h"
-
 #include <iomanip>
 
+using namespace lyx::support;
+
 using std::ostream;
 using std::setw;
 using std::endl;
@@ -36,7 +36,7 @@ error_item errorTags[] = {
 	{ Debug::INIT,      "init",      N_("Program initialisation")},
 	{ Debug::KEY,       "key",       N_("Keyboard events handling")},
 	{ Debug::GUI,       "gui",       N_("GUI handling")},
-	{ Debug::PARSER,    "parser",    N_("Lyxlex grammer parser")},
+	{ Debug::PARSER,    "parser",    N_("Lyxlex grammar parser")},
 	{ Debug::LYXRC,     "lyxrc",     N_("Configuration files reading")},
 	{ Debug::KBMAP,     "kbmap",     N_("Custom keyboard definition")},
 	{ Debug::LATEX,     "latex",     N_("LaTeX generation/execution")},
@@ -99,24 +99,17 @@ 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) {
-#if USE_BOOST_FORMAT
-			o << boost::format(
-				_("Debugging `%1$s' (%2$s)"))
-				% errorTags[i].name
-				% _(errorTags[i].desc)
-			  << endl;
-#else
-			o << _("Debugging `") << errorTags[i].name << "' ("
-			  << _(errorTags[i].desc) << ')'
-			  << endl;
-#endif
+			// avoid _(...) re-entrance problem
+			string const s = _(errorTags[i].desc);
+			os << bformat(_("Debugging `%1$s' (%2$s)"),
+					errorTags[i].name, s);
 		}
 	}
 }
@@ -124,7 +117,7 @@ void Debug::showLevel(ostream & o, Debug::type level)
 
 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';