"Inter-word Space"

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index c7f640a03a8e38dd2c5d7e2ab5517a07ddf43d09..0ef62d3b4850e49628b2d4d5c4266a5cc4e72e65 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -31,12 +31,11 @@
 #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 {
 
@@ -67,7 +66,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;
 }
 
@@ -76,7 +75,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);
 
@@ -226,7 +225,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)
@@ -321,22 +319,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.
@@ -390,7 +382,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);