X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=8707b76062d8c6569981cf00cc91cccc98cae628;hb=43dd383073fc61cfe5f24b87294c4e8698a1827a;hp=e17e965170d88ec129266ebfd7cdd737d0742750;hpb=c7549c1b546794526f6e944905db360743760c1c;p=lyx.git

diff --git a/src/Text3.cpp b/src/Text3.cpp
index e17e965170..8707b76062 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -47,10 +47,12 @@
 #include "TextMetrics.h"
 #include "WordLangTuple.h"
 
+#include "frontends/alert.h"
 #include "frontends/Application.h"
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"
 
+#include "insets/InsetArgument.h"
 #include "insets/InsetCollapsable.h"
 #include "insets/InsetCommand.h"
 #include "insets/InsetExternal.h"
@@ -58,6 +60,7 @@
 #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"
@@ -69,14 +72,14 @@
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
 #include "support/lyxtime.h"
 #include "support/os.h"
+#include "support/regex.h"
 
 #include "mathed/InsetMathHull.h"
 #include "mathed/MathMacroTemplate.h"
 
-#include <boost/next_prior.hpp>
-
 #include <clocale>
 #include <sstream>
 
@@ -146,7 +149,7 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display)
 #endif
 		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
@@ -227,6 +230,15 @@ 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)
 {
@@ -253,6 +265,42 @@ static bool doInsertInset(Cursor & cur, Text * text,
 		}
 		return true;
 	}
+	else if (cmd.action() == LFUN_ARGUMENT_INSERT) {
+		bool cotextinsert = false;
+		InsetArgument const * const ia = static_cast<InsetArgument const *>(inset);
+		Layout const & lay = cur.paragraph().layout();
+		Layout::LaTeXArgMap args = lay.args();
+		Layout::LaTeXArgMap::const_iterator const lait = args.find(ia->name());
+		if (lait != args.end())
+			cotextinsert = (*lait).second.insertcotext;
+		else {
+			InsetLayout const & il = cur.inset().getLayout();
+			args = il.args();
+			Layout::LaTeXArgMap::const_iterator const ilait = args.find(ia->name());
+			if (ilait != args.end())
+				cotextinsert = (*ilait).second.insertcotext;
+		}
+		// The argument requests to insert a copy of the co-text to the inset
+		if (cotextinsert) {
+			docstring ds;
+			// If we have a selection within a paragraph, use this
+			if (cur.selection() && cur.selBegin().pit() == cur.selEnd().pit())
+				ds = cur.selectionAsString(false);
+			// else use the whole paragraph
+			else
+				ds = cur.paragraph().asString();
+			text->insertInset(cur, inset);
+			if (edit)
+				inset->edit(cur, true);
+			// Now put co-text into inset
+			Font const f(inherit_font, cur.current_font.language());
+			if (!ds.empty()) {
+				cur.text()->insertStringAsLines(cur, ds, f);
+				cur.leaveInset(*inset);
+			}
+			return true;
+		}
+	}
 
 	bool gotsel = false;
 	if (cur.selection()) {
@@ -284,7 +332,14 @@ static bool doInsertInset(Cursor & cur, Text * text,
 			// 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);
@@ -321,14 +376,12 @@ static void outline(OutlineOp mode, Cursor & cur)
 	ParagraphList & pars = buf.text().paragraphs();
 	ParagraphList::iterator const bgn = pars.begin();
 	// The first paragraph of the area to be copied:
-	ParagraphList::iterator start = boost::next(bgn, pit);
+	ParagraphList::iterator start = next(bgn, pit);
 	// The final paragraph of area to be copied:
 	ParagraphList::iterator finish = start;
 	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
@@ -337,7 +390,7 @@ static void outline(OutlineOp mode, Cursor & cur)
 
 	// Seek the one (on same level) below
 	for (; finish != end; ++finish) {
-		toclevel = finish->layout().toclevel;
+		toclevel = buf.text().getTocLevel(distance(bgn, finish));
 		if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
 			break;
 	}
@@ -354,7 +407,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));
@@ -364,7 +417,7 @@ static void outline(OutlineOp mode, Cursor & cur)
 			pit_type const newpit = distance(bgn, dest);
 			pit_type const len = distance(start, finish);
 			pit_type const deletepit = pit + len;
-			buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1);
+			buf.undo().recordUndo(cur, newpit, deletepit - 1);
 			pars.splice(dest, start, finish);
 			cur.pit() = newpit;
 			break;
@@ -374,34 +427,41 @@ static void outline(OutlineOp mode, Cursor & cur)
 				// Nothing to move.
 				return;
 			// Go one down from *this* header:
-			ParagraphList::iterator dest = boost::next(finish, 1);
+			ParagraphList::iterator dest = 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)
 					break;
 			}
 			// One such was found:
 			pit_type newpit = distance(bgn, dest);
-			buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
+			buf.undo().recordUndo(cur, pit, newpit - 1);
 			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);
+			buf.undo().recordUndo(cur, 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 & tc = buf.params().documentClass();
 				DocumentClass::const_iterator lit = tc.begin();
 				DocumentClass::const_iterator len = tc.end();
+				int const newtoclevel = 
+					(mode == OutlineIn ? toclevel + 1 : toclevel - 1);
+				LabelType const oldlabeltype = start->layout().labeltype;
+
 				for (; lit != len; ++lit) {
-					if (lit->toclevel == toclevel + 1 &&
-					    start->layout().labeltype == lit->labeltype) {
+					if (lit->toclevel ==  newtoclevel &&
+					     lit->labeltype == oldlabeltype) {
 						start->setLayout(*lit);
 						break;
 					}
@@ -409,25 +469,6 @@ static void outline(OutlineOp mode, Cursor & cur)
 			}
 			break;
 		}
-		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;
-					}
-				}
-			}
-			break;
-		}
 	}
 }
 
@@ -470,7 +511,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	// at the end?
 	cur.noScreenUpdate();
 
-	LASSERT(cur.text() == this, /**/);
+	LBUFERR(this == cur.text());
+	
+	// NOTE: This should NOT be a reference. See commit 94a5481a.
 	CursorSlice const oldTopSlice = cur.top();
 	bool const oldBoundary = cur.boundary();
 	bool const oldSelection = cur.selection();
@@ -483,13 +526,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		LyXAction::NoUpdate) || singleParUpdate);
 	bool const last_misspelled = lyxrc.spellcheck_continuously
 		&& cur.paragraph().isMisspelled(cur.pos(), true);
-	
+
 	FuncCode const act = cmd.action();
 	switch (act) {
 
 	case LFUN_PARAGRAPH_MOVE_DOWN: {
 		pit_type const pit = cur.pit();
-		recUndo(cur, pit, pit + 1);
+		cur.recordUndo(pit, pit + 1);
 		cur.finishUndo();
 		pars_.swap(pit, pit + 1);
 		needsUpdate = true;
@@ -500,7 +543,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_PARAGRAPH_MOVE_UP: {
 		pit_type const pit = cur.pit();
-		recUndo(cur, pit - 1, pit);
+		cur.recordUndo(pit - 1, pit);
 		cur.finishUndo();
 		pars_.swap(pit, pit - 1);
 		--cur.pit();
@@ -519,7 +562,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// FIXME: this don't work for multipart document!
 		for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
 			if (pars_[tmp].params().startOfAppendix()) {
-				recUndo(cur, tmp);
+				cur.recordUndo(tmp, tmp);
 				pars_[tmp].params().startOfAppendix(false);
 				break;
 			}
@@ -549,7 +592,7 @@ 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
@@ -597,87 +640,72 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		cur.screenUpdateFlags(Update::FitCursor);
 		break;
 
-	case LFUN_INSET_SELECT_ALL:
-		if (cur.depth() == 1 || !cur.selection() || !cur.selBegin().at_begin()
-			  || !cur.selEnd().at_end()) {
-			needsUpdate |= cur.selHandle(false);
-			needsUpdate |= cursorTop(cur);
-			needsUpdate |= cur.selHandle(true);
-			needsUpdate |= cursorBottom(cur);
-		} else 
-			cur.undispatched();
-		cur.screenUpdateFlags(Update::FitCursor);
-		break;
-
 	case LFUN_CHAR_FORWARD:
-	case LFUN_CHAR_FORWARD_SELECT:
+	case LFUN_CHAR_FORWARD_SELECT: {
 		//LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur);
 		needsUpdate |= cur.selHandle(act == LFUN_CHAR_FORWARD_SELECT);
-		needsUpdate |= cursorForward(cur);
+		bool const cur_moved = cursorForward(cur);
+		needsUpdate |= cur_moved;
 
-		if (!needsUpdate && oldTopSlice == cur.top()
-				&& cur.boundary() == oldBoundary) {
+		if (!cur_moved && 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 
+			// 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() 
+			if (cur.depth() > 1 && cur.pos() == cur.lastpos()
 				  && cur.pit() == cur.lastpit()) {
-				// The cursor hasn't changed yet. To give the 
+				// 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)) {
+				if (cur.bv().checkDepm(dummy, cur))
 					cur.forceBufferUpdate();
-					// DEPM may have requested a screen update
-					cur.screenUpdateFlags(
-						cur.screenUpdate() | dummy.screenUpdate());
-				}
 			}
 		}
 		break;
+	}
 
 	case LFUN_CHAR_BACKWARD:
-	case LFUN_CHAR_BACKWARD_SELECT:
+	case LFUN_CHAR_BACKWARD_SELECT: {
 		//lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
 		needsUpdate |= cur.selHandle(act == LFUN_CHAR_BACKWARD_SELECT);
-		needsUpdate |= cursorBackward(cur);
+		bool const cur_moved = cursorBackward(cur);
+		needsUpdate |= cur_moved;
 
-		if (!needsUpdate && oldTopSlice == cur.top()
-			&& cur.boundary() == oldBoundary) {
+		if (!cur_moved && 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 
+			// 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 
+				// 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)) {
+				if (cur.bv().checkDepm(dummy, cur))
 					cur.forceBufferUpdate();
-					// DEPM may have requested a screen update
-					cur.screenUpdateFlags(
-						cur.screenUpdate() | dummy.screenUpdate());
-				}
 			}
 		}
 		break;
+	}
 
 	case LFUN_CHAR_LEFT:
 	case LFUN_CHAR_LEFT_SELECT:
 		if (lyxrc.visual_cursor) {
 			needsUpdate |= cur.selHandle(act == LFUN_CHAR_LEFT_SELECT);
-			needsUpdate |= cursorVisLeft(cur);
-			if (!needsUpdate && oldTopSlice == cur.top()
-					&& cur.boundary() == oldBoundary) {
+			bool const cur_moved = cursorVisLeft(cur);
+			needsUpdate |= cur_moved;
+			if (!cur_moved && oldTopSlice == cur.top()
+				       && cur.boundary() == oldBoundary) {
 				cur.undispatched();
 				cmd = FuncRequest(LFUN_FINISHED_LEFT);
 			}
@@ -698,9 +726,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_CHAR_RIGHT_SELECT:
 		if (lyxrc.visual_cursor) {
 			needsUpdate |= cur.selHandle(cmd.action() == LFUN_CHAR_RIGHT_SELECT);
-			needsUpdate |= cursorVisRight(cur);
-			if (!needsUpdate && oldTopSlice == cur.top()
-					&& cur.boundary() == oldBoundary) {
+			bool const cur_moved = cursorVisRight(cur);
+			needsUpdate |= cur_moved;
+			if (!cur_moved && oldTopSlice == cur.top()
+				       && cur.boundary() == oldBoundary) {
 				cur.undispatched();
 				cmd = FuncRequest(LFUN_FINISHED_RIGHT);
 			}
@@ -731,15 +760,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		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();
 		}
@@ -777,12 +805,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		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);
+		ParagraphList::iterator start = next(bgn, pit);
 		// The final paragraph of area to be selected:
 		ParagraphList::iterator finish = start;
 		ParagraphList::iterator end = pars.end();
 
-		int const thistoclevel = start->layout().toclevel;
+		int const thistoclevel = buf.text().getTocLevel(distance(bgn, start));
 		if (thistoclevel == Layout::NOT_IN_TOC)
 			break;
 
@@ -796,12 +824,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 		// Seek the one (on same level) below
 		for (; finish != end; ++finish, ++cur.pit()) {
-			int const toclevel = finish->layout().toclevel;
+			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;
 	}
@@ -810,9 +838,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_WORD_RIGHT_SELECT:
 		if (lyxrc.visual_cursor) {
 			needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_RIGHT_SELECT);
-			needsUpdate |= cursorVisRightOneWord(cur);
-			if (!needsUpdate && oldTopSlice == cur.top()
-					&& cur.boundary() == oldBoundary) {
+			bool const cur_moved = cursorVisRightOneWord(cur);
+			needsUpdate |= cur_moved;
+			if (!cur_moved && oldTopSlice == cur.top()
+				       && cur.boundary() == oldBoundary) {
 				cur.undispatched();
 				cmd = FuncRequest(LFUN_FINISHED_RIGHT);
 			}
@@ -830,42 +859,41 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_WORD_FORWARD:
-	case LFUN_WORD_FORWARD_SELECT:
+	case LFUN_WORD_FORWARD_SELECT: {
 		needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_FORWARD_SELECT);
-		needsUpdate |= cursorForwardOneWord(cur);
+		bool const cur_moved = cursorForwardOneWord(cur);
+		needsUpdate |= cur_moved;
 
-		if (!needsUpdate && oldTopSlice == cur.top()
-				&& cur.boundary() == oldBoundary) {
+		if (!cur_moved && 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 
+			// 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() 
+			if (cur.depth() > 1 && cur.pos() == cur.lastpos()
 				  && cur.pit() == cur.lastpit()) {
-				// The cursor hasn't changed yet. To give the 
+				// 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)) {
+				if (cur.bv().checkDepm(dummy, cur))
 					cur.forceBufferUpdate();
-					// DEPM may have requested a screen update
-					cur.screenUpdateFlags(
-						cur.screenUpdate() | dummy.screenUpdate());
-				}
 			}
 		}
 		break;
+	}
 
 	case LFUN_WORD_LEFT:
 	case LFUN_WORD_LEFT_SELECT:
 		if (lyxrc.visual_cursor) {
 			needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_LEFT_SELECT);
-			needsUpdate |= cursorVisLeftOneWord(cur);
-			if (!needsUpdate && oldTopSlice == cur.top()
-					&& cur.boundary() == oldBoundary) {
+			bool const cur_moved = cursorVisLeftOneWord(cur);
+			needsUpdate |= cur_moved;
+			if (!cur_moved && oldTopSlice == cur.top()
+				       && cur.boundary() == oldBoundary) {
 				cur.undispatched();
 				cmd = FuncRequest(LFUN_FINISHED_LEFT);
 			}
@@ -883,35 +911,33 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_WORD_BACKWARD:
-	case LFUN_WORD_BACKWARD_SELECT:
+	case LFUN_WORD_BACKWARD_SELECT: {
 		needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_BACKWARD_SELECT);
-		needsUpdate |= cursorBackwardOneWord(cur);
-	
-		if (!needsUpdate && oldTopSlice == cur.top()
-				&& cur.boundary() == oldBoundary) {
+		bool const cur_moved = cursorBackwardOneWord(cur);
+		needsUpdate |= cur_moved;
+
+		if (!cur_moved && 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 
+			// 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 
+			if (cur.depth() > 1 && cur.pos() == 0
 				  && cur.pit() == 0) {
-				// The cursor hasn't changed yet. To give the 
+				// 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)) {
+				if (cur.bv().checkDepm(dummy, cur))
 					cur.forceBufferUpdate();
-					// DEPM may have requested a screen update
-					cur.screenUpdateFlags(
-						cur.screenUpdate() | dummy.screenUpdate());
-				}
 			}
 		}
 		break;
+	}
 
 	case LFUN_WORD_SELECT: {
 		selectWord(cur, WHOLE_WORD);
@@ -922,15 +948,12 @@ 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);
@@ -946,8 +969,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			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().trackChanges);
+				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)
@@ -960,13 +983,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			// 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);	
+			dispatch(cur, cmd);
 		}
 		break;
 	}
 
 	case LFUN_TAB_DELETE: {
-		bool const tc = bv->buffer().params().trackChanges;
+		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.
@@ -980,11 +1003,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				if (c == '\t' || c == ' ') {
 					// remove either 1 tab or 4 spaces.
 					int const n = (c == ' ' ? 4 : 1);
-					for (int i = 0; i < n 
+					for (int i = 0; i < n
 						  && !par.empty() && par.getChar(0) == c; ++i) {
 						if (cur.pit() == pit)
 							cur.posBackward();
-						if (cur.realAnchor().pit() == pit 
+						if (cur.realAnchor().pit() == pit
 							  && cur.realAnchor().pos() > 0 )
 							cur.realAnchor().backwardPos();
 						par.eraseChar(0, tc);
@@ -993,23 +1016,23 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 			cur.finishUndo();
 		} else {
-			// If there is no selection, try to remove a tab or some spaces 
+			// 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; 
+				for (int n_spaces = 0;
 				     cur.pos() > 0
-					     && par.getChar(cur.pos() - 1) == ' ' 
+					     && par.getChar(cur.pos() - 1) == ' '
 					     && n_spaces < 4;
 				     ++n_spaces) {
 					cur.posBackward();
@@ -1022,11 +1045,20 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	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 {
@@ -1039,13 +1071,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();
-				// It is possible to make it a lot faster still
-				// just comment out the line below...
+				if (par_boundary && cur.pos() > 0
+				    && cur.paragraph().isEnvSeparator(cur.pos() - 1)) {
+					needsUpdate |= backspace(cur);
+					cur.resetAnchor();
+				}
 			}
 		} else {
 			cutSelection(cur, true, false);
@@ -1053,11 +1089,42 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		}
 		break;
 
-	case LFUN_BREAK_PARAGRAPH:
+	case LFUN_PARAGRAPH_BREAK: {
 		cap::replaceSelection(cur);
-		breakParagraph(cur, cmd.argument() == "inverse");
+		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 {
+			breakParagraph(cur, cmd.argument() == "inverse");
+		}
 		cur.resetAnchor();
 		break;
+	}
 
 	case LFUN_INSET_INSERT: {
 		cur.recordUndo();
@@ -1082,13 +1149,13 @@ 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':
 				cur.pos() = par.size();
 				// Insert a new paragraph
-				FuncRequest fr(LFUN_BREAK_PARAGRAPH);
+				FuncRequest fr(LFUN_PARAGRAPH_BREAK);
 				dispatch(cur, fr);
 			}
 			*/
@@ -1167,6 +1234,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
 		else if (name == "menu-separator")
 			specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
+		else if (name == "lyx")
+			specialChar(cur, InsetSpecialChar::PHRASE_LYX);
+		else if (name == "tex")
+			specialChar(cur, InsetSpecialChar::PHRASE_TEX);
+		else if (name == "latex")
+			specialChar(cur, InsetSpecialChar::PHRASE_LATEX);
+		else if (name == "latex2e")
+			specialChar(cur, InsetSpecialChar::PHRASE_LATEX2E);
 		else if (name.empty())
 			lyxerr << "LyX function 'specialchar-insert' needs an argument." << endl;
 		else
@@ -1174,6 +1249,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;
@@ -1192,23 +1296,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")
@@ -1223,9 +1334,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				type = Clipboard::EmfGraphicsType;
 			else if (arg == "wmf")
 				type = Clipboard::WmfGraphicsType;
-
 			else
-				LASSERT(false, /**/);
+				// we also check in getStatus()
+				LYXERR0("Unrecognized graphics type: " << arg);
 
 			pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type);
 		}
@@ -1233,6 +1344,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		bv->buffer().errors("Paste");
 		cur.clearSelection(); // bug 393
 		cur.finishUndo();
+		bv->buffer().updatePreviews();
 		break;
 	}
 
@@ -1327,6 +1439,53 @@ 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;
 	}
 
@@ -1374,25 +1533,25 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_QUOTE_INSERT: {
-		// this avoids a double undo
-		// FIXME: should not be needed, ideally
-		if (!cur.selection())
-			cur.recordUndo();
 		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();
-		bool const hebrew = 
+		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 const arg = to_utf8(cmd.argument());
 			InsetQuotes::QuoteTimes const quote_type = (arg == "single")
 				? InsetQuotes::SingleQuotes : InsetQuotes::DoubleQuotes;
 			cur.insert(new InsetQuotes(cur.buffer(), c, quote_type));
@@ -1400,8 +1559,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		} else {
 			// The cursor might have been invalidated by the replaceSelection.
 			cur.buffer()->changed(true);
-			lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
-		}			
+			string const quote_string = (arg == "single") ? "'" : "\"";
+			lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, quote_string));
+		}
 		break;
 	}
 
@@ -1425,7 +1585,7 @@ 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;
@@ -1445,11 +1605,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			break;
 
 		case mouse_button::button2:
-			// Middle mouse pasting.
-			bv->mouseSetCursor(cur);
-			lyx::dispatch(
-				FuncRequest(LFUN_COMMAND_ALTERNATIVES,
-					    "selection-paste ; primary-selection-paste paragraph"));
+			if (lyxrc.mouse_middlebutton_paste) {
+				// Middle mouse pasting.
+				bv->mouseSetCursor(cur);
+				lyx::dispatch(
+					FuncRequest(LFUN_COMMAND_ALTERNATIVES,
+						    "selection-paste ; primary-selection-paste paragraph"));
+			}
 			cur.noScreenUpdate();
 			break;
 
@@ -1583,16 +1745,47 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		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();
+
+		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 {
@@ -1640,7 +1833,6 @@ 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:
@@ -1661,6 +1853,37 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		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
 		if (doInsertInset(cur, this, cmd, false, true))
@@ -1745,7 +1968,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		dispatch(cur, fr);
 		break;
 	}
-	
+
 	case LFUN_NOMENCL_PRINT:
 	case LFUN_NEWPAGE_INSERT:
 		// do nothing fancy
@@ -1753,6 +1976,16 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		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;
@@ -1821,7 +2054,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		cap::replaceSelection(cur);
 		cur.insert(new InsetMathHull(cur.buffer(), hullSimple));
 		checkAndActivateInset(cur, true);
-		LASSERT(cur.inMathed(), /**/);
+		LASSERT(cur.inMathed(), break);
 		cur.dispatch(cmd);
 		break;
 	}
@@ -1889,14 +2122,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_FONT_UULINE: {
+	case LFUN_FONT_UNDERUNDERLINE: {
 		Font font(ignore_font, ignore_language);
 		font.fontInfo().setUuline(FONT_TOGGLE);
 		toggleAndShow(cur, this, font);
 		break;
 	}
 
-	case LFUN_FONT_UWAVE: {
+	case LFUN_FONT_UNDERWAVE: {
 		Font font(ignore_font, ignore_language);
 		font.fontInfo().setUwave(FONT_TOGGLE);
 		toggleAndShow(cur, this, font);
@@ -1918,12 +2151,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, false);
+		toggleAndShow(cur, this, font, toggle);
 		break;
 	}
 
@@ -2080,6 +2320,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				arg += " lang=" + from_ascii(cur.getFont().language()->lang());
 			}
 		}
+		if (lyxrc.thesaurusdir_path.empty()) {
+			frontend::Alert::warning(_("Path to thesaurus directory not set!"),
+					_("The path to the thesaurus directory has not been specified.\n"
+					  "The thesaurus is not functional.\n"
+					  "Please refer to sec. 6.15.1 of the User's Guide for setup\n"
+					  "instructions."));
+		}
 		bv->showDialog("thesaurus", to_utf8(arg));
 		break;
 	}
@@ -2096,8 +2343,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				word = cur.selectionAsString(false);
 			}
 			lang = const_cast<Language *>(cur.getFont().language());
-		} else
+		} else if (cmd.getArg(1).empty()) {
+			// optional language argument is missing
+			// use the language at cursor position
+			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;
@@ -2115,8 +2367,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				word = cur.selectionAsString(false);
 			}
 			lang = const_cast<Language *>(cur.getFont().language());
-		} else
+		} else if (cmd.getArg(1).empty()) {
+			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;
@@ -2134,8 +2389,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				word = cur.selectionAsString(false);
 			}
 			lang = const_cast<Language *>(cur.getFont().language());
-		} else
+		} else if (cmd.getArg(1).empty()) {
+			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;
@@ -2200,6 +2458,33 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		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();
@@ -2265,10 +2550,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 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()) {
@@ -2282,6 +2568,9 @@ 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;
 
@@ -2315,6 +2604,10 @@ 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")
@@ -2337,8 +2630,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:
@@ -2414,11 +2705,17 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		}
 		break;
 	}
-	case LFUN_CAPTION_INSERT:
+	case LFUN_CAPTION_INSERT: {
 		code = CAPTION_CODE;
-		// not allowed in description items
-		enable = !inDescriptionItem(cur);
+		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,
@@ -2462,9 +2759,55 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	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();
-		int const numargs = lay.reqargs + lay.optargs;
-		enable = cur.paragraph().insetList().count(ARG_CODE) < numargs;
+		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:
@@ -2487,13 +2830,21 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		// not allowed in description items
 		enable = !inDescriptionItem(cur);
 		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.
@@ -2598,22 +2949,44 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 			break;
 		}
 
-		// explicit graphics type?
-		Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
-		if ((arg == "pdf" && (type = Clipboard::PdfGraphicsType))
-			  || (arg == "png" && (type = Clipboard::PngGraphicsType))
-			  || (arg == "jpeg" && (type = Clipboard::JpegGraphicsType))
-			  || (arg == "linkback" &&  (type = Clipboard::LinkBackGraphicsType))
-			  || (arg == "emf" &&  (type = Clipboard::EmfGraphicsType))
-			  || (arg == "wmf" &&  (type = Clipboard::WmfGraphicsType))) {
-			enable = theClipboard().hasGraphicsContents(type);
+		// 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;
 		}
 
-		// unknown argument
-		enable = false;
+		Clipboard::GraphicsType type = Clipboard::AnyGraphicsType;
+		if (arg == "pdf")
+			type = Clipboard::PdfGraphicsType;
+		else if (arg == "png")
+			type = Clipboard::PngGraphicsType;
+		else if (arg == "jpeg")
+			type = Clipboard::JpegGraphicsType;
+		else if (arg == "linkback")
+			type = Clipboard::LinkBackGraphicsType;
+		else if (arg == "emf")
+			type = Clipboard::EmfGraphicsType;
+		else if (arg == "wmf")
+			type = Clipboard::WmfGraphicsType;
+		else {
+			// unknown argument
+			LYXERR0("Unrecognized graphics type: " << arg);
+			// we don't want to assert if the user just mistyped the LFUN
+			LATTEST(cmd.origin() != FuncRequest::INTERNAL);
+			enable = false;
+			break;
+		}
+		enable = theClipboard().hasGraphicsContents(type);
 		break;
-	 }
+	}
 
 	case LFUN_CLIPBOARD_PASTE:
 	case LFUN_CLIPBOARD_PASTE_SIMPLE:
@@ -2657,12 +3030,18 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_OUTLINE_OUT:
 		// FIXME: LyX is not ready for outlining within inset.
 		enable = isMainText()
-			&& cur.paragraph().layout().toclevel != Layout::NOT_IN_TOC;
+			&& 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:
@@ -2694,23 +3073,62 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 	case LFUN_LANGUAGE:
 		enable = !cur.paragraph().isPassThru();
-		flag.setOnOff(to_utf8(cmd.argument()) == cur.real_current_font.language()->lang());
+		flag.setOnOff(cmd.getArg(0) == cur.real_current_font.language()->lang());
 		break;
 
-	case LFUN_BREAK_PARAGRAPH:
-		enable = cur.inset().getLayout().isMultiPar();
+	case LFUN_PARAGRAPH_BREAK:
+		enable = inset().allowMultiPar();
 		break;
-	
+
 	case LFUN_SPELLING_ADD:
 	case LFUN_SPELLING_IGNORE:
 	case LFUN_SPELLING_REMOVE:
-		enable = theSpellChecker();
+		enable = theSpellChecker() != NULL;
+		if (enable && !cmd.getArg(1).empty()) {
+			// validate explicitly given language
+			Language const * const lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
+			enable &= lang != NULL;
+		}
 		break;
 
-	case LFUN_LAYOUT:
+	case LFUN_LAYOUT: {
 		enable = !cur.inset().forcePlainLayout();
+
+		docstring layout = cmd.argument();
+		if (layout.empty()) {
+			DocumentClass const & tclass = cur.buffer()->params().documentClass();
+			layout = tclass.defaultLayoutName();
+		}
+		flag.setOnOff(layout == cur.paragraph().layout().name());
 		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:
@@ -2741,8 +3159,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_FONT_STATE:
 	case LFUN_FONT_UNDERLINE:
 	case LFUN_FONT_STRIKEOUT:
-	case LFUN_FONT_UULINE:
-	case LFUN_FONT_UWAVE:
+	case LFUN_FONT_UNDERUNDERLINE:
+	case LFUN_FONT_UNDERWAVE:
 	case LFUN_TEXTSTYLE_APPLY:
 	case LFUN_TEXTSTYLE_UPDATE:
 		enable = !cur.paragraph().isPassThru();
@@ -2750,7 +3168,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 	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:
@@ -2785,7 +3203,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_INSET_END:
 	case LFUN_INSET_BEGIN_SELECT:
 	case LFUN_INSET_END_SELECT:
-	case LFUN_INSET_SELECT_ALL:
 	case LFUN_PARAGRAPH_UP:
 	case LFUN_PARAGRAPH_DOWN:
 	case LFUN_LINE_BEGIN:
@@ -2803,6 +3220,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_UNICODE_INSERT:
 	case LFUN_THESAURUS_ENTRY:
 	case LFUN_ESCAPE:
+	case LFUN_SERVER_GET_STATISTICS:
 		// these are handled in our dispatch()
 		enable = true;
 		break;
@@ -2825,9 +3243,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	}
 
 	if (code != NO_CODE
-	    && (cur.empty() 
+	    && (cur.empty()
 		|| !cur.inset().insetAllowed(code)
-		|| cur.paragraph().layout().pass_thru))
+		|| (cur.paragraph().layout().pass_thru && !allow_in_passthru)))
 		enable = false;
 
 	flag.setEnabled(enable);