namespace grfx -> lyx::graphics

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index df8af0248de5c7e856ae437694f0ebb3a597bf5d..a58c0c9e9c0ae1ade6684220676d0a50811c3444 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -31,11 +31,13 @@
 #include "frontends/Alert.h"
 #include "mathed/math_cursor.h"
 
-#include "support/lstrings.h"
+#include "support/tostr.h"
 #include "Lsstream.h"
 
 #include "insets/updatableinset.h"
 
+using namespace lyx::support;
+
 
 namespace {
 
@@ -319,7 +321,11 @@ string const currentState(BufferView * bv)
                buffer->params.getLyXTextClass().defaultfont();
        font.reduce(defaultfont);
 
-       state << bformat(_("Font: %1$s"), font.stateText(&buffer->params));
+       // 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();
@@ -355,6 +361,8 @@ string const currentState(BufferView * bv)
        }
 #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());
 }
@@ -385,7 +393,7 @@ void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
        if (font.language() != ignore_language ||
            font.number() != LyXFont::IGNORE) {
                LyXCursor & cursor = text->cursor;
-               text->computeBidiTables(bv->buffer(), cursor.row());
+               text->computeBidiTables(bv->buffer(), text->cursorRow());
                if (cursor.boundary() !=
                    text->isBoundary(bv->buffer(), *cursor.par(), cursor.pos(),
                                     text->real_current_font))