X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=01d47d69662ffba9ff06d21103222d62a99e3473;hb=9ec80456feed688440360e0a493cbf537c4fe5f9;hp=fc602fcf9775e325e54ea83aacb7c203a3c460c3;hpb=51aebc9327345f6ea065035f489dbfec1568279f;p=lyx.git diff --git a/src/Text.h b/src/Text.h index fc602fcf97..01d47d6966 100644 --- a/src/Text.h +++ b/src/Text.h @@ -19,22 +19,23 @@ namespace lyx { -class Buffer; class BufferParams; class BufferView; +class Change; class CompletionList; class Cursor; +class CursorData; class CursorSlice; -class DocIterator; class ErrorList; class Font; class FontInfo; class FuncRequest; class FuncStatus; class Inset; +class InsetText; class Lexer; -class PainterInfo; -class Spacing; +class Paragraph; +class ParagraphParameters; /// This class encapsulates the main text data and operations in LyX. /// This is more or less the private implementation of InsetText. @@ -49,7 +50,7 @@ private: public: /// \return true if there's no content at all. /// \warning a non standard layout on an empty paragraph doesn't - // count as empty. + /// count as empty. bool empty() const; /// Access to owner InsetText. InsetText const & inset() const; @@ -93,11 +94,11 @@ public: }; /// Increase or decrease the nesting depth of the selected paragraph(s) /// FIXME: replace Cursor with DocIterator. - void changeDepth(Cursor & cur, DEPTH_CHANGE type); + void changeDepth(Cursor const & cur, DEPTH_CHANGE type); /// Returns whether something would be changed by changeDepth /// FIXME: replace Cursor with DocIterator. - bool changeDepthAllowed(Cursor & cur, DEPTH_CHANGE type) const; + bool changeDepthAllowed(Cursor const & cur, DEPTH_CHANGE type) const; /// Set font over selection paragraphs and rebreak. /// FIXME: replace Cursor with DocIterator. @@ -108,10 +109,12 @@ public: /// void toggleFree(Cursor & cur, Font const &, bool toggleall = false); + /// Stack to save recent text propterty applications + std::vector getFreeFonts() const; /// ??? /// FIXME: replace Cursor with DocIterator. - docstring getStringToIndex(Cursor const & cur); + docstring getStringForDialog(Cursor & cur); /// Convert the paragraphs to a string. /// \param AsStringParameter options. This can contain any combination of @@ -157,8 +160,8 @@ public: /// read-write access to individual paragraph Paragraph & getPar(pit_type pit) { return pars_[pit]; } // Returns the current font and depth as a message. - /// FIXME: replace Cursor with DocIterator. - docstring currentState(Cursor const & cur) const; + // When \param devel_mode is true, add more precise information + docstring currentState(CursorData const & cur, bool devel_mode) const; /** Find the word under \c from in the relative location * defined by \c word_location. @@ -168,10 +171,10 @@ public: 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); + /// expands the selection to the word the cursor is in + void expandWordSel(Cursor & cur); /// select all text void selectAll(Cursor & cur); - /// convenience function get the previous word or an empty string - docstring previousWord(CursorSlice const & sl) const; /// what type of change operation to make enum ChangeOp { @@ -244,6 +247,8 @@ public: // Dissolve the inset under cursor /// FIXME: replace Cursor with DocIterator. bool dissolveInset(Cursor & cur); + /// FIXME: replace Cursor with DocIterator. + bool splitInset(Cursor & cur); /// bool selectWordWhenUnderCursor(Cursor & cur, word_location); /// Change the case of the word at cursor position. @@ -257,9 +262,9 @@ public: settings are given to the new one. This function will handle a multi-paragraph selection. */ - void setParagraphs(Cursor & cur, docstring arg, bool modify = false); + void setParagraphs(Cursor const & cur, docstring const & arg, bool merge = false); /// Sets parameters for current or selected paragraphs - void setParagraphs(Cursor & cur, ParagraphParameters const & p); + void setParagraphs(Cursor const & cur, ParagraphParameters const & p); /* these things are for search and replace */ @@ -280,9 +285,9 @@ public: double spacing(Paragraph const & par) const; /// make a suggestion for a label /// FIXME: replace Cursor with DocIterator. - docstring getPossibleLabel(Cursor const & cur) const; + docstring getPossibleLabel(DocIterator const & cur) const; /// is this paragraph right-to-left? - bool isRTL(Paragraph const & par) const; + bool isRTL(pit_type pit) const; /// bool checkAndActivateInset(Cursor & cur, bool front); @@ -298,15 +303,22 @@ public: /// delete double spaces, leading spaces, and empty paragraphs around old cursor. /// \retval true if a change has happened and we need a redraw. - /// FIXME: replace Cursor with DocIterator. This is not possible right - /// now because recordUndo() is called which needs a Cursor. + /// Handles undo. static bool deleteEmptyParagraphMechanism(Cursor & cur, Cursor & old, bool & need_anchor_change); /// delete double spaces, leading spaces, and empty paragraphs /// from \first to \last paragraph + /// Does NOT handle undo (responsibility of the caller) void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges); + /// delete double spaces, leading spaces, and empty paragraphs + /// from \first to \last paragraph and \first_pos to \last_pos + /// Does NOT handle undo (responsibility of the caller) + void deleteEmptyParagraphMechanism(pit_type first, pit_type last, + pos_type first_pos, pos_type last_pos, + 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 @@ -319,8 +331,9 @@ public: bool completionSupported(Cursor const & cur) const; /// CompletionList const * createCompletionList(Cursor const & cur) const; - /// - bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/); + /// Do a completion at the cursor position. Return true on success. + /// The completion does not contain the prefix. Handles undo. + bool insertCompletion(Cursor & cur, docstring const & s); /// docstring completionPrefix(Cursor const & cur) const; /// find a paragraph before \p par with the given \p depth, if such @@ -342,22 +355,20 @@ public: /// Get the font of the "environment" of paragraph \p par_offset in \p pars. /// All font changes of the paragraph are relative to this font. Font const outerFont(pit_type pit_offset) const; + /// Return the label type at the end of paragraph \c pit. + int getEndLabel(pit_type pit) const; private: /// The InsetText owner shall have access to everything. friend class InsetText; - // fix the cursor `cur' after a characters has been deleted at `where' - // position. Called by deleteEmptyParagraphMechanism - static void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where); - // At cursor position 0, try to merge the paragraph with the one before it. // Ignore change tracking, i.e., physically remove the end-of-par character bool backspacePos0(Cursor & cur); /// handle the case where bibitems were deleted bool handleBibitems(Cursor & cur); /// are we in a list item (description etc.)? - bool inDescriptionItem(Cursor & cur) const; + bool inDescriptionItem(Cursor const & cur) const; /// void charInserted(Cursor & cur); /// set 'number' font property