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

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 249acf9e49..a58c0c9e9c 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -1,20 +1,23 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file bufferview_funcs.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author Angus Leeming
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
 #include "bufferview_funcs.h"
-#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "paragraph.h"
 #include "lyxfont.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
 #include "buffer.h"
 #include "lyx_cb.h"
@@ -24,11 +27,154 @@
 #include "author.h"
 #include "changes.h"
 
+#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
+#include "mathed/math_cursor.h"
+
+#include "support/tostr.h"
+#include "Lsstream.h"
+
+#include "insets/updatableinset.h"
+
+using namespace lyx::support;
+
 
-#include "support/lstrings.h"
+namespace {
+
+LyXFont freefont(LyXFont::ALL_IGNORE);
+bool toggleall(false);
+
+}
+
+namespace bv_funcs {
+
+// Set data using font and toggle
+// If successful, returns true
+bool font2string(LyXFont const & font, bool toggle, string & data)
+{
+	string lang = "ignore";
+	if (font.language())
+		lang = font.language()->lang();
+
+	ostringstream os;
+	os << "family " << font.family() << '\n'
+	   << "series " << font.series() << '\n'
+	   << "shape " << font.shape() << '\n'
+	   << "size " << font.size() << '\n'
+	   << "emph " << font.emph() << '\n'
+	   << "underbar " << font.underbar() << '\n'
+	   << "noun " << font.noun() << '\n'
+	   << "number " << font.number() << '\n'
+	   << "color " << font.color() << '\n'
+	   << "language " << lang << '\n'
+	   << "toggleall " << tostr(toggle);
+	data = STRCONV(os.str());
+	return true;
+}
+
+
+// Set font and toggle using data
+// If successful, returns true
+bool string2font(string const & data, LyXFont & font, bool & toggle)
+{
+	istringstream is(STRCONV(data));
+	LyXLex lex(0,0);
+	lex.setStream(is);
+
+	int nset = 0;
+	while (lex.isOK()) {
+		string token;
+		if (lex.next())
+			token = lex.getString();
+
+		if (token.empty() || !lex.next())
+			break;
+
+		if (token == "family") {
+			int const next = lex.getInteger();
+			font.setFamily(LyXFont::FONT_FAMILY(next));
+
+		} else if (token == "series") {
+			int const next = lex.getInteger();
+			font.setSeries(LyXFont::FONT_SERIES(next));
+
+		} else if (token == "shape") {
+			int const next = lex.getInteger();
+			font.setShape(LyXFont::FONT_SHAPE(next));
+
+		} else if (token == "size") {
+			int const next = lex.getInteger();
+			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 =
+				LyXFont::FONT_MISC_STATE(next);
+
+			if (token == "emph")
+			    font.setEmph(misc);
+			else if (token == "underbar")
+				font.setUnderbar(misc);
+			else if (token == "noun")
+				font.setNoun(misc);
+			else if (token == "number")
+				font.setNumber(misc);
+
+		} else if (token == "color") {
+			int const next = lex.getInteger();
+			font.setColor(LColor::color(next));
+
+		} else if (token == "language") {
+			string const next = lex.getString();
+			if (next == "ignore")
+				font.setLanguage(ignore_language);
+			else
+				font.setLanguage(languages.getLanguage(next));
+
+		} else if (token == "toggleall") {
+			toggle = lex.getBool();
+
+		} else {
+			// Unrecognised token
+			break;
+		}
+
+		++nset;
+	}
+	return (nset > 0);
+}
+
+
+string const freefont2string()
+{
+	string data;
+	if (font2string(freefont, toggleall, data))
+		return data;
+	return string();
+}
+
+
+void update_and_apply_freefont(BufferView * bv, string const & data)
+{
+	LyXFont font;
+	bool toggle;
+	if (string2font(data, font, toggle)) {
+		freefont = font;
+		toggleall = toggle;
+		apply_freefont(bv);
+	}
+}
+
+
+void apply_freefont(BufferView * bv)
+{
+	toggleAndShow(bv, freefont, toggleall);
+	bv->owner()->view_state_changed();
+	bv->owner()->message(_("Character set"));
+}
 
-#include "BoostFormat.h"
 
 void emph(BufferView * bv)
 {
@@ -65,31 +211,28 @@ void lang(BufferView * bv, string const & l)
 {
 	LyXFont font(LyXFont::ALL_IGNORE);
 	Language const * lang = languages.getLanguage(l);
-	if (lang) {
-		font.setLanguage(lang);
-		toggleAndShow(bv, font);
-	} else
-		Alert::alert(_("Error! unknown language"),l);
+	if (!lang)
+		return;
+
+	font.setLanguage(lang);
+	toggleAndShow(bv, font);
 }
 
 
-// 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;
-
-	bv->hideCursor();
-	bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
-	if (decInc >= 0)
-		text->incDepth(bv);
-	else
-		text->decDepth(bv);
+	    return false;
+
+	if (test_only)
+		return text->changeDepth(type, true);
+
+	bv->update(BufferView::SELECT);
+	bool const changed = text->changeDepth(type, false);
 	if (text->inset_owner)
-		bv->updateInset((Inset *)text->inset_owner, true);
-	bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+		bv->updateInset((Inset *)text->inset_owner);
+	bv->update(BufferView::SELECT);
+	return changed;
 }
 
 
@@ -143,11 +286,14 @@ void fontSize(BufferView * bv, string const & size)
 // Returns the current font and depth as a message.
 string const currentState(BufferView * bv)
 {
-	ostringstream state;
-
 	if (!bv->available())
 		return string();
 
+	if (mathcursor)
+		return mathcursor->info();
+
+	ostringstream state;
+
 	LyXText * text = bv->getLyXText();
 	Buffer * buffer = bv->buffer();
 	LyXCursor const & c(text->cursor);
@@ -167,7 +313,7 @@ string const currentState(BufferView * bv)
 			state << _(" at ") << ctime(&change.changetime);
 		state << " : ";
 	}
- 
+
 	// I think we should only show changes from the default
 	// font. (Asger)
 	LyXFont font = text->real_current_font;
@@ -175,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.
@@ -221,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());
 }
@@ -244,19 +386,20 @@ void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
 	if (!text)
 		return;
 
-	bv->hideCursor();
-	bv->update(text, BufferView::SELECT | BufferView::FITCUR);
-	text->toggleFree(bv, font, toggleall);
-	bv->update(text, BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+	bv->update(text, BufferView::SELECT);
+	text->toggleFree(font, toggleall);
+	bv->update(text, BufferView::SELECT);
 
 	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(bv, cursor.par(), cursor.pos(),
+			text->setCursor(cursor.par(), cursor.pos(),
 					false, !cursor.boundary());
 	}
 }
+
+}; // namespace bv_funcs