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

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 0afd78ff67..a58c0c9e9c 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -29,19 +29,24 @@
 
 #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 {
+
 LyXFont freefont(LyXFont::ALL_IGNORE);
 bool toggleall(false);
+
 }
 
+namespace bv_funcs {
 
 // Set data using font and toggle
 // If successful, returns true
@@ -63,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;
 }
 
@@ -72,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);
 
@@ -87,34 +92,26 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 
 		if (token == "family") {
 			int const next = lex.getInteger();
-			LyXFont::FONT_FAMILY const family =
-				static_cast<LyXFont::FONT_FAMILY>(next);
-			font.setFamily(family);
+			font.setFamily(LyXFont::FONT_FAMILY(next));
 
 		} else if (token == "series") {
 			int const next = lex.getInteger();
-			LyXFont::FONT_SERIES const series =
-				static_cast<LyXFont::FONT_SERIES>(next);
-			font.setSeries(series);
+			font.setSeries(LyXFont::FONT_SERIES(next));
 
 		} else if (token == "shape") {
 			int const next = lex.getInteger();
-			LyXFont::FONT_SHAPE const shape =
-				static_cast<LyXFont::FONT_SHAPE>(next);
-			font.setShape(shape);
+			font.setShape(LyXFont::FONT_SHAPE(next));
 
 		} else if (token == "size") {
 			int const next = lex.getInteger();
-			LyXFont::FONT_SIZE const size =
-				static_cast<LyXFont::FONT_SIZE>(next);
-			font.setSize(size);
+			font.setSize(LyXFont::FONT_SIZE(next));
 
 		} else if (token == "emph" || token == "underbar" ||
 			   token == "noun" || token == "number") {
 
 			int const next = lex.getInteger();
 			LyXFont::FONT_MISC_STATE const misc =
-				static_cast<LyXFont::FONT_MISC_STATE>(next);
+				LyXFont::FONT_MISC_STATE(next);
 
 			if (token == "emph")
 			    font.setEmph(misc);
@@ -127,9 +124,7 @@ bool string2font(string const & data, LyXFont & font, bool & toggle)
 
 		} else if (token == "color") {
 			int const next = lex.getInteger();
-			LColor::color const color =
-				static_cast<LColor::color>(next);
-			font.setColor(color);
+			font.setColor(LColor::color(next));
 
 		} else if (token == "language") {
 			string const next = lex.getString();
@@ -224,23 +219,20 @@ void lang(BufferView * bv, string const & l)
 }
 
 
-// Change environment depth.
-// if decInc >= 0, increment depth
-// if decInc <	0, decrement depth
-void changeDepth(BufferView * bv, LyXText * text, int decInc)
+bool changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type, bool test_only)
 {
 	if (!bv->available() || !text)
-	    return;
+	    return false;
+
+	if (test_only)
+		return text->changeDepth(type, true);
 
-	bv->hideCursor();
 	bv->update(BufferView::SELECT);
-	if (decInc >= 0)
-		text->incDepth();
-	else
-		text->decDepth();
+	bool const changed = text->changeDepth(type, false);
 	if (text->inset_owner)
 		bv->updateInset((Inset *)text->inset_owner);
 	bv->update(BufferView::SELECT);
+	return changed;
 }
 
 
@@ -297,6 +289,9 @@ string const currentState(BufferView * bv)
 	if (!bv->available())
 		return string();
 
+	if (mathcursor)
+		return mathcursor->info();
+
 	ostringstream state;
 
 	LyXText * text = bv->getLyXText();
@@ -326,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.
@@ -372,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());
 }
@@ -395,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);
@@ -403,11 +393,13 @@ 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());
 	}
 }
+
+}; // namespace bv_funcs