X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=2092ac6ac0fb19c52a0278f209a0f818ee047fba;hb=74c9165190133af19c95584e4922ed749db0f9fe;hp=f306a6d2de1eb862c69e8ef2ba4f09d2174b7522;hpb=c7a09888a1c15d20f8757b7e3b1001d757ba53f5;p=lyx.git

diff --git a/src/Text3.cpp b/src/Text3.cpp
index f306a6d2de..2092ac6ac0 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -37,39 +37,43 @@
 #include "Language.h"
 #include "Layout.h"
 #include "LyXAction.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
+#include "SpellChecker.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
-#include "VSpace.h"
+#include "WordLangTuple.h"
 
 #include "frontends/Application.h"
 #include "frontends/Clipboard.h"
-#include "frontends/LyXView.h"
 #include "frontends/Selection.h"
-#include "frontends/WorkArea.h"
 
+#include "insets/InsetArgument.h"
 #include "insets/InsetCollapsable.h"
 #include "insets/InsetCommand.h"
 #include "insets/InsetExternal.h"
+#include "insets/InsetFloat.h"
 #include "insets/InsetFloatList.h"
 #include "insets/InsetGraphics.h"
 #include "insets/InsetGraphicsParams.h"
+#include "insets/InsetIPAMacro.h"
 #include "insets/InsetNewline.h"
 #include "insets/InsetQuotes.h"
 #include "insets/InsetSpecialChar.h"
 #include "insets/InsetText.h"
+#include "insets/InsetWrap.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
 #include "support/os.h"
+#include "support/regex.h"
 
 #include "mathed/InsetMathHull.h"
 #include "mathed/MathMacroTemplate.h"
@@ -92,6 +96,7 @@ using cap::pasteClipboardGraphics;
 using cap::replaceSelection;
 using cap::grabAndEraseSelection;
 using cap::selClearOrDel;
+using cap::pasteSimpleText;
 
 // globals...
 static Font freefont(ignore_font, ignore_language);
@@ -142,9 +147,9 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
 #ifdef ENABLE_ASSERTIONS
 		const int old_pos = cur.pos();
 #endif
-		cur.insert(new InsetMathHull(hullSimple));
+		cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
 #ifdef ENABLE_ASSERTIONS
-		LASSERT(old_pos == cur.pos(), /**/);
+		LATTEST(old_pos == cur.pos());
 #endif
 		cur.nextInset()->edit(cur, true);
 		// don't do that also for LFUN_MATH_MODE
@@ -166,7 +171,7 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
 				&& sel.find(from_ascii("\\newlyxcommand")) == string::npos
 				&& sel.find(from_ascii("\\def")) == string::npos)
 		{
-			InsetMathHull * formula = new InsetMathHull;
+			InsetMathHull * formula = new InsetMathHull(cur.buffer());
 			string const selstr = to_utf8(sel);
 			istringstream is(selstr);
 			Lexer lex;
@@ -185,7 +190,7 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
 			} else
 				cur.insert(formula);
 		} else {
-			cur.insert(new MathMacroTemplate(sel));
+			cur.insert(new MathMacroTemplate(cur.buffer(), sel));
 		}
 	}
 	if (valid)
@@ -197,19 +202,20 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
 
 void regexpDispatch(Cursor & cur, FuncRequest const & cmd)
 {
-	BOOST_ASSERT(cmd.action == LFUN_REGEXP_MODE);
+	LASSERT(cmd.action() == LFUN_REGEXP_MODE, return);
 	if (cur.inRegexped()) {
-		cur.message(_("Already in regexp mode"));
+		cur.message(_("Already in regular expression mode"));
 		return;
 	}
 	cur.recordUndo();
-	docstring const save_selection = grabAndEraseSelection(cur);
-	selClearOrDel(cur);
-	// replaceSelection(cur);
+	docstring sel = cur.selectionAsString(false);
+
+	// It may happen that sel is empty but there is a selection
+	replaceSelection(cur);
 
-	cur.insert(new InsetMathHull(hullRegexp));
+	cur.insert(new InsetMathHull(cur.buffer(), hullRegexp));
 	cur.nextInset()->edit(cur, true);
-	cur.niceInsert(save_selection);
+	cur.niceInsert(sel);
 
 	cur.message(_("Regexp editor mode"));
 }
@@ -224,27 +230,39 @@ static void specialChar(Cursor & cur, InsetSpecialChar::Kind kind)
 }
 
 
+static void ipaChar(Cursor & cur, InsetIPAChar::Kind kind)
+{
+	cur.recordUndo();
+	cap::replaceSelection(cur);
+	cur.insert(new InsetIPAChar(kind));
+	cur.posForward();
+}
+
+
 static bool doInsertInset(Cursor & cur, Text * text,
 	FuncRequest const & cmd, bool edit, bool pastesel)
 {
 	Buffer & buffer = cur.bv().buffer();
 	BufferParams const & bparams = buffer.params();
-	Inset * inset = createInset(buffer, cmd);
+	Inset * inset = createInset(&buffer, cmd);
 	if (!inset)
 		return false;
 
 	if (InsetCollapsable * ci = inset->asInsetCollapsable())
-		ci->setLayout(bparams);
+		ci->setButtonLabel();
 
 	cur.recordUndo();
-	if (cmd.action == LFUN_INDEX_INSERT) {
+	if (cmd.action() == LFUN_INDEX_INSERT) {
 		docstring ds = subst(text->getStringToIndex(cur), '\n', ' ');
 		text->insertInset(cur, inset);
 		if (edit)
 			inset->edit(cur, true);
 		// Now put this into inset
-		static_cast<InsetCollapsable *>(inset)->
-				text().insertStringAsParagraphs(cur, ds);
+		Font const f(inherit_font, cur.current_font.language());
+		if (!ds.empty()) {
+			cur.text()->insertStringAsLines(cur, ds, f);
+			cur.leaveInset(*inset);
+		}
 		return true;
 	}
 
@@ -266,17 +284,27 @@ static bool doInsertInset(Cursor & cur, Text * text,
 	cur.buffer()->errors("Paste");
 	cur.clearSelection(); // bug 393
 	cur.finishUndo();
-	InsetText * insetText = dynamic_cast<InsetText *>(inset);
-	if (insetText && (!insetText->allowMultiPar() || cur.lastpit() == 0)) {
-		// reset first par to default
-		cur.text()->paragraphs().begin()
-			->setPlainOrDefaultLayout(bparams.documentClass());
-		cur.pos() = 0;
-		cur.pit() = 0;
-		// Merge multiple paragraphs -- hack
-		while (cur.lastpit() > 0)
-			mergeParagraph(bparams, cur.text()->paragraphs(), 0);
-		cur.leaveInset(*inset);
+	InsetText * inset_text = inset->asInsetText();
+	if (inset_text) {
+		inset_text->fixParagraphsFont();
+		if (!inset_text->allowMultiPar() || cur.lastpit() == 0) {
+			// reset first par to default
+			cur.text()->paragraphs().begin()
+				->setPlainOrDefaultLayout(bparams.documentClass());
+			cur.pos() = 0;
+			cur.pit() = 0;
+			// Merge multiple paragraphs -- hack
+			while (cur.lastpit() > 0)
+				mergeParagraph(bparams, cur.text()->paragraphs(), 0);
+			if (cmd.action() == LFUN_FLEX_INSERT)
+				return true;
+			Cursor old = cur;
+			cur.leaveInset(*inset);
+			if (cmd.action() == LFUN_PREVIEW_INSERT
+			    || cmd.action() == LFUN_IPA_INSERT)
+				// trigger preview
+				notifyCursorLeavesOrEnters(old, cur);
+		}
 	} else {
 		cur.leaveInset(*inset);
 		// reset surrounding par to default
@@ -286,7 +314,6 @@ static bool doInsertInset(Cursor & cur, Text * text,
 			: dc.defaultLayoutName();
 		text->setLayout(cur, layoutname);
 	}
-
 	return true;
 }
 
@@ -311,27 +338,27 @@ static void outline(OutlineOp mode, Cursor & cur)
 	Buffer & buf = *cur.buffer();
 	pit_type & pit = cur.pit();
 	ParagraphList & pars = buf.text().paragraphs();
-	ParagraphList::iterator bgn = pars.begin();
+	ParagraphList::iterator const bgn = pars.begin();
 	// The first paragraph of the area to be copied:
 	ParagraphList::iterator start = boost::next(bgn, pit);
 	// The final paragraph of area to be copied:
 	ParagraphList::iterator finish = start;
-	ParagraphList::iterator end = pars.end();
+	ParagraphList::iterator const end = pars.end();
 
 	DocumentClass const & tc = buf.params().documentClass();
 
-	int const thistoclevel = start->layout().toclevel;
+	int const thistoclevel = buf.text().getTocLevel(distance(bgn, start));
 	int toclevel;
 
 	// Move out (down) from this section header
 	if (finish != end)
 		++finish;
+
 	// Seek the one (on same level) below
 	for (; finish != end; ++finish) {
-		toclevel = finish->layout().toclevel;
-		if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) {
+		toclevel = buf.text().getTocLevel(distance(bgn, finish));
+		if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
 			break;
-		}
 	}
 
 	switch (mode) {
@@ -346,7 +373,7 @@ static void outline(OutlineOp mode, Cursor & cur)
 			// Search previous same-level header above
 			do {
 				--dest;
-				toclevel = dest->layout().toclevel;
+				toclevel = buf.text().getTocLevel(distance(bgn, dest));
 			} while(dest != bgn
 				&& (toclevel == Layout::NOT_IN_TOC
 				    || toclevel > thistoclevel));
@@ -357,11 +384,9 @@ static void outline(OutlineOp mode, Cursor & cur)
 			pit_type const len = distance(start, finish);
 			pit_type const deletepit = pit + len;
 			buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1);
-			pars.insert(dest, start, finish);
-			start = boost::next(pars.begin(), deletepit);
-			pit = newpit;
-			pars.erase(start, finish);
-			return;
+			pars.splice(dest, start, finish);
+			cur.pit() = newpit;
+			break;
 		}
 		case OutlineDown: {
 			if (finish == end)
@@ -371,59 +396,39 @@ static void outline(OutlineOp mode, Cursor & cur)
 			ParagraphList::iterator dest = boost::next(finish, 1);
 			// Go further down to find header to insert in front of:
 			for (; dest != end; ++dest) {
-				toclevel = dest->layout().toclevel;
+				toclevel = buf.text().getTocLevel(distance(bgn, dest));
 				if (toclevel != Layout::NOT_IN_TOC
-				    && toclevel <= thistoclevel) {
+				      && toclevel <= thistoclevel)
 					break;
-				}
 			}
 			// One such was found:
 			pit_type newpit = distance(bgn, dest);
-			pit_type const len = distance(start, finish);
 			buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
-			pars.insert(dest, start, finish);
-			start = boost::next(bgn, pit);
-			pit = newpit - len;
-			pars.erase(start, finish);
-			return;
+			pit_type const len = distance(start, finish);
+			pars.splice(dest, start, finish);
+			cur.pit() = newpit - len;
+			break;
 		}
-		case OutlineIn: {
+		case OutlineIn:
+		case OutlineOut: {
 			pit_type const len = distance(start, finish);
 			buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
 			for (; start != finish; ++start) {
-				toclevel = start->layout().toclevel;
+				toclevel = buf.text().getTocLevel(distance(bgn, start));
 				if (toclevel == Layout::NOT_IN_TOC)
 					continue;
 				DocumentClass::const_iterator lit = tc.begin();
 				DocumentClass::const_iterator len = tc.end();
 				for (; lit != len; ++lit) {
-					if (lit->toclevel == toclevel + 1 &&
+					if (lit->toclevel == (mode == OutlineIn ?
+							      toclevel + 1 : toclevel - 1) &&
 					    start->layout().labeltype == lit->labeltype) {
 						start->setLayout(*lit);
 						break;
 					}
 				}
 			}
-			return;
-		}
-		case OutlineOut: {
-			pit_type const len = distance(start, finish);
-			buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1);
-			for (; start != finish; ++start) {
-				toclevel = start->layout().toclevel;
-				if (toclevel == Layout::NOT_IN_TOC)
-					continue;
-				DocumentClass::const_iterator lit = tc.begin();
-				DocumentClass::const_iterator len = tc.end();
-				for (; lit != len; ++lit) {
-					if (lit->toclevel == toclevel - 1 &&
-						start->layout().labeltype == lit->labeltype) {
-							start->setLayout(*lit);
-							break;
-					}
-				}
-			}
-			return;
+			break;
 		}
 	}
 }
@@ -437,8 +442,9 @@ void Text::number(Cursor & cur)
 }
 
 
-bool Text::isRTL(Buffer const & buffer, Paragraph const & par) const
+bool Text::isRTL(Paragraph const & par) const
 {
+	Buffer const & buffer = owner_->buffer();
 	return par.isRTL(buffer.params());
 }
 
@@ -447,39 +453,49 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 {
 	LYXERR(Debug::ACTION, "Text::dispatch: cmd: " << cmd);
 
+	// Dispatch if the cursor is inside the text. It is not the
+	// case for context menus (bug 5797).
+	if (cur.text() != this) {
+		cur.undispatched();
+		return;
+	}
+
 	BufferView * bv = &cur.bv();
-	TextMetrics & tm = bv->textMetrics(this);
-	if (!tm.contains(cur.pit())) {
+	TextMetrics * tm = &bv->textMetrics(this);
+	if (!tm->contains(cur.pit())) {
 		lyx::dispatch(FuncRequest(LFUN_SCREEN_SHOW_CURSOR));
-		tm = bv->textMetrics(this);
+		tm = &bv->textMetrics(this);
 	}
 
 	// FIXME: We use the update flag to indicates wether a singlePar or a
 	// full screen update is needed. We reset it here but shall we restore it
 	// at the end?
-	cur.noUpdate();
+	cur.noScreenUpdate();
 
-	LASSERT(cur.text() == this, /**/);
-	CursorSlice oldTopSlice = cur.top();
-	bool oldBoundary = cur.boundary();
-	bool sel = cur.selection();
+	LBUFERR(this == cur.text());
+	CursorSlice const oldTopSlice = cur.top();
+	bool const oldBoundary = cur.boundary();
+	bool const oldSelection = cur.selection();
 	// Signals that, even if needsUpdate == false, an update of the
 	// cursor paragraph is required
-	bool singleParUpdate = lyxaction.funcHasFlag(cmd.action,
+	bool singleParUpdate = lyxaction.funcHasFlag(cmd.action(),
 		LyXAction::SingleParUpdate);
 	// Signals that a full-screen update is required
-	bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action,
+	bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action(),
 		LyXAction::NoUpdate) || singleParUpdate);
+	bool const last_misspelled = lyxrc.spellcheck_continuously
+		&& cur.paragraph().isMisspelled(cur.pos(), true);
 
-	switch (cmd.action) {
+	FuncCode const act = cmd.action();
+	switch (act) {
 
 	case LFUN_PARAGRAPH_MOVE_DOWN: {
 		pit_type const pit = cur.pit();
 		recUndo(cur, pit, pit + 1);
 		cur.finishUndo();
-		swap(pars_[pit], pars_[pit + 1]);
-		cur.buffer()->updateLabels();
+		pars_.swap(pit, pit + 1);
 		needsUpdate = true;
+		cur.forceBufferUpdate();
 		++cur.pit();
 		break;
 	}
@@ -488,10 +504,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		pit_type const pit = cur.pit();
 		recUndo(cur, pit - 1, pit);
 		cur.finishUndo();
-		swap(pars_[pit], pars_[pit - 1]);
-		cur.buffer()->updateLabels();
+		pars_.swap(pit, pit - 1);
 		--cur.pit();
 		needsUpdate = true;
+		cur.forceBufferUpdate();
 		break;
 	}
 
@@ -515,7 +531,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		par.params().startOfAppendix(start);
 
 		// we can set the refreshing parameters now
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		break;
 	}
 
@@ -535,84 +551,112 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		finishChange(cur, false);
 		break;
 
-	case LFUN_LINE_DELETE:
+	case LFUN_LINE_DELETE_FORWARD:
 		if (cur.selection())
 			cutSelection(cur, true, false);
 		else
-			tm.deleteLineForward(cur);
+			tm->deleteLineForward(cur);
 		finishChange(cur, false);
 		break;
 
 	case LFUN_BUFFER_BEGIN:
 	case LFUN_BUFFER_BEGIN_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
+		needsUpdate |= cur.selHandle(act == LFUN_BUFFER_BEGIN_SELECT);
 		if (cur.depth() == 1)
 			needsUpdate |= cursorTop(cur);
 		else
 			cur.undispatched();
-		cur.updateFlags(Update::FitCursor);
+		cur.screenUpdateFlags(Update::FitCursor);
 		break;
 
 	case LFUN_BUFFER_END:
 	case LFUN_BUFFER_END_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
+		needsUpdate |= cur.selHandle(act == LFUN_BUFFER_END_SELECT);
 		if (cur.depth() == 1)
 			needsUpdate |= cursorBottom(cur);
 		else
 			cur.undispatched();
-		cur.updateFlags(Update::FitCursor);
+		cur.screenUpdateFlags(Update::FitCursor);
 		break;
 
 	case LFUN_INSET_BEGIN:
 	case LFUN_INSET_BEGIN_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_INSET_BEGIN_SELECT);
-		if (cur.depth() == 1 || cur.pos() > 0)
+		needsUpdate |= cur.selHandle(act == LFUN_INSET_BEGIN_SELECT);
+		if (cur.depth() == 1 || !cur.top().at_begin())
 			needsUpdate |= cursorTop(cur);
 		else
 			cur.undispatched();
-		cur.updateFlags(Update::FitCursor);
+		cur.screenUpdateFlags(Update::FitCursor);
 		break;
 
 	case LFUN_INSET_END:
 	case LFUN_INSET_END_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_INSET_END_SELECT);
-		if (cur.depth() == 1 || cur.pos() < cur.lastpos())
+		needsUpdate |= cur.selHandle(act == LFUN_INSET_END_SELECT);
+		if (cur.depth() == 1 || !cur.top().at_end())
 			needsUpdate |= cursorBottom(cur);
 		else
 			cur.undispatched();
-		cur.updateFlags(Update::FitCursor);
+		cur.screenUpdateFlags(Update::FitCursor);
 		break;
 
 	case LFUN_CHAR_FORWARD:
 	case LFUN_CHAR_FORWARD_SELECT:
 		//LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur);
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
+		needsUpdate |= cur.selHandle(act == LFUN_CHAR_FORWARD_SELECT);
 		needsUpdate |= cursorForward(cur);
 
 		if (!needsUpdate && oldTopSlice == cur.top()
 				&& cur.boundary() == oldBoundary) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_FORWARD);
+
+			// we will probably be moving out the inset, so we should execute
+			// the depm-mechanism, but only when the cursor has a place to
+			// go outside this inset, i.e. in a slice above.
+			if (cur.depth() > 1 && cur.pos() == cur.lastpos()
+				  && cur.pit() == cur.lastpit()) {
+				// The cursor hasn't changed yet. To give the
+				// DEPM the possibility of doing something we must
+				// provide it with two different cursors.
+				Cursor dummy = cur;
+				dummy.pos() = dummy.pit() = 0;
+				if (cur.bv().checkDepm(dummy, cur))
+					cur.forceBufferUpdate();
+			}
 		}
 		break;
 
 	case LFUN_CHAR_BACKWARD:
 	case LFUN_CHAR_BACKWARD_SELECT:
 		//lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
+		needsUpdate |= cur.selHandle(act == LFUN_CHAR_BACKWARD_SELECT);
 		needsUpdate |= cursorBackward(cur);
 
 		if (!needsUpdate && oldTopSlice == cur.top()
 			&& cur.boundary() == oldBoundary) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
+
+			// we will probably be moving out the inset, so we should execute
+			// the depm-mechanism, but only when the cursor has a place to
+			// go outside this inset, i.e. in a slice above.
+			if (cur.depth() > 1 && cur.pos() == 0 && cur.pit() == 0) {
+				// The cursor hasn't changed yet. To give the
+				// DEPM the possibility of doing something we must
+				// provide it with two different cursors.
+				Cursor dummy = cur;
+				dummy.pos() = cur.lastpos();
+				dummy.pit() = cur.lastpit();
+				if (cur.bv().checkDepm(dummy, cur))
+					cur.forceBufferUpdate();
+			}
 		}
 		break;
 
 	case LFUN_CHAR_LEFT:
 	case LFUN_CHAR_LEFT_SELECT:
 		if (lyxrc.visual_cursor) {
-			needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_LEFT_SELECT);
+			needsUpdate |= cur.selHandle(act == LFUN_CHAR_LEFT_SELECT);
 			needsUpdate |= cursorVisLeft(cur);
 			if (!needsUpdate && oldTopSlice == cur.top()
 					&& cur.boundary() == oldBoundary) {
@@ -621,11 +665,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 		} else {
 			if (reverseDirectionNeeded(cur)) {
-				cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
-					LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
+				cmd.setAction(cmd.action() == LFUN_CHAR_LEFT_SELECT ?
+					LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD);
 			} else {
-				cmd.action = cmd.action == LFUN_CHAR_LEFT_SELECT ?
-					LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
+				cmd.setAction(cmd.action() == LFUN_CHAR_LEFT_SELECT ?
+					LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD);
 			}
 			dispatch(cur, cmd);
 			return;
@@ -635,7 +679,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_CHAR_RIGHT:
 	case LFUN_CHAR_RIGHT_SELECT:
 		if (lyxrc.visual_cursor) {
-			needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_RIGHT_SELECT);
+			needsUpdate |= cur.selHandle(cmd.action() == LFUN_CHAR_RIGHT_SELECT);
 			needsUpdate |= cursorVisRight(cur);
 			if (!needsUpdate && oldTopSlice == cur.top()
 					&& cur.boundary() == oldBoundary) {
@@ -644,11 +688,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 		} else {
 			if (reverseDirectionNeeded(cur)) {
-				cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
-					LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD;
+				cmd.setAction(cmd.action() == LFUN_CHAR_RIGHT_SELECT ?
+					LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD);
 			} else {
-				cmd.action = cmd.action == LFUN_CHAR_RIGHT_SELECT ?
-					LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD;
+				cmd.setAction(cmd.action() == LFUN_CHAR_RIGHT_SELECT ?
+					LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD);
 			}
 			dispatch(cur, cmd);
 			return;
@@ -661,23 +705,22 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_UP:
 	case LFUN_DOWN: {
 		// stop/start the selection
-		bool select = cmd.action == LFUN_DOWN_SELECT ||
-			cmd.action == LFUN_UP_SELECT;
+		bool select = cmd.action() == LFUN_DOWN_SELECT ||
+			cmd.action() == LFUN_UP_SELECT;
 
 		// move cursor up/down
-		bool up = cmd.action == LFUN_UP_SELECT || cmd.action == LFUN_UP;
+		bool up = cmd.action() == LFUN_UP_SELECT || cmd.action() == LFUN_UP;
 		bool const atFirstOrLastRow = cur.atFirstOrLastRow(up);
 
 		if (!atFirstOrLastRow) {
-			needsUpdate |= cur.selHandle(select);	
-			cur.selHandle(select);
+			needsUpdate |= cur.selHandle(select);
 			cur.upDownInText(up, needsUpdate);
 			needsUpdate |= cur.beforeDispatchCursor().inMathed();
 		} else {
 			// if the cursor cannot be moved up or down do not remove
 			// the selection right now, but wait for the next dispatch.
 			if (select)
-				needsUpdate |= cur.selHandle(select);	
+				needsUpdate |= cur.selHandle(select);
 			cur.upDownInText(up, needsUpdate);
 			cur.undispatched();
 		}
@@ -687,32 +730,67 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_PARAGRAPH_UP:
 	case LFUN_PARAGRAPH_UP_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
+		needsUpdate |= cur.selHandle(cmd.action() == LFUN_PARAGRAPH_UP_SELECT);
 		needsUpdate |= cursorUpParagraph(cur);
 		break;
 
 	case LFUN_PARAGRAPH_DOWN:
 	case LFUN_PARAGRAPH_DOWN_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
+		needsUpdate |= cur.selHandle(cmd.action() == LFUN_PARAGRAPH_DOWN_SELECT);
 		needsUpdate |= cursorDownParagraph(cur);
 		break;
 
 	case LFUN_LINE_BEGIN:
 	case LFUN_LINE_BEGIN_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
-		needsUpdate |= tm.cursorHome(cur);
+		needsUpdate |= cur.selHandle(cmd.action() == LFUN_LINE_BEGIN_SELECT);
+		needsUpdate |= tm->cursorHome(cur);
 		break;
 
 	case LFUN_LINE_END:
 	case LFUN_LINE_END_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
-		needsUpdate |= tm.cursorEnd(cur);
+		needsUpdate |= cur.selHandle(cmd.action() == LFUN_LINE_END_SELECT);
+		needsUpdate |= tm->cursorEnd(cur);
 		break;
 
+	case LFUN_SECTION_SELECT: {
+		Buffer const & buf = *cur.buffer();
+		pit_type const pit = cur.pit();
+		ParagraphList & pars = buf.text().paragraphs();
+		ParagraphList::iterator bgn = pars.begin();
+		// The first paragraph of the area to be selected:
+		ParagraphList::iterator start = boost::next(bgn, pit);
+		// The final paragraph of area to be selected:
+		ParagraphList::iterator finish = start;
+		ParagraphList::iterator end = pars.end();
+
+		int const thistoclevel = buf.text().getTocLevel(distance(bgn, start));
+		if (thistoclevel == Layout::NOT_IN_TOC)
+			break;
+
+		cur.pos() = 0;
+		Cursor const old_cur = cur;
+		needsUpdate |= cur.selHandle(true);
+
+		// Move out (down) from this section header
+		if (finish != end)
+			++finish;
+
+		// Seek the one (on same level) below
+		for (; finish != end; ++finish, ++cur.pit()) {
+			int const toclevel = buf.text().getTocLevel(distance(bgn, finish));
+			if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
+				break;
+		}
+		cur.pos() = cur.lastpos();
+
+		needsUpdate |= cur != old_cur;
+		break;
+	}
+
 	case LFUN_WORD_RIGHT:
 	case LFUN_WORD_RIGHT_SELECT:
 		if (lyxrc.visual_cursor) {
-			needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_RIGHT_SELECT);
+			needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_RIGHT_SELECT);
 			needsUpdate |= cursorVisRightOneWord(cur);
 			if (!needsUpdate && oldTopSlice == cur.top()
 					&& cur.boundary() == oldBoundary) {
@@ -721,11 +799,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 		} else {
 			if (reverseDirectionNeeded(cur)) {
-				cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
-						LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+				cmd.setAction(cmd.action() == LFUN_WORD_RIGHT_SELECT ?
+						LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD);
 			} else {
-				cmd.action = cmd.action == LFUN_WORD_RIGHT_SELECT ?
-						LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+				cmd.setAction(cmd.action() == LFUN_WORD_RIGHT_SELECT ?
+						LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD);
 			}
 			dispatch(cur, cmd);
 			return;
@@ -734,14 +812,34 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_WORD_FORWARD:
 	case LFUN_WORD_FORWARD_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
+		needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_FORWARD_SELECT);
 		needsUpdate |= cursorForwardOneWord(cur);
+
+		if (!needsUpdate && oldTopSlice == cur.top()
+				&& cur.boundary() == oldBoundary) {
+			cur.undispatched();
+			cmd = FuncRequest(LFUN_FINISHED_FORWARD);
+
+			// we will probably be moving out the inset, so we should execute
+			// the depm-mechanism, but only when the cursor has a place to
+			// go outside this inset, i.e. in a slice above.
+			if (cur.depth() > 1 && cur.pos() == cur.lastpos()
+				  && cur.pit() == cur.lastpit()) {
+				// The cursor hasn't changed yet. To give the
+				// DEPM the possibility of doing something we must
+				// provide it with two different cursors.
+				Cursor dummy = cur;
+				dummy.pos() = dummy.pit() = 0;
+				if (cur.bv().checkDepm(dummy, cur))
+					cur.forceBufferUpdate();
+			}
+		}
 		break;
 
 	case LFUN_WORD_LEFT:
 	case LFUN_WORD_LEFT_SELECT:
 		if (lyxrc.visual_cursor) {
-			needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_LEFT_SELECT);
+			needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_LEFT_SELECT);
 			needsUpdate |= cursorVisLeftOneWord(cur);
 			if (!needsUpdate && oldTopSlice == cur.top()
 					&& cur.boundary() == oldBoundary) {
@@ -750,11 +848,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 		} else {
 			if (reverseDirectionNeeded(cur)) {
-				cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
-						LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD;
+				cmd.setAction(cmd.action() == LFUN_WORD_LEFT_SELECT ?
+						LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD);
 			} else {
-				cmd.action = cmd.action == LFUN_WORD_LEFT_SELECT ?
-						LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD;
+				cmd.setAction(cmd.action() == LFUN_WORD_LEFT_SELECT ?
+						LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD);
 			}
 			dispatch(cur, cmd);
 			return;
@@ -763,8 +861,29 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_WORD_BACKWARD:
 	case LFUN_WORD_BACKWARD_SELECT:
-		needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
+		needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_BACKWARD_SELECT);
 		needsUpdate |= cursorBackwardOneWord(cur);
+
+		if (!needsUpdate && oldTopSlice == cur.top()
+				&& cur.boundary() == oldBoundary) {
+			cur.undispatched();
+			cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
+
+			// we will probably be moving out the inset, so we should execute
+			// the depm-mechanism, but only when the cursor has a place to
+			// go outside this inset, i.e. in a slice above.
+			if (cur.depth() > 1 && cur.pos() == 0
+				  && cur.pit() == 0) {
+				// The cursor hasn't changed yet. To give the
+				// DEPM the possibility of doing something we must
+				// provide it with two different cursors.
+				Cursor dummy = cur;
+				dummy.pos() = cur.lastpos();
+				dummy.pit() = cur.lastpit();
+				if (cur.bv().checkDepm(dummy, cur))
+					cur.forceBufferUpdate();
+			}
+		}
 		break;
 
 	case LFUN_WORD_SELECT: {
@@ -776,28 +895,117 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_NEWLINE_INSERT: {
 		InsetNewlineParams inp;
 		docstring arg = cmd.argument();
-		// this avoids a double undo
-		// FIXME: should not be needed, ideally
-		if (!cur.selection())
-			cur.recordUndo();
-		cap::replaceSelection(cur);
 		if (arg == "linebreak")
 			inp.kind = InsetNewlineParams::LINEBREAK;
 		else
 			inp.kind = InsetNewlineParams::NEWLINE;
+		cap::replaceSelection(cur);
+		cur.recordUndo();
 		cur.insert(new InsetNewline(inp));
 		cur.posForward();
 		moveCursor(cur, false);
 		break;
 	}
 
+	case LFUN_TAB_INSERT: {
+		bool const multi_par_selection = cur.selection() &&
+			cur.selBegin().pit() != cur.selEnd().pit();
+		if (multi_par_selection) {
+			// If there is a multi-paragraph selection, a tab is inserted
+			// at the beginning of each paragraph.
+			cur.recordUndoSelection();
+			pit_type const pit_end = cur.selEnd().pit();
+			for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) {
+				pars_[pit].insertChar(0, '\t',
+						      bv->buffer().params().track_changes);
+				// Update the selection pos to make sure the selection does not
+				// change as the inserted tab will increase the logical pos.
+				if (cur.realAnchor().pit() == pit)
+					cur.realAnchor().forwardPos();
+				if (cur.pit() == pit)
+					cur.forwardPos();
+			}
+			cur.finishUndo();
+		} else {
+			// Maybe we shouldn't allow tabs within a line, because they
+			// are not (yet) aligned as one might do expect.
+			FuncRequest cmd(LFUN_SELF_INSERT, from_ascii("\t"));
+			dispatch(cur, cmd);
+		}
+		break;
+	}
+
+	case LFUN_TAB_DELETE: {
+		bool const tc = bv->buffer().params().track_changes;
+		if (cur.selection()) {
+			// If there is a selection, a tab (if present) is removed from
+			// the beginning of each paragraph.
+			cur.recordUndoSelection();
+			pit_type const pit_end = cur.selEnd().pit();
+			for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) {
+				Paragraph & par = paragraphs()[pit];
+				if (par.empty())
+					continue;
+				char_type const c = par.getChar(0);
+				if (c == '\t' || c == ' ') {
+					// remove either 1 tab or 4 spaces.
+					int const n = (c == ' ' ? 4 : 1);
+					for (int i = 0; i < n
+						  && !par.empty() && par.getChar(0) == c; ++i) {
+						if (cur.pit() == pit)
+							cur.posBackward();
+						if (cur.realAnchor().pit() == pit
+							  && cur.realAnchor().pos() > 0 )
+							cur.realAnchor().backwardPos();
+						par.eraseChar(0, tc);
+					}
+				}
+			}
+			cur.finishUndo();
+		} else {
+			// If there is no selection, try to remove a tab or some spaces
+			// before the position of the cursor.
+			Paragraph & par = paragraphs()[cur.pit()];
+			pos_type const pos = cur.pos();
+
+			if (pos == 0)
+				break;
+
+			char_type const c = par.getChar(pos - 1);
+			cur.recordUndo();
+			if (c == '\t') {
+				cur.posBackward();
+				par.eraseChar(cur.pos(), tc);
+			} else
+				for (int n_spaces = 0;
+				     cur.pos() > 0
+					     && par.getChar(cur.pos() - 1) == ' '
+					     && n_spaces < 4;
+				     ++n_spaces) {
+					cur.posBackward();
+					par.eraseChar(cur.pos(), tc);
+				}
+			cur.finishUndo();
+		}
+		break;
+	}
+
 	case LFUN_CHAR_DELETE_FORWARD:
 		if (!cur.selection()) {
+			bool was_separator = cur.paragraph().isEnvSeparator(cur.pos());
 			if (cur.pos() == cur.paragraph().size())
 				// Par boundary, force full-screen update
 				singleParUpdate = false;
 			needsUpdate |= erase(cur);
 			cur.resetAnchor();
+			if (was_separator && cur.pos() == cur.paragraph().size()
+			    && (!cur.paragraph().layout().isEnvironment()
+				|| cur.paragraph().size() > 0)) {
+				// Force full-screen update
+				singleParUpdate = false;
+				needsUpdate |= erase(cur);
+				cur.resetAnchor();
+			}
 			// It is possible to make it a lot faster still
 			// just comment out the line below...
 		} else {
@@ -810,11 +1018,17 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_CHAR_DELETE_BACKWARD:
 		if (!cur.selection()) {
 			if (bv->getIntl().getTransManager().backspace()) {
+				bool par_boundary = cur.pos() == 0;
 				// Par boundary, full-screen update
-				if (cur.pos() == 0)
+				if (par_boundary)
 					singleParUpdate = false;
 				needsUpdate |= backspace(cur);
 				cur.resetAnchor();
+				if (par_boundary && cur.pos() > 0
+				    && cur.paragraph().isEnvSeparator(cur.pos() - 1)) {
+					needsUpdate |= backspace(cur);
+					cur.resetAnchor();
+				}
 				// It is possible to make it a lot faster still
 				// just comment out the line below...
 			}
@@ -824,52 +1038,40 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		}
 		break;
 
-	case LFUN_BREAK_PARAGRAPH:
+	case LFUN_PARAGRAPH_BREAK: {
 		cap::replaceSelection(cur);
-		breakParagraph(cur, cmd.argument() == "inverse");
-		cur.resetAnchor();
-		break;
-
-	// TODO
-	// With the creation of LFUN_PARAGRAPH_PARAMS, this is now redundant,
-	// as its duties can be performed there. Should it be removed??
-	// FIXME For now, it can just dispatch LFUN_PARAGRAPH_PARAMS...
-	case LFUN_PARAGRAPH_SPACING: {
-		Paragraph & par = cur.paragraph();
-		Spacing::Space cur_spacing = par.params().spacing().getSpace();
-		string cur_value = "1.0";
-		if (cur_spacing == Spacing::Other)
-			cur_value = par.params().spacing().getValueAsString();
-
-		istringstream is(to_utf8(cmd.argument()));
-		string tmp;
-		is >> tmp;
-		Spacing::Space new_spacing = cur_spacing;
-		string new_value = cur_value;
-		if (tmp.empty()) {
-			lyxerr << "Missing argument to `paragraph-spacing'"
-			       << endl;
-		} else if (tmp == "single") {
-			new_spacing = Spacing::Single;
-		} else if (tmp == "onehalf") {
-			new_spacing = Spacing::Onehalf;
-		} else if (tmp == "double") {
-			new_spacing = Spacing::Double;
-		} else if (tmp == "other") {
-			new_spacing = Spacing::Other;
-			string tmpval = "0.0";
-			is >> tmpval;
-			lyxerr << "new_value = " << tmpval << endl;
-			if (tmpval != "0.0")
-				new_value = tmpval;
-		} else if (tmp == "default") {
-			new_spacing = Spacing::Default;
+		pit_type pit = cur.pit();
+		Paragraph const & par = pars_[pit];
+		pit_type prev = pit;
+		if (pit > 0) {
+			if (!pars_[pit - 1].layout().isEnvironment())
+				prev = depthHook(pit, par.getDepth());
+			else if (pars_[pit - 1].getDepth() >= par.getDepth())
+				prev = pit - 1;
+		}
+		if (prev < pit && cur.pos() == par.beginOfBody()
+		    && !par.isEnvSeparator(cur.pos())
+		    && !par.layout().isCommand()
+		    && pars_[prev].layout() != par.layout()
+		    && pars_[prev].layout().isEnvironment()) {
+			if (par.layout().isEnvironment()
+			    && pars_[prev].getDepth() == par.getDepth()) {
+				docstring const layout = par.layout().name();
+				DocumentClass const & tc = bv->buffer().params().documentClass();
+				lyx::dispatch(FuncRequest(LFUN_LAYOUT, tc.plainLayout().name()));
+				lyx::dispatch(FuncRequest(LFUN_SEPARATOR_INSERT, "parbreak"));
+				lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK, "inverse"));
+				lyx::dispatch(FuncRequest(LFUN_LAYOUT, layout));
+			} else {
+				lyx::dispatch(FuncRequest(LFUN_SEPARATOR_INSERT, "parbreak"));
+				breakParagraph(cur);
+			}
+			Font const f(inherit_font, cur.current_font.language());
+			pars_[cur.pit() - 1].resetFonts(f);
 		} else {
-			lyxerr << to_utf8(_("Unknown spacing argument: "))
-			       << to_utf8(cmd.argument()) << endl;
+			breakParagraph(cur, cmd.argument() == "inverse");
 		}
-		if (cur_spacing != new_spacing || cur_value != new_value)
-			par.params().spacing(Spacing(new_spacing, new_value));
+		cur.resetAnchor();
 		break;
 	}
 
@@ -880,13 +1082,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// before inserting into the document. See bug #5626.
 		bool loaded = bv->buffer().isFullyLoaded();
 		bv->buffer().setFullyLoaded(false);
-		Inset * inset = createInset(bv->buffer(), cmd);
+		Inset * inset = createInset(&bv->buffer(), cmd);
 		bv->buffer().setFullyLoaded(loaded);
 
 		if (inset) {
 			// FIXME (Abdel 01/02/2006):
 			// What follows would be a partial fix for bug 2154:
-			//   http://bugzilla.lyx.org/show_bug.cgi?id=2154
+			//   http://www.lyx.org/trac/ticket/2154
 			// This automatically put the label inset _after_ a
 			// numbered section. It should be possible to extend the mechanism
 			// to any kind of LateX environement.
@@ -896,7 +1098,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			/*
 			Paragraph & par = pars_[cur.pit()];
 			if (inset->lyxCode() == LABEL_CODE
-				&& par.layout().labeltype == LABEL_COUNTER) {
+				&& !par.layout().counter.empty() {
 				// Go to the end of the paragraph
 				// Warning: Because of Change-Tracking, the last
 				// position is 'size()' and not 'size()-1':
@@ -909,7 +1111,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			if (cur.selection())
 				cutSelection(cur, true, false);
 			cur.insert(inset);
-			cur.posForward();
+			if (inset->editable() && inset->asInsetText())
+				inset->edit(cur, true);
+			else
+				cur.posForward();
 
 			// trigger InstantPreview now
 			if (inset->lyxCode() == EXTERNAL_CODE) {
@@ -923,26 +1128,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_INSET_DISSOLVE: {
-		// first, try if there's an inset at cursor
-		// FIXME: this first part should be moved to
-		// a LFUN_NEXT_INSET_DISSOLVE, or be called via
-		// some generic "next-inset inset-dissolve"
-		Inset * inset = cur.nextInset();
-		if (inset && inset->isActive()) {
-			Cursor tmpcur = cur;
-			tmpcur.pushBackward(*inset);
-			inset->dispatch(tmpcur, cmd);
-			if (tmpcur.result().dispatched()) {
-				cur.dispatched();
-				break;
-			}
-		}
-		// if it did not work, try the underlying inset
 		if (dissolveInset(cur)) {
 			needsUpdate = true;
-			break;
+			cur.forceBufferUpdate();
 		}
-		// if it did not work, do nothing.
 		break;
 	}
 
@@ -1001,6 +1190,35 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	case LFUN_IPAMACRO_INSERT: {
+		string const arg = cmd.getArg(0);
+		if (arg == "deco") {
+			// Open the inset, and move the current selection
+			// inside it.
+			doInsertInset(cur, this, cmd, true, true);
+			cur.posForward();
+			// Some insets are numbered, others are shown in the outline pane so
+			// let's update the labels and the toc backend.
+			cur.forceBufferUpdate();
+			break;
+		}
+		if (arg == "tone-falling")
+			ipaChar(cur, InsetIPAChar::TONE_FALLING);
+		else if (arg == "tone-rising")
+			ipaChar(cur, InsetIPAChar::TONE_RISING);
+		else if (arg == "tone-high-rising")
+			ipaChar(cur, InsetIPAChar::TONE_HIGH_RISING);
+		else if (arg == "tone-low-rising")
+			ipaChar(cur, InsetIPAChar::TONE_LOW_RISING);
+		else if (arg == "tone-high-rising-falling")
+			ipaChar(cur, InsetIPAChar::TONE_HIGH_RISING_FALLING);
+		else if (arg.empty())
+			lyxerr << "LyX function 'ipamacro-insert' needs an argument." << endl;
+		else
+			lyxerr << "Wrong argument for LyX function 'ipamacro-insert'." << endl;
+		break;
+	}
+
 	case LFUN_WORD_UPCASE:
 		changeCase(cur, text_uppercase);
 		break;
@@ -1019,23 +1237,30 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_PASTE: {
 		cur.message(_("Paste"));
-		LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), /**/);
+		LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), break);
 		cap::replaceSelection(cur);
 
 		// without argument?
 		string const arg = to_utf8(cmd.argument());
 		if (arg.empty()) {
+			bool tryGraphics = true;
 			if (theClipboard().isInternal())
 				pasteFromStack(cur, bv->buffer().errorList("Paste"), 0);
-			else if (theClipboard().hasGraphicsContents() 
-				     && !theClipboard().hasTextContents())
+			else if (theClipboard().hasTextContents()) {
+				if (pasteClipboardText(cur, bv->buffer().errorList("Paste"),
+				                       true, Clipboard::AnyTextType))
+					tryGraphics = false;
+			}
+			if (tryGraphics && theClipboard().hasGraphicsContents())
 				pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"));
-			else
-				pasteClipboardText(cur, bv->buffer().errorList("Paste"));
 		} else if (isStrUnsignedInt(arg)) {
 			// we have a numerical argument
 			pasteFromStack(cur, bv->buffer().errorList("Paste"),
 				       convert<unsigned int>(arg));
+		} else if (arg == "html" || arg == "latex") {
+			Clipboard::TextType type = (arg == "html") ?
+				Clipboard::HtmlTextType : Clipboard::LaTeXTextType;
+			pasteClipboardText(cur, bv->buffer().errorList("Paste"), true, type);
 		} else {
 			Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
 			if (arg == "pdf")
@@ -1050,9 +1275,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				type = Clipboard::EmfGraphicsType;
 			else if (arg == "wmf")
 				type = Clipboard::WmfGraphicsType;
-
 			else
-				LASSERT(false, /**/);
+				// We used to assert, but couldn't the argument come from, say, the
+				// minibuffer and just be mistyped?
+				LYXERR0("Unrecognized graphics type: " << arg);
 
 			pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type);
 		}
@@ -1075,8 +1301,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_SERVER_GET_XY:
 		cur.message(from_utf8(
-			convert<string>(tm.cursorX(cur.top(), cur.boundary()))
-			+ ' ' + convert<string>(tm.cursorY(cur.top(), cur.boundary()))));
+			convert<string>(tm->cursorX(cur.top(), cur.boundary()))
+			+ ' ' + convert<string>(tm->cursorY(cur.top(), cur.boundary()))));
 		break;
 
 	case LFUN_SERVER_SET_XY: {
@@ -1088,7 +1314,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			lyxerr << "SETXY: Could not parse coordinates in '"
 			       << to_utf8(cmd.argument()) << endl;
 		else
-			tm.setCursorFromCoordinates(cur, x, y);
+			tm->setCursorFromCoordinates(cur, x, y);
 		break;
 	}
 
@@ -1107,7 +1333,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		if (layout.empty())
 			layout = tclass.defaultLayoutName();
 
-		if (para.forcePlainLayout())
+		if (owner_->forcePlainLayout())
 			// in this case only the empty layout is allowed
 			layout = tclass.plainLayoutName();
 		else if (para.usePlainLayout()) {
@@ -1154,17 +1380,70 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		if (change_layout)
 			setLayout(cur, layout);
 
+		Layout::LaTeXArgMap args = tclass[layout].args();
+		Layout::LaTeXArgMap::const_iterator lait = args.begin();
+		Layout::LaTeXArgMap::const_iterator const laend = args.end();
+		for (; lait != laend; ++lait) {
+			Layout::latexarg arg = (*lait).second;
+			if (arg.autoinsert) {
+				FuncRequest cmd(LFUN_ARGUMENT_INSERT, (*lait).first);
+				lyx::dispatch(cmd);
+			}
+		}
+
+		break;
+	}
+
+	case LFUN_ENVIRONMENT_SPLIT: {
+		bool const outer = cmd.argument() == "outer";
+		Paragraph const & para = cur.paragraph();
+		docstring layout = para.layout().name();
+		depth_type split_depth = cur.paragraph().params().depth();
+		if (outer) {
+			// check if we have an environment in our nesting hierarchy
+			pit_type pit = cur.pit();
+			Paragraph cpar = pars_[pit];
+			while (true) {
+				if (pit == 0 || cpar.params().depth() == 0)
+					break;
+				--pit;
+				cpar = pars_[pit];
+				if (cpar.params().depth() < split_depth
+				    && cpar.layout().isEnvironment()) {
+						layout = cpar.layout().name();
+						split_depth = cpar.params().depth();
+				}
+			}
+		}
+		if (cur.pos() > 0)
+			lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK));
+		if (outer) {
+			while (cur.paragraph().params().depth() > split_depth)
+				lyx::dispatch(FuncRequest(LFUN_DEPTH_DECREMENT));
+		}
+		DocumentClass const & tc = bv->buffer().params().documentClass();
+		lyx::dispatch(FuncRequest(LFUN_LAYOUT, tc.plainLayout().name()));
+		lyx::dispatch(FuncRequest(LFUN_SEPARATOR_INSERT, "plain"));
+		lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK, "inverse"));
+		lyx::dispatch(FuncRequest(LFUN_LAYOUT, layout));
+
 		break;
 	}
 
 	case LFUN_CLIPBOARD_PASTE:
-		cur.clearSelection();
+		cap::replaceSelection(cur);
 		pasteClipboardText(cur, bv->buffer().errorList("Paste"),
 			       cmd.argument() == "paragraph");
 		bv->buffer().errors("Paste");
 		break;
 
+	case LFUN_CLIPBOARD_PASTE_SIMPLE:
+		cap::replaceSelection(cur);
+		pasteSimpleText(cur, cmd.argument() == "paragraph");
+		break;
+
 	case LFUN_PRIMARY_SELECTION_PASTE:
+		cap::replaceSelection(cur);
 		pasteString(cur, theSelection().get(),
 			    cmd.argument() == "paragraph");
 		break;
@@ -1173,6 +1452,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// Copy the selection buffer to the clipboard stack,
 		// because we want it to appear in the "Edit->Paste
 		// recent" menu.
+		cap::replaceSelection(cur);
 		cap::copySelectionToStack();
 		cap::pasteSelection(bv->cursor(), bv->buffer().errorList("Paste"));
 		bv->buffer().errors("Paste");
@@ -1194,33 +1474,35 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_QUOTE_INSERT: {
-		Paragraph & par = cur.paragraph();
+		cap::replaceSelection(cur);
+		cur.recordUndo();
+
+		Paragraph const & par = cur.paragraph();
 		pos_type pos = cur.pos();
+		// Ignore deleted text before cursor
+		while (pos > 0 && par.isDeleted(pos - 1))
+			--pos;
+
 		BufferParams const & bufparams = bv->buffer().params();
-		Layout const & style = par.layout();
-		InsetLayout const & ilayout = cur.inset().getLayout(bufparams);
-		if (!style.pass_thru && !ilayout.isPassThru()
-		    && par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
-			// this avoids a double undo
-			// FIXME: should not be needed, ideally
-			if (!cur.selection())
-				cur.recordUndo();
-			cap::replaceSelection(cur);
-			pos = cur.pos();
-			char_type c;
-			if (pos == 0)
-				c = ' ';
-			else if (cur.prevInset() && cur.prevInset()->isSpace())
-				c = ' ';
-			else
+		bool const hebrew =
+			par.getFontSettings(bufparams, pos).language()->lang() == "hebrew";
+		bool const allow_inset_quote = !(par.isPassThru() || hebrew);
+
+		string const arg = to_utf8(cmd.argument());
+		if (allow_inset_quote) {
+			char_type c = ' ';
+			if (pos > 0 && (!cur.prevInset() || !cur.prevInset()->isSpace()))
 				c = par.getChar(pos - 1);
-			string arg = to_utf8(cmd.argument());
-			cur.insert(new InsetQuotes(bv->buffer(), c, (arg == "single")
-				? InsetQuotes::SingleQuotes : InsetQuotes::DoubleQuotes));
+			InsetQuotes::QuoteTimes const quote_type = (arg == "single")
+				? InsetQuotes::SingleQuotes : InsetQuotes::DoubleQuotes;
+			cur.insert(new InsetQuotes(cur.buffer(), c, quote_type));
 			cur.posForward();
+		} else {
+			// The cursor might have been invalidated by the replaceSelection.
+			cur.buffer()->changed(true);
+			string const quote_string = (arg == "single") ? "'" : "\"";
+			lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, quote_string));
 		}
-		else
-			lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
 		break;
 	}
 
@@ -1234,9 +1516,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_MOUSE_TRIPLE:
 		if (cmd.button() == mouse_button::button1) {
-			tm.cursorHome(cur);
+			tm->cursorHome(cur);
 			cur.resetAnchor();
-			tm.cursorEnd(cur);
+			tm->cursorEnd(cur);
 			cur.setSelection();
 			bv->cursor() = cur;
 		}
@@ -1244,20 +1526,23 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_MOUSE_DOUBLE:
 		if (cmd.button() == mouse_button::button1) {
-			selectWord(cur, WHOLE_WORD_STRICT);
+			selectWord(cur, WHOLE_WORD);
 			bv->cursor() = cur;
 		}
 		break;
 
 	// Single-click on work area
-	case LFUN_MOUSE_PRESS:
+	case LFUN_MOUSE_PRESS: {
 		// We are not marking a selection with the keyboard in any case.
-		cur.bv().cursor().setMark(false);
+		Cursor & bvcur = cur.bv().cursor();
+		bvcur.setMark(false);
 		switch (cmd.button()) {
 		case mouse_button::button1:
 			// Set the cursor
 			if (!bv->mouseSetCursor(cur, cmd.argument() == "region-select"))
-				cur.updateFlags(Update::SinglePar | Update::FitCursor);
+				cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor);
+			if (bvcur.wordSelection())
+				selectWord(bvcur, WHOLE_WORD);
 			break;
 
 		case mouse_button::button2:
@@ -1266,20 +1551,19 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			lyx::dispatch(
 				FuncRequest(LFUN_COMMAND_ALTERNATIVES,
 					    "selection-paste ; primary-selection-paste paragraph"));
-			cur.noUpdate();
+			cur.noScreenUpdate();
 			break;
 
 		case mouse_button::button3: {
-			Cursor const & bvcur = cur.bv().cursor();
 			// Don't do anything if we right-click a
 			// selection, a context menu will popup.
 			if (bvcur.selection() && cur >= bvcur.selectionBegin()
 			    && cur < bvcur.selectionEnd()) {
-				cur.noUpdate();
+				cur.noScreenUpdate();
 				return;
 			}
 			if (!bv->mouseSetCursor(cur, false))
-				cur.updateFlags(Update::SinglePar | Update::FitCursor);
+				cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor);
 			break;
 		}
 
@@ -1287,35 +1571,35 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			break;
 		} // switch (cmd.button())
 		break;
-
+	}
 	case LFUN_MOUSE_MOTION: {
 		// Mouse motion with right or middle mouse do nothing for now.
 		if (cmd.button() != mouse_button::button1) {
-			cur.noUpdate();
+			cur.noScreenUpdate();
 			return;
 		}
 		// ignore motions deeper nested than the real anchor
 		Cursor & bvcur = cur.bv().cursor();
-		if (!bvcur.anchor_.hasPart(cur)) {
+		if (!bvcur.realAnchor().hasPart(cur)) {
 			cur.undispatched();
 			break;
 		}
 		CursorSlice old = bvcur.top();
 
 		int const wh = bv->workHeight();
-		int const y = max(0, min(wh - 1, cmd.y));
+		int const y = max(0, min(wh - 1, cmd.y()));
 
-		tm.setCursorFromCoordinates(cur, cmd.x, y);
-		cur.setTargetX(cmd.x);
-		if (cmd.y >= wh)
+		tm->setCursorFromCoordinates(cur, cmd.x(), y);
+		cur.setTargetX(cmd.x());
+		if (cmd.y() >= wh)
 			lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
-		else if (cmd.y < 0)
+		else if (cmd.y() < 0)
 			lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
 		// This is to allow jumping over large insets
 		if (cur.top() == old) {
-			if (cmd.y >= wh)
+			if (cmd.y() >= wh)
 				lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
-			else if (cmd.y < 0)
+			else if (cmd.y() < 0)
 				lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
 		}
 		// We continue with our existing selection or start a new one, so don't
@@ -1324,8 +1608,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		bvcur.setSelection(true);
 		if (cur.top() == old) {
 			// We didn't move one iota, so no need to update the screen.
-			cur.updateFlags(Update::SinglePar | Update::FitCursor);
-			//cur.noUpdate();
+			cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor);
+			//cur.noScreenUpdate();
 			return;
 		}
 		break;
@@ -1346,23 +1630,23 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				cur.bv().cursor().setSelection();
 				// We might have removed an empty but drawn selection
 				// (probably a margin)
-				cur.updateFlags(Update::SinglePar | Update::FitCursor);
+				cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor);
 			} else
-				cur.noUpdate();
+				cur.noScreenUpdate();
 			// FIXME: We could try to handle drag and drop of selection here.
 			return;
 
 		case mouse_button::button2:
 			// Middle mouse pasting is handled at mouse press time,
 			// see LFUN_MOUSE_PRESS.
-			cur.noUpdate();
+			cur.noScreenUpdate();
 			return;
 
 		case mouse_button::button3:
 			// Cursor was set at LFUN_MOUSE_PRESS time.
 			// FIXME: If there is a selection we could try to handle a special
 			// drag & drop context menu.
-			cur.noUpdate();
+			cur.noScreenUpdate();
 			return;
 
 		case mouse_button::none:
@@ -1395,20 +1679,52 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 		cur.resetAnchor();
 		moveCursor(cur, false);
+		cur.markNewWordPosition();
 		bv->bookmarkEditPosition();
 		break;
 	}
 
-	case LFUN_HYPERLINK_INSERT: {
-		InsetCommandParams p(HYPERLINK_CODE);
-		docstring content;
+	case LFUN_HREF_INSERT: {
+		// FIXME If we're actually given an argument, shouldn't
+		// we use it, whether or not we have a selection?
+		docstring content = cmd.argument();
 		if (cur.selection()) {
 			content = cur.selectionAsString(false);
 			cutSelection(cur, true, false);
 		}
-		p["target"] = (cmd.argument().empty()) ?
-			content : cmd.argument();
-		string const data = InsetCommand::params2string("href", p);
+
+		InsetCommandParams p(HYPERLINK_CODE);
+		if (!content.empty()){
+			// if it looks like a link, we'll put it as target,
+			// otherwise as name (bug #8792).
+
+			// We can't do:
+			//   regex_match(to_utf8(content), matches, link_re)
+			// because smatch stores pointers to the substrings rather
+			// than making copies of them. And those pointers become
+			// invalid after regex_match returns, since it is then
+			// being given a temporary object. (Thanks to Georg for
+			// figuring that out.)
+			regex const link_re("^([a-z]+):.*");
+			smatch matches;
+			string const c = to_utf8(lowercase(content));
+
+			if (c.substr(0,7) == "mailto:") {
+				p["target"] = content;
+				p["type"] = from_ascii("mailto:");
+			} else if (regex_match(c, matches, link_re)) {
+				p["target"] = content;
+				string protocol = matches.str(1);
+				if (protocol == "file")
+					p["type"] = from_ascii("file:");
+			} else
+				p["name"] = content;
+		}
+		string const data = InsetCommand::params2string(p);
+
+		// we need to have a target. if we already have one, then
+		// that gets used at the default for the name, too, which
+		// is probably what is wanted.
 		if (p["target"].empty()) {
 			bv->showDialog("href", data);
 		} else {
@@ -1424,7 +1740,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		p["name"] = (cmd.argument().empty()) ?
 			cur.getPossibleLabel() :
 			cmd.argument();
-		string const data = InsetCommand::params2string("label", p);
+		string const data = InsetCommand::params2string(p);
 
 		if (cmd.argument().empty()) {
 			bv->showDialog("label", data);
@@ -1442,12 +1758,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			docstring ds = cur.selectionAsString(false);
 			cutSelection(cur, true, false);
 			FuncRequest cmd0(cmd, ds);
-			inset = createInset(cur.bv().buffer(), cmd0);
+			inset = createInset(cur.buffer(), cmd0);
 		} else {
-			inset = createInset(cur.bv().buffer(), cmd);
+			inset = createInset(cur.buffer(), cmd);
 		}
 		if (!inset)
 			break;
+		cur.recordUndo();
 		insertInset(cur, inset);
 		cur.posForward();
 		break;
@@ -1455,23 +1772,56 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_CAPTION_INSERT:
 	case LFUN_FOOTNOTE_INSERT:
 	case LFUN_NOTE_INSERT:
-	case LFUN_FLEX_INSERT:
 	case LFUN_BOX_INSERT:
 	case LFUN_BRANCH_INSERT:
 	case LFUN_PHANTOM_INSERT:
 	case LFUN_ERT_INSERT:
 	case LFUN_LISTING_INSERT:
 	case LFUN_MARGINALNOTE_INSERT:
-	case LFUN_OPTIONAL_INSERT:
+	case LFUN_ARGUMENT_INSERT:
 	case LFUN_INDEX_INSERT:
+	case LFUN_PREVIEW_INSERT:
+	case LFUN_SCRIPT_INSERT:
+	case LFUN_IPA_INSERT:
 		// Open the inset, and move the current selection
 		// inside it.
 		doInsertInset(cur, this, cmd, true, true);
 		cur.posForward();
 		// Some insets are numbered, others are shown in the outline pane so
 		// let's update the labels and the toc backend.
-		bv->buffer().updateLabels();
+		cur.forceBufferUpdate();
+		break;
+
+	case LFUN_FLEX_INSERT: {
+		// Open the inset, and move the current selection
+		// inside it.
+		bool const sel = cur.selection();
+		doInsertInset(cur, this, cmd, true, true);
+		// Insert auto-insert arguments
+		bool autoargs = false;
+		Layout::LaTeXArgMap args = cur.inset().getLayout().latexargs();
+		Layout::LaTeXArgMap::const_iterator lait = args.begin();
+		Layout::LaTeXArgMap::const_iterator const laend = args.end();
+		for (; lait != laend; ++lait) {
+			Layout::latexarg arg = (*lait).second;
+			if (arg.autoinsert) {
+				// The cursor might have been invalidated by the replaceSelection.
+				cur.buffer()->changed(true);
+				FuncRequest cmd(LFUN_ARGUMENT_INSERT, (*lait).first);
+				lyx::dispatch(cmd);
+				autoargs = true;
+			}
+		}
+		if (!autoargs) {
+			if (sel)
+				cur.leaveInset(cur.inset());
+			cur.posForward();
+		}
+		// Some insets are numbered, others are shown in the outline pane so
+		// let's update the labels and the toc backend.
+		cur.forceBufferUpdate();
 		break;
+	}
 
 	case LFUN_TABULAR_INSERT:
 		// if there were no arguments, just open the dialog
@@ -1485,16 +1835,19 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_FLOAT_INSERT:
 	case LFUN_FLOAT_WIDE_INSERT:
 	case LFUN_WRAP_INSERT: {
-		// will some text be moved into the inset?
-		bool content = cur.selection();
+		// will some content be moved into the inset?
+		bool const content = cur.selection();
+		// does the content consist of multiple paragraphs?
+		bool const singlepar = (cur.selBegin().pit() == cur.selEnd().pit());
 
 		doInsertInset(cur, this, cmd, true, true);
 		cur.posForward();
 
-		// If some text is moved into the inset, doInsertInset 
-		// puts the cursor outside the inset. To insert the
-		// caption we put it back into the inset.
-		if (content)
+		// If some single-par content is moved into the inset,
+		// doInsertInset puts the cursor outside the inset.
+		// To insert the caption we put it back into the inset.
+		// FIXME cleanup doInsertInset to avoid such dances!
+		if (content && singlepar)
 			cur.backwardPos();
 
 		ParagraphList & pars = cur.text()->paragraphs();
@@ -1503,7 +1856,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 		// add a separate paragraph for the caption inset
 		pars.push_back(Paragraph());
-		pars.back().setInsetOwner(&pars[0].inInset());
+		pars.back().setInsetOwner(&cur.text()->inset());
 		pars.back().setPlainOrDefaultLayout(tclass);
 		int cap_pit = pars.size() - 1;
 
@@ -1512,7 +1865,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// the graphics (or table).
 		if (!content) {
 			pars.push_back(Paragraph());
-			pars.back().setInsetOwner(&pars[0].inInset());
+			pars.back().setInsetOwner(&cur.text()->inset());
 			pars.back().setPlainOrDefaultLayout(tclass);
 		}
 
@@ -1524,8 +1877,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// date metrics.
 		FuncRequest cmd_caption(LFUN_CAPTION_INSERT);
 		doInsertInset(cur, cur.text(), cmd_caption, true, false);
-		bv->buffer().updateLabels();
-		cur.updateFlags(Update::Force);
+		cur.forceBufferUpdate();
+		cur.screenUpdateFlags(Update::Force);
 		// FIXME: When leaving the Float (or Wrap) inset we should
 		// delete any empty paragraph left above or below the
 		// caption.
@@ -1538,7 +1891,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			p["symbol"] = bv->cursor().innerText()->getStringToIndex(bv->cursor());
 		else
 			p["symbol"] = cmd.argument();
-		string const data = InsetCommand::params2string("nomenclature", p);
+		string const data = InsetCommand::params2string(p);
 		bv->showDialog("nomenclature", data);
 		break;
 	}
@@ -1549,21 +1902,29 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			p["type"] = from_ascii("idx");
 		else
 			p["type"] = cmd.argument();
-		string const data = InsetCommand::params2string("index_print", p);
+		string const data = InsetCommand::params2string(p);
 		FuncRequest fr(LFUN_INSET_INSERT, data);
 		dispatch(cur, fr);
 		break;
 	}
 
 	case LFUN_NOMENCL_PRINT:
-	case LFUN_TOC_INSERT:
-	case LFUN_LINE_INSERT:
 	case LFUN_NEWPAGE_INSERT:
 		// do nothing fancy
 		doInsertInset(cur, this, cmd, false, false);
 		cur.posForward();
 		break;
 
+	case LFUN_SEPARATOR_INSERT: {
+		doInsertInset(cur, this, cmd, false, false);
+		cur.posForward();
+		// remove a following space
+		Paragraph & par = cur.paragraph();
+		if (cur.pos() != cur.lastpos() && par.isLineSeparator(cur.pos()))
+		    par.eraseChar(cur.pos(), cur.buffer()->params().track_changes);
+		break;
+	}
+
 	case LFUN_DEPTH_DECREMENT:
 		changeDepth(cur, DEC_DEPTH);
 		break;
@@ -1583,6 +1944,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_MATH_MODE:
 		if (cmd.argument() == "on")
 			// don't pass "on" as argument
+			// (it would appear literally in the first cell)
 			mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
 		else
 			mathDispatch(cur, cmd, false);
@@ -1592,6 +1954,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		if (cmd.argument().empty())
 			cur.errorMessage(from_utf8(N_("Missing argument")));
 		else {
+			cur.recordUndo();
 			string s = to_utf8(cmd.argument());
 			string const s1 = token(s, ' ', 1);
 			int const nargs = s1.empty() ? 0 : convert<int>(s1);
@@ -1599,7 +1962,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			MacroType type = MacroTypeNewcommand;
 			if (s2 == "def")
 				type = MacroTypeDef;
-			MathMacroTemplate * inset = new MathMacroTemplate(from_utf8(token(s, ' ', 0)), nargs, false, type);
+			MathMacroTemplate * inset = new MathMacroTemplate(cur.buffer(),
+				from_utf8(token(s, ' ', 0)), nargs, false, type);
 			inset->setBuffer(bv->buffer());
 			insertInset(cur, inset);
 
@@ -1621,14 +1985,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_MATH_INSERT:
+	case LFUN_MATH_AMS_MATRIX:
 	case LFUN_MATH_MATRIX:
 	case LFUN_MATH_DELIM:
 	case LFUN_MATH_BIGDELIM: {
 		cur.recordUndo();
 		cap::replaceSelection(cur);
-		cur.insert(new InsetMathHull(hullSimple));
+		cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
 		checkAndActivateInset(cur, true);
-		LASSERT(cur.inMathed(), /**/);
+		LASSERT(cur.inMathed(), break);
 		cur.dispatch(cmd);
 		break;
 	}
@@ -1689,6 +2054,27 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	case LFUN_FONT_STRIKEOUT: {
+		Font font(ignore_font, ignore_language);
+		font.fontInfo().setStrikeout(FONT_TOGGLE);
+		toggleAndShow(cur, this, font);
+		break;
+	}
+
+	case LFUN_FONT_UNDERUNDERLINE: {
+		Font font(ignore_font, ignore_language);
+		font.fontInfo().setUuline(FONT_TOGGLE);
+		toggleAndShow(cur, this, font);
+		break;
+	}
+
+	case LFUN_FONT_UNDERWAVE: {
+		Font font(ignore_font, ignore_language);
+		font.fontInfo().setUwave(FONT_TOGGLE);
+		toggleAndShow(cur, this, font);
+		break;
+	}
+
 	case LFUN_FONT_UNDERLINE: {
 		Font font(ignore_font, ignore_language);
 		font.fontInfo().setUnderbar(FONT_TOGGLE);
@@ -1704,11 +2090,19 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_LANGUAGE: {
-		Language const * lang = languages.getLanguage(to_utf8(cmd.argument()));
-		if (!lang)
+		string const lang_arg = cmd.getArg(0);
+		bool const reset = (lang_arg.empty() || lang_arg == "reset");
+		Language const * lang =
+			reset ? reset_language
+			      : languages.getLanguage(lang_arg);
+		// we allow reset_language, which is 0, but only if it
+		// was requested via empty or "reset" arg.
+		if (!lang && !reset)
 			break;
+		bool const toggle = (cmd.getArg(1) != "set");
+		selectWordWhenUnderCursor(cur, WHOLE_WORD_STRICT);
 		Font font(ignore_font, lang);
-		toggleAndShow(cur, this, font);
+		toggleAndShow(cur, this, font, toggle);
 		break;
 	}
 
@@ -1802,10 +2196,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_ACCENT_HUNGARIAN_UMLAUT:
 	case LFUN_ACCENT_CIRCLE:
 	case LFUN_ACCENT_OGONEK:
-		theLyXFunc().handleKeyFunc(cmd.action);
+		theApp()->handleKeyFunc(cmd.action());
 		if (!cmd.argument().empty())
 			// FIXME: Are all these characters encoded in one byte in utf8?
 			bv->translateAndInsert(cmd.argument()[0], this, cur);
+		cur.screenUpdateFlags(Update::FitCursor);
 		break;
 
 	case LFUN_FLOAT_LIST_INSERT: {
@@ -1831,7 +2226,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			setParagraphs(cur, p);
 			// FIXME This should be simplified when InsetFloatList takes a
 			// Buffer in its constructor.
-			InsetFloatList * ifl = new InsetFloatList(to_utf8(cmd.argument()));
+			InsetFloatList * ifl = new InsetFloatList(cur.buffer(), to_utf8(cmd.argument()));
 			ifl->setBuffer(bv->buffer());
 			insertInset(cur, ifl);
 			cur.posForward();
@@ -1868,6 +2263,63 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	case LFUN_SPELLING_ADD: {
+		docstring word = from_utf8(cmd.getArg(0));
+		Language * lang;
+		if (word.empty()) {
+			word = cur.selectionAsString(false);
+			// FIXME
+			if (word.size() > 100 || word.empty()) {
+				// Get word or selection
+				selectWordWhenUnderCursor(cur, WHOLE_WORD);
+				word = cur.selectionAsString(false);
+			}
+			lang = const_cast<Language *>(cur.getFont().language());
+		} else
+			lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
+		WordLangTuple wl(word, lang);
+		theSpellChecker()->insert(wl);
+		break;
+	}
+
+	case LFUN_SPELLING_IGNORE: {
+		docstring word = from_utf8(cmd.getArg(0));
+		Language * lang;
+		if (word.empty()) {
+			word = cur.selectionAsString(false);
+			// FIXME
+			if (word.size() > 100 || word.empty()) {
+				// Get word or selection
+				selectWordWhenUnderCursor(cur, WHOLE_WORD);
+				word = cur.selectionAsString(false);
+			}
+			lang = const_cast<Language *>(cur.getFont().language());
+		} else
+			lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
+		WordLangTuple wl(word, lang);
+		theSpellChecker()->accept(wl);
+		break;
+	}
+
+	case LFUN_SPELLING_REMOVE: {
+		docstring word = from_utf8(cmd.getArg(0));
+		Language * lang;
+		if (word.empty()) {
+			word = cur.selectionAsString(false);
+			// FIXME
+			if (word.size() > 100 || word.empty()) {
+				// Get word or selection
+				selectWordWhenUnderCursor(cur, WHOLE_WORD);
+				word = cur.selectionAsString(false);
+			}
+			lang = const_cast<Language *>(cur.getFont().language());
+		} else
+			lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
+		WordLangTuple wl(word, lang);
+		theSpellChecker()->remove(wl);
+		break;
+	}
+
 	case LFUN_PARAGRAPH_PARAMS_APPLY: {
 		// Given data, an encoding of the ParagraphParameters
 		// generated in the Paragraph dialog, this function sets
@@ -1904,29 +2356,56 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_OUTLINE_UP:
 		outline(OutlineUp, cur);
 		setCursor(cur, cur.pit(), 0);
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		needsUpdate = true;
 		break;
 
 	case LFUN_OUTLINE_DOWN:
 		outline(OutlineDown, cur);
 		setCursor(cur, cur.pit(), 0);
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		needsUpdate = true;
 		break;
 
 	case LFUN_OUTLINE_IN:
 		outline(OutlineIn, cur);
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		needsUpdate = true;
 		break;
 
 	case LFUN_OUTLINE_OUT:
 		outline(OutlineOut, cur);
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		needsUpdate = true;
 		break;
 
+	case LFUN_SERVER_GET_STATISTICS:
+		{
+			DocIterator from, to;
+			if (cur.selection()) {
+				from = cur.selectionBegin();
+				to = cur.selectionEnd();
+			} else {
+				from = doc_iterator_begin(cur.buffer());
+				to = doc_iterator_end(cur.buffer());
+			}
+
+			cur.buffer()->updateStatistics(from, to);
+			string const arg0 = cmd.getArg(0);
+			if (arg0 == "words") {
+				cur.message(convert<docstring>(cur.buffer()->wordCount()));
+			} else if (arg0 == "chars") {
+				cur.message(convert<docstring>(cur.buffer()->charCount(false)));
+			} else if (arg0 == "chars-space") {
+				cur.message(convert<docstring>(cur.buffer()->charCount(true)));
+			} else {
+				cur.message(convert<docstring>(cur.buffer()->wordCount()) + " "
+				+ convert<docstring>(cur.buffer()->charCount(false)) + " "
+				+ convert<docstring>(cur.buffer()->charCount(true)));
+			}
+		}
+		break;
+
 	default:
 		LYXERR(Debug::ACTION, "Command " << cmd << " not DISPATCHED by Text");
 		cur.undispatched();
@@ -1935,12 +2414,27 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	needsUpdate |= (cur.pos() != cur.lastpos()) && cur.selection();
 
+	if (lyxrc.spellcheck_continuously && !needsUpdate) {
+		// Check for misspelled text
+		// The redraw is useful because of the painting of
+		// misspelled markers depends on the cursor position.
+		// Trigger a redraw for cursor moves inside misspelled text.
+		if (!cur.inTexted()) {
+			// move from regular text to math
+			needsUpdate = last_misspelled;
+		} else if (oldTopSlice != cur.top() || oldBoundary != cur.boundary()) {
+			// move inside regular text
+			needsUpdate = last_misspelled
+				|| cur.paragraph().isMisspelled(cur.pos(), true);
+		}
+	}
+
 	// FIXME: The cursor flag is reset two lines below
 	// so we need to check here if some of the LFUN did touch that.
 	// for now only Text::erase() and Text::backspace() do that.
 	// The plan is to verify all the LFUNs and then to remove this
 	// singleParUpdate boolean altogether.
-	if (cur.result().update() & Update::Force) {
+	if (cur.result().screenUpdate() & Update::Force) {
 		singleParUpdate = false;
 		needsUpdate = true;
 	}
@@ -1951,40 +2445,40 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// Inserting characters does not change par height in general. So, try
 		// to update _only_ this paragraph. BufferView will detect if a full
 		// metrics update is needed anyway.
-		cur.updateFlags(Update::SinglePar | Update::FitCursor);
+		cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor);
 		return;
 	}
-
 	if (!needsUpdate
 	    && &oldTopSlice.inset() == &cur.inset()
 	    && oldTopSlice.idx() == cur.idx()
-	    && !sel // sel is a backup of cur.selection() at the biginning of the function.
+	    && !oldSelection // oldSelection is a backup of cur.selection() at the beginning of the function.
 	    && !cur.selection())
 		// FIXME: it would be better if we could just do this
 		//
 		//if (cur.result().update() != Update::FitCursor)
-		//	cur.noUpdate();
+		//	cur.noScreenUpdate();
 		//
 		// But some LFUNs do not set Update::FitCursor when needed, so we
 		// do it for all. This is not very harmfull as FitCursor will provoke
 		// a full redraw only if needed but still, a proper review of all LFUN
 		// should be done and this needsUpdate boolean can then be removed.
-		cur.updateFlags(Update::FitCursor);
+		cur.screenUpdateFlags(Update::FitCursor);
 	else
-		cur.updateFlags(Update::Force | Update::FitCursor);
+		cur.screenUpdateFlags(Update::Force | Update::FitCursor);
 }
 
 
 bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 			FuncStatus & flag) const
 {
-	LASSERT(cur.text() == this, /**/);
+	LBUFERR(this == cur.text());
 
 	FontInfo const & fontinfo = cur.real_current_font.fontInfo();
 	bool enable = true;
+	bool allow_in_passthru = false;
 	InsetCode code = NO_CODE;
 
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_DEPTH_DECREMENT:
 		enable = changeDepthAllowed(cur, DEC_DEPTH);
@@ -1995,14 +2489,20 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 
 	case LFUN_APPENDIX:
+		// FIXME We really should not allow this to be put, e.g.,
+		// in a footnote, or in ERT. But it would make sense in a
+		// branch, so I'm not sure what to do.
 		flag.setOnOff(cur.paragraph().params().startOfAppendix());
 		break;
 
 	case LFUN_DIALOG_SHOW_NEW_INSET:
 		if (cmd.argument() == "bibitem")
 			code = BIBITEM_CODE;
-		else if (cmd.argument() == "bibtex")
+		else if (cmd.argument() == "bibtex") {
 			code = BIBTEX_CODE;
+			// not allowed in description items
+			enable = !inDescriptionItem(cur);
+		}
 		else if (cmd.argument() == "box")
 			code = BOX_CODE;
 		else if (cmd.argument() == "branch")
@@ -2025,10 +2525,18 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 			code = INDEX_CODE;
 		else if (cmd.argument() == "index_print")
 			code = INDEX_PRINT_CODE;
+		else if (cmd.argument() == "listings")
+			code = LISTINGS_CODE;
+		else if (cmd.argument() == "mathspace")
+			code = MATH_HULL_CODE;
 		else if (cmd.argument() == "nomenclature")
 			code = NOMENCL_CODE;
+		else if (cmd.argument() == "nomencl_print")
+			code = NOMENCL_PRINT_CODE;
 		else if (cmd.argument() == "label")
 			code = LABEL_CODE;
+		else if (cmd.argument() == "line")
+			code = LINE_CODE;
 		else if (cmd.argument() == "note")
 			code = NOTE_CODE;
 		else if (cmd.argument() == "phantom")
@@ -2043,8 +2551,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 			code = VSPACE_CODE;
 		else if (cmd.argument() == "wrap")
 			code = WRAP_CODE;
-		else if (cmd.argument() == "listings")
-			code = LISTINGS_CODE;
 		break;
 
 	case LFUN_ERT_INSERT:
@@ -2066,23 +2572,71 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	case LFUN_FLOAT_INSERT:
 	case LFUN_FLOAT_WIDE_INSERT:
+		// FIXME: If there is a selection, we should check whether there
+		// are floats in the selection, but this has performance issues, see
+		// LFUN_CHANGE_ACCEPT/REJECT.
 		code = FLOAT_CODE;
-		// not allowed in description items
-		enable = !inDescriptionItem(cur);
+		if (inDescriptionItem(cur))
+			// not allowed in description items
+			enable = false;
+		else {
+			InsetCode const inset_code = cur.inset().lyxCode();
+
+			// algorithm floats cannot be put in another float
+			if (to_utf8(cmd.argument()) == "algorithm") {
+				enable = inset_code != WRAP_CODE && inset_code != FLOAT_CODE;
+				break;
+			}
+
+			// for figures and tables: only allow in another
+			// float or wrap if it is of the same type and
+			// not a subfloat already
+			if(cur.inset().lyxCode() == code) {
+				InsetFloat const & ins =
+					static_cast<InsetFloat const &>(cur.inset());
+				enable = ins.params().type == to_utf8(cmd.argument())
+					&& !ins.params().subfloat;
+			} else if(cur.inset().lyxCode() == WRAP_CODE) {
+				InsetWrap const & ins =
+					static_cast<InsetWrap const &>(cur.inset());
+				enable = ins.params().type == to_utf8(cmd.argument());
+			}
+		}
 		break;
 	case LFUN_WRAP_INSERT:
 		code = WRAP_CODE;
 		// not allowed in description items
 		enable = !inDescriptionItem(cur);
 		break;
-	case LFUN_FLOAT_LIST_INSERT:
+	case LFUN_FLOAT_LIST_INSERT: {
 		code = FLOAT_LIST_CODE;
-		break;
-	case LFUN_CAPTION_INSERT:
-		code = CAPTION_CODE;
 		// not allowed in description items
 		enable = !inDescriptionItem(cur);
+		if (enable) {
+			FloatList const & floats = cur.buffer()->params().documentClass().floats();
+			FloatList::const_iterator cit = floats[to_ascii(cmd.argument())];
+			// make sure we know about such floats
+			if (cit == floats.end() ||
+					// and that we know how to generate a list of them
+			    (!cit->second.usesFloatPkg() && cit->second.listCommand().empty())) {
+				flag.setUnknown(true);
+				// probably not necessary, but...
+				enable = false;
+			}
+		}
 		break;
+	}
+	case LFUN_CAPTION_INSERT: {
+		code = CAPTION_CODE;
+		string arg = cmd.getArg(0);
+		bool varia = arg != "LongTableNoNumber"
+			&& cur.inset().allowsCaptionVariation(arg);
+		// not allowed in description items,
+		// and in specific insets
+		enable = !inDescriptionItem(cur)
+			&& (varia || arg.empty() || arg == "Standard");
+		break;
+	}
 	case LFUN_NOTE_INSERT:
 		code = NOTE_CODE;
 		// in commands (sections etc.) and description items,
@@ -2108,9 +2662,13 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	case LFUN_BRANCH_INSERT:
 		code = BRANCH_CODE;
-		if (cur.buffer()->masterBuffer()->params().branchlist().empty())
+		if (cur.buffer()->masterBuffer()->params().branchlist().empty()
+		    && cur.buffer()->params().branchlist().empty())
 			enable = false;
 		break;
+	case LFUN_IPA_INSERT:
+		code = IPA_CODE;
+		break;
 	case LFUN_PHANTOM_INSERT:
 		code = PHANTOM_CODE;
 		break;
@@ -2120,16 +2678,66 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_INFO_INSERT:
 		code = INFO_CODE;
 		break;
-	case LFUN_OPTIONAL_INSERT:
-		code = OPTARG_CODE;
-		enable = cur.paragraph().insetList().count(OPTARG_CODE)
-			< cur.paragraph().layout().optionalargs;
+	case LFUN_ARGUMENT_INSERT: {
+		code = ARG_CODE;
+		allow_in_passthru = true;
+		string const arg = cmd.getArg(0);
+		if (arg.empty()) {
+			enable = false;
+			break;
+		}
+		Layout const & lay = cur.paragraph().layout();
+		Layout::LaTeXArgMap args = lay.args();
+		Layout::LaTeXArgMap::const_iterator const lait =
+				args.find(arg);
+		if (lait != args.end()) {
+			enable = true;
+			pit_type pit = cur.pit();
+			pit_type lastpit = cur.pit();
+			if (lay.isEnvironment() && !prefixIs(arg, "item:")) {
+				// In a sequence of "merged" environment layouts, we only allow
+				// non-item arguments once.
+				lastpit = cur.lastpit();
+				// get the first paragraph in sequence with this layout
+				depth_type const current_depth = cur.paragraph().params().depth();
+				while (true) {
+					if (pit == 0)
+						break;
+					Paragraph cpar = pars_[pit - 1];
+					if (cpar.layout() == lay && cpar.params().depth() == current_depth)
+						--pit;
+					else
+						break;
+				}
+			}
+			for (; pit <= lastpit; ++pit) {
+				if (pars_[pit].layout() != lay)
+					break;
+				InsetList::const_iterator it = pars_[pit].insetList().begin();
+				InsetList::const_iterator end = pars_[pit].insetList().end();
+				for (; it != end; ++it) {
+					if (it->inset->lyxCode() == ARG_CODE) {
+						InsetArgument const * ins =
+							static_cast<InsetArgument const *>(it->inset);
+						if (ins->name() == arg) {
+							// we have this already
+							enable = false;
+							break;
+						}
+					}
+				}
+			}
+		} else
+			enable = false;
 		break;
+	}
 	case LFUN_INDEX_INSERT:
 		code = INDEX_CODE;
 		break;
 	case LFUN_INDEX_PRINT:
 		code = INDEX_PRINT_CODE;
+		// not allowed in description items
+		enable = !inDescriptionItem(cur);
 		break;
 	case LFUN_NOMENCL_INSERT:
 		if (cur.selIsMultiCell() || cur.selIsMultiLine()) {
@@ -2140,17 +2748,24 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	case LFUN_NOMENCL_PRINT:
 		code = NOMENCL_PRINT_CODE;
+		// not allowed in description items
+		enable = !inDescriptionItem(cur);
 		break;
-	case LFUN_TOC_INSERT:
-		code = TOC_CODE;
-		break;
-	case LFUN_HYPERLINK_INSERT:
+	case LFUN_HREF_INSERT:
 		if (cur.selIsMultiCell() || cur.selIsMultiLine()) {
 			enable = false;
 			break;
 		}
 		code = HYPERLINK_CODE;
 		break;
+	case LFUN_IPAMACRO_INSERT: {
+		string const arg = cmd.getArg(0);
+		if (arg == "deco")
+			code = IPADECO_CODE;
+		else
+			code = IPACHAR_CODE;
+		break;
+	}
 	case LFUN_QUOTE_INSERT:
 		// always allow this, since we will inset a raw quote
 		// if an inset is not allowed.
@@ -2163,6 +2778,30 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		if (cur.inTexted())
 			code = SPACE_CODE;
 		break;
+	case LFUN_PREVIEW_INSERT:
+		code = PREVIEW_CODE;
+		break;
+	case LFUN_SCRIPT_INSERT:
+		code = SCRIPT_CODE;
+		break;
+
+	case LFUN_MATH_INSERT:
+	case LFUN_MATH_AMS_MATRIX:
+	case LFUN_MATH_MATRIX:
+	case LFUN_MATH_DELIM:
+	case LFUN_MATH_BIGDELIM:
+	case LFUN_MATH_DISPLAY:
+	case LFUN_MATH_MODE:
+	case LFUN_MATH_MACRO:
+	case LFUN_MATH_SUBSCRIPT:
+	case LFUN_MATH_SUPERSCRIPT:
+		code = MATH_HULL_CODE;
+		break;
+
+	case LFUN_REGEXP_MODE:
+		code = MATH_HULL_CODE;
+		enable = cur.buffer()->isInternal() && !cur.inRegexped();
+		break;
 
 	case LFUN_INSET_MODIFY:
 		// We need to disable this, because we may get called for a
@@ -2174,31 +2813,38 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 	case LFUN_FONT_EMPH:
 		flag.setOnOff(fontinfo.emph() == FONT_ON);
+		enable = !cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_FONT_ITAL:
 		flag.setOnOff(fontinfo.shape() == ITALIC_SHAPE);
+		enable = !cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_FONT_NOUN:
 		flag.setOnOff(fontinfo.noun() == FONT_ON);
+		enable = !cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_FONT_BOLD:
 	case LFUN_FONT_BOLDSYMBOL:
 		flag.setOnOff(fontinfo.series() == BOLD_SERIES);
+		enable = !cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_FONT_SANS:
 		flag.setOnOff(fontinfo.family() == SANS_FAMILY);
+		enable = !cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_FONT_ROMAN:
 		flag.setOnOff(fontinfo.family() == ROMAN_FAMILY);
+		enable = !cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_FONT_TYPEWRITER:
 		flag.setOnOff(fontinfo.family() == TYPEWRITER_FAMILY);
+		enable = !cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_CUT:
@@ -2224,6 +2870,20 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 			break;
 		}
 
+		// explicit text type?
+		if (arg == "html") {
+			// Do not enable for PlainTextType, since some tidying in the
+			// frontend is needed for HTML, which is too unsafe for plain text.
+			enable = theClipboard().hasTextContents(Clipboard::HtmlTextType);
+			break;
+		} else if (arg == "latex") {
+			// LaTeX is usually not available on the clipboard with
+			// the correct MIME type, but in plain text.
+			enable = theClipboard().hasTextContents(Clipboard::PlainTextType) ||
+			         theClipboard().hasTextContents(Clipboard::LaTeXTextType);
+			break;
+		}
+
 		// explicit graphics type?
 		Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
 		if ((arg == "pdf" && (type = Clipboard::PdfGraphicsType))
@@ -2242,6 +2902,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	 }
 
 	case LFUN_CLIPBOARD_PASTE:
+	case LFUN_CLIPBOARD_PASTE_SIMPLE:
 		enable = !theClipboard().empty();
 		break;
 
@@ -2261,21 +2922,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		enable = cur.pit() < cur.lastpit() && !cur.selection();
 		break;
 
-	case LFUN_INSET_DISSOLVE:
-		if (!cmd.argument().empty()) {
-			InsetLayout const & il = cur.inset().getLayout(cur.buffer()->params());
-			InsetLayout::InsetLyXType const type = 
-					translateLyXType(to_utf8(cmd.argument()));
-			enable = cur.inset().lyxCode() == FLEX_CODE
-			         && il.lyxtype() == type;
-		} else {
-			enable = ((!isMainText(cur.bv().buffer())
-			              && cur.inset().nargs() == 1)
-				  || (cur.nextInset()
-				      && cur.nextInset()->nargs() == 1));
-		}
-		break;
-
 	case LFUN_CHANGE_ACCEPT:
 	case LFUN_CHANGE_REJECT:
 		// In principle, these LFUNs should only be enabled if there
@@ -2283,10 +2929,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		// However, without proper optimizations, this will inevitably
 		// result in unacceptable performance - just imagine a user who
 		// wants to select the complete content of a long document.
-		if (!cur.selection()) {
-			Change const & change = cur.paragraph().lookupChange(cur.pos());
-			enable = change.changed();
-		} else
+		if (!cur.selection())
+			enable = cur.paragraph().isChanged(cur.pos());
+		else
 			// TODO: context-sensitive enabling of LFUN_CHANGE_ACCEPT/REJECT
 			// for selections.
 			enable = true;
@@ -2297,13 +2942,24 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_OUTLINE_IN:
 	case LFUN_OUTLINE_OUT:
 		// FIXME: LyX is not ready for outlining within inset.
-		enable = isMainText(cur.bv().buffer())
-			&& cur.paragraph().layout().toclevel != Layout::NOT_IN_TOC;
+		enable = isMainText()
+			&& cur.buffer()->text().getTocLevel(cur.pit()) != Layout::NOT_IN_TOC;
 		break;
 
 	case LFUN_NEWLINE_INSERT:
 		// LaTeX restrictions (labels or empty par)
-		enable = (cur.pos() > cur.paragraph().beginOfBody());
+		enable = !cur.paragraph().isPassThru()
+			&& cur.pos() > cur.paragraph().beginOfBody();
+		break;
+
+	case LFUN_SEPARATOR_INSERT:
+		// Always enabled for now
+		enable = true;
+		break;
+
+	case LFUN_TAB_INSERT:
+	case LFUN_TAB_DELETE:
+		enable = cur.paragraph().isPassThru();
 		break;
 
 	case LFUN_SET_GRAPHICS_GROUP: {
@@ -2317,17 +2973,10 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 	case LFUN_NEWPAGE_INSERT:
 		// not allowed in description items
+		code = NEWPAGE_CODE;
 		enable = !inDescriptionItem(cur);
 		break;
 
-	case LFUN_MATH_INSERT:
-	case LFUN_MATH_MATRIX:
-	case LFUN_MATH_DELIM:
-	case LFUN_MATH_BIGDELIM:
-		// not allowed in ERT, for example.
-		enable = cur.inset().insetAllowed(MATH_CODE);
-		break;
-
 	case LFUN_DATE_INSERT: {
 		string const format = cmd.argument().empty()
 			? lyxrc.date_insert_format : to_utf8(cmd.argument());
@@ -2335,9 +2984,91 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	}
 
+	case LFUN_LANGUAGE:
+		enable = !cur.paragraph().isPassThru();
+		flag.setOnOff(cmd.getArg(0) == cur.real_current_font.language()->lang());
+		break;
+
+	case LFUN_PARAGRAPH_BREAK:
+		enable = cur.inset().getLayout().isMultiPar();
+		break;
+
+	case LFUN_SPELLING_ADD:
+	case LFUN_SPELLING_IGNORE:
+	case LFUN_SPELLING_REMOVE:
+		enable = theSpellChecker();
+		break;
+
+	case LFUN_LAYOUT:
+		enable = !cur.inset().forcePlainLayout();
+		break;
+
+	case LFUN_ENVIRONMENT_SPLIT: {
+		if (cmd.argument() == "outer") {
+			// check if we have an environment in our nesting hierarchy
+			bool res = false;
+			depth_type const current_depth = cur.paragraph().params().depth();
+			pit_type pit = cur.pit();
+			Paragraph cpar = pars_[pit];
+			while (true) {
+				if (pit == 0 || cpar.params().depth() == 0)
+					break;
+				--pit;
+				cpar = pars_[pit];
+				if (cpar.params().depth() < current_depth)
+					res = cpar.layout().isEnvironment();
+			}
+			enable = res;
+			break;
+		}
+		else if (cur.paragraph().layout().isEnvironment()) {
+			enable = true;
+			break;
+		}
+		enable = false;
+		break;
+	}
+
+	case LFUN_LAYOUT_PARAGRAPH:
+	case LFUN_PARAGRAPH_PARAMS:
+	case LFUN_PARAGRAPH_PARAMS_APPLY:
+	case LFUN_PARAGRAPH_UPDATE:
+		enable = cur.inset().allowParagraphCustomization();
+		break;
+
+	// FIXME: why are accent lfuns forbidden with pass_thru layouts?
+	case LFUN_ACCENT_ACUTE:
+	case LFUN_ACCENT_BREVE:
+	case LFUN_ACCENT_CARON:
+	case LFUN_ACCENT_CEDILLA:
+	case LFUN_ACCENT_CIRCLE:
+	case LFUN_ACCENT_CIRCUMFLEX:
+	case LFUN_ACCENT_DOT:
+	case LFUN_ACCENT_GRAVE:
+	case LFUN_ACCENT_HUNGARIAN_UMLAUT:
+	case LFUN_ACCENT_MACRON:
+	case LFUN_ACCENT_OGONEK:
+	case LFUN_ACCENT_TIE:
+	case LFUN_ACCENT_TILDE:
+	case LFUN_ACCENT_UMLAUT:
+	case LFUN_ACCENT_UNDERBAR:
+	case LFUN_ACCENT_UNDERDOT:
+	case LFUN_FONT_DEFAULT:
+	case LFUN_FONT_FRAK:
+	case LFUN_FONT_SIZE:
+	case LFUN_FONT_STATE:
+	case LFUN_FONT_UNDERLINE:
+	case LFUN_FONT_STRIKEOUT:
+	case LFUN_FONT_UNDERUNDERLINE:
+	case LFUN_FONT_UNDERWAVE:
+	case LFUN_TEXTSTYLE_APPLY:
+	case LFUN_TEXTSTYLE_UPDATE:
+		enable = !cur.paragraph().isPassThru();
+		break;
+
 	case LFUN_WORD_DELETE_FORWARD:
 	case LFUN_WORD_DELETE_BACKWARD:
-	case LFUN_LINE_DELETE:
+	case LFUN_LINE_DELETE_FORWARD:
 	case LFUN_WORD_FORWARD:
 	case LFUN_WORD_BACKWARD:
 	case LFUN_WORD_RIGHT:
@@ -2363,15 +3094,21 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_WORD_RIGHT_SELECT:
 	case LFUN_WORD_LEFT_SELECT:
 	case LFUN_WORD_SELECT:
+	case LFUN_SECTION_SELECT:
+	case LFUN_BUFFER_BEGIN:
+	case LFUN_BUFFER_END:
+	case LFUN_BUFFER_BEGIN_SELECT:
+	case LFUN_BUFFER_END_SELECT:
+	case LFUN_INSET_BEGIN:
+	case LFUN_INSET_END:
+	case LFUN_INSET_BEGIN_SELECT:
+	case LFUN_INSET_END_SELECT:
 	case LFUN_PARAGRAPH_UP:
 	case LFUN_PARAGRAPH_DOWN:
 	case LFUN_LINE_BEGIN:
 	case LFUN_LINE_END:
 	case LFUN_CHAR_DELETE_FORWARD:
 	case LFUN_CHAR_DELETE_BACKWARD:
-	case LFUN_BREAK_PARAGRAPH:
-	case LFUN_PARAGRAPH_SPACING:
-	case LFUN_INSET_INSERT:
 	case LFUN_WORD_UPCASE:
 	case LFUN_WORD_LOWCASE:
 	case LFUN_WORD_CAPITALIZE:
@@ -2379,61 +3116,36 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_SERVER_GET_XY:
 	case LFUN_SERVER_SET_XY:
 	case LFUN_SERVER_GET_LAYOUT:
-	case LFUN_LAYOUT:
 	case LFUN_SELF_INSERT:
-	case LFUN_LINE_INSERT:
-	case LFUN_MATH_DISPLAY:
-	case LFUN_MATH_MODE:
-	case LFUN_MATH_MACRO:
-	case LFUN_MATH_SUBSCRIPT:
-	case LFUN_MATH_SUPERSCRIPT:
-	case LFUN_FONT_DEFAULT:
-	case LFUN_FONT_UNDERLINE:
-	case LFUN_FONT_SIZE:
-	case LFUN_LANGUAGE:
-	case LFUN_TEXTSTYLE_APPLY:
-	case LFUN_TEXTSTYLE_UPDATE:
-	case LFUN_LAYOUT_PARAGRAPH:
-	case LFUN_PARAGRAPH_UPDATE:
-	case LFUN_ACCENT_UMLAUT:
-	case LFUN_ACCENT_CIRCUMFLEX:
-	case LFUN_ACCENT_GRAVE:
-	case LFUN_ACCENT_ACUTE:
-	case LFUN_ACCENT_TILDE:
-	case LFUN_ACCENT_CEDILLA:
-	case LFUN_ACCENT_MACRON:
-	case LFUN_ACCENT_DOT:
-	case LFUN_ACCENT_UNDERDOT:
-	case LFUN_ACCENT_UNDERBAR:
-	case LFUN_ACCENT_CARON:
-	case LFUN_ACCENT_BREVE:
-	case LFUN_ACCENT_TIE:
-	case LFUN_ACCENT_HUNGARIAN_UMLAUT:
-	case LFUN_ACCENT_CIRCLE:
-	case LFUN_ACCENT_OGONEK:
+	case LFUN_UNICODE_INSERT:
 	case LFUN_THESAURUS_ENTRY:
-	case LFUN_PARAGRAPH_PARAMS_APPLY:
-	case LFUN_PARAGRAPH_PARAMS:
 	case LFUN_ESCAPE:
-	case LFUN_BUFFER_BEGIN:
-	case LFUN_BUFFER_END:
-	case LFUN_BUFFER_BEGIN_SELECT:
-	case LFUN_BUFFER_END_SELECT:
-	case LFUN_INSET_BEGIN:
-	case LFUN_INSET_END:
-	case LFUN_INSET_BEGIN_SELECT:
-	case LFUN_INSET_END_SELECT:
-	case LFUN_UNICODE_INSERT:
+	case LFUN_SERVER_GET_STATISTICS:
 		// these are handled in our dispatch()
 		enable = true;
 		break;
 
+	case LFUN_INSET_INSERT: {
+		string const type = cmd.getArg(0);
+		if (type == "toc") {
+			code = TOC_CODE;
+			// not allowed in description items
+			//FIXME: couldn't this be merged in Inset::insetAllowed()?
+			enable = !inDescriptionItem(cur);
+		} else {
+			enable = true;
+		}
+		break;
+	}
+
 	default:
 		return false;
 	}
 
 	if (code != NO_CODE
-	    && (cur.empty() || !cur.inset().insetAllowed(code)))
+	    && (cur.empty()
+		|| !cur.inset().insetAllowed(code)
+		|| (cur.paragraph().layout().pass_thru && !allow_in_passthru)))
 		enable = false;
 
 	flag.setEnabled(enable);
@@ -2444,13 +3156,12 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 void Text::pasteString(Cursor & cur, docstring const & clip,
 		bool asParagraphs)
 {
-	cur.clearSelection();
 	if (!clip.empty()) {
 		cur.recordUndo();
 		if (asParagraphs)
-			insertStringAsParagraphs(cur, clip);
+			insertStringAsParagraphs(cur, clip, cur.current_font);
 		else
-			insertStringAsLines(cur, clip);
+			insertStringAsLines(cur, clip, cur.current_font);
 	}
 }