/* This file is part of
-* ======================================================
-*
+* ======================================================
+*
* LyX, The Document Processor
-*
+*
* Copyright 1999-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-#include <iomanip>
-
#include "debug.h"
#include "gettext.h"
#include "support/lstrings.h"
+#include "BoostFormat.h"
+
+#include <iomanip>
+
using std::ostream;
using std::setw;
using std::endl;
} // 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::INSETTEXT | Debug::GRAPHICS);
-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;
void Debug::showLevel(ostream & o, 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) {
+#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
+ }
+ }
}
-void Debug::showTags(ostream & os)
+void Debug::showTags(ostream & os)
{
for (int i = 0 ; i < numErrorTags ; ++i)
os << setw(7) << errorTags[i].level