X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.h;h=1a6d123ac6981d98f116a26add9d18d956b1e4d6;hb=dae8555234f0e5c8358b91c307d91b219c664617;hp=e8d8ba6a941b9fcd2d1a09c54ea3072e35248de7;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index e8d8ba6a94..1a6d123ac6 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -17,8 +17,6 @@
 #include "ColorCode.h"
 #include "Text.h"
 
-#include "insets/InsetLayout.h"
-
 namespace lyx {
 
 class CompletionList;
@@ -73,9 +71,10 @@ public:
 	Text & text() { return text_; }
 	Text const & text() const { return text_; }
 	///
-	int latex(otexstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
@@ -93,6 +92,9 @@ public:
 	                       XHTMLOptions) const;
 	///
 	void validate(LaTeXFeatures & features) const;
+	
+	/// return the argument(s) only
+	void getArgs(otexstream & os, OutputParams const &, bool const post = false) const;
 
 	/// return x,y of given position relative to the inset's baseline
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
@@ -146,7 +148,7 @@ public:
 	///
 	ParagraphList const & paragraphs() const;
 	///
-	bool insetAllowed(InsetCode) const { return !getLayout().isPassThru(); }
+	bool insetAllowed(InsetCode) const;
 	///
 	bool allowSpellCheck() const { return getLayout().spellcheck() && !getLayout().isPassThru(); }
 	///
@@ -164,11 +166,13 @@ public:
 	/// Update the counters of this inset and of its contents
 	virtual void updateBuffer(ParIterator const &, UpdateType);
 	/// 
+	void setMacrocontextPositionRecursive(DocIterator const & pos);
+	///
 	void toString(odocstream &) const;
 	///
-	void forToc(docstring &, size_t) const;
+	void forOutliner(docstring &, size_t) const;
 	///
-	void addToToc(DocIterator const &) const;
+	void addToToc(DocIterator const & di, bool output_active) const;
 	///
 	Inset * clone() const { return new InsetText(*this); }
 	///
@@ -201,9 +205,9 @@ public:
 			size_t numlines = 5, size_t len = 80) const;
 
 	///
-	docstring contextMenu(BufferView const &, int, int) const;
+	std::string contextMenu(BufferView const &, int, int) const;
 	///
-	docstring contextMenuName() const;
+	std::string contextMenuName() const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 protected:
@@ -213,14 +217,14 @@ protected:
 	docstring getCaptionText(OutputParams const &) const;
 	///
 	docstring getCaptionHTML(OutputParams const &) const;
+	///
+	void iterateForToc(DocIterator const & cdit, bool output_active) const;
 private:
 	///
 	bool drawFrame_;
 	///
 	ColorCode frame_color_;
 	///
-	mutable pit_type old_pit;
-	///
 	mutable Text text_;
 };