X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.h;h=1c8d5468fe918845d069376f83cf73fec006364e;hb=d6f1915684328c6e3fe61c6eef8846b5cabec334;hp=0c70080fcebc1d06ae4d91eda47911bb9ecfc550;hpb=eea79637c78bb9916031924eca7b305cfb8e83df;p=lyx.git

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 0c70080fce..1c8d5468fe 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -13,22 +13,21 @@
 #define INSETTEXT_H
 
 #include "Inset.h"
-#include "Font.h"
-#include "Text.h"
 
-#include "support/types.h"
+#include "ColorCode.h"
+#include "Text.h"
 
 namespace lyx {
 
 class Buffer;
 class BufferParams;
 class BufferView;
+class CompletionList;
 class CursorSlice;
 class Dimension;
 class ParagraphList;
 class InsetTabular;
 
-
 /**
  A text inset is like a TeX box to write full text
  (including styles and other insets) in a given space.
@@ -36,9 +35,11 @@ class InsetTabular;
 class InsetText : public Inset {
 public:
 	///
-	explicit InsetText(BufferParams const &);
+	explicit InsetText(Buffer const & buffer);
 	///
-	InsetText();
+	InsetText(InsetText const &);
+	///
+	void setBuffer(Buffer &);
 
 	///
 	Dimension const dimension(BufferView const &) const;
@@ -46,29 +47,32 @@ public:
 	/// empty inset to empty par
 	void clear();
 	///
-	void read(Buffer const & buf, Lexer & lex);
+	void read(Lexer & lex);
 	///
-	void write(Buffer const & buf, std::ostream & os) const;
+	void write(std::ostream & os) const;
 	///
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	virtual docstring const editMessage() const;
+	docstring editMessage() const;
 	///
 	EDITABLE editable() const { return HIGHLY_EDITABLE; }
 	///
 	bool canTrackChanges() const { return true; }
 	///
-	InsetText * asTextInset() { return this; }
+	InsetText * asInsetText() { return this; }
+	///
+	InsetText const * asInsetText() const { return this; }
 	///
-	InsetText const * asTextInset() const { return this; }
+	Text & text() { return text_; }
+	Text const & text() const { return text_; }
 	///
-	int latex(Buffer const &, odocstream &, OutputParams const &) const;
+	int latex(odocstream &, OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
+	int plaintext(odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
+	int docbook(odocstream &, OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures & features) const;
 
@@ -106,13 +110,13 @@ public:
 	void rejectChanges(BufferParams const & bparams);
 
 	/// append text onto the existing text
-	void appendParagraphs(Buffer * bp, ParagraphList &);
+	void appendParagraphs(ParagraphList &);
 
 	///
 	void addPreview(graphics::PreviewLoader &) const;
 
 	///
-	void edit(Cursor & cur, bool left);
+	void edit(Cursor & cur, bool front, EntryDirection entry_from);
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 
@@ -126,36 +130,54 @@ public:
 	bool insetAllowed(InsetCode) const { return true; }
 	///
 	bool allowSpellCheck() const { return true; }
-	/// should paragraph indendation be ommitted in any case?
-	bool neverIndent(Buffer const &) const;
 	///
-	virtual bool allowMultiPar() const { return true; }
+	virtual bool isMacroScope() const { return false; }
 	///
-	InsetText(InsetText const &);
+	virtual bool allowMultiPar() const { return true; }
 
 	// Update the counters of this inset and of its contents
-	virtual void updateLabels(Buffer const &, ParIterator const &);
+	void updateLabels(ParIterator const &);
+	///
+	void addToToc(DocIterator const &);
 	///
-	virtual Inset * clone() const;
+	Inset * clone() const { return new InsetText(*this); }
+	///
+	bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
 
-protected:
 	///
-	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+	bool completionSupported(Cursor const &) const;
+	///
+	bool inlineCompletionSupported(Cursor const & cur) const;
+	///
+	bool automaticInlineCompletion() const;
+	///
+	bool automaticPopupCompletion() const;
+	///
+	bool showCompletionCursor() const;
+	///
+	CompletionList const * createCompletionList(Cursor const & cur) const;
+	///
+	docstring completionPrefix(Cursor const & cur) const;
+	///
+	bool insertCompletion(Cursor & cur, docstring const & s, bool finished);
+	///
+	void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
 
+	///
+	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	///
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
 	///
-	void init();
-
+	void initParagraphs();
+	///
+	void setParagraphOwner();
 	///
 	bool drawFrame_;
-	/** We store the ColorCode value as an int to get Color.h out
-	 *  of the header file.
-	 */
-	int frame_color_;
+	///
+	ColorCode frame_color_;
 	///
 	mutable pit_type old_pit;
-
-public:
 	///
 	mutable Text text_;
 };