X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=0f8ba1c7f0a7bc1edbd3f99f72fe82dd8dd117c6;hb=1ab314f8e6e145dc73d0a26b7e82a280b497ea3c;hp=6f0af587b5734aaebf242f6ef9e45092d410f654;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git diff --git a/src/Text.h b/src/Text.h index 6f0af587b5..0f8ba1c7f0 100644 --- a/src/Text.h +++ b/src/Text.h @@ -14,6 +14,7 @@ #ifndef TEXT_H #define TEXT_H +#include "DocIterator.h" #include "ParagraphList.h" namespace lyx { @@ -168,15 +169,27 @@ public: * Returns true if an update is needed after the move. */ bool cursorBackward(Cursor & cur); + /// Move cursor visually one position to the left + /** + * \param skip_inset if true, don't enter insets + * Returns true if an update is needed after the move. + */ + bool cursorVisLeft(Cursor & cur, bool skip_inset = false); /// Move cursor one position forward /** * Returns true if an update is needed after the move. */ bool cursorForward(Cursor & cur); + /// Move cursor visually one position to the right + /** + * \param skip_inset if true, don't enter insets + * Returns true if an update is needed after the move. + */ + bool cursorVisRight(Cursor & cur, bool skip_inset = false); /// - bool cursorLeftOneWord(Cursor & cur); + bool cursorBackwardOneWord(Cursor & cur); /// - bool cursorRightOneWord(Cursor & cur); + bool cursorForwardOneWord(Cursor & cur); /// Delete from cursor up to the end of the current or next word. void deleteWordForward(Cursor & cur); /// Delete from cursor to start of current or prior word. @@ -240,11 +253,15 @@ public: /// bool checkAndActivateInset(Cursor & cur, bool front); + /// + bool checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft); /// void write(Buffer const & buf, std::ostream & os) const; /// returns whether we've seen our usual 'end' marker - bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList); + /// insetPtr is the containing Inset + bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList, + InsetText * insetPtr); /// delete double spaces, leading spaces, and empty paragraphs around old cursor. /// \retval true if a change has happened and we need a redraw. @@ -257,6 +274,14 @@ public: /// from \first to \last paragraph void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges); + /// To resolve macros properly the texts get their DocIterator. + /// Every macro definition is stored with its DocIterator + /// as well. Only those macros with a smaller iterator become + /// visible in a paragraph. + DocIterator macrocontextPosition() const; + /// + void setMacrocontextPosition(DocIterator const & pos); + public: /// ParagraphList pars_; @@ -287,6 +312,9 @@ private: /// \param asParagraphs whether to paste as paragraphs or as lines void pasteString(Cursor & cur, docstring const & str, bool asParagraphs); + + /// position of the text in the buffer. + DocIterator macrocontext_position_; }; } // namespace lyx