X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.h;h=53c584c40abe974ad74e0c4bc3cb5046dd272053;hb=9176e60b7bcab3e355521a86ddb4c2778cd9b29e;hp=ff4b144ed2153f858adcaf7d08fd8389812e06d2;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index ff4b144ed2..53c584c40a 100644
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -13,15 +13,20 @@
 #ifndef INSET_FLOAT_H
 #define INSET_FLOAT_H
 
-#include "InsetCollapsable.h"
+#include "InsetCaptionable.h"
 
 
 namespace lyx {
 
-class InsetFloatParams {
+struct TexString;
+
+
+class InsetFloatParams
+{
 public:
 	///
-	InsetFloatParams() : wide(false), sideways(false), subfloat(false) {}
+	InsetFloatParams() : type("senseless"), placement("document"), alignment("document"),
+		wide(false), sideways(false), subfloat(false) {}
 	///
 	void write(std::ostream & os) const;
 	///
@@ -30,6 +35,8 @@ public:
 	std::string type;
 	///
 	std::string placement;
+	///
+	std::string alignment;
 	/// span columns
 	bool wide;
 	///
@@ -47,31 +54,35 @@ public:
 /////////////////////////////////////////////////////////////////////////
 
 /// Used for "floating" objects like tables, figures etc.
-class InsetFloat : public InsetCollapsable
+class InsetFloat : public InsetCaptionable
 {
 public:
-	///
-	InsetFloat(Buffer const &, std::string const &);
-	///
-	~InsetFloat();
-
+	InsetFloat(Buffer * buffer, std::string const & params_str);
 	///
 	static void string2params(std::string const &, InsetFloatParams &);
 	///
 	static std::string params2string(InsetFloatParams const &);
 	///
-	void setWide(bool w, BufferParams const &, bool update_label = true);
+	void setWide(bool w, bool update_label = true);
 	///
-	void setSideways(bool s, BufferParams const &, bool update_label = true);
+	void setSideways(bool s, bool update_label = true);
 	///
-	void setSubfloat(bool s, BufferParams const &, bool update_label = true);
+	void setSubfloat(bool s, bool update_label = true);
 	///
-	void setNewLabel(BufferParams const &);
+	void setNewLabel();
 	///
 	InsetFloatParams const & params() const { return params_; }
+	///
+	bool allowsCaptionVariation(std::string const &) const;
+	///
+	LyXAlignment contentAlignment() const;
+	///
+	bool forceParDirectionSwitch() const { return true; }
 private:
 	///
-	docstring name() const;
+	void setCaptionType(std::string const & type);
+	///
+	docstring layoutName() const;
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
@@ -83,37 +94,38 @@ private:
 	///
 	InsetCode lyxCode() const { return FLOAT_CODE; }
 	///
-	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;
 	///
-	docstring editMessage() const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	bool insetAllowed(InsetCode) const;
-	/** returns true if, when outputing LaTeX, font changes should
+	/** returns false if, when outputing LaTeX, font changes should
 	    be closed before generating this inset. This is needed for
 	    insets that may contain several paragraphs */
-	bool noFontChange() const { return true; }
-	///
-	bool showInsetDialog(BufferView *) const;
+	bool inheritFont() const { return false; }
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-	// Update the counters of this inset and of its contents
-	void updateLabels(ParIterator const &);
+	///
+	bool hasSubCaptions(ParIterator const & it) const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
 	Inset * clone() const { return new InsetFloat(*this); }
+	/// Is the content of this inset part of the immediate (visible) text sequence?
+	bool isPartOfTextSequence() const { return false; }
 	///
-	docstring getCaption(OutputParams const &) const;
+	TexString getCaption(OutputParams const &) const;
 	///
-	docstring getCaptionText(OutputParams const &) const;
+	std::string getAlignment() const;
 	///
+	OutputParams::CtObject CtObject(OutputParams const &) const { return OutputParams::CT_OMITOBJECT; }
+
 	InsetFloatParams params_;
-	///
-	docstring name_;
 };