X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext3.C;h=1dc903f7cf3006e262ede13f7cb3ab0a28d783d9;hb=2bb86211292f416cd584023feb23dc3b86bc1761;hp=2b4f91be62e031762884d29a1c0740ed425fa974;hpb=7c15014ec2884e50a17559c1269747658c924eb3;p=lyx.git

diff --git a/src/text3.C b/src/text3.C
index 2b4f91be62..1dc903f7cf 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -17,12 +17,15 @@
 
 #include "lyxtext.h"
 
+#include "BranchList.h"
 #include "FloatList.h"
 #include "FuncStatus.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "bufferparams.h"
 #include "BufferView.h"
 #include "cursor.h"
+#include "coordcache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "dispatchresult.h"
@@ -31,6 +34,7 @@
 #include "gettext.h"
 #include "intl.h"
 #include "language.h"
+#include "LyXAction.h"
 #include "lyxfunc.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
@@ -53,11 +57,14 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
+#include "support/lyxtime.h"
 
 #include "mathed/math_hullinset.h"
 #include "mathed/math_macrotemplate.h"
 
+#include <boost/current_function.hpp>
+
 #include <clocale>
 #include <sstream>
 
@@ -69,23 +76,15 @@ using lyx::cap::pasteSelection;
 using lyx::cap::replaceSelection;
 
 using lyx::support::isStrUnsignedInt;
-using lyx::support::strToUnsignedInt;
-using lyx::support::atoi;
 using lyx::support::token;
 
 using std::endl;
-using std::find;
 using std::string;
 using std::istringstream;
-using std::vector;
 
 
 extern string current_layout;
 
-// the selection possible is needed, that only motion events are
-// used, where the button press event was on the drawing area too
-bool selection_possible = false;
-
 
 namespace {
 
@@ -107,7 +106,7 @@ namespace {
 					text->bidi.isBoundary(cur.buffer(), par,
 							cur.pos(),
 							text->real_current_font))
-				text->setCursor(cur, cur.par(), cur.pos(),
+				text->setCursor(cur, cur.pit(), cur.pos(),
 						false, !cur.boundary());
 		}
 	}
@@ -134,28 +133,34 @@ namespace {
 	{
 		recordUndo(cur);
 		string sel = cur.selectionAsString(false);
-		lyxerr << "selection is: '" << sel << "'" << endl;
+		//lyxerr << "selection is: '" << sel << "'" << endl;
 
 		if (sel.empty()) {
-			cur.insert(new MathHullInset);
+			const int old_pos = cur.pos();
+			cur.insert(new MathHullInset("simple"));
+			BOOST_ASSERT(old_pos == cur.pos());
 			cur.nextInset()->edit(cur, true);
-			cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
-			// don't do that also for LFUN_MATH_MODE unless you want end up with
-			// always changing to mathrm when opening an inlined inset
-			// -- I really hate "LyXfunc overloading"...
+			// don't do that also for LFUN_MATH_MODE
+			// unless you want end up with always changing
+			// to mathrm when opening an inlined inset --
+			// I really hate "LyXfunc overloading"...
 			if (display)
 				cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
-			cur.dispatch(FuncRequest(LFUN_INSERT_MATH, cmd.argument));
+			// Avoid an unnecessary undo step if cmd.argument
+			// is empty
+			if (!cmd.argument.empty())
+				cur.dispatch(FuncRequest(LFUN_INSERT_MATH,
+				                         cmd.argument));
 		} else {
-			// create a macro if we see "\\newcommand" somewhere, and an ordinary
-			// formula otherwise
+			// create a macro if we see "\\newcommand"
+			// somewhere, and an ordinary formula
+			// otherwise
 			cutSelection(cur, true, true);
 			if (sel.find("\\newcommand") == string::npos
 			    && sel.find("\\def") == string::npos)
 			{
-				cur.insert(new MathHullInset);
+				cur.insert(new MathHullInset("simple"));
 				cur.dispatch(FuncRequest(LFUN_RIGHT));
-				cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
 				cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
 			} else {
 				istringstream is(sel);
@@ -181,150 +186,50 @@ string const freefont2string()
 
 }
 
-
-//takes absolute x,y coordinates
-InsetBase * LyXText::checkInsetHit(int x, int y)
-{
-	par_type pit;
-	par_type end;
-
-	getParsInRange(paragraphs(),
-		       bv()->top_y() - yo_,
-		       bv()->top_y() - yo_ + bv()->workHeight(),
-		       pit, end);
-
-	lyxerr << "checkInsetHit: x: " << x << " y: " << y << endl;
-	lyxerr << "  pit: " << pit << " end: " << end << endl;
-	for ( ; pit != end; ++pit) {
-		InsetList::iterator iit = pars_[pit].insetlist.begin();
-		InsetList::iterator iend = pars_[pit].insetlist.end();
-		for ( ; iit != iend; ++iit) {
-			InsetBase * inset = iit->inset;
-#if 0
-			lyxerr << "examining inset " << inset
-				<< " xo: " << inset->xo() << "..." << inset->xo() + inset->width()
-				<< " yo: " << inset->yo() - inset->ascent() << "..."
-				<< inset->yo() + inset->descent() << endl;
-#endif
-			if (inset->covers(x, y)) {
-				lyxerr << "Hit inset: " << inset << endl;
-				return inset;
-			}
-		}
-	}
-	//lyxerr << "No inset hit. " << endl;
-	return 0;
-}
-
-
-bool LyXText::gotoNextInset(LCursor & cur,
-	vector<InsetOld_code> const & codes, string const & contents)
-{
-	BOOST_ASSERT(this == cur.text());
-	par_type end = paragraphs().size();
-	par_type pit = cur.par();
-	pos_type pos = cur.pos();
-
-	InsetBase * inset;
-	do {
-		if (pos + 1 < pars_[pit].size()) {
-			++pos;
-		} else  {
-			++pit;
-			pos = 0;
-		}
-
-	} while (pit != end &&
-		 !(pars_[pit].isInset(pos) &&
-		   (inset = pars_[pit].getInset(pos)) != 0 &&
-		   find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() &&
-		   (contents.empty() ||
-		    static_cast<InsetCommand *>(pars_[pit].getInset(pos))->getContents()
-		    == contents)));
-
-	if (pit == end)
-		return false;
-
-	setCursor(cur, pit, pos, false);
-	return true;
-}
-
-
-void LyXText::gotoInset(LCursor & cur,
-	vector<InsetOld_code> const & codes, bool same_content)
-{
-	cur.clearSelection();
-
-	string contents;
-	if (same_content
-	    && cur.pos() < cur.lastpos()
-	    && cur.paragraph().isInset(cur.pos())) {
-		InsetBase const * inset = cur.paragraph().getInset(cur.pos());
-		if (find(codes.begin(), codes.end(), inset->lyxCode())
-		    != codes.end())
-			contents = static_cast<InsetCommand const *>(inset)->getContents();
-	}
-
-	if (!gotoNextInset(cur, codes, contents)) {
-		if (cur.pos() || cur.par() != 0) {
-			CursorSlice tmp = cur.top();
-			cur.par() = 0;
-			cur.pos() = 0;
-			if (!gotoNextInset(cur, codes, contents)) {
-				cur.top() = tmp;
-				cur.message(_("No more insets"));
-			}
-		} else {
-			cur.message(_("No more insets"));
-		}
-	}
-	cur.resetAnchor();
-}
-
-
-void LyXText::gotoInset(LCursor & cur, InsetOld_code code, bool same_content)
-{
-	gotoInset(cur, vector<InsetOld_code>(1, code), same_content);
-}
-
-
-void LyXText::cursorPrevious(LCursor & cur)
+bool LyXText::cursorPrevious(LCursor & cur)
 {
 	pos_type cpos = cur.pos();
-	lyx::par_type cpar = cur.par();
+	lyx::pit_type cpar = cur.pit();
 
 	int x = cur.x_target();
-	int y = cur.bv().top_y();
-	setCursorFromCoordinates(cur, x, y);
 
-	if (cpar == cur.par() && cpos == cur.pos()) {
+	bool updated = setCursorFromCoordinates(cur, x, 0);
+	if (updated)
+		cur.bv().update();
+	updated |= cursorUp(cur);
+
+	if (cpar == cur.pit() && cpos == cur.pos()) {
 		// we have a row which is taller than the workarea. The
 		// simplest solution is to move to the previous row instead.
-		cursorUp(cur);
+		updated |= cursorUp(cur);
 	}
 
 	cur.bv().updateScrollbar();
 	finishUndo();
+	return updated;
 }
 
 
-void LyXText::cursorNext(LCursor & cur)
+bool LyXText::cursorNext(LCursor & cur)
 {
 	pos_type cpos = cur.pos();
-	lyx::par_type cpar = cur.par();
+	lyx::pit_type cpar = cur.pit();
 
 	int x = cur.x_target();
-	int y = cur.bv().top_y() + cur.bv().workHeight();
-	setCursorFromCoordinates(cur, x, y);
+	bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
+	if (updated)
+		cur.bv().update();
+	updated |= cursorDown(cur);
 
-	if (cpar == cur.par() && cpos == cur.pos()) {
+	if (cpar == cur.pit() && cpos == cur.pos()) {
 		// we have a row which is taller than the workarea. The
 		// simplest solution is to move to the next row instead.
-		cursorDown(cur);
+		updated |= cursorDown(cur);
 	}
 
 	cur.bv().updateScrollbar();
 	finishUndo();
+	return updated;
 }
 
 
@@ -334,15 +239,16 @@ void specialChar(LCursor & cur, InsetSpecialChar::Kind kind)
 {
 	lyx::cap::replaceSelection(cur);
 	cur.insert(new InsetSpecialChar(kind));
+	cur.posRight();
 }
 
 
-void doInsertInset(LCursor & cur, LyXText * text,
+bool doInsertInset(LCursor & cur, LyXText * text,
 	FuncRequest const & cmd, bool edit, bool pastesel)
 {
 	InsetBase * inset = createInset(&cur.bv(), cmd);
 	if (!inset)
-		return;
+		return false;
 
 	recordUndo(cur);
 	bool gotsel = false;
@@ -351,12 +257,24 @@ void doInsertInset(LCursor & cur, LyXText * text,
 		gotsel = true;
 	}
 	text->insertInset(cur, inset);
+
 	if (edit)
 		inset->edit(cur, true);
+
 	if (gotsel && pastesel)
 		cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
+	return true;
+}
+
+
+void update(LCursor & cur)
+{
+	//we don't call update(true, false) directly to save a metrics call
+	if (cur.bv().fitCursor())
+		cur.bv().update(Update::Force);
 }
 
+
 } // anon namespace
 
 
@@ -377,13 +295,21 @@ bool LyXText::isRTL(Paragraph const & par) const
 void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 {
 	lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
-	//lyxerr << "*** LyXText::dispatch: cmd: " << cmd << endl;
 
 	BOOST_ASSERT(cur.text() == this);
 	BufferView * bv = &cur.bv();
-	CursorSlice sl = cur.top();
+	CursorSlice oldTopSlice = cur.top();
+	bool oldBoundary = cur.boundary();
 	bool sel = cur.selection();
-	bool moving = false;
+	// Signals that, even if needsUpdate == false, an update of the
+	// cursor paragraph is required
+	bool singleParUpdate = lyxaction.funcHasFlag(cmd.action,
+		LyXAction::SingleParUpdate);
+	// Signals that a full-screen update is required
+	bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action, 
+		LyXAction::NoUpdate) || singleParUpdate);
+	// Remember the old paragraph metric (_outer_ paragraph!)
+	Dimension olddim = cur.bottom().paragraph().dim();
 
 	switch (cmd.action) {
 
@@ -391,12 +317,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		Paragraph & par = cur.paragraph();
 		bool start = !par.params().startOfAppendix();
 
+#ifdef WITH_WARNINGS
+#warning The code below only makes sense at top level.
+// Should LFUN_APPENDIX be restricted to top-level paragraphs?
+#endif
 		// ensure that we have only one start_of_appendix in this document
-		for (par_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
+		for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
 			if (pars_[tmp].params().startOfAppendix()) {
 				recUndo(tmp);
 				pars_[tmp].params().startOfAppendix(false);
-				redoParagraph(tmp);
 				break;
 			}
 		}
@@ -405,8 +334,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		par.params().startOfAppendix(start);
 
 		// we can set the refreshing parameters now
-		updateCounters();
-		redoParagraph(cur);
+		updateCounters(cur.buffer());
 		break;
 	}
 
@@ -429,95 +357,137 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_WORDRIGHT:
-		moving = true;
 		if (!cur.mark())
 			cur.clearSelection();
 		if (isRTL(cur.paragraph()))
-			cursorLeftOneWord(cur);
+			needsUpdate = cursorLeftOneWord(cur);
 		else
-			cursorRightOneWord(cur);
+			needsUpdate = cursorRightOneWord(cur);
 		finishChange(cur, false);
 		break;
 
 	case LFUN_WORDLEFT:
-		moving = true;
 		if (!cur.mark())
 			cur.clearSelection();
 		if (isRTL(cur.paragraph()))
-			cursorRightOneWord(cur);
+			needsUpdate = cursorRightOneWord(cur);
 		else
-			cursorLeftOneWord(cur);
+			needsUpdate = cursorLeftOneWord(cur);
 		finishChange(cur, false);
 		break;
 
 	case LFUN_BEGINNINGBUF:
-		if (!cur.mark())
-			cur.clearSelection();
-		cursorTop(cur);
-		finishChange(cur, false);
+		if (cur.depth() == 1) {
+			if (!cur.mark())
+				cur.clearSelection();
+			cursorTop(cur);
+			finishChange(cur, false);
+		} else {
+			cur.undispatched();
+		}
+		break;
+
+	case LFUN_BEGINNINGBUFSEL:
+		if (cur.depth() == 1) {
+			if (!cur.selection())
+				cur.resetAnchor();
+			cursorTop(cur);
+			finishChange(cur, true);
+		} else {
+			cur.undispatched();
+		}
 		break;
 
 	case LFUN_ENDBUF:
-		if (!cur.mark())
-			cur.clearSelection();
-		cursorBottom(cur);
-		finishChange(cur, false);
+		if (cur.depth() == 1) {
+			if (!cur.mark())
+				cur.clearSelection();
+			cursorBottom(cur);
+			finishChange(cur, false);
+		} else {
+			cur.undispatched();
+		}
+		break;
+
+	case LFUN_ENDBUFSEL:
+		if (cur.depth() == 1) {
+			if (!cur.selection())
+				cur.resetAnchor();
+			cursorBottom(cur);
+			finishChange(cur, true);
+		} else {
+			cur.undispatched();
+		}
 		break;
 
 	case LFUN_RIGHT:
-		moving = true;
 	case LFUN_RIGHTSEL:
-		//lyxerr << "handle LFUN_RIGHT[SEL]:\n" << cur << endl;
+		//lyxerr << BOOST_CURRENT_FUNCTION
+		//       << " LFUN_RIGHT[SEL]:\n" << cur << endl;
 		cur.selHandle(cmd.action == LFUN_RIGHTSEL);
 		if (isRTL(cur.paragraph()))
-			cursorLeft(cur);
+			needsUpdate = cursorLeft(cur);
 		else
-			cursorRight(cur);
-		if (sl == cur.top()) {
+			needsUpdate = cursorRight(cur);
+
+		if (!needsUpdate && oldTopSlice == cur.top()
+				&& cur.boundary() == oldBoundary) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_RIGHT);
 		}
 		break;
 
 	case LFUN_LEFT:
-		moving = true;
 	case LFUN_LEFTSEL:
 		//lyxerr << "handle LFUN_LEFT[SEL]:\n" << cur << endl;
 		cur.selHandle(cmd.action == LFUN_LEFTSEL);
 		if (isRTL(cur.paragraph()))
-			cursorRight(cur);
+			needsUpdate = cursorRight(cur);
 		else
-			cursorLeft(cur);
-		if (sl == cur.top()) {
+			needsUpdate = cursorLeft(cur);
+
+		if (!needsUpdate && oldTopSlice == cur.top()
+			&& cur.boundary() == oldBoundary) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_LEFT);
 		}
 		break;
 
 	case LFUN_UP:
-		moving = true;
 	case LFUN_UPSEL:
+		update(cur);
 		//lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
 		cur.selHandle(cmd.action == LFUN_UPSEL);
-		cursorUp(cur);
-		if (sl == cur.top()) {
+
+		needsUpdate = cursorUp(cur);
+		if (!needsUpdate && oldTopSlice == cur.top()
+			  && cur.boundary() == oldBoundary) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_UP);
 		}
 		break;
 
 	case LFUN_DOWN:
-		moving = true;
 	case LFUN_DOWNSEL:
+		update(cur);
 		//lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
 		cur.selHandle(cmd.action == LFUN_DOWNSEL);
-		cursorDown(cur);
-		if (sl == cur.top()) {
+		needsUpdate = cursorDown(cur);
+		if (!needsUpdate && oldTopSlice == cur.top() &&
+		    cur.boundary() == oldBoundary)
+		{
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_DOWN);
 		}
 		break;
 
+	case LFUN_UP_PARAGRAPH:
+		if (!cur.mark())
+			cur.clearSelection();
+		needsUpdate = cursorUpParagraph(cur);
+		finishChange(cur, false);
+		break;
+
 	case LFUN_UP_PARAGRAPHSEL:
 		if (!cur.selection())
 			cur.resetAnchor();
@@ -525,6 +495,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		finishChange(cur, true);
 		break;
 
+	case LFUN_DOWN_PARAGRAPH:
+		if (!cur.mark())
+			cur.clearSelection();
+		needsUpdate = cursorDownParagraph(cur);
+		finishChange(cur, false);
+		break;
+
 	case LFUN_DOWN_PARAGRAPHSEL:
 		if (!cur.selection())
 			cur.resetAnchor();
@@ -533,6 +510,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_PRIORSEL:
+		update(cur);
 		if (!cur.selection())
 			cur.resetAnchor();
 		cursorPrevious(cur);
@@ -540,6 +518,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_NEXTSEL:
+		update(cur);
 		if (!cur.selection())
 			cur.resetAnchor();
 		cursorNext(cur);
@@ -547,6 +526,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_HOMESEL:
+		update(cur);
 		if (!cur.selection())
 			cur.resetAnchor();
 		cursorHome(cur);
@@ -554,6 +534,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_ENDSEL:
+		update(cur);
 		if (!cur.selection())
 			cur.resetAnchor();
 		cursorEnd(cur);
@@ -586,46 +567,30 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_UP_PARAGRAPH:
-		moving = true;
-		if (!cur.mark())
-			cur.clearSelection();
-		cursorUpParagraph(cur);
-		finishChange(cur, false);
-		break;
-
-	case LFUN_DOWN_PARAGRAPH:
-		moving = true;
-		if (!cur.mark())
-			cur.clearSelection();
-		cursorDownParagraph(cur);
-		finishChange(cur, false);
-		break;
-
 	case LFUN_PRIOR:
-		moving = true;
+		update(cur);
 		if (!cur.mark())
 			cur.clearSelection();
 		finishChange(cur, false);
-		if (cur.par() == 0 && cur.textRow().pos() == 0) {
+		if (cur.pit() == 0 && cur.textRow().pos() == 0) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_UP);
 		} else {
-			cursorPrevious(cur);
+			needsUpdate = cursorPrevious(cur);
 		}
 		break;
 
 	case LFUN_NEXT:
-		moving = true;
+		update(cur);
 		if (!cur.mark())
 			cur.clearSelection();
 		finishChange(cur, false);
-		if (cur.par() == cur.lastpar()
+		if (cur.pit() == cur.lastpit()
 			  && cur.textRow().endpos() == cur.lastpos()) {
 			cur.undispatched();
 			cmd = FuncRequest(LFUN_FINISHED_DOWN);
 		} else {
-			cursorNext(cur);
+			needsUpdate = cursorNext(cur);
 		}
 		break;
 
@@ -648,6 +613,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		if (cur.pos() > cur.paragraph().beginOfBody()) {
 			lyx::cap::replaceSelection(cur);
 			cur.insert(new InsetNewline);
+			cur.posRight();
 			moveCursor(cur, false);
 		}
 		break;
@@ -655,7 +621,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_DELETE:
 		if (!cur.selection()) {
-			Delete(cur);
+			needsUpdate = Delete(cur);
 			cur.resetAnchor();
 			// It is possible to make it a lot faster still
 			// just comment out the line below...
@@ -683,7 +649,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_BACKSPACE:
 		if (!cur.selection()) {
 			if (bv->owner()->getIntl().getTransManager().backspace()) {
-				backspace(cur);
+				needsUpdate = backspace(cur);
 				cur.resetAnchor();
 				// It is possible to make it a lot faster still
 				// just comment out the line below...
@@ -738,15 +704,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_PARAGRAPH_SPACING: {
 		Paragraph & par = cur.paragraph();
 		Spacing::Space cur_spacing = par.params().spacing().getSpace();
-		float cur_value = 1.0;
+		string cur_value = "1.0";
 		if (cur_spacing == Spacing::Other)
-			cur_value = par.params().spacing().getValue();
+			cur_value = par.params().spacing().getValueAsString();
 
 		istringstream is(cmd.argument);
 		string tmp;
 		is >> tmp;
 		Spacing::Space new_spacing = cur_spacing;
-		float new_value = cur_value;
+		string new_value = cur_value;
 		if (tmp.empty()) {
 			lyxerr << "Missing argument to `paragraph-spacing'"
 			       << endl;
@@ -758,10 +724,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 			new_spacing = Spacing::Double;
 		} else if (tmp == "other") {
 			new_spacing = Spacing::Other;
-			float tmpval = 0.0;
+			string tmpval = "0.0";
 			is >> tmpval;
 			lyxerr << "new_value = " << tmpval << endl;
-			if (tmpval != 0.0)
+			if (tmpval != "0.0")
 				new_value = tmpval;
 		} else if (tmp == "default") {
 			new_spacing = Spacing::Default;
@@ -769,60 +735,54 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 			lyxerr << _("Unknown spacing argument: ")
 			       << cmd.argument << endl;
 		}
-		if (cur_spacing != new_spacing || cur_value != new_value) {
+		if (cur_spacing != new_spacing || cur_value != new_value)
 			par.params().spacing(Spacing(new_spacing, new_value));
-			redoParagraph(cur);
-		}
-		break;
-	}
-
-	case LFUN_INSET_APPLY: {
-		string const name = cmd.getArg(0);
-		InsetBase * inset = bv->owner()->getDialogs().getOpenInset(name);
-		if (inset) {
-			FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
-			inset->dispatch(cur, fr);
-		} else {
-			FuncRequest fr(LFUN_INSET_INSERT, cmd.argument);
-			dispatch(cur, fr);
-		}
 		break;
 	}
 
 	case LFUN_INSET_INSERT: {
 		recordUndo(cur);
 		InsetBase * inset = createInset(bv, cmd);
-		if (inset)
+		if (inset) {
 			insertInset(cur, inset);
+			cur.posRight();
+		}
 		break;
 	}
 
 	case LFUN_INSET_SETTINGS:
-		if (cur.inset().asUpdatableInset())
-			cur.inset().asUpdatableInset()->showInsetDialog(bv);
+		cur.inset().showInsetDialog(bv);
 		break;
 
 	case LFUN_NEXT_INSET_TOGGLE: {
 		InsetBase * inset = cur.nextInset();
+		// this is the real function we want to invoke
+		cmd = FuncRequest(LFUN_INSET_TOGGLE);
+		cur.undispatched();
+		// if there is an inset at cursor, see whether it
+		// wants to toggle.
 		if (inset) {
-			cur.clearSelection();
-			FuncRequest fr = cmd;
-			fr.action = LFUN_INSET_TOGGLE;
-			inset->dispatch(cur, fr);
+			LCursor tmpcur = cur;
+			tmpcur.pushLeft(*inset);
+			inset->dispatch(tmpcur, cmd);
+			if (tmpcur.result().dispatched()) {
+				cur.clearSelection();
+				cur.dispatched();
+			}
 		}
+		// if it did not work, try the underlying inset.
+		if (!cur.result().dispatched())
+			cur.inset().dispatch(cur, cmd);
 		break;
 	}
 
-	case LFUN_KEYMAP_TOGGLE:
-		cur.clearSelection();
-		bv->switchKeyMap();
-		break;
-
 	case LFUN_SPACE_INSERT:
 		if (cur.paragraph().layout()->free_spacing)
 			insertChar(cur, ' ');
-		else
+		else {
 			doInsertInset(cur, this, cmd, false, false);
+			cur.posRight();
+		}
 		moveCursor(cur, false);
 		break;
 
@@ -860,17 +820,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_TRANSPOSE_CHARS:
 		recordUndo(cur);
-		redoParagraph(cur);
 		break;
 
 	case LFUN_PASTE:
 		cur.message(_("Paste"));
 		lyx::cap::replaceSelection(cur);
-#ifdef WITH_WARNINGS
-#warning FIXME Check if the arg is in the domain of available selections.
-#endif
 		if (isStrUnsignedInt(cmd.argument))
-			pasteSelection(cur, strToUnsignedInt(cmd.argument));
+			pasteSelection(cur, convert<unsigned int>(cmd.argument));
 		else
 			pasteSelection(cur, 0);
 		cur.clearSelection(); // bug 393
@@ -889,8 +845,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_GETXY:
-		cur.message(tostr(cursorX(cur.top())) + ' '
-		          + tostr(cursorY(cur.top())));
+		cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
+		          + convert<string>(cursorY(cur.top(), cur.boundary())));
 		break;
 
 	case LFUN_SETXY: {
@@ -955,10 +911,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		bool change_layout = (current_layout != layout);
 
 		if (!change_layout && cur.selection() &&
-			cur.selBegin().par() != cur.selEnd().par())
+			cur.selBegin().pit() != cur.selEnd().pit())
 		{
-			par_type spit = cur.selBegin().par();
-			par_type epit = cur.selEnd().par() + 1;
+			pit_type spit = cur.selBegin().pit();
+			pit_type epit = cur.selEnd().pit() + 1;
 			while (spit != epit) {
 				if (pars_[spit].layout()->name() != current_layout) {
 					change_layout = true;
@@ -981,6 +937,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		cur.clearSelection();
 		string const clip = bv->getClipboard();
 		if (!clip.empty()) {
+			recordUndo(cur);
 			if (cmd.argument == "paragraph")
 				insertStringAsParagraphs(cur, clip);
 			else
@@ -989,22 +946,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_GOTOERROR:
-		gotoInset(cur, InsetBase::ERROR_CODE, false);
-		break;
-
-	case LFUN_GOTONOTE:
-		gotoInset(cur, InsetBase::NOTE_CODE, false);
-		break;
-
-	case LFUN_REFERENCE_GOTO: {
-		vector<InsetOld_code> tmp;
-		tmp.push_back(InsetBase::LABEL_CODE);
-		tmp.push_back(InsetBase::REF_CODE);
-		gotoInset(cur, tmp, true);
-		break;
-	}
-
 	case LFUN_QUOTE: {
 		lyx::cap::replaceSelection(cur);
 		Paragraph & par = cur.paragraph();
@@ -1027,115 +968,50 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 				cur.insert(new InsetQuotes(c,
 				    bufparams.quotes_language,
 				    InsetQuotes::SingleQ));
-			else if (arg == "double")
+			else
 				cur.insert(new InsetQuotes(c,
 				    bufparams.quotes_language,
 				    InsetQuotes::DoubleQ));
-			else
-				cur.insert(new InsetQuotes(c, bufparams));
+			cur.posRight();
 		}
 		else
 			bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
 		break;
 	}
 
-	case LFUN_DATE_INSERT: {
-		lyx::cap::replaceSelection(cur);
-		time_t now_time_t = time(NULL);
-		struct tm * now_tm = localtime(&now_time_t);
-		setlocale(LC_TIME, "");
-		string arg;
-		if (!cmd.argument.empty())
-			arg = cmd.argument;
+	case LFUN_DATE_INSERT: 
+		if (cmd.argument.empty())
+			bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
+				lyx::formatted_time(lyx::current_time())));
 		else
-			arg = lyxrc.date_insert_format;
-		char datetmp[32];
-		int const datetmp_len =
-			::strftime(datetmp, 32, arg.c_str(), now_tm);
-
-		for (int i = 0; i < datetmp_len; i++)
-			insertChar(cur, datetmp[i]);
-
-		cur.resetAnchor();
-		moveCursor(cur, false);
+			bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
+				lyx::formatted_time(lyx::current_time(), cmd.argument)));
 		break;
-	}
 
 	case LFUN_MOUSE_TRIPLE:
 		if (cmd.button() == mouse_button::button1) {
-			selection_possible = true;
 			cursorHome(cur);
 			cur.resetAnchor();
 			cursorEnd(cur);
 			cur.setSelection();
+			bv->cursor() = cur;
 			bv->haveSelection(cur.selection());
 		}
 		break;
 
 	case LFUN_MOUSE_DOUBLE:
 		if (cmd.button() == mouse_button::button1) {
-			selection_possible = true;
 			selectWord(cur, lyx::WHOLE_WORD_STRICT);
+			bv->cursor() = cur;
 			bv->haveSelection(cur.selection());
 		}
 		break;
 
-	case LFUN_MOUSE_MOTION: {
-		// Only use motion with button 1
-		//if (cmd.button() != mouse_button::button1)
-		//	return false;
-		// We want to use only motion events for which
-		// the button press event was on the drawing area too.
-		if (!selection_possible) {
-			lyxerr[Debug::ACTION] << "BufferView::Pimpl::"
-				"dispatch: no selection possible\n";
-			lyxerr << "BufferView::Pimpl::dispatch: no selection possible\n";
-			break;
-		}
-
-		// ignore motions deeper nested than the real anchor
-		LCursor & bvcur = cur.bv().cursor();
-		if (bvcur.selection() && bvcur.anchor_.size() < cur.size())
-			break;
-
-		CursorSlice old = cur.top();
-		setCursorFromCoordinates(cur, cmd.x, cmd.y);
-
-		// This is to allow jumping over large insets
-		// FIXME: shouldn't be top-text-specific
-		if (isMainText() && cur.top() == old) {
-			if (cmd.y - bv->top_y() >= bv->workHeight())
-				cursorDown(cur);
-			else if (cmd.y - bv->top_y() < 0)
-				cursorUp(cur);
-		}
-
-		// don't set anchor_
-		bv->cursor().setCursor(cur, true);
-		lyxerr << "MOTION: " << bv->cursor() << endl;
-		break;
-	}
-
 	// Single-click on work area
 	case LFUN_MOUSE_PRESS: {
-		// ok ok, this is a hack (for xforms)
-		// We shouldn't go further down as we really need to. Only do the
-		// scrolling and be done with this. Otherwise we may open some
-		// dialogs (Jug 20020424).
-		if (cmd.button() == mouse_button::button4) {
-			bv->scroll(-lyxrc.wheel_jump);
-			break;
-		}
-
-		if (cmd.button() == mouse_button::button5) {
-			bv->scroll(lyxrc.wheel_jump);
-			break;
-		}
-
 		// Right click on a footnote flag opens float menu
 		if (cmd.button() == mouse_button::button3) {
 			cur.clearSelection();
-			selection_possible = false;
 			break;
 		}
 
@@ -1149,26 +1025,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 			paste_internally = true;
 		}
 
-		selection_possible = true;
-
-		// Clear the selection
-		cur.clearSelection();
-
-		setCursorFromCoordinates(cur, cmd.x, cmd.y);
-		cur.resetAnchor();
-		finishUndo();
-		cur.x_target() = cursorX(cur.top());
-
-		// Has the cursor just left the inset?
-		if (bv->cursor().inMathed() && !cur.inMathed())
-			bv->cursor().inset().notifyCursorLeaves(bv->cursor());
-
-		// Set cursor here.
-		bv->cursor() = cur;
-
-		// Don't allow selection after a big jump.
-		if (bv->fitCursor())
-			selection_possible = false;
+		bv->mouseSetCursor(cur);
 
 		// Insert primary selection with middle mouse
 		// if there is a local selection in the current buffer,
@@ -1178,22 +1035,53 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 				bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
 			else
 				bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph"));
-			selection_possible = false;
 		}
 
 		break;
 	}
 
-	case LFUN_MOUSE_RELEASE: {
-		// do nothing if we used the mouse wheel
-		if (cmd.button() == mouse_button::button4
-		 || cmd.button() == mouse_button::button5) {
-			cur.undispatched();
-			break;
-		}
+	case LFUN_MOUSE_MOTION: {
+		// Only use motion with button 1
+		//if (cmd.button() != mouse_button::button1)
+		//	return false;
 
-		selection_possible = false;
+		// ignore motions deeper nested than the real anchor
+		LCursor & bvcur = cur.bv().cursor();
+		if (bvcur.anchor_.hasPart(cur)) {
+			CursorSlice old = bvcur.top();
+
+			int const wh = bv->workHeight();
+			int const y = std::max(0, std::min(wh - 1, cmd.y));
+
+			setCursorFromCoordinates(cur, cmd.x, y);
+			cur.x_target() = cmd.x;
+			if (cmd.y >= wh)
+				cursorDown(cur);
+			else if (cmd.y < 0)
+				cursorUp(cur);
+			// This is to allow jumping over large insets
+			if (cur.top() == old) {
+				if (cmd.y >= wh)
+					cursorDown(cur);
+				else if (cmd.y < 0)
+					cursorUp(cur);
+			}
 
+			if (cur.top() == old)
+				cur.noUpdate();
+			else {
+				// don't set anchor_
+				bvcur.setCursor(cur);
+				bvcur.selection() = true;
+				//lyxerr << "MOTION: " << bv->cursor() << endl;
+			}
+
+		} else
+			cur.undispatched();
+		break;
+	}
+
+	case LFUN_MOUSE_RELEASE: {
 		if (cmd.button() == mouse_button::button2)
 			break;
 
@@ -1234,10 +1122,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 		cur.resetAnchor();
 		moveCursor(cur, false);
-
-		// real_current_font.number can change so we need to
-		// update the minibuffer
-		if (old_font != real_current_font)
 		bv->updateScrollbar();
 		break;
 	}
@@ -1285,24 +1169,48 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_INSERT_BRANCH:
 	case LFUN_INSERT_BIBITEM:
 	case LFUN_INSET_ERT:
-	case LFUN_INSET_FLOAT:
 	case LFUN_INSET_FOOTNOTE:
 	case LFUN_INSET_MARGINAL:
 	case LFUN_INSET_OPTARG:
-	case LFUN_INSET_WIDE_FLOAT:
-	case LFUN_INSET_WRAP:
-	case LFUN_TABULAR_INSERT:
 	case LFUN_ENVIRONMENT_INSERT:
 		// Open the inset, and move the current selection
 		// inside it.
 		doInsertInset(cur, this, cmd, true, true);
+		cur.posRight();
 		break;
 
-	case LFUN_INDEX_INSERT:
-		// Just open the inset
-		doInsertInset(cur, this, cmd, true, false);
+	case LFUN_TABULAR_INSERT:
+		// if there were no arguments, just open the dialog
+		if (doInsertInset(cur, this, cmd, false, true))
+			cur.posRight();
+		else
+			bv->owner()->getDialogs().show("tabularcreate");
+
+		break;
+
+	case LFUN_INSET_FLOAT:
+	case LFUN_INSET_WIDE_FLOAT:
+	case LFUN_INSET_WRAP:
+		doInsertInset(cur, this, cmd, true, true);
+		cur.posRight();
+		// FIXME: the "Caption" name should not be hardcoded,
+		// but given by the float definition.
+		cur.dispatch(FuncRequest(LFUN_LAYOUT, "Caption"));
 		break;
 
+	case LFUN_INDEX_INSERT: {
+		InsetBase * inset = createInset(&cur.bv(), cmd);
+		if (!inset)
+			break;
+
+		recordUndo(cur);
+		cur.clearSelection();
+		insertInset(cur, inset);
+		inset->edit(cur, true);
+		cur.posRight();
+		break;
+	}
+
 	case LFUN_INDEX_PRINT:
 	case LFUN_TOC_INSERT:
 	case LFUN_HFILL:
@@ -1310,6 +1218,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_INSERT_PAGEBREAK:
 		// do nothing fancy
 		doInsertInset(cur, this, cmd, false, false);
+		cur.posRight();
 		break;
 
 	case LFUN_DEPTH_MIN:
@@ -1326,7 +1235,11 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_MATH_IMPORT_SELECTION:
 	case LFUN_MATH_MODE:
-		mathDispatch(cur, cmd, false);
+		if (cmd.argument == "on")
+			// don't pass "on" as argument
+			mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
+		else
+			mathDispatch(cur, cmd, false);
 		break;
 
 	case LFUN_MATH_MACRO:
@@ -1335,20 +1248,27 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		else {
 			string s = cmd.argument;
 			string const s1 = token(s, ' ', 1);
-			int const nargs = s1.empty() ? 0 : atoi(s1);
+			int const nargs = s1.empty() ? 0 : convert<int>(s1);
 			string const s2 = token(s, ' ', 2);
 			string const type = s2.empty() ? "newcommand" : s2;
-			cur.insert(new MathMacroTemplate(token(s, ' ', 0), nargs, s2));
+			cur.insert(new MathMacroTemplate(token(s, ' ', 0), nargs, type));
 			//cur.nextInset()->edit(cur, true);
 		}
 		break;
 
+	// passthrough hat and underscore outside mathed:
+	case LFUN_SUBSCRIPT:
+		mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "_"), false);
+		break;
+	case LFUN_SUPERSCRIPT:
+		mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "^"), false);
+		break;
+
 	case LFUN_INSERT_MATH:
 	case LFUN_INSERT_MATRIX:
 	case LFUN_MATH_DELIM: {
-		cur.insert(new MathHullInset);
+		cur.insert(new MathHullInset("simple"));
 		cur.dispatch(FuncRequest(LFUN_RIGHT));
-		cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
 		cur.dispatch(cmd);
 		break;
 	}
@@ -1446,21 +1366,21 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_FINISHED_LEFT:
-		lyxerr << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
+		lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
 		break;
 
 	case LFUN_FINISHED_RIGHT:
-		lyxerr << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
+		lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
 		++cur.pos();
 		break;
 
 	case LFUN_FINISHED_UP:
-		lyxerr << "handle LFUN_FINISHED_UP:\n" << cur << endl;
+		lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_UP:\n" << cur << endl;
 		cursorUp(cur);
 		break;
 
 	case LFUN_FINISHED_DOWN:
-		lyxerr << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
+		lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
 		cursorDown(cur);
 		break;
 
@@ -1479,10 +1399,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 		params2string(cur.paragraph(), data);
 
 		// Will the paragraph accept changes from the dialog?
-		InsetBase & inset = cur.inset();
-		bool const accept = !inset.forceDefaultParagraphs(&inset);
+		bool const accept = !cur.inset().forceDefaultParagraphs(cur.idx());
 
-		data = "update " + tostr(accept) + '\n' + data;
+		data = "update " + convert<string>(accept) + '\n' + data;
 		bv->owner()->getDialogs().update("paragraph", data);
 		break;
 	}
@@ -1526,6 +1445,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 			setLayout(cur, tclass.defaultLayoutName());
 			setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, string(), 0);
 			insertInset(cur, new InsetFloatList(cmd.argument));
+			cur.posRight();
 		} else {
 			lyxerr << "Non-existent float type: "
 			       << cmd.argument << endl;
@@ -1590,31 +1510,46 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 			cur.selection() = false;
 		} else {
 			cur.undispatched();
-			cmd = FuncRequest(LFUN_FINISHED_LEFT);
+			cmd = FuncRequest(LFUN_FINISHED_RIGHT);
 		}
 		break;
 
 	default:
+		lyxerr[Debug::ACTION] 
+			<< BOOST_CURRENT_FUNCTION
+			<< ": Command " << cmd 
+			<< " not DISPATCHED by LyXText" << endl;
 		cur.undispatched();
 		break;
 	}
 
-	// avoid to update when navigating
-	if (moving
-	    && &sl.inset() == &cur.inset()
-	    && sl.idx() == cur.idx()
-	    && sel == false
-	    && cur.selection() == false)
+	if (singleParUpdate)
+		// Inserting characters does not change par height
+	   	if (cur.bottom().paragraph().dim().height() 
+		    == olddim.height()) {
+			// if so, update _only_ this paragraph
+			cur.bv().update(Update::SinglePar | Update::Force);
+		} else
+			needsUpdate = true;
+	if (!needsUpdate
+	    && &oldTopSlice.inset() == &cur.inset()
+	    && oldTopSlice.idx() == cur.idx()
+	    && !sel
+	    && !cur.selection())
 		cur.noUpdate();
+	else
+		cur.needsUpdate();
 }
 
 
 bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
-	FuncStatus & flag) const
+			FuncStatus & flag) const
 {
 	BOOST_ASSERT(cur.text() == this);
+
 	LyXFont const & font = real_current_font;
 	bool enable = true;
+	InsetBase::Code code = InsetBase::NO_CODE;
 
 	switch (cmd.action) {
 
@@ -1626,127 +1561,125 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 		enable = changeDepthAllowed(cur, INC_DEPTH);
 		break;
 
-	case LFUN_INSET_OPTARG:
-		enable = cur.paragraph().layout()->optionalargs;
-		break;
-
 	case LFUN_APPENDIX:
 		flag.setOnOff(cur.paragraph().params().startOfAppendix());
+		return true;
+
+	case LFUN_INSERT_BIBITEM:
+		enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO);
 		break;
 
-#if 0
-	// the functions which insert insets
-	InsetOld::Code code = InsetOld::NO_CODE;
-	switch (cmd.action) {
 	case LFUN_DIALOG_SHOW_NEW_INSET:
 		if (cmd.argument == "bibitem")
-			code = InsetOld::BIBITEM_CODE;
+			code = InsetBase::BIBITEM_CODE;
 		else if (cmd.argument == "bibtex")
-			code = InsetOld::BIBTEX_CODE;
+			code = InsetBase::BIBTEX_CODE;
 		else if (cmd.argument == "box")
-			code = InsetOld::BOX_CODE;
+			code = InsetBase::BOX_CODE;
 		else if (cmd.argument == "branch")
-			code = InsetOld::BRANCH_CODE;
+			code = InsetBase::BRANCH_CODE;
 		else if (cmd.argument == "citation")
-			code = InsetOld::CITE_CODE;
+			code = InsetBase::CITE_CODE;
 		else if (cmd.argument == "ert")
-			code = InsetOld::ERT_CODE;
+			code = InsetBase::ERT_CODE;
 		else if (cmd.argument == "external")
-			code = InsetOld::EXTERNAL_CODE;
+			code = InsetBase::EXTERNAL_CODE;
 		else if (cmd.argument == "float")
-			code = InsetOld::FLOAT_CODE;
+			code = InsetBase::FLOAT_CODE;
 		else if (cmd.argument == "graphics")
-			code = InsetOld::GRAPHICS_CODE;
+			code = InsetBase::GRAPHICS_CODE;
 		else if (cmd.argument == "include")
-			code = InsetOld::INCLUDE_CODE;
+			code = InsetBase::INCLUDE_CODE;
 		else if (cmd.argument == "index")
-			code = InsetOld::INDEX_CODE;
+			code = InsetBase::INDEX_CODE;
 		else if (cmd.argument == "label")
-			code = InsetOld::LABEL_CODE;
+			code = InsetBase::LABEL_CODE;
 		else if (cmd.argument == "note")
-			code = InsetOld::NOTE_CODE;
+			code = InsetBase::NOTE_CODE;
 		else if (cmd.argument == "ref")
-			code = InsetOld::REF_CODE;
+			code = InsetBase::REF_CODE;
 		else if (cmd.argument == "toc")
-			code = InsetOld::TOC_CODE;
+			code = InsetBase::TOC_CODE;
 		else if (cmd.argument == "url")
-			code = InsetOld::URL_CODE;
+			code = InsetBase::URL_CODE;
 		else if (cmd.argument == "vspace")
-			code = InsetOld::VSPACE_CODE;
+			code = InsetBase::VSPACE_CODE;
 		else if (cmd.argument == "wrap")
-			code = InsetOld::WRAP_CODE;
+			code = InsetBase::WRAP_CODE;
 		break;
 
 	case LFUN_INSET_ERT:
-		code = InsetOld::ERT_CODE;
+		code = InsetBase::ERT_CODE;
 		break;
 	case LFUN_INSET_FOOTNOTE:
-		code = InsetOld::FOOT_CODE;
+		code = InsetBase::FOOT_CODE;
 		break;
 	case LFUN_TABULAR_INSERT:
-		code = InsetOld::TABULAR_CODE;
+		code = InsetBase::TABULAR_CODE;
 		break;
 	case LFUN_INSET_MARGINAL:
-		code = InsetOld::MARGIN_CODE;
+		code = InsetBase::MARGIN_CODE;
 		break;
 	case LFUN_INSET_FLOAT:
 	case LFUN_INSET_WIDE_FLOAT:
-		code = InsetOld::FLOAT_CODE;
+		code = InsetBase::FLOAT_CODE;
 		break;
 	case LFUN_INSET_WRAP:
-		code = InsetOld::WRAP_CODE;
+		code = InsetBase::WRAP_CODE;
 		break;
 	case LFUN_FLOAT_LIST:
-		code = InsetOld::FLOAT_LIST_CODE;
+		code = InsetBase::FLOAT_LIST_CODE;
 		break;
 #if 0
 	case LFUN_INSET_LIST:
-		code = InsetOld::LIST_CODE;
+		code = InsetBase::LIST_CODE;
 		break;
 	case LFUN_INSET_THEOREM:
-		code = InsetOld::THEOREM_CODE;
+		code = InsetBase::THEOREM_CODE;
 		break;
 #endif
 	case LFUN_INSET_CAPTION:
-		code = InsetOld::CAPTION_CODE;
+		code = InsetBase::CAPTION_CODE;
 		break;
 	case LFUN_INSERT_NOTE:
-		code = InsetOld::NOTE_CODE;
+		code = InsetBase::NOTE_CODE;
 		break;
 	case LFUN_INSERT_CHARSTYLE:
-		code = InsetOld::CHARSTYLE_CODE;
-		if (buf->params().getLyXTextClass().charstyles().empty())
+		code = InsetBase::CHARSTYLE_CODE;
+		if (cur.buffer().params().getLyXTextClass().charstyles().empty())
 			enable = false;
 		break;
 	case LFUN_INSERT_BOX:
-		code = InsetOld::BOX_CODE;
+		code = InsetBase::BOX_CODE;
 		break;
 	case LFUN_INSERT_BRANCH:
-		code = InsetOld::BRANCH_CODE;
-		if (buf->params().branchlist().empty())
+		code = InsetBase::BRANCH_CODE;
+		if (cur.buffer().getMasterBuffer()->params().branchlist().empty())
 			enable = false;
 		break;
 	case LFUN_INSERT_LABEL:
-		code = InsetOld::LABEL_CODE;
+		code = InsetBase::LABEL_CODE;
 		break;
 	case LFUN_INSET_OPTARG:
-		code = InsetOld::OPTARG_CODE;
+		code = InsetBase::OPTARG_CODE;
+		enable = numberOfOptArgs(cur.paragraph())
+			< cur.paragraph().layout()->optionalargs;
 		break;
 	case LFUN_ENVIRONMENT_INSERT:
-		code = InsetOld::BOX_CODE;
+		code = InsetBase::BOX_CODE;
 		break;
 	case LFUN_INDEX_INSERT:
-		code = InsetOld::INDEX_CODE;
+		code = InsetBase::INDEX_CODE;
 		break;
 	case LFUN_INDEX_PRINT:
-		code = InsetOld::INDEX_PRINT_CODE;
+		code = InsetBase::INDEX_PRINT_CODE;
 		break;
 	case LFUN_TOC_INSERT:
-		code = InsetOld::TOC_CODE;
+		code = InsetBase::TOC_CODE;
 		break;
 	case LFUN_HTMLURL:
 	case LFUN_URL:
-		code = InsetOld::URL_CODE;
+		code = InsetBase::URL_CODE;
 		break;
 	case LFUN_QUOTE:
 		// always allow this, since we will inset a raw quote
@@ -1758,79 +1691,72 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_MENU_SEPARATOR:
 	case LFUN_LDOTS:
 	case LFUN_END_OF_SENTENCE:
-		code = InsetOld::SPECIALCHAR_CODE;
+		code = InsetBase::SPECIALCHAR_CODE;
 		break;
 	case LFUN_SPACE_INSERT:
 		// slight hack: we know this is allowed in math mode
 		if (cur.inTexted())
-			code = InsetOld::SPACE_CODE;
+			code = InsetBase::SPACE_CODE;
 		break;
+
+#ifdef WITH_WARNINGS
+#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005)
+#endif
+#if 0
 	case LFUN_INSET_DIALOG_SHOW: {
 		InsetBase * inset = cur.nextInset();
 		enable = inset;
 		if (inset) {
 			code = inset->lyxCode();
-			if (!(code == InsetOld::INCLUDE_CODE
-				|| code == InsetOld::BIBTEX_CODE
-				|| code == InsetOld::FLOAT_LIST_CODE
-				|| code == InsetOld::TOC_CODE))
+			if (!(code == InsetBase::INCLUDE_CODE
+				|| code == InsetBase::BIBTEX_CODE
+				|| code == InsetBase::FLOAT_LIST_CODE
+				|| code == InsetBase::TOC_CODE))
 				enable = false;
 		}
 		break;
 	}
-	default:
-		break;
-	}
-
-	if (code != InsetOld::NO_CODE
-			&& (cur.empty() || !cur.inset().insetAllowed(code)))
-		enable = false;
-
 #endif
 
-	case LFUN_DIALOG_SHOW_NEW_INSET:
-	case LFUN_INSET_ERT:
-	case LFUN_INSERT_BOX:
-	case LFUN_INSERT_BRANCH:
-	case LFUN_ENVIRONMENT_INSERT:
-	case LFUN_INDEX_INSERT:
-	case LFUN_INDEX_PRINT:
-	case LFUN_TOC_INSERT:
-	case LFUN_HTMLURL:
-	case LFUN_URL:
-	case LFUN_QUOTE:
-	case LFUN_HYPHENATION:
-	case LFUN_LIGATURE_BREAK:
-	case LFUN_HFILL:
-	case LFUN_MENU_SEPARATOR:
-	case LFUN_LDOTS:
-	case LFUN_END_OF_SENTENCE:
-	case LFUN_SPACE_INSERT:
-	case LFUN_INSET_DIALOG_SHOW:
+	case LFUN_INSET_MODIFY:
+		// We need to disable this, because we may get called for a
+		// tabular cell via
+		// InsetTabular::getStatus() -> InsetText::getStatus()
+		// and we don't handle LFUN_INSET_MODIFY.
+		enable = false;
 		break;
 
 	case LFUN_EMPH:
 		flag.setOnOff(font.emph() == LyXFont::ON);
-		break;
+		return true;
 
 	case LFUN_NOUN:
 		flag.setOnOff(font.noun() == LyXFont::ON);
-		break;
+		return true;
 
 	case LFUN_BOLD:
 		flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
-		break;
+		return true;
 
 	case LFUN_SANS:
 		flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
-		break;
+		return true;
 
 	case LFUN_ROMAN:
 		flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
-		break;
+		return true;
 
 	case LFUN_CODE:
 		flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
+		return true;
+
+	case LFUN_CUT:
+	case LFUN_COPY:
+		enable = cur.selection();
+		break;
+
+	case LFUN_PASTE:
+		enable = lyx::cap::numberOfSelections() > 0;
 		break;
 
 	case LFUN_DELETE_WORD_FORWARD:
@@ -1838,8 +1764,6 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_DELETE_LINE_FORWARD:
 	case LFUN_WORDRIGHT:
 	case LFUN_WORDLEFT:
-	case LFUN_ENDBUF:
-	case LFUN_BEGINNINGBUF:
 	case LFUN_RIGHT:
 	case LFUN_RIGHTSEL:
 	case LFUN_LEFT:
@@ -1872,37 +1796,20 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
 	case LFUN_BREAKPARAGRAPH_SKIP:
 	case LFUN_PARAGRAPH_SPACING:
-	case LFUN_INSET_APPLY:
 	case LFUN_INSET_INSERT:
 	case LFUN_NEXT_INSET_TOGGLE:
 	case LFUN_UPCASE_WORD:
 	case LFUN_LOWCASE_WORD:
 	case LFUN_CAPITALIZE_WORD:
 	case LFUN_TRANSPOSE_CHARS:
-	case LFUN_PASTE:
-	case LFUN_CUT:
-	case LFUN_COPY:
 	case LFUN_GETXY:
 	case LFUN_SETXY:
 	case LFUN_GETFONT:
 	case LFUN_GETLAYOUT:
 	case LFUN_LAYOUT:
 	case LFUN_PASTESELECTION:
-	case LFUN_GOTOERROR:
-	case LFUN_GOTONOTE:
-	case LFUN_REFERENCE_GOTO:
 	case LFUN_DATE_INSERT:
 	case LFUN_SELFINSERT:
-	case LFUN_INSERT_LABEL:
-	case LFUN_INSERT_NOTE:
-	case LFUN_INSERT_CHARSTYLE:
-	case LFUN_INSERT_BIBITEM:
-	case LFUN_INSET_FLOAT:
-	case LFUN_INSET_FOOTNOTE:
-	case LFUN_INSET_MARGINAL:
-	case LFUN_INSET_WIDE_FLOAT:
-	case LFUN_INSET_WRAP:
-	case LFUN_TABULAR_INSERT:
 	case LFUN_INSERT_LINE:
 	case LFUN_INSERT_PAGEBREAK:
 	case LFUN_MATH_DISPLAY:
@@ -1912,6 +1819,8 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_INSERT_MATH:
 	case LFUN_INSERT_MATRIX:
 	case LFUN_MATH_DELIM:
+	case LFUN_SUBSCRIPT:
+	case LFUN_SUPERSCRIPT:
 	case LFUN_DEFAULT:
 	case LFUN_UNDERLINE:
 	case LFUN_FONT_SIZE:
@@ -1937,21 +1846,27 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 	case LFUN_HUNG_UMLAUT:
 	case LFUN_CIRCLE:
 	case LFUN_OGONEK:
-	case LFUN_FLOAT_LIST:
 	case LFUN_ACCEPT_CHANGE:
 	case LFUN_REJECT_CHANGE:
 	case LFUN_THESAURUS_ENTRY:
 	case LFUN_PARAGRAPH_APPLY:
 	case LFUN_ESCAPE:
-	case LFUN_KEYMAP_TOGGLE:
+	case LFUN_ENDBUF:
+	case LFUN_BEGINNINGBUF:
+	case LFUN_BEGINNINGBUFSEL:
+	case LFUN_ENDBUFSEL:
 		// these are handled in our dispatch()
 		enable = true;
 		break;
 
 	default:
-		enable = false;
-		break;
+		return false;
 	}
+
+	if (code != InsetBase::NO_CODE
+	    && (cur.empty() || !cur.inset().insetAllowed(code)))
+		enable = false;
+
 	flag.enabled(enable);
 	return true;
 }