X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FText.h;h=f4110e260f5fe820ab2a56de19d862fafd3a4d18;hb=dc7c7ca03eca25cf7a6395c155b70dac1594e481;hp=c8073eec711150df87764b08b10a8573ef9d6642;hpb=116c7c34c3127cd4ce6b3ab78f8fdde0fa4d91e1;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index c8073eec71..f4110e260f 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -36,14 +36,17 @@ class Lexer;
 class PainterInfo;
 class Spacing;
 
-/// This class encapsulates the main text data and operations in LyX
+/// This class encapsulates the main text data and operations in LyX.
+/// This is more or less the private implementation of InsetText.
 class Text {
-public:
-	/// constructor
-	explicit Text(InsetText * owner)
-		: owner_(owner), autoBreakRows_(false), undo_counter_(0)
-	{}
+private:
+	/// Default constructor.
+	Text(InsetText * owner, bool use_default_layout);
+
+	/// Copy constructor.
+	Text(InsetText * owner, Text const & text);
 
+public:
 	/// \return true if there's no content at all.
 	/// \warning a non standard layout on an empty paragraph doesn't
 	// count as empty.
@@ -63,16 +66,17 @@ public:
 		Font const & font, Font const & display_font);
 
 	/** Needed to propagate font changes to all text cells of insets
-	 *  that are not allowed inside a font change (bug 1973).
+	 *  that are not allowed inside a font change (bugs 1973, 6919).
 	 *  Must not be called if \p pos denotes an ordinary character or an
 	 *  inset that is alowed inside a font change.
-	 *  FIXME: This should be removed, see documentation of noFontChange
-	 *  in insetbase.h
 	 */
 	void setInsetFont(BufferView const & bv, pit_type pit, pos_type pos,
 		Font const & font, bool toggleall = false);
 
 	/// what you expect when pressing \<enter\> at cursor position
+	/// \param inverse_logic if false, the same layout is set for the
+	/// new paragraph if the layout is an environment; if true, the
+	/// same layout is set if it is not an environment
 	void breakParagraph(Cursor & cur, bool inverse_logic = false);
 
 	/// set layout over selection
@@ -120,6 +124,12 @@ public:
 	///
 	docstring asString(pit_type beg, pit_type end,
 		int options = AS_STR_NONE) const;
+	/// Appends a possibly abbreviated representation of our text
+	/// to \param os, where \param maxlen defines the maximum size
+	/// 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;
 
 	/// insert a character at cursor position
 	/// FIXME: replace Cursor with DocIterator.
@@ -389,6 +399,9 @@ void mergeParagraph(BufferParams const & bparams,
 /// accept the changes within the complete ParagraphList
 void acceptChanges(ParagraphList & pars, BufferParams const & bparams);
 
+/// reject the changes within the complete ParagraphList
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams);
+
 } // namespace lyx
 
 #endif // TEXT_H