X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.h;h=f4110e260f5fe820ab2a56de19d862fafd3a4d18;hb=dc7c7ca03eca25cf7a6395c155b70dac1594e481;hp=39cffceadee8bccf52d3a2dc8e107946efb2389e;hpb=5425c53fd132644ae615d3d03efcb1ee23e69ea0;p=lyx.git

diff --git a/src/Text.h b/src/Text.h
index 39cffceade..f4110e260f 100644
--- a/src/Text.h
+++ b/src/Text.h
@@ -19,9 +19,11 @@
 
 namespace lyx {
 
+class Buffer;
 class BufferParams;
 class BufferView;
 class CompletionList;
+class Cursor;
 class CursorSlice;
 class DocIterator;
 class ErrorList;
@@ -30,26 +32,27 @@ class FontInfo;
 class FuncRequest;
 class FuncStatus;
 class Inset;
-class Cursor;
 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)
-		: autoBreakRows_(false), owner_(owner)
-	{}
+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.
 	bool empty() const;
-
-	InsetText const * inset() { return owner_; }
+	/// Access to owner InsetText.
+	InsetText const & inset() const;
 
 	///
 	FontInfo layoutFont(pit_type pit) const;
@@ -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.
@@ -164,9 +174,9 @@ public:
 	/// accept or reject the selected change
 	void acceptOrRejectChanges(Cursor & cur, ChangeOp op);
 	/// accept the changes within the complete Text
-	void acceptChanges(BufferParams const & bparams);
+	void acceptChanges();
 	/// reject the changes within the complete Text
-	void rejectChanges(BufferParams const & bparams);
+	void rejectChanges();
 
 	/// returns true if par was empty and was removed
 	bool setCursor(Cursor & cur, pit_type par, pos_type pos,
@@ -253,11 +263,11 @@ public:
 	/* these things are for search and replace */
 
 	/// needed to insert the selection
-	/// FIXME: replace Cursor with DocIterator.
-	void insertStringAsLines(Cursor & cur, docstring const & str);
+	void insertStringAsLines(DocIterator const & dit, docstring const & str,
+		Font const & font);
 	/// needed to insert the selection
-	/// FIXME: replace Cursor with DocIterator.
-	void insertStringAsParagraphs(Cursor & cur, docstring const & str);
+	void insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+		Font const & font);
 
 	/// access to our paragraphs
 	ParagraphList const & paragraphs() const { return pars_; }
@@ -312,14 +322,20 @@ public:
 	bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/);
 	///
 	docstring completionPrefix(Cursor const & cur) const;
-
-public:
+	/// for the environments
+	pit_type depthHook(pit_type par, depth_type depth) const;
 	///
-	ParagraphList pars_;
+	pit_type outerHook(pit_type par) const;
+	/// Is it the first par with same depth and layout?
+	bool isFirstInSequence(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;
 
-	///
-	bool autoBreakRows_;
 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);
@@ -350,14 +366,42 @@ private:
 		Font & font, Change & change, ErrorList & errorList);
 	///
 	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);
 
 	/// Owner Inset.
 	InsetText * owner_;
-
+	///
+	ParagraphList pars_;
+	///
+	bool autoBreakRows_;
 	/// position of the text in the buffer.
 	DocIterator macrocontext_position_;
+	///
+	unsigned int undo_counter_;
 };
 
+
+///
+void breakParagraphConservative(BufferParams const & bparams,
+				ParagraphList & paragraphs,
+				pit_type par,
+				pos_type pos);
+
+/**
+ * Append the next paragraph onto the tail of this one.
+ * Be careful, this doesent make any check at all.
+ */
+void mergeParagraph(BufferParams const & bparams,
+	ParagraphList & paragraphs, pit_type par);
+
+/// 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