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

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index df8af0248d..a58c0c9e9c 100644
--- 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))