Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 12772211588254868b84544455d2e07fbfe4b1d3..f51106448ff90dddbffb98f5ab579ef3e12e89ef 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -190,6 +190,9 @@ static bool doInsertInset(Cursor & cur, Text * text,
        if (!inset)
                return false;
 
+       if (InsetCollapsable * ci = inset->asInsetCollapsable())
+               ci->setLayout(cur.bv().buffer().params());
+
        cur.recordUndo();
        if (cmd.action == LFUN_INDEX_INSERT) {
                docstring ds = support::subst(text->getStringToIndex(cur), '\n', ' ');
@@ -500,22 +503,44 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                needsUpdate |= tm.cursorEnd(cur);
                break;
 
+       case LFUN_WORD_RIGHT:
+       case LFUN_WORD_RIGHT_SELECT:
+               //FIXME: for visual cursor mode, really move right
+               if (reverseDirectionNeeded(cur)) {
+                       lyx::dispatch(FuncRequest(
+                               cmd.action == LFUN_WORD_RIGHT_SELECT ?
+                                       LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD));
+               } else {
+                       lyx::dispatch(FuncRequest(
+                               cmd.action == LFUN_WORD_RIGHT_SELECT ?
+                                       LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD));
+               }
+               break;
+
        case LFUN_WORD_FORWARD:
        case LFUN_WORD_FORWARD_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
-               if (reverseDirectionNeeded(cur))
-                       needsUpdate |= cursorLeftOneWord(cur);
-               else
-                       needsUpdate |= cursorRightOneWord(cur);
+               needsUpdate |= cursorForwardOneWord(cur);
+               break;
+
+       case LFUN_WORD_LEFT:
+       case LFUN_WORD_LEFT_SELECT:
+               //FIXME: for visual cursor mode, really move left
+               if (reverseDirectionNeeded(cur)) {
+                       lyx::dispatch(FuncRequest(
+                               cmd.action == LFUN_WORD_LEFT_SELECT ?
+                                       LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD));
+               } else {
+                       lyx::dispatch(FuncRequest(
+                               cmd.action == LFUN_WORD_LEFT_SELECT ?
+                                       LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD));
+               }
                break;
 
        case LFUN_WORD_BACKWARD:
        case LFUN_WORD_BACKWARD_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
-               if (reverseDirectionNeeded(cur))
-                       needsUpdate |= cursorRightOneWord(cur);
-               else
-                       needsUpdate |= cursorLeftOneWord(cur);
+               needsUpdate |= cursorBackwardOneWord(cur);
                break;
 
        case LFUN_WORD_SELECT: {
@@ -1139,10 +1164,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_THEOREM_INSERT:
 #endif
        case LFUN_CAPTION_INSERT:
+       case LFUN_FOOTNOTE_INSERT:
                // Open the inset, and move the current selection
                // inside it.
                doInsertInset(cur, this, cmd, true, true);
                cur.posRight();
+               // These insets are numbered.
                updateLabels(bv->buffer());
                break;
        case LFUN_NOTE_INSERT:
@@ -1152,7 +1179,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_BIBITEM_INSERT:
        case LFUN_ERT_INSERT:
        case LFUN_LISTING_INSERT:
-       case LFUN_FOOTNOTE_INSERT:
        case LFUN_MARGINALNOTE_INSERT:
        case LFUN_OPTIONAL_INSERT:
        case LFUN_ENVIRONMENT_INSERT:
@@ -1276,7 +1302,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        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(from_utf8(token(s, ' ', 0)), nargs, from_utf8(type)));
+                       cur.insert(new MathMacroTemplate(from_utf8(token(s, ' ', 0)), nargs, false, from_utf8(type)));
                        //cur.nextInset()->edit(cur, true);
                }
                break;
@@ -1393,6 +1419,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        toggleall = toggle;
                        toggleAndShow(cur, this, freefont, toggleall);
                        cur.message(_("Character set"));
+               } else {
+                       lyxerr << "Argument not ok";
                }
                break;
        }
@@ -1883,6 +1911,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_LINE_DELETE:
        case LFUN_WORD_FORWARD:
        case LFUN_WORD_BACKWARD:
+       case LFUN_WORD_RIGHT:
+       case LFUN_WORD_LEFT:
        case LFUN_CHAR_FORWARD:
        case LFUN_CHAR_FORWARD_SELECT:
        case LFUN_CHAR_BACKWARD:
@@ -1903,6 +1933,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_LINE_END_SELECT:
        case LFUN_WORD_FORWARD_SELECT:
        case LFUN_WORD_BACKWARD_SELECT:
+       case LFUN_WORD_RIGHT_SELECT:
+       case LFUN_WORD_LEFT_SELECT:
        case LFUN_WORD_SELECT:
        case LFUN_PARAGRAPH_UP:
        case LFUN_PARAGRAPH_DOWN: