#include "frontends/Alert.h"
#include "mathed/math_cursor.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
#include "Lsstream.h"
#include "insets/updatableinset.h"
-#include "support/BoostFormat.h"
namespace {
<< "color " << font.color() << '\n'
<< "language " << lang << '\n'
<< "toggleall " << tostr(toggle);
- data = os.str();
+ data = STRCONV(os.str());
return true;
}
// If successful, returns true
bool string2font(string const & data, LyXFont & font, bool & toggle)
{
- istringstream is(data);
+ istringstream is(STRCONV(data));
LyXLex lex(0,0);
lex.setStream(is);
buffer->params.getLyXTextClass().defaultfont();
font.reduce(defaultfont);
-#if USE_BOOST_FORMAT
- state << boost::format(_("Font: %1$s")) % font.stateText(&buffer->params);
-#else
- state << _("Font: ") << font.stateText(&buffer->params);
-#endif
+ // avoid _(...) re-entrance problem
+ string const s = font.stateText(&buffer->params);
+ state << bformat(_("Font: %1$s"), s);
+
+ // state << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
// The paragraph depth
int depth = text->getDepth();
- if (depth > 0) {
-#if USE_BOOST_FORMAT
- state << boost::format(_(", Depth: %1$d")) % depth;
-#else
- state << _(", Depth: ") << depth;
-#endif
- }
-
+ if (depth > 0)
+ state << bformat(_(", Depth: %1$s"), tostr(depth));
// The paragraph spacing, but only if different from
// buffer spacing.
}
#ifdef DEVEL_VERSION
state << _(", Paragraph: ") << text->cursor.par()->id();
+ state << " Inset: " <<
+ (text->cursor.par()->inInset() ? text->cursor.par()->inInset()->id() : -1);
#endif
return STRCONV(state.str());
}