#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);
if (test_only)
return text->changeDepth(type, true);
- bv->hideCursor();
bv->update(BufferView::SELECT);
bool const changed = text->changeDepth(type, false);
if (text->inset_owner)
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.
if (!text)
return;
- bv->hideCursor();
bv->update(text, BufferView::SELECT);
text->toggleFree(font, toggleall);
bv->update(text, BufferView::SELECT);
LyXCursor & cursor = text->cursor;
text->computeBidiTables(bv->buffer(), cursor.row());
if (cursor.boundary() !=
- text->isBoundary(bv->buffer(), &*cursor.par(), cursor.pos(),
+ text->isBoundary(bv->buffer(), *cursor.par(), cursor.pos(),
text->real_current_font))
text->setCursor(cursor.par(), cursor.pos(),
false, !cursor.boundary());