X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=7aed1655f0ce1cffa4c845fa29a18505ebf0d7b2;hb=3bb588f4aaa810fa9cf00a93cf1bd6015cc4d8cf;hp=60b6130cc4f2ea067d156ad2ec736ef88bc4196c;hpb=e1b2466faf6973946a6c86f24814f060be31e285;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index 60b6130cc4..7aed1655f0 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 \<enter\> 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);
@@ -129,7 +128,9 @@ public:
 	/// of \param os. If \param shorten is true, then we will shorten
 	/// \param os to maxlen chars and replace the final three by "...,
 	/// if \param os is longer than maxlen chars.
-	void forToc(docstring & os, size_t maxlen, bool shorten = true) const;
+	/// if \param maxlen is passed as 0, then it is ignored. (In fact,
+	/// it is reset to the maximum value for size_t.)
+	void forOutliner(docstring & os, size_t maxlen, bool shorten = true) const;
 
 	/// insert a character at cursor position
 	/// FIXME: replace Cursor with DocIterator.
@@ -187,11 +188,6 @@ public:
 	void setCursorIntern(Cursor & cur, pit_type par,
 		 pos_type pos, bool setfont = true, bool boundary = false);
 
-	///
-	void recUndo(Cursor & cur, pit_type first, pit_type last) const;
-	///
-	void recUndo(Cursor & cur, pit_type first) const;
-
 	/// Move cursor one position backwards
 	/**
 	 * Returns true if an update is needed after the move.
@@ -292,7 +288,7 @@ public:
 	void write(std::ostream & os) const;
 	/// returns true if \end_document has not been read
 	/// insetPtr is the containing Inset
-	bool read(Lexer & lex, ErrorList & errorList, 
+	bool read(Lexer & lex, ErrorList & errorList,
 	          InsetText * insetPtr);
 
 	/// delete double spaces, leading spaces, and empty paragraphs around old cursor.
@@ -308,7 +304,7 @@ public:
 
 	/// 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 
+	/// as well. Only those macros with a smaller iterator become
 	/// visible in a paragraph.
 	DocIterator macrocontextPosition() const;
 	///
@@ -322,12 +318,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;
@@ -336,10 +339,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);
@@ -367,19 +366,15 @@ 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);
+	/// and depth in a sequence.
+	void setLabelWidthStringToSequence(Cursor const & cur, docstring const & s);
 
 	/// Owner Inset.
 	InsetText * owner_;
 	///
 	ParagraphList pars_;
-	///
-	bool autoBreakRows_;
 	/// position of the text in the buffer.
 	DocIterator macrocontext_position_;
-	///
-	unsigned int undo_counter_;
 };