X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.h;h=6f509ada4572c470fad3b69b39a9b0c51ae8c640;hb=f61bebd7fb25beabdf0dc761520030f9059499d6;hp=94b3baebc21730523bc0cd168d2ffab3cee5e25a;hpb=1bf7b59d60a30aed7d418cb63e9f12610635f7e6;p=lyx.git

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 94b3baebc2..6f509ada45 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -17,31 +17,36 @@
 #include "ColorCode.h"
 #include "Text.h"
 
-#include "support/types.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.
  */
 class InsetText : public Inset {
 public:
-	///
-	explicit InsetText(BufferParams const &);
-	///
-	InsetText();
+	enum UsePlain {
+		DefaultLayout,
+		PlainLayout
+	};
+	/// \param buffer
+	/// \param useplain whether to use the plain layout
+	/// This is needed because we cannot call the virtual function
+	/// usePlainLayout() from within the constructor.
+	explicit InsetText(Buffer const & buffer, UsePlain type = DefaultLayout);
 	///
 	InsetText(InsetText const &);
+	///
+	void setBuffer(Buffer &);
 
 	///
 	Dimension const dimension(BufferView const &) const;
@@ -49,17 +54,17 @@ 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 editable() const { return true; }
 	///
 	bool canTrackChanges() const { return true; }
 	///
@@ -67,11 +72,16 @@ public:
 	///
 	InsetText const * asInsetText() const { return this; }
 	///
-	int latex(Buffer const &, odocstream &, OutputParams const &) const;
+	Text & text() { return text_; }
+	Text const & text() const { return text_; }
+	///
+	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;
+	///
+	int xhtml(odocstream &, OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures & features) const;
 
@@ -109,7 +119,7 @@ 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;
@@ -129,17 +139,19 @@ 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 isMacroScope(Buffer const &) const { return true; }
+	virtual bool isMacroScope() const { return false; }
 	///
 	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);
 
 	///
 	bool completionSupported(Cursor const &) const;
@@ -150,7 +162,9 @@ public:
 	///
 	bool automaticPopupCompletion() const;
 	///
-	CompletionListPtr completionList(Cursor const & cur) const;
+	bool showCompletionCursor() const;
+	///
+	CompletionList const * createCompletionList(Cursor const & cur) const;
 	///
 	docstring completionPrefix(Cursor const & cur) const;
 	///
@@ -158,11 +172,13 @@ public:
 	///
 	void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
 
-protected:
 	///
-	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
-
+	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	///
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
+	///
+	void initParagraphs(UsePlain type);
 	///
 	void setParagraphOwner();
 	///
@@ -171,10 +187,6 @@ private:
 	ColorCode frame_color_;
 	///
 	mutable pit_type old_pit;
-	///
-	docstring previousWord(Buffer const & buffer, CursorSlice const & sl) const;
-
-public:
 	///
 	mutable Text text_;
 };