*
* ====================================================== */
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include <config.h>
#include "debug.h"
#include "gettext.h"
#include "support/lstrings.h"
-#include "BoostFormat.h"
-
#include <iomanip>
+using namespace lyx::support;
+
using std::ostream;
using std::setw;
using std::endl;
{ 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")},
{ 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")}
};
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)
}
-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
+ string const 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';