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

diff --git a/src/debug.C b/src/debug.C
index 8fa82458fb..ab90e5e3c4 100644
--- a/src/debug.C
+++ b/src/debug.C
@@ -1,22 +1,21 @@
 /* This file is part of
-* ====================================================== 
-* 
+* ======================================================
+*
 *           LyX, The Document Processor
-*        
+*
 *           Copyright 1999-2001 The LyX Team.
 *
 * ====================================================== */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
-#include <iomanip>
-
 #include "debug.h"
 #include "gettext.h"
+#include "support/lstrings.h"
+
+#include <iomanip>
+
+using namespace lyx::support;
 
 using std::ostream;
 using std::setw;
@@ -37,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")},
@@ -52,7 +51,11 @@ error_item errorTags[] = {
 	{ Debug::DEPEND,    "depend",    N_("Dependency information")},
 	{ Debug::INSETS,    "insets",    N_("LyX Insets")},
 	{ Debug::FILES,     "files",     N_("Files used by LyX")},
-        { Debug::ANY,       "any",       N_("All debugging messages")}
+	{ 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")}
 };
 
 
@@ -60,30 +63,31 @@ int const numErrorTags = sizeof(errorTags)/sizeof(error_item);
 
 } // namespace anon
 
-	
+
 Debug::type const Debug::ANY = Debug::type(
 	Debug::INFO | Debug::INIT | Debug::KEY | Debug::GUI |
 	Debug::PARSER | Debug::LYXRC | Debug::KBMAP | Debug::LATEX |
 	Debug::MATHED | Debug::FONT | Debug::TCLASS | Debug::LYXVC |
 	Debug::LYXSERVER | Debug::ROFF | Debug::ACTION | Debug::LYXLEX |
-	Debug::DEPEND | Debug::INSETS | Debug::FILES);
+	Debug::DEPEND | Debug::INSETS | Debug::FILES | Debug::WORKAREA |
+	Debug::INSETTEXT | Debug::GRAPHICS | Debug::CHANGES);
 
 
-Debug::type Debug::value(string const & val) 
+Debug::type Debug::value(string const & val)
 {
 	type l = Debug::NONE;
 	string v(val);
 	while (!v.empty()) {
 		string::size_type st = v.find(',');
-		string tmp(lowercase(v.substr(0, st)));
+		string tmp(ascii_lowercase(v.substr(0, st)));
 		if (tmp.empty())
 			break;
 		// Is it a number?
-		if (isStrInt(tmp)) 
+		if (isStrInt(tmp))
 			l |= static_cast<type>(strToInt(tmp));
 		else
 		// Search for an explicit name
-		for (int i = 0 ; i < numErrorTags ; ++i) 
+		for (int i = 0 ; i < numErrorTags ; ++i)
 			if (tmp == errorTags[i].name) {
 				l |= errorTags[i].level;
 				break;
@@ -95,21 +99,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 << _("Debugging `") << errorTags[i].name
-			  << "' (" << _(errorTags[i].desc) << ')' << endl;
+		    && errorTags[i].level & level) {
+			// avoid _(...) re-entrance problem
+			string const s = _(errorTags[i].desc);
+			os << bformat(_("Debugging `%1$s' (%2$s)"),
+					errorTags[i].name, s);
+		}
+	}
 }
 
 
-void Debug::showTags(ostream & os) 
+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';