namespace grfx -> lyx::graphics

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 798ff2870a556862a363ff3fb2e7845285b0b238..a58c0c9e9c0ae1ade6684220676d0a50811c3444 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -29,13 +29,15 @@
 
 #include "frontends/LyXView.h"
 #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"
+using namespace lyx::support;
+
 
 namespace {
 
@@ -66,7 +68,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
           << "color " << font.color() << '\n'
           << "language " << lang << '\n'
           << "toggleall " << tostr(toggle);
-       data = os.str();
+       data = STRCONV(os.str());
        return true;
 }
 
@@ -75,7 +77,7 @@ bool font2string(LyXFont const & font, bool toggle, string & data)
 // 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);
 
@@ -225,7 +227,6 @@ bool changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type, bool test_o
        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)
@@ -288,6 +289,9 @@ string const currentState(BufferView * bv)
        if (!bv->available())
                return string();
 
+       if (mathcursor)
+               return mathcursor->info();
+
        ostringstream state;
 
        LyXText * text = bv->getLyXText();
@@ -317,22 +321,16 @@ string const currentState(BufferView * bv)
                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.
@@ -363,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());
 }
@@ -386,7 +386,6 @@ void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
        if (!text)
                return;
 
-       bv->hideCursor();
        bv->update(text, BufferView::SELECT);
        text->toggleFree(font, toggleall);
        bv->update(text, BufferView::SELECT);
@@ -394,9 +393,9 @@ 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->isBoundary(bv->buffer(), *cursor.par(), cursor.pos(),
                                     text->real_current_font))
                        text->setCursor(cursor.par(), cursor.pos(),
                                        false, !cursor.boundary());