#ifndef TEXT_H
#define TEXT_H
+#include "DocIterator.h"
#include "ParagraphList.h"
namespace lyx {
class DocIterator;
class ErrorList;
class Font;
+class FontInfo;
class FuncRequest;
class FuncStatus;
class Inset;
-class Color_color;
class Cursor;
class Lexer;
class PainterInfo;
bool empty() const;
///
- Font getLayoutFont(Buffer const & buffer, pit_type pit) const;
+ FontInfo layoutFont(Buffer const & buffer, pit_type pit) const;
///
- Font getLabelFont(Buffer const & buffer,
+ FontInfo labelFont(Buffer const & buffer,
Paragraph const & par) const;
/** Set font of character at position \p pos in paragraph \p pit.
* Must not be called if \p pos denotes an inset with text contents,
* @param from return here the start of the word
* @param to return here the end of the word
*/
- void getWord(CursorSlice & from, CursorSlice & to, word_location const);
+ void getWord(CursorSlice & from, CursorSlice & to, word_location const) const;
/// just selects the word the cursor is in
void selectWord(Cursor & cur, word_location loc);
* 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.
///
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.
/// 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_;
/// \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
-#endif // LYXTEXT_H
+#endif // TEXT_H