X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetert.h;h=77f81aef220a049bcaf6f5d780c4770c5c28c2d8;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=98c102ba572831f98e792fb33ddce4544d7cc6a8;hpb=d6c55f8b5089977a332c30db85f4305aaf2dc743;p=lyx.git

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 98c102ba57..77f81aef22 100644
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -13,8 +13,11 @@
 #ifndef INSETERT_H
 #define INSETERT_H
 
-
 #include "insetcollapsable.h"
+#include "mailinset.h"
+
+
+namespace lyx {
 
 /** A collapsable text inset for LaTeX insertions.
 
@@ -30,112 +33,64 @@ class Language;
 class InsetERT : public InsetCollapsable {
 public:
 	///
-	enum ERTStatus {
-		Open,
-		Collapsed,
-		Inlined
-	};
-	///
-	InsetERT(BufferParams const &, bool collapsed = false);
-	///
-	InsetERT(InsetERT const &);
-	///
-	virtual std::auto_ptr<InsetBase> clone() const;
+	InsetERT(BufferParams const &, CollapseStatus status = Open);
+#if 0
 	///
 	InsetERT(BufferParams const &,
-		 Language const *, std::string const & contents, bool collapsed);
+		 Language const *, std::string const & contents, CollapseStatus status);
+#endif
 	///
 	~InsetERT();
 	///
-	InsetOld::Code lyxCode() const { return InsetOld::ERT_CODE; }
-	///
-	void read(Buffer const & buf, LyXLex & lex);
+	InsetBase::Code lyxCode() const { return InsetBase::ERT_CODE; }
 	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
-	std::string const editMessage() const;
-	///
-	bool insertInset(BufferView *, InsetOld *);
+	void read(Buffer const & buf, LyXLex & lex);
 	///
-	bool insetAllowed(InsetOld::Code code) const {
-		return code == InsetOld::NEWLINE_CODE;
-	}
+	virtual docstring const editMessage() const;
 	///
-	EDITABLE editable() const;
+	bool insetAllowed(InsetBase::Code code) const;
 	///
-	int latex(Buffer const &, std::ostream &,
+	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const & runparams) const;
 	///
-	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const;
-	///
-	int docbook(Buffer const &, std::ostream &,
+	int docbook(Buffer const &, odocstream &,
 		    OutputParams const & runparams) const;
 	///
 	void validate(LaTeXFeatures &) const {}
 	///
-	// these are needed here because of the label/inlined functionallity
-	///
-	bool isOpen() const { return status_ == Open || status_ == Inlined; }
-	///
-	bool inlined() const { return status_ == Inlined; }
-	///
-	ERTStatus status() const { return status_; }
-	///
-	void open();
-	///
-	void close() const;
-	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
-	/// set the status of the inset
-	void status(ERTStatus const st) const;
 	///
 	bool showInsetDialog(BufferView *) const;
 	///
 	void getDrawFont(LyXFont &) const;
 	///
-	bool forceDefaultParagraphs(InsetOld const *) const { return true; }
+	bool forceDefaultParagraphs(idx_type) const { return true; }
+	/// should paragraph indendation be ommitted in any case?
+	bool neverIndent(Buffer const &) const { return true; }
 protected:
+	InsetERT(InsetERT const &);
 	///
-	virtual
-	DispatchResult
-	priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
-private:
-	///
-	void lfunMousePress(FuncRequest const &);
-	///
-	// the bool return is used to see if we opened a dialog so that we can
-	// check this from an outer inset and open the dialog of the outer inset
-	// if that one has one!
-	///
-	bool lfunMouseRelease(FuncRequest const &);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 	///
-	void lfunMouseMotion(FuncRequest const &);
+	bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
 	///
 	void init();
 	///
-	void setButtonLabel() const;
-	///
-	void setLatexFont(BufferView *);
-	/// update status on button
-	void updateStatus(bool = false) const;
-	///
-	void edit(BufferView * bv, bool left);
+	void setButtonLabel();
 	///
 	bool allowSpellCheck() const { return false; }
-
-	///
-	mutable ERTStatus status_;
 };
 
 
-#include "mailinset.h"
-
 class InsetERTMailer : public MailInset {
 public:
 	///
@@ -147,9 +102,10 @@ public:
 	///
 	virtual std::string const inset2string(Buffer const &) const;
 	///
-	static void string2params(std::string const &, InsetERT::ERTStatus &);
+	static void string2params(std::string const &,
+		InsetCollapsable::CollapseStatus &);
 	///
-	static std::string const params2string(InsetERT::ERTStatus);
+	static std::string const params2string(InsetCollapsable::CollapseStatus);
 private:
 	///
 	static std::string const name_;
@@ -157,4 +113,7 @@ private:
 	InsetERT & inset_;
 };
 
+
+} // namespace lyx
+
 #endif