X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=7ee76d232b5754c6975be75ffaef6332800e4ee7;hb=ca66e175c9705045793ba3cc2ba95909e5ef5a93;hp=c4da020cceb442e2e1fd8b2209a60ba6aa3948ae;hpb=12b16d1ae980f559b729738d295785e0d159f7c5;p=lyx.git diff --git a/src/Text.h b/src/Text.h index c4da020cce..7ee76d232b 100644 --- a/src/Text.h +++ b/src/Text.h @@ -71,7 +71,7 @@ public: * inset that is alowed inside a font change. */ void setInsetFont(BufferView const & bv, pit_type pit, pos_type pos, - Font const & font, bool toggleall = false); + Font const & font); /// what you expect when pressing \ at cursor position /// \param inverse_logic if false, the same layout is set for the @@ -82,8 +82,8 @@ public: /// set layout over selection void setLayout(pit_type start, pit_type end, docstring const & layout); - /// Set given layout to current cursor position. - /// FIXME: replace Cursor with DocIterator. + /// Set given layout to current cursor position or selection. + /// Handles undo. void setLayout(Cursor & cur, docstring const & layout); /// what type of depth change to make @@ -104,8 +104,7 @@ public: void setFont(Cursor & cur, Font const &, bool toggleall = false); /// Set font from \p begin to \p end and rebreak. void setFont(BufferView const & bv, CursorSlice const & begin, - CursorSlice const & end, Font const &, - bool toggleall = false); + CursorSlice const & end, Font const &); /// void toggleFree(Cursor & cur, Font const &, bool toggleall = false); @@ -324,12 +323,19 @@ public: bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/); /// docstring completionPrefix(Cursor const & cur) const; - /// for the environments + /// find a paragraph before \p par with the given \p depth, if such + /// a paragraph cannot be found, \p par is returned pit_type depthHook(pit_type par, depth_type depth) const; - /// + /// find a paragraph before \p par with depth less than the + /// depth of \p par. If such paragraph cannot be found because + /// \p par already has depth 0, lastpar + 1 is returned. If + /// such paragraph cannot be found because there isn't a par + /// with less depth before this one, \p par is returned. pit_type outerHook(pit_type par) const; /// Is it the first par with same depth and layout? bool isFirstInSequence(pit_type par) const; + /// Is this paragraph in the table of contents? + int getTocLevel(pit_type par) const; /// 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 par_offset) const; @@ -338,10 +344,6 @@ private: /// The InsetText owner shall have access to everything. friend class InsetText; - /// return past-the-last paragraph influenced by a layout - /// change on pit - pit_type undoSpan(pit_type pit); - // fix the cursor `cur' after a characters has been deleted at `where' // position. Called by deleteEmptyParagraphMechanism static void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where); @@ -370,7 +372,7 @@ private: void readParagraph(Paragraph & par, Lexer & lex, ErrorList & errorList); /// Set Label Width string to all paragraphs of the same layout /// and depth in a sequence. - void setLabelWidthStringToSequence(pit_type const par_offset, docstring const & s); + void setLabelWidthStringToSequence(Cursor const & cur, docstring const & s); /// Owner Inset. InsetText * owner_;