X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBox.h;h=d5610b746a0344a18d1cf551d5c72e91a3988e8f;hb=96dea61f22c04529e726cab36acf0240d41fa778;hp=b838cc8e47e00e3488e84f40af93e1e26d50f462;hpb=1eed486fc4292906c57130b7b42f327fdba0c1d8;p=lyx.git

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index b838cc8e47..d5610b746a 100644
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -6,6 +6,7 @@
  *
  * \author Angus Leeming
  * \author Martin Vermeer
+ * \author Uwe Stöhr
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,7 +14,7 @@
 #ifndef INSETBOX_H
 #define INSETBOX_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
 #include "Length.h"
 
 
@@ -31,8 +32,10 @@ public:
 
 	///
 	std::string type;
-	/// Use a parbox (true) or minipage (false)
+	/// Is there a parbox?
 	bool use_parbox;
+	/// Is there a makebox?
+	bool use_makebox;
 	/// Do we have an inner parbox or minipage to format paragraphs to
 	/// columnwidth?
 	bool inner_box;
@@ -50,6 +53,16 @@ public:
 	Length height;
 	///
 	std::string height_special;
+	///
+	Length thickness;
+	///
+	Length separation;
+	///
+	Length shadowsize;
+	///
+	std::string framecolor;
+	///
+	std::string backgroundcolor;
 };
 
 
@@ -61,7 +74,7 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-class InsetBox : public InsetCollapsable
+class InsetBox : public InsetCollapsible
 {
 public:
 	///
@@ -77,43 +90,47 @@ public:
 	};
 	///
 	InsetBox(Buffer *, std::string const &);
+
 	///
 	static std::string params2string(InsetBoxParams const &);
 	///
 	static void string2params(std::string const &, InsetBoxParams &);
 	///
 	InsetBoxParams const & params() const { return params_; }
-private:
-	///
-	friend class InsetBoxParams;
+
+	/// \name Public functions inherited from Inset class
+	//@{
 	///
 	InsetCode lyxCode() const { return BOX_CODE; }
 	///
-	docstring name() const;
+	docstring layoutName() const;
 	///
 	void write(std::ostream &) const;
 	///
 	void read(Lexer & lex);
 	///
-	void setButtonLabel();
-	///
 	void metrics(MetricsInfo &, Dimension &) const;
-	/// show the Box dialog
-	bool showInsetDialog(BufferView * bv) const;
 	///
 	DisplayType display() const { return Inline; }
 	///
+	ColorCode backgroundColor(PainterInfo const &) const;
+	///
+	LyXAlignment contentAlignment() const;
+	///
 	bool allowParagraphCustomization(idx_type = 0) const { return !forcePlainLayout(); }
 	///
+	bool allowMultiPar() const;
+	///
 	bool forcePlainLayout(idx_type = 0) const;
 	///
 	bool neverIndent() const { return true; }
 	///
-	bool noFontChange() const { return true; }
+	bool inheritFont() const { return false; }
 	///
-	int latex(odocstream &, 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;
 	///
@@ -121,19 +138,34 @@ private:
 	///
 	void validate(LaTeXFeatures &) const;
 	///
+	bool hasFixedWidth() const;
+	///
+	std::string contextMenuName() const;
+	//@}
+
+	/// \name Public functions inherited from InsetCollapsible class
+	//@{
+	///
+	void setButtonLabel();
+	//@}
+
+protected:
+	/// \name Protected functions inherited from Inset class
+	//@{
+	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
-	/// Is the width forced to some value?
-	bool hasFixedWidth() const;
 	///
 	Inset * clone() const { return new InsetBox(*this); }
+	//@}
+
+private:
 	/// used by the constructors
 	void init();
-	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
 
 	///
+	friend class InsetBoxParams;
 	InsetBoxParams params_;
 };