X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.C;h=a58c0c9e9c0ae1ade6684220676d0a50811c3444;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=3edb7bbb11a9fc79f2cb96248ee65a1db7236b71;hpb=0408f69287e363d0724bcef3a0c21dd122d79538;p=lyx.git

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 3edb7bbb11..a58c0c9e9c 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -31,12 +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"
 
-#include "support/BoostFormat.h"
+using namespace lyx::support;
+
 
 namespace {
 
@@ -67,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;
 }
 
@@ -76,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);
 
@@ -226,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)
@@ -321,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.
@@ -367,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());
 }
@@ -390,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);
@@ -398,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());