X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.h;h=38ddad3502c314f36410d66c76965e567d4ce467;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=3c132e0f29415aa7c14b52f7b863fc2f7e1111dc;hpb=641ae5c7add025e51a2da718cdbb0dff098b29e7;p=lyx.git diff --git a/src/Cursor.h b/src/Cursor.h index 3c132e0f29..38ddad3502 100644 --- a/src/Cursor.h +++ b/src/Cursor.h @@ -171,15 +171,11 @@ public: /// Repopulate the slices insets from bottom to top. Useful /// for stable iterators or Undo data. void sanitize(); - /// - bool isInside(Inset const *) const; - /// make sure we are outside of given inset - void leaveInset(Inset const & inset); /// - bool textUndo(); + bool undoAction(); /// - bool textRedo(); + bool redoAction(); /// makes sure the next operation will be stored void finishUndo() const; @@ -245,9 +241,10 @@ private: // FIXME: make them private public: - /// the current font settings + /// The current font settings. This holds the settings for output. Font current_font; - /// the current font + /// The current display font. This holds the settings of the text + /// in the workarea. Font real_current_font; }; @@ -263,6 +260,10 @@ public: void push(Inset & inset); /// add a new cursor slice, place cursor at front (move backwards) void pushBackward(Inset & inset); + /// try to put cursor in inset before it in entry cell, or next one + /// if it is not empty, or exit the slice if there is no next one. + void editInsertedInset(); + /// pop one level off the cursor void pop(); /// pop one slice off the cursor stack and go backwards @@ -521,13 +522,9 @@ public: /// the name of the macro we are currently inputting docstring macroName(); - /// replace selected stuff with at, placing the former // selection in entry cell of atom void handleNest(MathAtom const & at); - /// replace selected stuff with at, placing the former - // selection in given cell of atom - void handleNest(MathAtom const & at, int cell); /// make sure cursor position is valid /// FIXME: It does a subset of fixIfBroken. Maybe merge them?