X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext3.C;h=7f0e8465726625e9381ab528e8290b07c0e51a14;hb=8ebf862adbe377d032f888a82d88d4393aebc929;hp=31db8bf99b27c3d18ba079e2efce6e1186c7e8fb;hpb=b6c3478eda7703baff04c4e885f810a523cf283b;p=lyx.git

diff --git a/src/text3.C b/src/text3.C
index 31db8bf99b..7f0e846572 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -29,6 +29,7 @@
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "dispatchresult.h"
+#include "errorlist.h"
 #include "factory.h"
 #include "funcrequest.h"
 #include "gettext.h"
@@ -47,7 +48,10 @@
 #include "pariterator.h"
 
 #include "frontends/Dialogs.h"
+#include "frontends/Gui.h"
 #include "frontends/LyXView.h"
+#include "frontends/Clipboard.h"
+#include "frontends/Selection.h"
 
 #include "insets/insetcommand.h"
 #include "insets/insetfloatlist.h"
@@ -61,14 +65,16 @@
 #include "support/convert.h"
 #include "support/lyxtime.h"
 
-#include "mathed/math_hullinset.h"
-#include "mathed/math_macrotemplate.h"
+#include "mathed/InsetMathHull.h"
+#include "mathed/MathMacroTemplate.h"
 
 #include <boost/current_function.hpp>
 
 #include <clocale>
 #include <sstream>
 
+using lyx::char_type;
+using lyx::docstring;
 using lyx::pos_type;
 
 using lyx::cap::copySelection;
@@ -119,7 +125,7 @@ namespace {
 		if (selecting || cur.mark())
 			cur.setSelection();
 		if (!cur.selection())
-			cur.bv().haveSelection(false);
+			cur.bv().owner()->gui().selection().haveSelection(false);
 		cur.bv().switchKeyMap();
 	}
 
@@ -134,7 +140,7 @@ namespace {
 	void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
 	{
 		recordUndo(cur);
-		string sel = cur.selectionAsString(false);
+		string sel = lyx::to_utf8(cur.selectionAsString(false));
 		//lyxerr << "selection is: '" << sel << "'" << endl;
 
 		// It may happen that sel is empty but there is a selection
@@ -142,7 +148,7 @@ namespace {
 
 		if (sel.empty()) {
 			const int old_pos = cur.pos();
-			cur.insert(new MathHullInset("simple"));
+			cur.insert(new InsetMathHull(hullSimple));
 			BOOST_ASSERT(old_pos == cur.pos());
 			cur.nextInset()->edit(cur, true);
 			// don't do that also for LFUN_MATH_MODE
@@ -153,9 +159,9 @@ namespace {
 				cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
 			// Avoid an unnecessary undo step if cmd.argument
 			// is empty
-			if (!cmd.argument.empty())
+			if (!cmd.argument().empty())
 				cur.dispatch(FuncRequest(LFUN_MATH_INSERT,
-							 cmd.argument));
+							 cmd.argument()));
 		} else {
 			// create a macro if we see "\\newcommand"
 			// somewhere, and an ordinary formula
@@ -164,19 +170,19 @@ namespace {
 			if (sel.find("\\newcommand") == string::npos
 			    && sel.find("\\def") == string::npos)
 			{
-				MathHullInset * formula = new MathHullInset;
+				InsetMathHull * formula = new InsetMathHull;
 				LyXLex lex(0, 0);
 				lex.setStream(is);
 				formula->read(cur.buffer(), lex);
-				if (formula->getType() == "none")
+				if (formula->getType() == hullNone)
 					// Don't create pseudo formulas if
 					// delimiters are left out
-					formula->mutate("simple");
+					formula->mutate(hullSimple);
 				cur.insert(formula);
 			} else
 				cur.insert(new MathMacroTemplate(is));
 		}
-		cur.message(N_("Math editor mode"));
+		cur.message(lyx::from_utf8(N_("Math editor mode")));
 	}
 
 } // namespace anon
@@ -213,7 +219,6 @@ bool LyXText::cursorPrevious(LCursor & cur)
 		updated |= cursorUp(cur);
 	}
 
-	cur.bv().updateScrollbar();
 	finishUndo();
 	return updated;
 }
@@ -236,7 +241,6 @@ bool LyXText::cursorNext(LCursor & cur)
 		updated |= cursorDown(cur);
 	}
 
-	cur.bv().updateScrollbar();
 	finishUndo();
 	return updated;
 }
@@ -270,8 +274,15 @@ bool doInsertInset(LCursor & cur, LyXText * text,
 	if (edit)
 		inset->edit(cur, true);
 
-	if (gotsel && pastesel)
+	if (gotsel && pastesel) {
 		cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
+		// reset first par to default
+		if (cur.lastpit() != 0 || cur.lastpos() != 0) {
+			LyXLayout_ptr const layout =
+				cur.buffer().params().getLyXTextClass().defaultLayout();
+			cur.text()->paragraphs().begin()->layout(layout);
+		}
+	}
 	return true;
 }
 
@@ -377,93 +388,49 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_DELETE_FORWARD_WORD_FORWARD:
+	case LFUN_WORD_DELETE_FORWARD:
 		cur.clearSelection();
 		deleteWordForward(cur);
 		finishChange(cur, false);
 		break;
 
-	case LFUN_DELETE_FORWARD_WORD_BACKWARD:
+	case LFUN_WORD_DELETE_BACKWARD:
 		cur.clearSelection();
 		deleteWordBackward(cur);
 		finishChange(cur, false);
 		break;
 
-	case LFUN_DELETE_FORWARD_LINE_FORWARD:
+	case LFUN_LINE_DELETE:
 		cur.clearSelection();
 		deleteLineForward(cur);
 		finishChange(cur, false);
 		break;
 
-	case LFUN_WORD_FORWARD:
-		if (!cur.mark())
-			cur.clearSelection();
-		if (isRTL(cur.paragraph()))
-			needsUpdate = cursorLeftOneWord(cur);
-		else
-			needsUpdate = cursorRightOneWord(cur);
-		finishChange(cur, false);
-		break;
-
-	case LFUN_WORD_BACKWARD:
-		if (!cur.mark())
-			cur.clearSelection();
-		if (isRTL(cur.paragraph()))
-			needsUpdate = cursorRightOneWord(cur);
-		else
-			needsUpdate = cursorLeftOneWord(cur);
-		finishChange(cur, false);
-		break;
-
 	case LFUN_BUFFER_BEGIN:
+	case LFUN_BUFFER_BEGIN_SELECT:
+		cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
 		if (cur.depth() == 1) {
-			if (!cur.mark())
-				cur.clearSelection();
-			needsUpdate = cursorTop(cur);
-			finishChange(cur, false);
-		} else {
-			cur.undispatched();
-		}
-		break;
-
-	case LFUN_BUFFER_BEGINSEL:
-		if (cur.depth() == 1) {
-			if (!cur.selection())
-				cur.resetAnchor();
 			needsUpdate = cursorTop(cur);
-			finishChange(cur, true);
 		} else {
 			cur.undispatched();
 		}
 		break;
 
 	case LFUN_BUFFER_END:
+	case LFUN_BUFFER_END_SELECT:
+		cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
 		if (cur.depth() == 1) {
-			if (!cur.mark())
-				cur.clearSelection();
 			needsUpdate = cursorBottom(cur);
-			finishChange(cur, false);
-		} else {
-			cur.undispatched();
-		}
-		break;
-
-	case LFUN_BUFFER_ENDSEL:
-		if (cur.depth() == 1) {
-			if (!cur.selection())
-				cur.resetAnchor();
-			needsUpdate = cursorBottom(cur);
-			finishChange(cur, true);
 		} else {
 			cur.undispatched();
 		}
 		break;
 
 	case LFUN_CHAR_FORWARD:
-	case LFUN_CHAR_FORWARDSEL:
+	case LFUN_CHAR_FORWARD_SELECT:
 		//lyxerr << BOOST_CURRENT_FUNCTION
 		//       << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
-		cur.selHandle(cmd.action == LFUN_CHAR_FORWARDSEL);
+		cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
 		if (isRTL(cur.paragraph()))
 			needsUpdate = cursorLeft(cur);
 		else
@@ -477,9 +444,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_CHAR_BACKWARD:
-	case LFUN_BACKWARD_SELECT:
-		//lyxerr << "handle LFUN_CHAR_BACKWARD[SEL]:\n" << cur << endl;
-		cur.selHandle(cmd.action == LFUN_BACKWARD_SELECT);
+	case LFUN_CHAR_BACKWARD_SELECT:
+		//lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
+		cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
 		if (isRTL(cur.paragraph()))
 			needsUpdate = cursorRight(cur);
 		else
@@ -521,96 +488,21 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_PARAGRAPH_UP:
-		if (!cur.mark())
-			cur.clearSelection();
+	case LFUN_PARAGRAPH_UP_SELECT:
+		cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
 		needsUpdate = cursorUpParagraph(cur);
-		finishChange(cur, false);
-		break;
-
-	case LFUN_PARAGRAPH_UPSEL:
-		if (!cur.selection())
-			cur.resetAnchor();
-		cursorUpParagraph(cur);
-		finishChange(cur, true);
 		break;
 
 	case LFUN_PARAGRAPH_DOWN:
-		if (!cur.mark())
-			cur.clearSelection();
+	case LFUN_PARAGRAPH_DOWN_SELECT:
+		cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
 		needsUpdate = cursorDownParagraph(cur);
-		finishChange(cur, false);
-		break;
-
-	case LFUN_PARAGRAPH_DOWNSEL:
-		if (!cur.selection())
-			cur.resetAnchor();
-		cursorDownParagraph(cur);
-		finishChange(cur, true);
-		break;
-
-	case LFUN_SCREEN_UPSEL:
-		update(cur);
-		if (!cur.selection())
-			cur.resetAnchor();
-		needsUpdate = cursorPrevious(cur);
-		finishChange(cur, true);
-		break;
-
-	case LFUN_SCREEN_DOWNSEL:
-		update(cur);
-		if (!cur.selection())
-			cur.resetAnchor();
-		needsUpdate = cursorNext(cur);
-		finishChange(cur, true);
-		break;
-
-	case LFUN_LINE_BEGINSEL:
-		update(cur);
-		if (!cur.selection())
-			cur.resetAnchor();
-		needsUpdate = cursorHome(cur);
-		finishChange(cur, true);
 		break;
 
-	case LFUN_LINE_ENDSEL:
-		update(cur);
-		if (!cur.selection())
-			cur.resetAnchor();
-		needsUpdate = cursorEnd(cur);
-		finishChange(cur, true);
-		break;
-
-	case LFUN_WORD_FORWARDSEL:
-		if (!cur.selection())
-			cur.resetAnchor();
-		if (isRTL(cur.paragraph()))
-			cursorLeftOneWord(cur);
-		else
-			cursorRightOneWord(cur);
-		finishChange(cur, true);
-		break;
-
-	case LFUN_WORD_BACKWARDSEL:
-		if (!cur.selection())
-			cur.resetAnchor();
-		if (isRTL(cur.paragraph()))
-			cursorRightOneWord(cur);
-		else
-			cursorLeftOneWord(cur);
-		finishChange(cur, true);
-		break;
-
-	case LFUN_WORD_SELECT: {
-		selectWord(cur, lyx::WHOLE_WORD);
-		finishChange(cur, true);
-		break;
-	}
-
 	case LFUN_SCREEN_UP:
+	case LFUN_SCREEN_UP_SELECT:
 		update(cur);
-		if (!cur.mark())
-			cur.clearSelection();
-		finishChange(cur, false);
+		cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
 		if (cur.pit() == 0 && cur.textRow().pos() == 0) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_UP);
@@ -620,10 +512,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_SCREEN_DOWN:
+	case LFUN_SCREEN_DOWN_SELECT:
 		update(cur);
-		if (!cur.mark())
-			cur.clearSelection();
-		finishChange(cur, false);
+		cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
 		if (cur.pit() == cur.lastpit()
 			  && cur.textRow().endpos() == cur.lastpos()) {
 			cur.undispatched();
@@ -634,19 +525,43 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_LINE_BEGIN:
-		if (!cur.mark())
-			cur.clearSelection();
+	case LFUN_LINE_BEGIN_SELECT:
+		update(cur);
+		cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
 		needsUpdate = cursorHome(cur);
-		finishChange(cur, false);
 		break;
 
 	case LFUN_LINE_END:
-		if (!cur.mark())
-			cur.clearSelection();
+	case LFUN_LINE_END_SELECT:
+		update(cur);
+		cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
 		needsUpdate = cursorEnd(cur);
-		finishChange(cur, false);
 		break;
 
+	case LFUN_WORD_FORWARD:
+	case LFUN_WORD_FORWARD_SELECT:
+		cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
+		if (isRTL(cur.paragraph()))
+			needsUpdate = cursorLeftOneWord(cur);
+		else
+			needsUpdate = cursorRightOneWord(cur);
+		break;
+
+	case LFUN_WORD_BACKWARD:
+	case LFUN_WORD_BACKWARD_SELECT:
+		cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
+		if (isRTL(cur.paragraph()))
+			needsUpdate = cursorRightOneWord(cur);
+		else
+			needsUpdate = cursorLeftOneWord(cur);
+		break;
+
+	case LFUN_WORD_SELECT: {
+		selectWord(cur, lyx::WHOLE_WORD);
+		finishChange(cur, true);
+		break;
+	}
+
 	case LFUN_BREAK_LINE: {
 		// Not allowed by LaTeX (labels or empty par)
 		if (cur.pos() > cur.paragraph().beginOfBody()) {
@@ -658,7 +573,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_DELETE_FORWARD:
+	case LFUN_CHAR_DELETE_FORWARD:
 		if (!cur.selection()) {
 			if (cur.pos() == cur.paragraph().size())
 				// Par boundary, force full-screen update
@@ -689,9 +604,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 
-	case LFUN_DELETE_FORWARD_BACKWARD:
+	case LFUN_CHAR_DELETE_BACKWARD:
 		if (!cur.selection()) {
-			if (bv->owner()->getIntl().getTransManager().backspace()) {
+			if (bv->getIntl().getTransManager().backspace()) {
 				// Par boundary, full-screen update
 				if (cur.pos() == 0)
 					singleParUpdate = false;
@@ -707,7 +622,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		bv->switchKeyMap();
 		break;
 
-	case LFUN_DELETE_FORWARD_BACKWARD_SKIP:
+	case LFUN_DELETE_BACKWARD_SKIP:
 		// Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
 		if (!cur.selection()) {
 #ifdef WITH_WARNINGS
@@ -728,7 +643,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		bv->switchKeyMap();
 		break;
 
-	case LFUN_BREAK_PARAGRAPHKEEPLAYOUT:
+	case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
 		lyx::cap::replaceSelection(cur);
 		breakParagraph(cur, 1);
 		cur.resetAnchor();
@@ -755,7 +670,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		if (cur_spacing == Spacing::Other)
 			cur_value = par.params().spacing().getValueAsString();
 
-		istringstream is(cmd.argument);
+		istringstream is(lyx::to_utf8(cmd.argument()));
 		string tmp;
 		is >> tmp;
 		Spacing::Space new_spacing = cur_spacing;
@@ -779,8 +694,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		} else if (tmp == "default") {
 			new_spacing = Spacing::Default;
 		} else {
-			lyxerr << _("Unknown spacing argument: ")
-			       << cmd.argument << endl;
+			lyxerr << lyx::to_utf8(_("Unknown spacing argument: "))
+			       << lyx::to_utf8(cmd.argument()) << endl;
 		}
 		if (cur_spacing != new_spacing || cur_value != new_value)
 			par.params().spacing(Spacing(new_spacing, new_value));
@@ -797,31 +712,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_INSET_SETTINGS:
-		cur.inset().showInsetDialog(bv);
+	case LFUN_INSET_DISSOLVE:
+		needsUpdate = dissolveInset(cur);
 		break;
 
-	case LFUN_SCREEN_DOWN_INSET_TOGGLE: {
-		InsetBase * inset = cur.nextInset();
-		// this is the real function we want to invoke
-		cmd = FuncRequest(LFUN_INSET_TOGGLE);
-		cur.undispatched();
-		// if there is an inset at cursor, see whether it
-		// wants to toggle.
-		if (inset) {
-			LCursor tmpcur = cur;
-			tmpcur.pushLeft(*inset);
-			inset->dispatch(tmpcur, cmd);
-			if (tmpcur.result().dispatched()) {
-				cur.clearSelection();
-				cur.dispatched();
-			}
-		}
-		// if it did not work, try the underlying inset.
-		if (!cur.result().dispatched())
-			cur.inset().dispatch(cur, cmd);
+	case LFUN_INSET_SETTINGS:
+		cur.inset().showInsetDialog(bv);
 		break;
-	}
 
 	case LFUN_SPACE_INSERT:
 		if (cur.paragraph().layout()->free_spacing)
@@ -845,7 +742,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		specialChar(cur, InsetSpecialChar::LDOTS);
 		break;
 
-	case LFUN_LINE_END_OF_SENTENCE_PERIOD_INSERT:
+	case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
 		specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
 		break;
 
@@ -872,10 +769,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_PASTE:
 		cur.message(_("Paste"));
 		lyx::cap::replaceSelection(cur);
-		if (isStrUnsignedInt(cmd.argument))
-			pasteSelection(cur, convert<unsigned int>(cmd.argument));
+		if (isStrUnsignedInt(lyx::to_utf8(cmd.argument())))
+			pasteSelection(cur, bv->buffer()->errorList("Paste"),
+			convert<unsigned int>(lyx::to_utf8(cmd.argument())));
 		else
-			pasteSelection(cur, 0);
+			pasteSelection(cur, bv->buffer()->errorList("Paste"),
+			0);
+		bv->buffer()->errors("Paste");
 		cur.clearSelection(); // bug 393
 		bv->switchKeyMap();
 		finishUndo();
@@ -892,18 +792,19 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_SERVER_GET_XY:
-		cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
-			  + convert<string>(cursorY(cur.top(), cur.boundary())));
+		cur.message(lyx::from_utf8(
+			convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
+			  + convert<string>(cursorY(cur.top(), cur.boundary()))));
 		break;
 
 	case LFUN_SERVER_SET_XY: {
 		int x = 0;
 		int y = 0;
-		istringstream is(cmd.argument);
+		istringstream is(lyx::to_utf8(cmd.argument()));
 		is >> x >> y;
 		if (!is)
 			lyxerr << "SETXY: Could not parse coordinates in '"
-			       << cmd.argument << std::endl;
+			       << lyx::to_utf8(cmd.argument()) << std::endl;
 		else
 			setCursorFromCoordinates(cur, x, y);
 		break;
@@ -911,27 +812,27 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_SERVER_GET_FONT:
 		if (current_font.shape() == LyXFont::ITALIC_SHAPE)
-			cur.message("E");
+			cur.message(lyx::from_utf8("E"));
 		else if (current_font.shape() == LyXFont::SMALLCAPS_SHAPE)
-			cur.message("N");
+			cur.message(lyx::from_utf8("N"));
 		else
-			cur.message("0");
+			cur.message(lyx::from_utf8("0"));
 		break;
 
 	case LFUN_SERVER_GET_LAYOUT:
-		cur.message(cur.paragraph().layout()->name());
+		cur.message(lyx::from_utf8(cur.paragraph().layout()->name()));
 		break;
 
 	case LFUN_LAYOUT: {
 		lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
-		  << cmd.argument << endl;
+		  << lyx::to_utf8(cmd.argument()) << endl;
 
 		// This is not the good solution to the empty argument
 		// problem, but it will hopefully suffice for 1.2.0.
 		// The correct solution would be to augument the
 		// function list/array with information about what
 		// functions needs arguments and their type.
-		if (cmd.argument.empty()) {
+		if (cmd.argument().empty()) {
 			cur.errorMessage(_("LyX function 'layout' needs an argument."));
 			break;
 		}
@@ -939,8 +840,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		// Derive layout number from given argument (string)
 		// and current buffer's textclass (number)
 		LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
-		bool hasLayout = tclass.hasLayout(cmd.argument);
-		string layout = cmd.argument;
+		bool hasLayout = tclass.hasLayout(lyx::to_utf8(cmd.argument()));
+		string layout = lyx::to_utf8(cmd.argument());
 
 		// If the entry is obsolete, use the new one instead.
 		if (hasLayout) {
@@ -950,8 +851,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		}
 
 		if (!hasLayout) {
-			cur.errorMessage(string(N_("Layout ")) + cmd.argument +
-				N_(" not known"));
+			cur.errorMessage(lyx::from_utf8(N_("Layout ")) + cmd.argument() +
+				lyx::from_utf8(N_(" not known")));
 			break;
 		}
 
@@ -980,12 +881,25 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	case LFUN_CLIPBOARD_PASTE: {
+		cur.clearSelection();
+		docstring const clip = bv->owner()->gui().clipboard().get();
+		if (!clip.empty()) {
+			recordUndo(cur);
+			if (cmd.argument() == "paragraph")
+				insertStringAsParagraphs(cur, clip);
+			else
+				insertStringAsLines(cur, clip);
+		}
+		break;
+	}
+
 	case LFUN_PRIMARY_SELECTION_PASTE: {
 		cur.clearSelection();
-		string const clip = bv->getClipboard();
+		docstring const clip = bv->owner()->gui().selection().get();
 		if (!clip.empty()) {
 			recordUndo(cur);
-			if (cmd.argument == "paragraph")
+			if (cmd.argument() == "paragraph")
 				insertStringAsParagraphs(cur, clip);
 			else
 				insertStringAsLines(cur, clip);
@@ -1010,7 +924,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		BufferParams const & bufparams = bv->buffer()->params();
 		if (!style->pass_thru
 		    && par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
-			string arg = cmd.argument;
+			string arg = lyx::to_utf8(cmd.argument());
 			if (arg == "single")
 				cur.insert(new InsetQuotes(c,
 				    bufparams.quotes_language,
@@ -1027,12 +941,12 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_DATE_INSERT:
-		if (cmd.argument.empty())
+		if (cmd.argument().empty())
 			bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
 				lyx::formatted_time(lyx::current_time())));
 		else
 			bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
-				lyx::formatted_time(lyx::current_time(), cmd.argument)));
+				lyx::formatted_time(lyx::current_time(), lyx::to_utf8(cmd.argument()))));
 		break;
 
 	case LFUN_MOUSE_TRIPLE:
@@ -1042,7 +956,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 			cursorEnd(cur);
 			cur.setSelection();
 			bv->cursor() = cur;
-			bv->haveSelection(cur.selection());
+			bv->owner()->gui().selection().haveSelection(cur.selection());
 		}
 		break;
 
@@ -1050,7 +964,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		if (cmd.button() == mouse_button::button1) {
 			selectWord(cur, lyx::WHOLE_WORD_STRICT);
 			bv->cursor() = cur;
-			bv->haveSelection(cur.selection());
+			bv->owner()->gui().selection().haveSelection(cur.selection());
 		}
 		break;
 
@@ -1132,7 +1046,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 		// finish selection
 		if (cmd.button() == mouse_button::button1)
-			bv->haveSelection(cur.selection());
+			bv->owner()->gui().selection().haveSelection(cur.selection());
 
 		bv->switchKeyMap();
 		bv->owner()->updateMenubar();
@@ -1141,7 +1055,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_SELF_INSERT: {
-		if (cmd.argument.empty())
+		if (cmd.argument().empty())
 			break;
 
 		// Automatically delete the currently selected
@@ -1153,21 +1067,24 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		if (lyxrc.auto_region_delete) {
 			if (cur.selection())
 				cutSelection(cur, false, false);
-			bv->haveSelection(false);
+			bv->owner()->gui().selection().haveSelection(false);
 		}
 
 		cur.clearSelection();
 		LyXFont const old_font = real_current_font;
 
-		string::const_iterator cit = cmd.argument.begin();
-		string::const_iterator end = cmd.argument.end();
+		docstring::const_iterator cit = cmd.argument().begin();
+		docstring::const_iterator end = cmd.argument().end();
 		for (; cit != end; ++cit)
-			bv->owner()->getIntl().getTransManager().
+#if 0
+			bv->getIntl().getTransManager().
 				translateAndInsert(*cit, this);
+#else
+			insertChar(bv->cursor(), *cit);
+#endif
 
 		cur.resetAnchor();
 		moveCursor(cur, false);
-		bv->updateScrollbar();
 		break;
 	}
 
@@ -1187,13 +1104,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_LABEL_INSERT: {
 		// Try to generate a valid label
-		string const contents = cmd.argument.empty() ?
-			cur.getPossibleLabel() : cmd.argument;
+		string const contents = cmd.argument().empty() ?
+			cur.getPossibleLabel() : lyx::to_utf8(cmd.argument());
 
 		InsetCommandParams p("label", contents);
 		string const data = InsetCommandMailer::params2string("label", p);
 
-		if (cmd.argument.empty()) {
+		if (cmd.argument().empty()) {
 			bv->owner()->getDialogs().show("label", data, 0);
 		} else {
 			FuncRequest fr(LFUN_INSET_INSERT, data);
@@ -1280,7 +1197,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_MATH_IMPORT_SELECTION:
 	case LFUN_MATH_MODE:
-		if (cmd.argument == "on")
+		if (cmd.argument() == "on")
 			// don't pass "on" as argument
 			mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
 		else
@@ -1288,10 +1205,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_MATH_MACRO:
-		if (cmd.argument.empty())
-			cur.errorMessage(N_("Missing argument"));
+		if (cmd.argument().empty())
+			cur.errorMessage(lyx::from_utf8(N_("Missing argument")));
 		else {
-			string s = cmd.argument;
+			string s = lyx::to_utf8(cmd.argument());
 			string const s1 = token(s, ' ', 1);
 			int const nargs = s1.empty() ? 0 : convert<int>(s1);
 			string const s2 = token(s, ' ', 2);
@@ -1313,7 +1230,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_MATH_MATRIX:
 	case LFUN_MATH_DELIM:
 	case LFUN_MATH_BIGDELIM: {
-		cur.insert(new MathHullInset("simple"));
+		cur.insert(new InsetMathHull(hullSimple));
 		cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
 		cur.dispatch(cmd);
 		break;
@@ -1376,13 +1293,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_FONT_SIZE: {
 		LyXFont font(LyXFont::ALL_IGNORE);
-		font.setLyXSize(cmd.argument);
+		font.setLyXSize(lyx::to_utf8(cmd.argument()));
 		toggleAndShow(cur, this, font);
 		break;
 	}
 
 	case LFUN_LANGUAGE: {
-		Language const * lang = languages.getLanguage(cmd.argument);
+		Language const * lang = languages.getLanguage(lyx::to_utf8(cmd.argument()));
 		if (!lang)
 			break;
 		LyXFont font(LyXFont::ALL_IGNORE);
@@ -1402,7 +1319,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_FONT_FREE_UPDATE: {
 		LyXFont font;
 		bool toggle;
-		if (bv_funcs::string2font(cmd.argument, font, toggle)) {
+		if (bv_funcs::string2font(lyx::to_utf8(cmd.argument()), font, toggle)) {
 			freefont = font;
 			toggleall = toggle;
 			toggleAndShow(cur, this, freefont, toggleall);
@@ -1470,14 +1387,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_ACCENT_CIRCLE:
 	case LFUN_ACCENT_OGONEK:
 		bv->owner()->getLyXFunc().handleKeyFunc(cmd.action);
-		if (!cmd.argument.empty())
-			bv->owner()->getIntl().getTransManager()
-				.translateAndInsert(cmd.argument[0], this);
+		if (!cmd.argument().empty())
+			// FIXME: Are all these characters encoded in one byte in utf8?
+			bv->getIntl().getTransManager()
+				.translateAndInsert(cmd.argument()[0], this);
 		break;
 
 	case LFUN_FLOAT_LIST: {
 		LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
-		if (tclass.floats().typeExist(cmd.argument)) {
+		if (tclass.floats().typeExist(lyx::to_utf8(cmd.argument()))) {
 			// not quite sure if we want this...
 			recordUndo(cur);
 			cur.clearSelection();
@@ -1490,27 +1408,27 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 			setLayout(cur, tclass.defaultLayoutName());
 			setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, string(), 0);
-			insertInset(cur, new InsetFloatList(cmd.argument));
+			insertInset(cur, new InsetFloatList(lyx::to_utf8(cmd.argument())));
 			cur.posRight();
 		} else {
 			lyxerr << "Non-existent float type: "
-			       << cmd.argument << endl;
+			       << lyx::to_utf8(cmd.argument()) << endl;
 		}
 		break;
 	}
 
-	case LFUN_ACCEPT_CHANGE: {
+	case LFUN_CHANGE_ACCEPT: {
 		acceptChange(cur);
 		break;
 	}
 
-	case LFUN_REJECT_CHANGE: {
+	case LFUN_CHANGE_REJECT: {
 		rejectChange(cur);
 		break;
 	}
 
 	case LFUN_THESAURUS_ENTRY: {
-		string arg = cmd.argument;
+		docstring arg = cmd.argument();
 		if (arg.empty()) {
 			arg = cur.selectionAsString(false);
 			// FIXME
@@ -1520,7 +1438,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 				arg = cur.selectionAsString(false);
 			}
 		}
-		bv->owner()->getDialogs().show("thesaurus", arg);
+		bv->owner()->getDialogs().show("thesaurus", lyx::to_utf8(arg));
 		break;
 	}
 
@@ -1528,7 +1446,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		// Given data, an encoding of the ParagraphParameters
 		// generated in the Paragraph dialog, this function sets
 		// the current paragraph appropriately.
-		istringstream is(cmd.argument);
+		istringstream is(lyx::to_utf8(cmd.argument()));
 		LyXLex lex(0, 0);
 		lex.setStream(is);
 		ParagraphParameters params;
@@ -1542,15 +1460,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_INSET_DIALOG_SHOW: {
-		InsetBase * inset = cur.nextInset();
-		if (inset) {
-			FuncRequest fr(LFUN_INSET_DIALOG_SHOW);
-			inset->dispatch(cur, fr);
-		}
-		break;
-	}
-
 	case LFUN_ESCAPE:
 		if (cur.selection()) {
 			cur.selection() = false;
@@ -1620,41 +1529,41 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 		break;
 
 	case LFUN_DIALOG_SHOW_NEW_INSET:
-		if (cmd.argument == "bibitem")
+		if (cmd.argument() == "bibitem")
 			code = InsetBase::BIBITEM_CODE;
-		else if (cmd.argument == "bibtex")
+		else if (cmd.argument() == "bibtex")
 			code = InsetBase::BIBTEX_CODE;
-		else if (cmd.argument == "box")
+		else if (cmd.argument() == "box")
 			code = InsetBase::BOX_CODE;
-		else if (cmd.argument == "branch")
+		else if (cmd.argument() == "branch")
 			code = InsetBase::BRANCH_CODE;
-		else if (cmd.argument == "citation")
+		else if (cmd.argument() == "citation")
 			code = InsetBase::CITE_CODE;
-		else if (cmd.argument == "ert")
+		else if (cmd.argument() == "ert")
 			code = InsetBase::ERT_CODE;
-		else if (cmd.argument == "external")
+		else if (cmd.argument() == "external")
 			code = InsetBase::EXTERNAL_CODE;
-		else if (cmd.argument == "float")
+		else if (cmd.argument() == "float")
 			code = InsetBase::FLOAT_CODE;
-		else if (cmd.argument == "graphics")
+		else if (cmd.argument() == "graphics")
 			code = InsetBase::GRAPHICS_CODE;
-		else if (cmd.argument == "include")
+		else if (cmd.argument() == "include")
 			code = InsetBase::INCLUDE_CODE;
-		else if (cmd.argument == "index")
+		else if (cmd.argument() == "index")
 			code = InsetBase::INDEX_CODE;
-		else if (cmd.argument == "label")
+		else if (cmd.argument() == "label")
 			code = InsetBase::LABEL_CODE;
-		else if (cmd.argument == "note")
+		else if (cmd.argument() == "note")
 			code = InsetBase::NOTE_CODE;
-		else if (cmd.argument == "ref")
+		else if (cmd.argument() == "ref")
 			code = InsetBase::REF_CODE;
-		else if (cmd.argument == "toc")
+		else if (cmd.argument() == "toc")
 			code = InsetBase::TOC_CODE;
-		else if (cmd.argument == "url")
+		else if (cmd.argument() == "url")
 			code = InsetBase::URL_CODE;
-		else if (cmd.argument == "vspace")
+		else if (cmd.argument() == "vspace")
 			code = InsetBase::VSPACE_CODE;
-		else if (cmd.argument == "wrap")
+		else if (cmd.argument() == "wrap")
 			code = InsetBase::WRAP_CODE;
 		break;
 
@@ -1740,7 +1649,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_HFILL_INSERT:
 	case LFUN_MENU_SEPARATOR_INSERT:
 	case LFUN_DOTS_INSERT:
-	case LFUN_LINE_END_OF_SENTENCE_PERIOD_INSERT:
+	case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
 		code = InsetBase::SPECIALCHAR_CODE;
 		break;
 	case LFUN_SPACE_INSERT:
@@ -1749,25 +1658,6 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 			code = InsetBase::SPACE_CODE;
 		break;
 
-#ifdef WITH_WARNINGS
-#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005)
-#endif
-#if 0
-	case LFUN_INSET_DIALOG_SHOW: {
-		InsetBase * inset = cur.nextInset();
-		enable = inset;
-		if (inset) {
-			code = inset->lyxCode();
-			if (!(code == InsetBase::INCLUDE_CODE
-				|| code == InsetBase::BIBTEX_CODE
-				|| code == InsetBase::FLOAT_LIST_CODE
-				|| code == InsetBase::TOC_CODE))
-				enable = false;
-		}
-		break;
-	}
-#endif
-
 	case LFUN_INSET_MODIFY:
 		// We need to disable this, because we may get called for a
 		// tabular cell via
@@ -1809,37 +1699,39 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 		enable = lyx::cap::numberOfSelections() > 0;
 		break;
 
-	case LFUN_PARAGRAPH_MOVE_UP: {
+	case LFUN_PARAGRAPH_MOVE_UP:
 		enable = cur.pit() > 0 && !cur.selection();
 		break;
-	}
 
-	case LFUN_PARAGRAPH_MOVE_DOWN: {
+	case LFUN_PARAGRAPH_MOVE_DOWN:
 		enable = cur.pit() < cur.lastpit() && !cur.selection();
 		break;
-	}
 
-	case LFUN_DELETE_FORWARD_WORD_FORWARD:
-	case LFUN_DELETE_FORWARD_WORD_BACKWARD:
-	case LFUN_DELETE_FORWARD_LINE_FORWARD:
+	case LFUN_INSET_DISSOLVE:
+		enable = !isMainText() && cur.inset().nargs() == 1;
+		break;
+
+	case LFUN_WORD_DELETE_FORWARD:
+	case LFUN_WORD_DELETE_BACKWARD:
+	case LFUN_LINE_DELETE:
 	case LFUN_WORD_FORWARD:
 	case LFUN_WORD_BACKWARD:
 	case LFUN_CHAR_FORWARD:
-	case LFUN_CHAR_FORWARDSEL:
+	case LFUN_CHAR_FORWARD_SELECT:
 	case LFUN_CHAR_BACKWARD:
-	case LFUN_BACKWARD_SELECT:
+	case LFUN_CHAR_BACKWARD_SELECT:
 	case LFUN_UP:
 	case LFUN_UP_SELECT:
 	case LFUN_DOWN:
 	case LFUN_DOWN_SELECT:
-	case LFUN_PARAGRAPH_UPSEL:
-	case LFUN_PARAGRAPH_DOWNSEL:
-	case LFUN_SCREEN_UPSEL:
-	case LFUN_SCREEN_DOWNSEL:
-	case LFUN_LINE_BEGINSEL:
-	case LFUN_LINE_ENDSEL:
-	case LFUN_WORD_FORWARDSEL:
-	case LFUN_WORD_BACKWARDSEL:
+	case LFUN_PARAGRAPH_UP_SELECT:
+	case LFUN_PARAGRAPH_DOWN_SELECT:
+	case LFUN_SCREEN_UP_SELECT:
+	case LFUN_SCREEN_DOWN_SELECT:
+	case LFUN_LINE_BEGIN_SELECT:
+	case LFUN_LINE_END_SELECT:
+	case LFUN_WORD_FORWARD_SELECT:
+	case LFUN_WORD_BACKWARD_SELECT:
 	case LFUN_WORD_SELECT:
 	case LFUN_PARAGRAPH_UP:
 	case LFUN_PARAGRAPH_DOWN:
@@ -1848,16 +1740,15 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_LINE_BEGIN:
 	case LFUN_LINE_END:
 	case LFUN_BREAK_LINE:
-	case LFUN_DELETE_FORWARD:
+	case LFUN_CHAR_DELETE_FORWARD:
 	case LFUN_DELETE_FORWARD_SKIP:
-	case LFUN_DELETE_FORWARD_BACKWARD:
-	case LFUN_DELETE_FORWARD_BACKWARD_SKIP:
+	case LFUN_CHAR_DELETE_BACKWARD:
+	case LFUN_DELETE_BACKWARD_SKIP:
 	case LFUN_BREAK_PARAGRAPH:
-	case LFUN_BREAK_PARAGRAPHKEEPLAYOUT:
+	case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
 	case LFUN_BREAK_PARAGRAPH_SKIP:
 	case LFUN_PARAGRAPH_SPACING:
 	case LFUN_INSET_INSERT:
-	case LFUN_SCREEN_DOWN_INSET_TOGGLE:
 	case LFUN_WORD_UPCASE:
 	case LFUN_WORD_LOWCASE:
 	case LFUN_WORD_CAPITALIZE:
@@ -1867,6 +1758,7 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_SERVER_GET_FONT:
 	case LFUN_SERVER_GET_LAYOUT:
 	case LFUN_LAYOUT:
+	case LFUN_CLIPBOARD_PASTE:
 	case LFUN_PRIMARY_SELECTION_PASTE:
 	case LFUN_DATE_INSERT:
 	case LFUN_SELF_INSERT:
@@ -1907,15 +1799,15 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_ACCENT_HUNGARIAN_UMLAUT:
 	case LFUN_ACCENT_CIRCLE:
 	case LFUN_ACCENT_OGONEK:
-	case LFUN_ACCEPT_CHANGE:
-	case LFUN_REJECT_CHANGE:
+	case LFUN_CHANGE_ACCEPT:
+	case LFUN_CHANGE_REJECT:
 	case LFUN_THESAURUS_ENTRY:
 	case LFUN_PARAGRAPH_PARAMS_APPLY:
 	case LFUN_ESCAPE:
 	case LFUN_BUFFER_END:
 	case LFUN_BUFFER_BEGIN:
-	case LFUN_BUFFER_BEGINSEL:
-	case LFUN_BUFFER_ENDSEL:
+	case LFUN_BUFFER_BEGIN_SELECT:
+	case LFUN_BUFFER_END_SELECT:
 		// these are handled in our dispatch()
 		enable = true;
 		break;