]> git.lyx.org Git - lyx.git/blobdiff - src/text3.C
Tweak layout in GToc
[lyx.git] / src / text3.C
index 1f65d67e0776efb4fc75965d907a5105e1a861fb..1dc903f7cf3006e262ede13f7cb3ab0a28d783d9 100644 (file)
 
 #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"
 #include "factory.h"
 #include "gettext.h"
 #include "intl.h"
 #include "language.h"
+#include "LyXAction.h"
+#include "lyxfunc.h"
+#include "lyxlex.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
 #include "paragraph.h"
+#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "text_funcs.h"
 #include "undo.h"
 #include "vspace.h"
 
 #include "frontends/LyXView.h"
 
 #include "insets/insetcommand.h"
+#include "insets/insetfloatlist.h"
 #include "insets/insetnewline.h"
+#include "insets/insetquotes.h"
 #include "insets/insetspecialchar.h"
 #include "insets/insettext.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/lyxlib.h"
+#include "support/convert.h"
+#include "support/lyxtime.h"
 
-#include "support/std_sstream.h"
-#include <clocale>
+#include "mathed/math_hullinset.h"
+#include "mathed/math_macrotemplate.h"
+
+#include <boost/current_function.hpp>
 
-using bv_funcs::replaceSelection;
+#include <clocale>
+#include <sstream>
 
 using lyx::pos_type;
 
+using lyx::cap::copySelection;
+using lyx::cap::cutSelection;
+using lyx::cap::pasteSelection;
+using lyx::cap::replaceSelection;
+
 using lyx::support::isStrUnsignedInt;
-using lyx::support::strToUnsignedInt;
+using lyx::support::token;
 
 using std::endl;
-using std::find;
 using std::string;
 using std::istringstream;
-using std::vector;
 
 
 extern string current_layout;
-extern int bibitemMaxWidth(BufferView *, LyXFont const &);
-
-// the selection possible is needed, that only motion events are
-// used, where the bottom press event was on the drawing area too
-bool selection_possible = false;
 
 
 namespace {
 
-       void moveCursorUpdate(BufferView * bv, bool selecting)
-       {
-               LyXText * lt = bv->getLyXText();
+       // globals...
+       LyXFont freefont(LyXFont::ALL_IGNORE);
+       bool toggleall = false;
 
-//             if (!lt->selection.set())
-//                     lt->selection.cursor = lt->cursor;
 
-               if (selecting || lt->selection.mark())
-                       lt->setSelection();
+       void toggleAndShow(LCursor & cur, LyXText * text,
+               LyXFont const & font, bool toggleall = true)
+       {
+               text->toggleFree(cur, font, toggleall);
+
+               if (font.language() != ignore_language ||
+                               font.number() != LyXFont::IGNORE) {
+                       Paragraph & par = cur.paragraph();
+                       text->bidi.computeTables(par, cur.buffer(), cur.textRow());
+                       if (cur.boundary() !=
+                                       text->bidi.isBoundary(cur.buffer(), par,
+                                                       cur.pos(),
+                                                       text->real_current_font))
+                               text->setCursor(cur, cur.pit(), cur.pos(),
+                                               false, !cur.boundary());
+               }
+       }
 
-               if (!lt->selection.set())
-                       bv->haveSelection(false);
 
-               bv->update();
-               bv->switchKeyMap();
+       void moveCursor(LCursor & cur, bool selecting)
+       {
+               if (selecting || cur.mark())
+                       cur.setSelection();
+               if (!cur.selection())
+                       cur.bv().haveSelection(false);
+               cur.bv().switchKeyMap();
        }
 
 
-       void finishChange(BufferView * bv, bool selecting = false)
+       void finishChange(LCursor & cur, bool selecting)
        {
                finishUndo();
-               moveCursorUpdate(bv, selecting);
-               bv->owner()->view_state_changed();
+               moveCursor(cur, selecting);
        }
 
-       // check if the given co-ordinates are inside an inset at the
-       // given cursor, if one exists. If so, the inset is returned,
-       // and the co-ordinates are made relative. Otherwise, 0 is returned.
-       InsetOld * checkInset(LyXText & text,
-               LyXCursor const & cur, int & x, int & y)
-       {
-               lyx::pos_type const pos = cur.pos();
-               ParagraphList::iterator par = text.getPar(cur);
-
-               if (pos >= par->size() || !par->isInset(pos))
-                       return 0;
-
-               InsetOld /*const*/ * inset = par->getInset(pos);
-
-               if (!isEditableInset(inset))
-                       return 0;
 
-               // get inset dimensions
-               BOOST_ASSERT(par->getInset(pos));
-
-               LyXFont const & font = text.getFont(par, pos);
-
-               int const width = inset->width();
-               int const inset_x = font.isVisibleRightToLeft()
-                       ? (cur.x() - width) : cur.x();
-
-               Box b(
-                       inset_x + inset->scroll(),
-                       inset_x + width,
-                       cur.y() - inset->ascent(),
-                       cur.y() + inset->descent()
-               );
-
-               if (!b.contains(x, y)) {
-                       lyxerr[Debug::GUI] << "Missed inset at x,y "
-                                          << x << ',' << y
-                                          << " box " << b << endl;
-                       return 0;
+       void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
+       {
+               recordUndo(cur);
+               string sel = cur.selectionAsString(false);
+               //lyxerr << "selection is: '" << sel << "'" << endl;
+
+               if (sel.empty()) {
+                       const int old_pos = cur.pos();
+                       cur.insert(new MathHullInset("simple"));
+                       BOOST_ASSERT(old_pos == cur.pos());
+                       cur.nextInset()->edit(cur, true);
+                       // 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));
+                       // 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
+                       cutSelection(cur, true, true);
+                       if (sel.find("\\newcommand") == string::npos
+                           && sel.find("\\def") == string::npos)
+                       {
+                               cur.insert(new MathHullInset("simple"));
+                               cur.dispatch(FuncRequest(LFUN_RIGHT));
+                               cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
+                       } else {
+                               istringstream is(sel);
+                               cur.insert(new MathMacroTemplate(is));
+                       }
                }
-
-               text.setCursor(cur.par(), pos, true);
-
-               x -= b.x1;
-               // The origin of an inset is on the baseline
-               y -= text.cursor.y();
-
-               return inset;
+               cur.message(N_("Math editor mode"));
        }
 
-} // anon namespace
-
-
-InsetOld * LyXText::checkInsetHit(int & x, int & y)
-{
-       int y_tmp = y + bv_owner->top_y();
-
-       LyXCursor cur;
-       setCursorFromCoordinates(cur, x, y_tmp);
+} // namespace anon
 
-       InsetOld * inset = checkInset(*this, cur, x, y_tmp);
-       if (inset) {
-               y = y_tmp;
-               return inset;
-       }
 
-       // look at previous position
-       if (cur.pos() == 0)
-               return 0;
 
-       // move back one
-       setCursor(cur, cur.par(), cur.pos() - 1, true);
+namespace bv_funcs {
 
-       inset = checkInset(*this, cur, x, y_tmp);
-       if (inset)
-               y = y_tmp;
-       return inset;
+string const freefont2string()
+{
+       string data;
+       if (font2string(freefont, toggleall, data))
+               return data;
+       return string();
 }
 
+}
 
-bool LyXText::gotoNextInset(vector<InsetOld::Code> const & codes,
-                           string const & contents)
+bool LyXText::cursorPrevious(LCursor & cur)
 {
-       ParagraphList::iterator end = ownerParagraphs().end();
-       ParagraphList::iterator pit = cursorPar();
-       pos_type pos = cursor.pos();
-
-       InsetOld * inset;
-       do {
-               if (pos + 1 < pit->size()) {
-                       ++pos;
-               } else  {
-                       ++pit;
-                       pos = 0;
-               }
-
-       } while (pit != end &&
-                !(pit->isInset(pos) &&
-                  (inset = pit->getInset(pos)) != 0 &&
-                  find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() &&
-                  (contents.empty() ||
-                   static_cast<InsetCommand *>(pit->getInset(pos))->getContents()
-                   == contents)));
-
-       if (pit == end)
-               return false;
-
-       setCursor(parOffset(pit), pos, false);
-       return true;
-}
+       pos_type cpos = cur.pos();
+       lyx::pit_type cpar = cur.pit();
 
+       int x = cur.x_target();
 
-void LyXText::gotoInset(vector<InsetOld::Code> const & codes,
-                       bool same_content)
-{
-       bv()->beforeChange(this);
-
-       string contents;
-       if (same_content && cursor.pos() < cursorPar()->size()
-           && cursorPar()->isInset(cursor.pos())) {
-               InsetOld const * inset = cursorPar()->getInset(cursor.pos());
-               if (find(codes.begin(), codes.end(), inset->lyxCode())
-                   != codes.end())
-                       contents = static_cast<InsetCommand const *>(inset)->getContents();
-       }
+       bool updated = setCursorFromCoordinates(cur, x, 0);
+       if (updated)
+               cur.bv().update();
+       updated |= cursorUp(cur);
 
-       if (!gotoNextInset(codes, contents)) {
-               if (cursor.pos() || cursorPar() != ownerParagraphs().begin()) {
-                       LyXCursor tmp = cursor;
-                       cursor.par(0);
-                       cursor.pos(0);
-                       if (!gotoNextInset(codes, contents)) {
-                               cursor = tmp;
-                               bv()->owner()->message(_("No more insets"));
-                       }
-               } else {
-                       bv()->owner()->message(_("No more insets"));
-               }
+       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.
+               updated |= cursorUp(cur);
        }
-       bv()->update();
-       selection.cursor = cursor;
-}
 
-
-void LyXText::gotoInset(InsetOld::Code code, bool same_content)
-{
-       gotoInset(vector<InsetOld::Code>(1, code), same_content);
+       cur.bv().updateScrollbar();
+       finishUndo();
+       return updated;
 }
 
 
-void LyXText::cursorPrevious()
+bool LyXText::cursorNext(LCursor & cur)
 {
-       int y = bv()->top_y();
+       pos_type cpos = cur.pos();
+       lyx::pit_type cpar = cur.pit();
 
-       ParagraphList::iterator cpit = cursorPar();
-       RowList::iterator crit = cpit->getRow(cursor.pos());
+       int x = cur.x_target();
+       bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
+       if (updated)
+               cur.bv().update();
+       updated |= cursorDown(cur);
 
-       if (isFirstRow(cpit, *crit)) {
-               if (y > 0)
-                       bv()->updateScrollbar();
-               return;
+       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.
+               updated |= cursorDown(cur);
        }
 
-       setCursorFromCoordinates(cursor.x_fix(), y);
+       cur.bv().updateScrollbar();
        finishUndo();
+       return updated;
+}
 
-       if (crit == bv()->text->cursorRow()) {
-               // we have a row which is taller than the workarea. The
-               // simplest solution is to move to the previous row instead.
-               cursorUp(true);
-               return;
-       }
-
-       int new_y = + crit->height() - bv()->workHeight() + 1;
 
-       if (inset_owner) {
-               new_y += bv()->text->cursor.y()
-                       + bv()->theLockingInset()->insetInInsetY() + y;
-       } else {
-               new_y += cursor.y() - crit->baseline();
-       }
+namespace {
 
-       previousRow(cpit, crit);
-       LyXCursor cur;
-       setCursor(cur, parOffset(cpit), crit->pos(), false);
-       if (cur.y() > bv()->top_y())
-               cursorUp(true);
-       bv()->updateScrollbar();
+void specialChar(LCursor & cur, InsetSpecialChar::Kind kind)
+{
+       lyx::cap::replaceSelection(cur);
+       cur.insert(new InsetSpecialChar(kind));
+       cur.posRight();
 }
 
 
-void LyXText::cursorNext()
+bool doInsertInset(LCursor & cur, LyXText * text,
+       FuncRequest const & cmd, bool edit, bool pastesel)
 {
-       int topy = bv()->top_y();
-
-       ParagraphList::iterator cpit = cursorPar();
-       RowList::iterator crit = cpit->getRow(cursor.pos());
-
-       if (isLastRow(cpit, *crit)) {
-               int y = cursor.y() - crit->baseline() + crit->height();
-               if (y > topy + bv()->workHeight())
-                       bv()->updateScrollbar();
-               return;
-       }
+       InsetBase * inset = createInset(&cur.bv(), cmd);
+       if (!inset)
+               return false;
 
-       int y = topy + bv()->workHeight();
-       if (inset_owner && !topy) {
-               y -= (bv()->text->cursor.y()
-                         - bv()->top_y()
-                         + bv()->theLockingInset()->insetInInsetY());
+       recordUndo(cur);
+       bool gotsel = false;
+       if (cur.selection()) {
+               cur.bv().owner()->dispatch(FuncRequest(LFUN_CUT));
+               gotsel = true;
        }
+       text->insertInset(cur, inset);
 
-       ParagraphList::iterator dummypit;
-       Row const & rr = *getRowNearY(y, dummypit);
-       y = dummypit->y + rr.y_offset();
-
-       setCursorFromCoordinates(cursor.x_fix(), y);
-       // + bv->workHeight());
-       finishUndo();
-
-       int new_y;
-       if (crit == bv()->text->cursorRow()) {
-               // we have a row which is taller than the workarea. The
-               // simplest solution is to move to the next row instead.
-               cursorDown(true);
-               return;
-               // This is what we used to do, so we wouldn't skip right past
-               // tall rows, but it's not working right now.
-#if 0
-               new_y = bv->top_y() + bv->workHeight();
-#endif
-       }
+       if (edit)
+               inset->edit(cur, true);
 
-       if (inset_owner) {
-               new_y = bv()->text->cursor.y()
-                       + bv()->theLockingInset()->insetInInsetY()
-                       + y - crit->baseline();
-       } else {
-               new_y = cursor.y() - crit->baseline();
-       }
+       if (gotsel && pastesel)
+               cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
+       return true;
+}
 
 
-       nextRow(cpit, crit);
-       LyXCursor cur;
-       setCursor(cur, parOffset(cpit), crit->pos(), false);
-       if (cur.y() < bv_owner->top_y() + bv()->workHeight())
-               cursorDown(true);
-       bv()->updateScrollbar();
+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);
 }
 
 
-namespace {
+} // anon namespace
+
 
-void specialChar(LyXText * lt, BufferView * bv, InsetSpecialChar::Kind kind)
+void LyXText::number(LCursor & cur)
 {
-       bv->update();
-       InsetSpecialChar * new_inset = new InsetSpecialChar(kind);
-       replaceSelection(lt);
-       if (!bv->insertInset(new_inset))
-               delete new_inset;
-       else
-               bv->updateInset(new_inset);
+       LyXFont font(LyXFont::ALL_IGNORE);
+       font.setNumber(LyXFont::TOGGLE);
+       toggleAndShow(cur, this, font);
 }
 
 
-void doInsertInset(LyXText * lt, FuncRequest const & cmd,
-                  bool edit, bool pastesel)
+bool LyXText::isRTL(Paragraph const & par) const
 {
-       InsetOld * inset = createInset(cmd);
-       BufferView * bv = cmd.view();
-
-       if (inset) {
-               bool gotsel = false;
-               if (lt->selection.set()) {
-                       bv->owner()->dispatch(FuncRequest(LFUN_CUT));
-                       gotsel = true;
-               }
-               if (bv->insertInset(inset)) {
-                       if (edit) {
-                               FuncRequest cmd(bv, LFUN_INSET_EDIT, "left");
-                               inset->dispatch(cmd);
-                       }
-                       if (gotsel && pastesel)
-                               bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
-               }
-               else
-                       delete inset;
-       }
+       return par.isRightToLeftPar(bv()->buffer()->params());
 }
 
-} // anon namespace
-
 
-DispatchResult LyXText::dispatch(FuncRequest const & cmd)
+void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 {
-       lyxerr[Debug::ACTION] << "LyXText::dispatch: action[" << cmd.action
-                             <<"] arg[" << cmd.argument << ']' << "xy[" <<
-                                 cmd.x << ',' << cmd.y << ']' << endl;
-
-       BufferView * bv = cmd.view();
+       lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
+
+       BOOST_ASSERT(cur.text() == this);
+       BufferView * bv = &cur.bv();
+       CursorSlice oldTopSlice = cur.top();
+       bool oldBoundary = cur.boundary();
+       bool sel = cur.selection();
+       // 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) {
 
        case LFUN_APPENDIX: {
-               ParagraphList::iterator pit = cursorPar();
-               bool start = !pit->params().startOfAppendix();
+               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
-               ParagraphList::iterator tmp = ownerParagraphs().begin();
-               ParagraphList::iterator end = ownerParagraphs().end();
-
-               for (; tmp != end; ++tmp) {
-                       if (tmp->params().startOfAppendix()) {
-                               recUndo(parOffset(tmp));
-                               tmp->params().startOfAppendix(false);
-                               redoParagraph(tmp);
+               for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
+                       if (pars_[tmp].params().startOfAppendix()) {
+                               recUndo(tmp);
+                               pars_[tmp].params().startOfAppendix(false);
                                break;
                        }
                }
 
-               recUndo(parOffset(pit));
-               pit->params().startOfAppendix(start);
+               recordUndo(cur);
+               par.params().startOfAppendix(start);
 
                // we can set the refreshing parameters now
-               updateCounters();
-               redoParagraph(cursorPar());
-               setCursor(cursorPar(), cursor.pos());
-               bv->update();
+               updateCounters(cur.buffer());
                break;
        }
 
        case LFUN_DELETE_WORD_FORWARD:
-               bv->beforeChange(this);
-               deleteWordForward();
-               finishChange(bv);
+               cur.clearSelection();
+               deleteWordForward(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_DELETE_WORD_BACKWARD:
-               bv->beforeChange(this);
-               deleteWordBackward();
-               finishChange(bv);
+               cur.clearSelection();
+               deleteWordBackward(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_DELETE_LINE_FORWARD:
-               bv->beforeChange(this);
-               deleteLineForward();
-               finishChange(bv);
+               cur.clearSelection();
+               deleteLineForward(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_WORDRIGHT:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               if (cursorPar()->isRightToLeftPar(bv->buffer()->params()))
-                       cursorLeftOneWord();
+               if (!cur.mark())
+                       cur.clearSelection();
+               if (isRTL(cur.paragraph()))
+                       needsUpdate = cursorLeftOneWord(cur);
                else
-                       cursorRightOneWord();
-               finishChange(bv);
+                       needsUpdate = cursorRightOneWord(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_WORDLEFT:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               if (cursorPar()->isRightToLeftPar(bv->buffer()->params()))
-                       cursorRightOneWord();
+               if (!cur.mark())
+                       cur.clearSelection();
+               if (isRTL(cur.paragraph()))
+                       needsUpdate = cursorRightOneWord(cur);
                else
-                       cursorLeftOneWord();
-               finishChange(bv);
+                       needsUpdate = cursorLeftOneWord(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_BEGINNINGBUF:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorTop();
-               finishChange(bv);
+               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 (selection.mark())
-                       bv->beforeChange(this);
-               cursorBottom();
-               finishChange(bv);
+               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:
        case LFUN_RIGHTSEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               if (cursorPar()->isRightToLeftPar(bv->buffer()->params()))
-                       cursorLeft(bv);
+               //lyxerr << BOOST_CURRENT_FUNCTION
+               //       << " LFUN_RIGHT[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_RIGHTSEL);
+               if (isRTL(cur.paragraph()))
+                       needsUpdate = cursorLeft(cur);
                else
-                       cursorRight(bv);
-               finishChange(bv, true);
+                       needsUpdate = cursorRight(cur);
+
+               if (!needsUpdate && oldTopSlice == cur.top()
+                               && cur.boundary() == oldBoundary) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+               }
                break;
 
+       case LFUN_LEFT:
        case LFUN_LEFTSEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               if (cursorPar()->isRightToLeftPar(bv->buffer()->params()))
-                       cursorRight(bv);
+               //lyxerr << "handle LFUN_LEFT[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_LEFTSEL);
+               if (isRTL(cur.paragraph()))
+                       needsUpdate = cursorRight(cur);
                else
-                       cursorLeft(bv);
-               finishChange(bv, true);
+                       needsUpdate = cursorLeft(cur);
+
+               if (!needsUpdate && oldTopSlice == cur.top()
+                       && cur.boundary() == oldBoundary) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_LEFT);
+               }
                break;
 
+       case LFUN_UP:
        case LFUN_UPSEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               cursorUp(true);
-               finishChange(bv, true);
+               update(cur);
+               //lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_UPSEL);
+
+               needsUpdate = cursorUp(cur);
+               if (!needsUpdate && oldTopSlice == cur.top()
+                         && cur.boundary() == oldBoundary) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_UP);
+               }
                break;
 
+       case LFUN_DOWN:
        case LFUN_DOWNSEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               cursorDown(true);
-               finishChange(bv, true);
+               update(cur);
+               //lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
+               cur.selHandle(cmd.action == LFUN_DOWNSEL);
+               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 (!selection.set())
-                       selection.cursor = cursor;
-               cursorUpParagraph();
-               finishChange(bv, true);
+               if (!cur.selection())
+                       cur.resetAnchor();
+               cursorUpParagraph(cur);
+               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 (!selection.set())
-                       selection.cursor = cursor;
-               cursorDownParagraph();
-               finishChange(bv, true);
+               if (!cur.selection())
+                       cur.resetAnchor();
+               cursorDownParagraph(cur);
+               finishChange(cur, true);
                break;
 
        case LFUN_PRIORSEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               cursorPrevious();
-               finishChange(bv, true);
+               update(cur);
+               if (!cur.selection())
+                       cur.resetAnchor();
+               cursorPrevious(cur);
+               finishChange(cur, true);
                break;
 
        case LFUN_NEXTSEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               cursorNext();
-               finishChange(bv, true);
+               update(cur);
+               if (!cur.selection())
+                       cur.resetAnchor();
+               cursorNext(cur);
+               finishChange(cur, true);
                break;
 
        case LFUN_HOMESEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               cursorHome();
-               finishChange(bv, true);
+               update(cur);
+               if (!cur.selection())
+                       cur.resetAnchor();
+               cursorHome(cur);
+               finishChange(cur, true);
                break;
 
        case LFUN_ENDSEL:
-               if (!selection.set())
-                       selection.cursor = cursor;
-               cursorEnd();
-               finishChange(bv, true);
+               update(cur);
+               if (!cur.selection())
+                       cur.resetAnchor();
+               cursorEnd(cur);
+               finishChange(cur, true);
                break;
 
        case LFUN_WORDRIGHTSEL:
-               if (cursorPar()->isRightToLeftPar(bv->buffer()->params()))
-                       cursorLeftOneWord();
+               if (!cur.selection())
+                       cur.resetAnchor();
+               if (isRTL(cur.paragraph()))
+                       cursorLeftOneWord(cur);
                else
-                       cursorRightOneWord();
-               finishChange(bv, true);
+                       cursorRightOneWord(cur);
+               finishChange(cur, true);
                break;
 
        case LFUN_WORDLEFTSEL:
-               if (cursorPar()->isRightToLeftPar(bv->buffer()->params()))
-                       cursorRightOneWord();
+               if (!cur.selection())
+                       cur.resetAnchor();
+               if (isRTL(cur.paragraph()))
+                       cursorRightOneWord(cur);
                else
-                       cursorLeftOneWord();
-               finishChange(bv, true);
+                       cursorLeftOneWord(cur);
+               finishChange(cur, true);
                break;
 
        case LFUN_WORDSEL: {
-               LyXCursor cur1 = cursor;
-               LyXCursor cur2;
-               ::getWord(*this, cur1, cur2, lyx::WHOLE_WORD, ownerParagraphs());
-               setCursor(cur1.par(), cur1.pos());
-               bv->beforeChange(this);
-               setCursor(cur2.par(), cur2.pos());
-               finishChange(bv, true);
-               break;
-       }
-
-       case LFUN_RIGHT: {
-               bool is_rtl = cursorPar()->isRightToLeftPar(bv->buffer()->params());
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               if (is_rtl)
-                       cursorLeft(false);
-               if (cursor.pos() < cursorPar()->size()
-                   && cursorPar()->isInset(cursor.pos())
-                   && isHighlyEditableInset(cursorPar()->getInset(cursor.pos()))) {
-                       InsetOld * tmpinset = cursorPar()->getInset(cursor.pos());
-                       cmd.message(tmpinset->editMessage());
-                       FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "right" : "left");
-                       tmpinset->dispatch(cmd1);
-                       break;
-               }
-               if (!is_rtl)
-                       cursorRight(false);
-               finishChange(bv);
-               break;
-       }
-
-       case LFUN_LEFT: {
-               // This is soooo ugly. Isn`t it possible to make
-               // it simpler? (Lgb)
-               bool const is_rtl = cursorPar()->isRightToLeftPar(bv->buffer()->params());
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               LyXCursor const cur = cursor;
-               if (!is_rtl)
-                       cursorLeft(false);
-               if ((is_rtl || cur != cursor) && // only if really moved!
-                   cursor.pos() < cursorPar()->size() &&
-                   cursorPar()->isInset(cursor.pos()) &&
-                   isHighlyEditableInset(cursorPar()->getInset(cursor.pos()))) {
-                       InsetOld * tmpinset = cursorPar()->getInset(cursor.pos());
-                       cmd.message(tmpinset->editMessage());
-                       FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "left" : "right");
-                       tmpinset->dispatch(cmd1);
-                       break;
-               }
-               if (is_rtl)
-                       cursorRight(false);
-               finishChange(bv);
+               selectWord(cur, lyx::WHOLE_WORD);
+               finishChange(cur, true);
                break;
        }
 
-       case LFUN_UP:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorUp(false);
-               finishChange(bv);
-               break;
-
-       case LFUN_DOWN:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorDown(false);
-               finishChange(bv);
-               break;
-
-       case LFUN_UP_PARAGRAPH:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorUpParagraph();
-               finishChange(bv);
-               break;
-
-       case LFUN_DOWN_PARAGRAPH:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorDownParagraph();
-               finishChange(bv, false);
-               break;
-
        case LFUN_PRIOR:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorPrevious();
-               finishChange(bv, false);
+               update(cur);
+               if (!cur.mark())
+                       cur.clearSelection();
+               finishChange(cur, false);
+               if (cur.pit() == 0 && cur.textRow().pos() == 0) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_UP);
+               } else {
+                       needsUpdate = cursorPrevious(cur);
+               }
                break;
 
        case LFUN_NEXT:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorNext();
-               finishChange(bv, false);
+               update(cur);
+               if (!cur.mark())
+                       cur.clearSelection();
+               finishChange(cur, false);
+               if (cur.pit() == cur.lastpit()
+                         && cur.textRow().endpos() == cur.lastpos()) {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_DOWN);
+               } else {
+                       needsUpdate = cursorNext(cur);
+               }
                break;
 
        case LFUN_HOME:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorHome();
-               finishChange(bv, false);
+               if (!cur.mark())
+                       cur.clearSelection();
+               cursorHome(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_END:
-               if (!selection.mark())
-                       bv->beforeChange(this);
-               cursorEnd();
-               finishChange(bv, false);
+               if (!cur.mark())
+                       cur.clearSelection();
+               cursorEnd(cur);
+               finishChange(cur, false);
                break;
 
        case LFUN_BREAKLINE: {
-               lyx::pos_type body = cursorPar()->beginningOfBody();
-
                // Not allowed by LaTeX (labels or empty par)
-               if (cursor.pos() <= body)
-                       break;
-
-               replaceSelection(bv->getLyXText());
-               insertInset(new InsetNewline);
-               setCursor(cursorPar(), cursor.pos());
-               moveCursorUpdate(bv, false);
+               if (cur.pos() > cur.paragraph().beginOfBody()) {
+                       lyx::cap::replaceSelection(cur);
+                       cur.insert(new InsetNewline);
+                       cur.posRight();
+                       moveCursor(cur, false);
+               }
                break;
        }
 
        case LFUN_DELETE:
-               if (!selection.set()) {
-                       Delete();
-                       selection.cursor = cursor;
+               if (!cur.selection()) {
+                       needsUpdate = Delete(cur);
+                       cur.resetAnchor();
                        // It is possible to make it a lot faster still
                        // just comment out the line below...
                } else {
-                       cutSelection(true, false);
+                       cutSelection(cur, true, false);
                }
-               moveCursorUpdate(bv, false);
-               bv->owner()->view_state_changed();
+               moveCursor(cur, false);
                break;
 
        case LFUN_DELETE_SKIP:
                // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
-               if (!selection.set()) {
-                       if (cursor.pos() == cursorPar()->size()) {
-                               cursorRight(bv);
-                               ParagraphParameters & params = cursorPar()->params();
-                               if (cursor.pos() == 0
-                                   && !(params.spaceTop() == VSpace (VSpace::NONE))) {
-                                       setParagraph(
-                                                VSpace(VSpace::NONE),
-                                                params.spaceBottom(),
-                                                params.spacing(),
-                                                params.align(),
-                                                params.labelWidthString(), 0);
-                                       cursorLeft(bv);
-                               } else {
-                                       cursorLeft(bv);
-                                       Delete();
-                                       selection.cursor = cursor;
-                               }
-                       } else {
-                               Delete();
-                               selection.cursor = cursor;
+               if (!cur.selection()) {
+                       if (cur.pos() == cur.lastpos()) {
+                               cursorRight(cur);
+                               cursorLeft(cur);
                        }
+                       Delete(cur);
+                       cur.resetAnchor();
                } else {
-                       cutSelection(true, false);
+                       cutSelection(cur, true, false);
                }
-               bv->update();
                break;
 
 
        case LFUN_BACKSPACE:
-               if (!selection.set()) {
+               if (!cur.selection()) {
                        if (bv->owner()->getIntl().getTransManager().backspace()) {
-                               backspace();
-                               selection.cursor = cursor;
+                               needsUpdate = backspace(cur);
+                               cur.resetAnchor();
                                // It is possible to make it a lot faster still
                                // just comment out the line below...
                        }
                } else {
-                       cutSelection(true, false);
+                       cutSelection(cur, true, false);
                }
-               bv->owner()->view_state_changed();
                bv->switchKeyMap();
-               bv->update();
                break;
 
        case LFUN_BACKSPACE_SKIP:
                // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
-               if (!selection.set()) {
-                       ParagraphParameters & params = cursorPar()->params();
-                       if (cursor.pos() == 0 && !(params.spaceTop() == VSpace(VSpace::NONE))) {
-                               setParagraph(
-                                        VSpace(VSpace::NONE),
-                                  params.spaceBottom(),
-                                        params.spacing(),
-                                        params.align(),
-                                        params.labelWidthString(), 0);
-                       } else {
-                               LyXCursor cur = cursor;
-                               backspace();
-                               selection.cursor = cur;
-                       }
+               if (!cur.selection()) {
+#ifdef WITH_WARNINGS
+#warning look here
+#endif
+                       //CursorSlice cur = cursor();
+                       backspace(cur);
+                       //anchor() = cur;
                } else {
-                       cutSelection(true, false);
+                       cutSelection(cur, true, false);
                }
-               bv->update();
                break;
 
        case LFUN_BREAKPARAGRAPH:
-               replaceSelection(bv->getLyXText());
-               breakParagraph(bv->buffer()->paragraphs(), 0);
-               bv->update();
-               selection.cursor = cursor;
+               lyx::cap::replaceSelection(cur);
+               breakParagraph(cur, 0);
+               cur.resetAnchor();
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                break;
 
        case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
-               replaceSelection(bv->getLyXText());
-               breakParagraph(bv->buffer()->paragraphs(), 1);
-               bv->update();
-               selection.cursor = cursor;
+               lyx::cap::replaceSelection(cur);
+               breakParagraph(cur, 1);
+               cur.resetAnchor();
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                break;
 
        case LFUN_BREAKPARAGRAPH_SKIP: {
                // When at the beginning of a paragraph, remove
-               // indentation and add a "defskip" at the top.
-               // Otherwise, do the same as LFUN_BREAKPARAGRAPH.
-               LyXCursor cur = cursor;
-               replaceSelection(bv->getLyXText());
-               if (cur.pos() == 0) {
-                       ParagraphParameters & params = getPar(cur)->params();
-                       if (params.spaceTop() == VSpace(VSpace::NONE)) {
-                               setParagraph(
-                                        VSpace(VSpace::DEFSKIP), params.spaceBottom(),
-                                        params.spacing(),
-                                        params.align(),
-                                        params.labelWidthString(), 1);
-                       }
-               }
-               else {
-                       breakParagraph(bv->buffer()->paragraphs(), 0);
-               }
-               bv->update();
-               selection.cursor = cur;
+               // indentation.  Otherwise, do the same as LFUN_BREAKPARAGRAPH.
+               lyx::cap::replaceSelection(cur);
+               if (cur.pos() == 0)
+                       cur.paragraph().params().labelWidthString(string());
+               else
+                       breakParagraph(cur, 0);
+               cur.resetAnchor();
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                break;
        }
 
        case LFUN_PARAGRAPH_SPACING: {
-               ParagraphList::iterator pit = cursorPar();
-               Spacing::Space cur_spacing = pit->params().spacing().getSpace();
-               float cur_value = 1.0;
+               Paragraph & par = cur.paragraph();
+               Spacing::Space cur_spacing = par.params().spacing().getSpace();
+               string cur_value = "1.0";
                if (cur_spacing == Spacing::Other)
-                       cur_value = pit->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;
@@ -848,10 +724,10 @@ DispatchResult LyXText::dispatch(FuncRequest const & 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;
@@ -859,143 +735,118 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
                        lyxerr << _("Unknown spacing argument: ")
                               << cmd.argument << endl;
                }
-               if (cur_spacing != new_spacing || cur_value != new_value) {
-                       pit->params().spacing(Spacing(new_spacing, new_value));
-                       redoParagraph();
-                       bv->update();
-               }
+               if (cur_spacing != new_spacing || cur_value != new_value)
+                       par.params().spacing(Spacing(new_spacing, new_value));
                break;
        }
 
-       case LFUN_INSET_SETTINGS:
-               BOOST_ASSERT(bv->theLockingInset());
-               bv->theLockingInset()->getLockingInset()->showInsetDialog(bv);
+       case LFUN_INSET_INSERT: {
+               recordUndo(cur);
+               InsetBase * inset = createInset(bv, cmd);
+               if (inset) {
+                       insertInset(cur, inset);
+                       cur.posRight();
+               }
                break;
+       }
 
-       case LFUN_INSET_TOGGLE:
-               bv->beforeChange(this);
-               toggleInset();
-               bv->update();
-               bv->switchKeyMap();
+       case LFUN_INSET_SETTINGS:
+               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) {
+                       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_SPACE_INSERT:
-               if (cursorPar()->layout()->free_spacing)
-                       insertChar(' ');
-               else
-                       doInsertInset(this, cmd, false, false);
-               moveCursorUpdate(bv, false);
+               if (cur.paragraph().layout()->free_spacing)
+                       insertChar(cur, ' ');
+               else {
+                       doInsertInset(cur, this, cmd, false, false);
+                       cur.posRight();
+               }
+               moveCursor(cur, false);
                break;
 
        case LFUN_HYPHENATION:
-               specialChar(this, bv, InsetSpecialChar::HYPHENATION);
+               specialChar(cur, InsetSpecialChar::HYPHENATION);
                break;
 
        case LFUN_LIGATURE_BREAK:
-               specialChar(this, bv, InsetSpecialChar::LIGATURE_BREAK);
+               specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
                break;
 
        case LFUN_LDOTS:
-               specialChar(this, bv, InsetSpecialChar::LDOTS);
+               specialChar(cur, InsetSpecialChar::LDOTS);
                break;
 
        case LFUN_END_OF_SENTENCE:
-               specialChar(this, bv, InsetSpecialChar::END_OF_SENTENCE);
+               specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
                break;
 
        case LFUN_MENU_SEPARATOR:
-               specialChar(this, bv, InsetSpecialChar::MENU_SEPARATOR);
-               break;
-
-       case LFUN_MARK_OFF:
-               bv->beforeChange(this);
-               bv->update();
-               selection.cursor = cursor;
-               cmd.message(N_("Mark off"));
-               break;
-
-       case LFUN_MARK_ON:
-               bv->beforeChange(this);
-               selection.mark(true);
-               bv->update();
-               selection.cursor = cursor;
-               cmd.message(N_("Mark on"));
-               break;
-
-       case LFUN_SETMARK:
-               bv->beforeChange(this);
-               if (selection.mark()) {
-                       cmd.message(N_("Mark removed"));
-               } else {
-                       selection.mark(true);
-                       cmd.message(N_("Mark set"));
-               }
-               selection.cursor = cursor;
-               bv->update();
+               specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
                break;
 
        case LFUN_UPCASE_WORD:
-               changeCase(LyXText::text_uppercase);
-               bv->update();
+               changeCase(cur, LyXText::text_uppercase);
                break;
 
        case LFUN_LOWCASE_WORD:
-               changeCase(LyXText::text_lowercase);
-               bv->update();
+               changeCase(cur, LyXText::text_lowercase);
                break;
 
        case LFUN_CAPITALIZE_WORD:
-               changeCase(LyXText::text_capitalization);
-               bv->update();
+               changeCase(cur, LyXText::text_capitalization);
                break;
 
        case LFUN_TRANSPOSE_CHARS:
-               recUndo(cursor.par());
-               redoParagraph();
-               bv->update();
+               recordUndo(cur);
                break;
 
        case LFUN_PASTE:
-               cmd.message(_("Paste"));
-               replaceSelection(bv->getLyXText());
-#warning FIXME Check if the arg is in the domain of available selections.
+               cur.message(_("Paste"));
+               lyx::cap::replaceSelection(cur);
                if (isStrUnsignedInt(cmd.argument))
-                       pasteSelection(strToUnsignedInt(cmd.argument));
+                       pasteSelection(cur, convert<unsigned int>(cmd.argument));
                else
-                       pasteSelection(0);
-               clearSelection(); // bug 393
-               bv->update();
+                       pasteSelection(cur, 0);
+               cur.clearSelection(); // bug 393
                bv->switchKeyMap();
                finishUndo();
                break;
 
        case LFUN_CUT:
-               cutSelection(true, true);
-               cmd.message(_("Cut"));
-               bv->update();
+               cutSelection(cur, true, true);
+               cur.message(_("Cut"));
                break;
 
        case LFUN_COPY:
-               copySelection();
-               cmd.message(_("Copy"));
-               break;
-
-       case LFUN_BEGINNINGBUFSEL:
-               if (inset_owner)
-                       return DispatchResult(UNDISPATCHED);
-               cursorTop();
-               finishChange(bv, true);
-               break;
-
-       case LFUN_ENDBUFSEL:
-               if (inset_owner)
-                       return DispatchResult(UNDISPATCHED);
-               cursorBottom();
-               finishChange(bv, true);
+               copySelection(cur);
+               cur.message(_("Copy"));
                break;
 
        case LFUN_GETXY:
-               cmd.message(tostr(cursor.x()) + ' ' + tostr(cursor.y()));
+               cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
+                         + convert<string>(cursorY(cur.top(), cur.boundary())));
                break;
 
        case LFUN_SETXY: {
@@ -1007,21 +858,21 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
                        lyxerr << "SETXY: Could not parse coordinates in '"
                               << cmd.argument << std::endl;
                else
-                       setCursorFromCoordinates(x, y);
+                       setCursorFromCoordinates(cur, x, y);
                break;
        }
 
        case LFUN_GETFONT:
                if (current_font.shape() == LyXFont::ITALIC_SHAPE)
-                       cmd.message("E");
+                       cur.message("E");
                else if (current_font.shape() == LyXFont::SMALLCAPS_SHAPE)
-                       cmd.message("N");
+                       cur.message("N");
                else
-                       cmd.message("0");
+                       cur.message("0");
                break;
 
        case LFUN_GETLAYOUT:
-               cmd.message(tostr(cursorPar()->layout()));
+               cur.message(cur.paragraph().layout()->name());
                break;
 
        case LFUN_LAYOUT: {
@@ -1034,7 +885,7 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
                // function list/array with information about what
                // functions needs arguments and their type.
                if (cmd.argument.empty()) {
-                       cmd.errorMessage(_("LyX function 'layout' needs an argument."));
+                       cur.errorMessage(_("LyX function 'layout' needs an argument."));
                        break;
                }
 
@@ -1052,20 +903,20 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
                }
 
                if (!hasLayout) {
-                       cmd.errorMessage(string(N_("Layout ")) + cmd.argument +
+                       cur.errorMessage(string(N_("Layout ")) + cmd.argument +
                                N_(" not known"));
                        break;
                }
 
                bool change_layout = (current_layout != layout);
 
-               if (!change_layout && selection.set() &&
-                       selection.start.par() != selection.end.par())
+               if (!change_layout && cur.selection() &&
+                       cur.selBegin().pit() != cur.selEnd().pit())
                {
-                       ParagraphList::iterator spit = getPar(selection.start);
-                       ParagraphList::iterator epit = boost::next(getPar(selection.end));
+                       pit_type spit = cur.selBegin().pit();
+                       pit_type epit = cur.selEnd().pit() + 1;
                        while (spit != epit) {
-                               if (spit->layout()->name() != current_layout) {
+                               if (pars_[spit].layout()->name() != current_layout) {
                                        change_layout = true;
                                        break;
                                }
@@ -1075,359 +926,172 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
 
                if (change_layout) {
                        current_layout = layout;
-                       setLayout(layout);
+                       setLayout(cur, layout);
                        bv->owner()->setLayout(layout);
-                       bv->update();
                        bv->switchKeyMap();
                }
                break;
        }
 
        case LFUN_PASTESELECTION: {
-               // this was originally a beforeChange(bv->text), i.e
-               // the outermost LyXText!
-               bv->beforeChange(this);
+               cur.clearSelection();
                string const clip = bv->getClipboard();
                if (!clip.empty()) {
+                       recordUndo(cur);
                        if (cmd.argument == "paragraph")
-                               insertStringAsParagraphs(clip);
+                               insertStringAsParagraphs(cur, clip);
                        else
-                               insertStringAsLines(clip);
-                       clearSelection();
-                       bv->update();
+                               insertStringAsLines(cur, clip);
                }
                break;
        }
 
-       case LFUN_GOTOERROR:
-               gotoInset(InsetOld::ERROR_CODE, false);
-               break;
-
-       case LFUN_GOTONOTE:
-               gotoInset(InsetOld::NOTE_CODE, false);
-               break;
-
-       case LFUN_REFERENCE_GOTO:
-       {
-               vector<InsetOld::Code> tmp;
-               tmp.push_back(InsetOld::LABEL_CODE);
-               tmp.push_back(InsetOld::REF_CODE);
-               gotoInset(tmp, true);
-               break;
-       }
-
        case LFUN_QUOTE: {
-               replaceSelection(bv->getLyXText());
-               ParagraphList::iterator pit = cursorPar();
-               lyx::pos_type pos = cursor.pos();
+               lyx::cap::replaceSelection(cur);
+               Paragraph & par = cur.paragraph();
+               lyx::pos_type pos = cur.pos();
                char c;
-               if (!pos)
+               if (pos == 0)
                        c = ' ';
-               else if (pit->isInset(pos - 1) && pit->getInset(pos - 1)->isSpace())
+               else if (cur.prevInset() && cur.prevInset()->isSpace())
                        c = ' ';
                else
-                       c = pit->getChar(pos - 1);
+                       c = par.getChar(pos - 1);
 
-               LyXLayout_ptr const & style = pit->layout();
+               LyXLayout_ptr const & style = par.layout();
 
                BufferParams const & bufparams = bv->buffer()->params();
-               if (style->pass_thru ||
-                   pit->getFontSettings(bufparams,pos).language()->lang() == "hebrew" ||
-                   !bv->insertInset(new InsetQuotes(c, bufparams)))
+               if (!style->pass_thru
+                   && par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
+                       string arg = cmd.argument;
+                       if (arg == "single")
+                               cur.insert(new InsetQuotes(c,
+                                   bufparams.quotes_language,
+                                   InsetQuotes::SingleQ));
+                       else
+                               cur.insert(new InsetQuotes(c,
+                                   bufparams.quotes_language,
+                                   InsetQuotes::DoubleQ));
+                       cur.posRight();
+               }
+               else
                        bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT, "\""));
                break;
        }
 
-       case LFUN_DATE_INSERT: {
-               replaceSelection(bv->getLyXText());
-               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(datetmp[i]);
-
-               selection.cursor = cursor;
-               moveCursorUpdate(bv, false);
+                       bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
+                               lyx::formatted_time(lyx::current_time(), cmd.argument)));
                break;
-       }
 
        case LFUN_MOUSE_TRIPLE:
-               if (!bv->buffer())
-                       break;
-               if (!isInInset() && bv->theLockingInset())
-                       break;
                if (cmd.button() == mouse_button::button1) {
-                       cursorHome();
-                       selection.cursor = cursor;
-                       cursorEnd();
-                       setSelection();
-                       bv->update();
-                       bv->haveSelection(selection.set());
+                       cursorHome(cur);
+                       cur.resetAnchor();
+                       cursorEnd(cur);
+                       cur.setSelection();
+                       bv->cursor() = cur;
+                       bv->haveSelection(cur.selection());
                }
                break;
 
        case LFUN_MOUSE_DOUBLE:
-               if (!bv->buffer())
-                       break;
-               if (!isInInset() && bv->theLockingInset())
-                       break;
                if (cmd.button() == mouse_button::button1) {
-                       selectWord(lyx::WHOLE_WORD_STRICT);
-                       bv->update();
-                       bv->haveSelection(selection.set());
-               }
-               break;
-
-       case LFUN_MOUSE_MOTION:
-       {
-               // Only use motion with button 1
-               //if (ev.button() != mouse_button::button1)
-               //      return false;
-
-               if (!bv->buffer())
-                       break;
-
-               // Check for inset locking
-               if (bv->theLockingInset()) {
-                       InsetOld * tli = bv->theLockingInset();
-                       LyXCursor cursor = bv->text->cursor;
-                       LyXFont font = bv->text->getFont(bv->text->cursorPar(), cursor.pos());
-                       int width = tli->width();
-                       int inset_x = font.isVisibleRightToLeft()
-                               ? cursor.x() - width : cursor.x();
-                       int start_x = inset_x + tli->scroll();
-                       FuncRequest cmd1 = cmd;
-                       cmd1.x = cmd.x - start_x;
-                       cmd1.y = cmd.y - cursor.y() + bv->top_y();
-                       tli->dispatch(cmd1);
-                       break;
-               }
-
-               // The test for not selection possible is needed, that only motion
-               // events are used, where the bottom press event was on
-               //  the drawing area too
-               if (!selection_possible) {
-                       lyxerr[Debug::ACTION]
-                               << "BufferView::Pimpl::Dispatch: no selection possible\n";
-                       break;
-               }
-
-               RowList::iterator cursorrow = bv->text->cursorRow();
-               bv->text->setCursorFromCoordinates(cmd.x, cmd.y + bv->top_y());
-       #if 0
-               // sorry for this but I have a strange error that the y value jumps at
-               // a certain point. This seems like an error in my xforms library or
-               // in some other local environment, but I would like to leave this here
-               // for the moment until I can remove this (Jug 20020418)
-               if (y_before < bv->text->cursor.y())
-                       lyxerr << y_before << ':'
-                              << bv->text->cursor.y() << endl;
-       #endif
-               // This is to allow jumping over large insets
-               if (cursorrow == bv->text->cursorRow()) {
-                       if (cmd.y >= bv->workHeight())
-                               bv->text->cursorDown(false);
-                       else if (cmd.y < 0)
-                               bv->text->cursorUp(false);
+                       selectWord(cur, lyx::WHOLE_WORD_STRICT);
+                       bv->cursor() = cur;
+                       bv->haveSelection(cur.selection());
                }
-
-               bv->text->setSelection();
-               bv->update();
                break;
-       }
 
        // Single-click on work area
-       case LFUN_MOUSE_PRESS:
-       {
-               if (!bv->buffer())
-                       break;
-
-               // ok ok, this is a hack (for xforms)
-               // We shouldn't go further down as we really should 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);
+       case LFUN_MOUSE_PRESS: {
+               // Right click on a footnote flag opens float menu
+               if (cmd.button() == mouse_button::button3) {
+                       cur.clearSelection();
                        break;
                }
 
-               int x = cmd.x;
-               int y = cmd.y;
-               InsetOld * inset_hit = bv->text->checkInsetHit(x, y);
-
                // Middle button press pastes if we have a selection
                // We do this here as if the selection was inside an inset
                // it could get cleared on the unlocking of the inset so
                // we have to check this first
                bool paste_internally = false;
-               if (cmd.button() == mouse_button::button2 && selection.set()) {
+               if (cmd.button() == mouse_button::button2 && cur.selection()) {
                        bv->owner()->dispatch(FuncRequest(LFUN_COPY));
                        paste_internally = true;
                }
 
-               int const screen_first = bv->top_y();
+               bv->mouseSetCursor(cur);
 
-               if (bv->theLockingInset()) {
-                       // We are in inset locking mode
-
-                       // Check whether the inset was hit. If not reset mode,
-                       // otherwise give the event to the inset
-                       if (inset_hit == bv->theLockingInset()) {
-                               FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button());
-                               bv->theLockingInset()->dispatch(cmd1);
-                               break;
-                       }
-                       bv->unlockInset(bv->theLockingInset());
+               // Insert primary selection with middle mouse
+               // if there is a local selection in the current buffer,
+               // insert this
+               if (cmd.button() == mouse_button::button2) {
+                       if (paste_internally)
+                               bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
+                       else
+                               bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph"));
                }
 
-               if (!inset_hit)
-                       selection_possible = true;
+               break;
+       }
 
-               // Clear the selection
-               bv->text->clearSelection();
-               bv->update();
-               bv->updateScrollbar();
+       case LFUN_MOUSE_MOTION: {
+               // Only use motion with button 1
+               //if (cmd.button() != mouse_button::button1)
+               //      return false;
 
-               // Single left click in math inset?
-               if (isHighlyEditableInset(inset_hit)) {
-                       // Highly editable inset, like math
-                       UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
-                       selection_possible = false;
-                       bv->owner()->message(inset->editMessage());
-                       // We just have to lock the inset before calling a PressEvent on it!
-                       if (!bv->lockInset(inset))
-                               lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
-                       FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button());
-                       inset->dispatch(cmd1);
-                       break;
-               }
-               // I'm not sure we should continue here if we hit an inset (Jug20020403)
+               // ignore motions deeper nested than the real anchor
+               LCursor & bvcur = cur.bv().cursor();
+               if (bvcur.anchor_.hasPart(cur)) {
+                       CursorSlice old = bvcur.top();
 
-               // Right click on a footnote flag opens float menu
-               if (cmd.button() == mouse_button::button3) {
-                       selection_possible = false;
-                       break;
-               }
+                       int const wh = bv->workHeight();
+                       int const y = std::max(0, std::min(wh - 1, cmd.y));
 
-               if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
-                       bv->text->setCursorFromCoordinates(x, y + screen_first);
-               finishUndo();
-               bv->text->selection.cursor = bv->text->cursor;
-               bv->text->cursor.x_fix(bv->text->cursor.x());
+                       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 (bv->fitCursor())
-                       selection_possible = false;
+                       if (cur.top() == old)
+                               cur.noUpdate();
+                       else {
+                               // don't set anchor_
+                               bvcur.setCursor(cur);
+                               bvcur.selection() = true;
+                               //lyxerr << "MOTION: " << bv->cursor() << endl;
+                       }
 
-               // Insert primary selection with middle mouse
-               // if there is a local selection in the current buffer,
-               // insert this
-               if (cmd.button() == mouse_button::button2) {
-                       if (paste_internally)
-                               bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
-                       else
-                               bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph"));
-                       selection_possible = false;
-               }
+               } else
+                       cur.undispatched();
                break;
        }
 
-       case LFUN_MOUSE_RELEASE:
-       {
-               // do nothing if we used the mouse wheel
-               if (!bv->buffer())
-                       break;
-
-               if (cmd.button() == mouse_button::button4
-                || cmd.button() == mouse_button::button5)
-                       break;
-
-               // If we hit an inset, we have the inset coordinates in these
-               // and inset_hit points to the inset.  If we do not hit an
-               // inset, inset_hit is 0, and inset_x == x, inset_y == y.
-               int x = cmd.x;
-               int y = cmd.y;
-               InsetOld * inset_hit = bv->text->checkInsetHit(x, y);
-
-               if (bv->theLockingInset()) {
-                       // We are in inset locking mode.
-
-                       // LyX does a kind of work-area grabbing for insets.
-                       // Only a ButtonPress FuncRequest outside the inset will
-                       // force a insetUnlock.
-                       FuncRequest cmd1(bv, LFUN_MOUSE_RELEASE, x, y, cmd.button());
-                       bv->theLockingInset()->dispatch(cmd1);
-                       break;
-               }
-
-               selection_possible = false;
-
+       case LFUN_MOUSE_RELEASE: {
                if (cmd.button() == mouse_button::button2)
                        break;
 
                // finish selection
                if (cmd.button() == mouse_button::button1)
-                       bv->haveSelection(selection.set());
+                       bv->haveSelection(cur.selection());
 
                bv->switchKeyMap();
-               bv->owner()->view_state_changed();
                bv->owner()->updateMenubar();
-               bv->owner()->updateToolbar();
-
-               // Did we hit an editable inset?
-               if (inset_hit) {
-                       selection_possible = false;
-
-                       // if we reach this point with a selection, it
-                       // must mean we are currently selecting.
-                       // But we don't want to open the inset
-                       // because that is annoying for the user.
-                       // So just pretend we didn't hit it.
-                       // this is OK because a "kosher" ButtonRelease
-                       // will follow a ButtonPress that clears
-                       // the selection.
-                       // Note this also fixes selection drawing
-                       // problems if we end up opening an inset
-                       if (selection.set())
-                               break;
-
-                       // CHECK fix this proper in 0.13
-                       // well, maybe 13.0 !!!!!!!!!
-
-                       // Following a ref shouldn't issue
-                       // a push on the undo-stack
-                       // anylonger, now that we have
-                       // keybindings for following
-                       // references and returning from
-                       // references.  IMHO though, it
-                       // should be the inset's own business
-                       // to push or not push on the undo
-                       // stack. They don't *have* to
-                       // alter the document...
-                       // (Joacim)
-                       // ...or maybe the recordUndo()
-                       // below isn't necessary at all anylonger?
-                       if (inset_hit->lyxCode() == InsetOld::REF_CODE)
-                               recUndo(cursor.par());
-
-                       bv->owner()->message(inset_hit->editMessage());
-
-                       FuncRequest cmd1(bv, LFUN_MOUSE_RELEASE, x, y, cmd.button());
-                       inset_hit->dispatch(cmd1);
-               }
-
+               bv->owner()->updateToolbars();
                break;
        }
 
@@ -1442,12 +1106,12 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
                // true (on).
 
                if (lyxrc.auto_region_delete) {
-                       if (selection.set())
-                               cutSelection(false, false);
+                       if (cur.selection())
+                               cutSelection(cur, false, false);
                        bv->haveSelection(false);
                }
 
-               bv->beforeChange(this);
+               cur.clearSelection();
                LyXFont const old_font = real_current_font;
 
                string::const_iterator cit = cmd.argument.begin();
@@ -1456,31 +1120,43 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
                        bv->owner()->getIntl().getTransManager().
                                TranslateAndInsert(*cit, this);
 
-               selection.cursor = cursor;
-               moveCursorUpdate(bv, false);
-
-               // real_current_font.number can change so we need to
-               // update the minibuffer
-               if (old_font != real_current_font)
-                       bv->owner()->view_state_changed();
+               cur.resetAnchor();
+               moveCursor(cur, false);
                bv->updateScrollbar();
                break;
        }
 
-       case LFUN_HTMLURL: {
-               InsetCommandParams p("htmlurl");
+       case LFUN_URL: {
+               InsetCommandParams p("url");
                string const data = InsetCommandMailer::params2string("url", p);
                bv->owner()->getDialogs().show("url", data, 0);
                break;
        }
 
-       case LFUN_URL: {
-               InsetCommandParams p("url");
+       case LFUN_HTMLURL: {
+               InsetCommandParams p("htmlurl");
                string const data = InsetCommandMailer::params2string("url", p);
                bv->owner()->getDialogs().show("url", data, 0);
                break;
        }
 
+       case LFUN_INSERT_LABEL: {
+               // Try to generate a valid label
+               string const contents = cmd.argument.empty() ?
+                       cur.getPossibleLabel() : cmd.argument;
+
+               InsetCommandParams p("label", contents);
+               string const data = InsetCommandMailer::params2string("label", p);
+
+               if (cmd.argument.empty()) {
+                       bv->owner()->getDialogs().show("label", data, 0);
+               } else {
+                       FuncRequest fr(LFUN_INSET_INSERT, data);
+                       dispatch(cur, fr);
+               }
+               break;
+       }
+
 
 #if 0
        case LFUN_INSET_LIST:
@@ -1488,54 +1164,709 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
        case LFUN_INSET_CAPTION:
 #endif
        case LFUN_INSERT_NOTE:
+       case LFUN_INSERT_CHARSTYLE:
        case LFUN_INSERT_BOX:
        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_MINIPAGE:
        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(this, cmd, true, true);
+               doInsertInset(cur, this, cmd, true, true);
+               cur.posRight();
                break;
 
-       case LFUN_INDEX_INSERT:
-               // Just open the inset
-               doInsertInset(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:
        case LFUN_INSERT_LINE:
        case LFUN_INSERT_PAGEBREAK:
                // do nothing fancy
-               doInsertInset(this, cmd, false, false);
+               doInsertInset(cur, this, cmd, false, false);
+               cur.posRight();
                break;
 
        case LFUN_DEPTH_MIN:
-               bv_funcs::changeDepth(bv, this, bv_funcs::DEC_DEPTH, false);
-               clearSelection();
-               bv->update();
+               changeDepth(cur, DEC_DEPTH);
                break;
 
        case LFUN_DEPTH_PLUS:
-               clearSelection();
-               bv_funcs::changeDepth(bv, this, bv_funcs::INC_DEPTH, false);
-               clearSelection();
-               bv->update();
+               changeDepth(cur, INC_DEPTH);
+               break;
+
+       case LFUN_MATH_DISPLAY:
+               mathDispatch(cur, cmd, true);
+               break;
+
+       case LFUN_MATH_IMPORT_SELECTION:
+       case LFUN_MATH_MODE:
+               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:
+               if (cmd.argument.empty())
+                       cur.errorMessage(N_("Missing argument"));
+               else {
+                       string s = cmd.argument;
+                       string const s1 = token(s, ' ', 1);
+                       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, 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("simple"));
+               cur.dispatch(FuncRequest(LFUN_RIGHT));
+               cur.dispatch(cmd);
+               break;
+       }
+
+       case LFUN_EMPH: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setEmph(LyXFont::TOGGLE);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_BOLD: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setSeries(LyXFont::BOLD_SERIES);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_NOUN: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setNoun(LyXFont::TOGGLE);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_CODE: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setFamily(LyXFont::TYPEWRITER_FAMILY); // no good
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_SANS: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setFamily(LyXFont::SANS_FAMILY);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_ROMAN: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setFamily(LyXFont::ROMAN_FAMILY);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_DEFAULT: {
+               LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_UNDERLINE: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setUnderbar(LyXFont::TOGGLE);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_FONT_SIZE: {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setLyXSize(cmd.argument);
+               toggleAndShow(cur, this, font);
+               break;
+       }
+
+       case LFUN_LANGUAGE: {
+               Language const * lang = languages.getLanguage(cmd.argument);
+               if (!lang)
+                       break;
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setLanguage(lang);
+               toggleAndShow(cur, this, font);
+               bv->switchKeyMap();
+               break;
+       }
+
+       case LFUN_FREEFONT_APPLY:
+               toggleAndShow(cur, this, freefont, toggleall);
+               cur.message(_("Character set"));
+               break;
+
+       // Set the freefont using the contents of \param data dispatched from
+       // the frontends and apply it at the current cursor location.
+       case LFUN_FREEFONT_UPDATE: {
+               LyXFont font;
+               bool toggle;
+               if (bv_funcs::string2font(cmd.argument, font, toggle)) {
+                       freefont = font;
+                       toggleall = toggle;
+                       toggleAndShow(cur, this, freefont, toggleall);
+                       cur.message(_("Character set"));
+               }
+               break;
+       }
+
+       case LFUN_FINISHED_LEFT:
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_LEFT:\n" << cur << endl;
+               break;
+
+       case LFUN_FINISHED_RIGHT:
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_RIGHT:\n" << cur << endl;
+               ++cur.pos();
+               break;
+
+       case LFUN_FINISHED_UP:
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_UP:\n" << cur << endl;
+               cursorUp(cur);
+               break;
+
+       case LFUN_FINISHED_DOWN:
+               lyxerr[Debug::DEBUG] << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
+               cursorDown(cur);
+               break;
+
+       case LFUN_LAYOUT_PARAGRAPH: {
+               string data;
+               params2string(cur.paragraph(), data);
+               data = "show\n" + data;
+               bv->owner()->getDialogs().show("paragraph", data);
+               break;
+       }
+
+       case LFUN_PARAGRAPH_UPDATE: {
+               if (!bv->owner()->getDialogs().visible("paragraph"))
+                       break;
+               string data;
+               params2string(cur.paragraph(), data);
+
+               // Will the paragraph accept changes from the dialog?
+               bool const accept = !cur.inset().forceDefaultParagraphs(cur.idx());
+
+               data = "update " + convert<string>(accept) + '\n' + data;
+               bv->owner()->getDialogs().update("paragraph", data);
+               break;
+       }
+
+       case LFUN_UMLAUT:
+       case LFUN_CIRCUMFLEX:
+       case LFUN_GRAVE:
+       case LFUN_ACUTE:
+       case LFUN_TILDE:
+       case LFUN_CEDILLA:
+       case LFUN_MACRON:
+       case LFUN_DOT:
+       case LFUN_UNDERDOT:
+       case LFUN_UNDERBAR:
+       case LFUN_CARON:
+       case LFUN_SPECIAL_CARON:
+       case LFUN_BREVE:
+       case LFUN_TIE:
+       case LFUN_HUNG_UMLAUT:
+       case LFUN_CIRCLE:
+       case LFUN_OGONEK:
+               bv->owner()->getLyXFunc().handleKeyFunc(cmd.action);
+               if (!cmd.argument.empty())
+                       bv->owner()->getIntl().getTransManager()
+                               .TranslateAndInsert(cmd.argument[0], this);
+               break;
+
+       case LFUN_FLOAT_LIST: {
+               LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
+               if (tclass.floats().typeExist(cmd.argument)) {
+                       // not quite sure if we want this...
+                       recordUndo(cur);
+                       cur.clearSelection();
+                       breakParagraph(cur);
+
+                       if (cur.lastpos() != 0) {
+                               cursorLeft(cur);
+                               breakParagraph(cur);
+                       }
+
+                       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;
+               }
+               break;
+       }
+
+       case LFUN_ACCEPT_CHANGE: {
+               acceptChange(cur);
+               break;
+       }
+
+       case LFUN_REJECT_CHANGE: {
+               rejectChange(cur);
+               break;
+       }
+
+       case LFUN_THESAURUS_ENTRY: {
+               string arg = cmd.argument;
+               if (arg.empty()) {
+                       arg = cur.selectionAsString(false);
+                       // FIXME
+                       if (arg.size() > 100 || arg.empty()) {
+                               // Get word or selection
+                               selectWordWhenUnderCursor(cur, lyx::WHOLE_WORD);
+                               arg = cur.selectionAsString(false);
+                       }
+               }
+               bv->owner()->getDialogs().show("thesaurus", arg);
+               break;
+       }
+
+       case LFUN_PARAGRAPH_APPLY: {
+               // Given data, an encoding of the ParagraphParameters
+               // generated in the Paragraph dialog, this function sets
+               // the current paragraph appropriately.
+               istringstream is(cmd.argument);
+               LyXLex lex(0, 0);
+               lex.setStream(is);
+               ParagraphParameters params;
+               params.read(lex);
+               setParagraph(cur,
+                                        params.spacing(),
+                                        params.align(),
+                                        params.labelWidthString(),
+                                        params.noindent());
+               cur.message(_("Paragraph layout set"));
+               break;
+       }
+
+       case LFUN_INSET_DIALOG_SHOW: {
+               InsetBase * inset = cur.nextInset();
+               if (inset) {
+                       FuncRequest fr(LFUN_INSET_DIALOG_SHOW);
+                       inset->dispatch(cur, fr);
+               }
+               break;
+       }
+
+       case LFUN_ESCAPE:
+               if (cur.selection()) {
+                       cur.selection() = false;
+               } else {
+                       cur.undispatched();
+                       cmd = FuncRequest(LFUN_FINISHED_RIGHT);
+               }
+               break;
+
+       default:
+               lyxerr[Debug::ACTION] 
+                       << BOOST_CURRENT_FUNCTION
+                       << ": Command " << cmd 
+                       << " not DISPATCHED by LyXText" << endl;
+               cur.undispatched();
+               break;
+       }
+
+       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
+{
+       BOOST_ASSERT(cur.text() == this);
+
+       LyXFont const & font = real_current_font;
+       bool enable = true;
+       InsetBase::Code code = InsetBase::NO_CODE;
+
+       switch (cmd.action) {
+
+       case LFUN_DEPTH_MIN:
+               enable = changeDepthAllowed(cur, DEC_DEPTH);
+               break;
+
+       case LFUN_DEPTH_PLUS:
+               enable = changeDepthAllowed(cur, INC_DEPTH);
+               break;
+
+       case LFUN_APPENDIX:
+               flag.setOnOff(cur.paragraph().params().startOfAppendix());
+               return true;
+
+       case LFUN_INSERT_BIBITEM:
+               enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO);
+               break;
+
+       case LFUN_DIALOG_SHOW_NEW_INSET:
+               if (cmd.argument == "bibitem")
+                       code = InsetBase::BIBITEM_CODE;
+               else if (cmd.argument == "bibtex")
+                       code = InsetBase::BIBTEX_CODE;
+               else if (cmd.argument == "box")
+                       code = InsetBase::BOX_CODE;
+               else if (cmd.argument == "branch")
+                       code = InsetBase::BRANCH_CODE;
+               else if (cmd.argument == "citation")
+                       code = InsetBase::CITE_CODE;
+               else if (cmd.argument == "ert")
+                       code = InsetBase::ERT_CODE;
+               else if (cmd.argument == "external")
+                       code = InsetBase::EXTERNAL_CODE;
+               else if (cmd.argument == "float")
+                       code = InsetBase::FLOAT_CODE;
+               else if (cmd.argument == "graphics")
+                       code = InsetBase::GRAPHICS_CODE;
+               else if (cmd.argument == "include")
+                       code = InsetBase::INCLUDE_CODE;
+               else if (cmd.argument == "index")
+                       code = InsetBase::INDEX_CODE;
+               else if (cmd.argument == "label")
+                       code = InsetBase::LABEL_CODE;
+               else if (cmd.argument == "note")
+                       code = InsetBase::NOTE_CODE;
+               else if (cmd.argument == "ref")
+                       code = InsetBase::REF_CODE;
+               else if (cmd.argument == "toc")
+                       code = InsetBase::TOC_CODE;
+               else if (cmd.argument == "url")
+                       code = InsetBase::URL_CODE;
+               else if (cmd.argument == "vspace")
+                       code = InsetBase::VSPACE_CODE;
+               else if (cmd.argument == "wrap")
+                       code = InsetBase::WRAP_CODE;
+               break;
+
+       case LFUN_INSET_ERT:
+               code = InsetBase::ERT_CODE;
+               break;
+       case LFUN_INSET_FOOTNOTE:
+               code = InsetBase::FOOT_CODE;
+               break;
+       case LFUN_TABULAR_INSERT:
+               code = InsetBase::TABULAR_CODE;
+               break;
+       case LFUN_INSET_MARGINAL:
+               code = InsetBase::MARGIN_CODE;
+               break;
+       case LFUN_INSET_FLOAT:
+       case LFUN_INSET_WIDE_FLOAT:
+               code = InsetBase::FLOAT_CODE;
+               break;
+       case LFUN_INSET_WRAP:
+               code = InsetBase::WRAP_CODE;
+               break;
+       case LFUN_FLOAT_LIST:
+               code = InsetBase::FLOAT_LIST_CODE;
+               break;
+#if 0
+       case LFUN_INSET_LIST:
+               code = InsetBase::LIST_CODE;
+               break;
+       case LFUN_INSET_THEOREM:
+               code = InsetBase::THEOREM_CODE;
+               break;
+#endif
+       case LFUN_INSET_CAPTION:
+               code = InsetBase::CAPTION_CODE;
+               break;
+       case LFUN_INSERT_NOTE:
+               code = InsetBase::NOTE_CODE;
+               break;
+       case LFUN_INSERT_CHARSTYLE:
+               code = InsetBase::CHARSTYLE_CODE;
+               if (cur.buffer().params().getLyXTextClass().charstyles().empty())
+                       enable = false;
+               break;
+       case LFUN_INSERT_BOX:
+               code = InsetBase::BOX_CODE;
+               break;
+       case LFUN_INSERT_BRANCH:
+               code = InsetBase::BRANCH_CODE;
+               if (cur.buffer().getMasterBuffer()->params().branchlist().empty())
+                       enable = false;
+               break;
+       case LFUN_INSERT_LABEL:
+               code = InsetBase::LABEL_CODE;
+               break;
+       case LFUN_INSET_OPTARG:
+               code = InsetBase::OPTARG_CODE;
+               enable = numberOfOptArgs(cur.paragraph())
+                       < cur.paragraph().layout()->optionalargs;
+               break;
+       case LFUN_ENVIRONMENT_INSERT:
+               code = InsetBase::BOX_CODE;
+               break;
+       case LFUN_INDEX_INSERT:
+               code = InsetBase::INDEX_CODE;
+               break;
+       case LFUN_INDEX_PRINT:
+               code = InsetBase::INDEX_PRINT_CODE;
+               break;
+       case LFUN_TOC_INSERT:
+               code = InsetBase::TOC_CODE;
+               break;
+       case LFUN_HTMLURL:
+       case LFUN_URL:
+               code = InsetBase::URL_CODE;
+               break;
+       case LFUN_QUOTE:
+               // always allow this, since we will inset a raw quote
+               // if an inset is not allowed.
+               break;
+       case LFUN_HYPHENATION:
+       case LFUN_LIGATURE_BREAK:
+       case LFUN_HFILL:
+       case LFUN_MENU_SEPARATOR:
+       case LFUN_LDOTS:
+       case LFUN_END_OF_SENTENCE:
+               code = InsetBase::SPECIALCHAR_CODE;
+               break;
+       case LFUN_SPACE_INSERT:
+               // slight hack: we know this is allowed in math mode
+               if (cur.inTexted())
+                       code = InsetBase::SPACE_CODE;
+               break;
+
+#ifdef WITH_WARNINGS
+#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005)
+#endif
+#if 0
+       case LFUN_INSET_DIALOG_SHOW: {
+               InsetBase * inset = cur.nextInset();
+               enable = inset;
+               if (inset) {
+                       code = inset->lyxCode();
+                       if (!(code == InsetBase::INCLUDE_CODE
+                               || code == InsetBase::BIBTEX_CODE
+                               || code == InsetBase::FLOAT_LIST_CODE
+                               || code == InsetBase::TOC_CODE))
+                               enable = false;
+               }
+               break;
+       }
+#endif
+
+       case LFUN_INSET_MODIFY:
+               // We need to disable this, because we may get called for a
+               // tabular cell via
+               // InsetTabular::getStatus() -> InsetText::getStatus()
+               // and we don't handle LFUN_INSET_MODIFY.
+               enable = false;
+               break;
+
+       case LFUN_EMPH:
+               flag.setOnOff(font.emph() == LyXFont::ON);
+               return true;
+
+       case LFUN_NOUN:
+               flag.setOnOff(font.noun() == LyXFont::ON);
+               return true;
+
+       case LFUN_BOLD:
+               flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
+               return true;
+
+       case LFUN_SANS:
+               flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
+               return true;
+
+       case LFUN_ROMAN:
+               flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
+               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:
+       case LFUN_DELETE_WORD_BACKWARD:
+       case LFUN_DELETE_LINE_FORWARD:
+       case LFUN_WORDRIGHT:
+       case LFUN_WORDLEFT:
+       case LFUN_RIGHT:
+       case LFUN_RIGHTSEL:
+       case LFUN_LEFT:
+       case LFUN_LEFTSEL:
+       case LFUN_UP:
+       case LFUN_UPSEL:
+       case LFUN_DOWN:
+       case LFUN_DOWNSEL:
+       case LFUN_UP_PARAGRAPHSEL:
+       case LFUN_DOWN_PARAGRAPHSEL:
+       case LFUN_PRIORSEL:
+       case LFUN_NEXTSEL:
+       case LFUN_HOMESEL:
+       case LFUN_ENDSEL:
+       case LFUN_WORDRIGHTSEL:
+       case LFUN_WORDLEFTSEL:
+       case LFUN_WORDSEL:
+       case LFUN_UP_PARAGRAPH:
+       case LFUN_DOWN_PARAGRAPH:
+       case LFUN_PRIOR:
+       case LFUN_NEXT:
+       case LFUN_HOME:
+       case LFUN_END:
+       case LFUN_BREAKLINE:
+       case LFUN_DELETE:
+       case LFUN_DELETE_SKIP:
+       case LFUN_BACKSPACE:
+       case LFUN_BACKSPACE_SKIP:
+       case LFUN_BREAKPARAGRAPH:
+       case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+       case LFUN_BREAKPARAGRAPH_SKIP:
+       case LFUN_PARAGRAPH_SPACING:
+       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_GETXY:
+       case LFUN_SETXY:
+       case LFUN_GETFONT:
+       case LFUN_GETLAYOUT:
+       case LFUN_LAYOUT:
+       case LFUN_PASTESELECTION:
+       case LFUN_DATE_INSERT:
+       case LFUN_SELFINSERT:
+       case LFUN_INSERT_LINE:
+       case LFUN_INSERT_PAGEBREAK:
+       case LFUN_MATH_DISPLAY:
+       case LFUN_MATH_IMPORT_SELECTION:
+       case LFUN_MATH_MODE:
+       case LFUN_MATH_MACRO:
+       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:
+       case LFUN_LANGUAGE:
+       case LFUN_FREEFONT_APPLY:
+       case LFUN_FREEFONT_UPDATE:
+       case LFUN_LAYOUT_PARAGRAPH:
+       case LFUN_PARAGRAPH_UPDATE:
+       case LFUN_UMLAUT:
+       case LFUN_CIRCUMFLEX:
+       case LFUN_GRAVE:
+       case LFUN_ACUTE:
+       case LFUN_TILDE:
+       case LFUN_CEDILLA:
+       case LFUN_MACRON:
+       case LFUN_DOT:
+       case LFUN_UNDERDOT:
+       case LFUN_UNDERBAR:
+       case LFUN_CARON:
+       case LFUN_SPECIAL_CARON:
+       case LFUN_BREVE:
+       case LFUN_TIE:
+       case LFUN_HUNG_UMLAUT:
+       case LFUN_CIRCLE:
+       case LFUN_OGONEK:
+       case LFUN_ACCEPT_CHANGE:
+       case LFUN_REJECT_CHANGE:
+       case LFUN_THESAURUS_ENTRY:
+       case LFUN_PARAGRAPH_APPLY:
+       case LFUN_ESCAPE:
+       case LFUN_ENDBUF:
+       case LFUN_BEGINNINGBUF:
+       case LFUN_BEGINNINGBUFSEL:
+       case LFUN_ENDBUFSEL:
+               // these are handled in our dispatch()
+               enable = true;
                break;
 
        default:
-               return DispatchResult(UNDISPATCHED);
+               return false;
        }
 
-       return DispatchResult(DISPATCHED);
+       if (code != InsetBase::NO_CODE
+           && (cur.empty() || !cur.inset().insetAllowed(code)))
+               enable = false;
+
+       flag.enabled(enable);
+       return true;
 }