X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathHull.h;h=1b3eef3410676475dd514272231696b1fe20c77a;hb=f9835d054d7aac5830ec6bb5a3537c2b4fa2d269;hp=55275371fd796dc7f4cb33fe007ad4fd03bf48bc;hpb=39329935f33c14b4d9f2bcf73c4cf90d6bbf1bef;p=lyx.git

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 55275371fd..1b3eef3410 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -17,12 +17,13 @@
 #include "DocIterator.h"
 #include "OutputEnums.h"
 
-#include <boost/scoped_ptr.hpp>
+#include "support/unique_ptr.h"
 
 
 namespace lyx {
 
 class InsetLabel;
+class MacroNameSet;
 class ParConstIterator;
 class RenderPreview;
 
@@ -50,7 +51,8 @@ public:
 	///
 	void updateBuffer(ParIterator const &, UpdateType);
 	///
-	void addToToc(DocIterator const & di, bool output_active) const;
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype, TocBackend & backend) const;
 	///
 	InsetMathHull & operator=(InsetMathHull const &);
 	///
@@ -84,6 +86,8 @@ public:
 	///
 	bool ams() const;
 	///
+	bool outerDisplay() const;
+	///
 	void validate(LaTeXFeatures & features) const;
 	/// identifies HullInset
 	InsetMathHull const * asHullInset() const { return this; }
@@ -103,12 +107,16 @@ public:
 
 	/// get type
 	HullType getType() const;
+	/// is mutation implemented for this type?
+	static bool isMutable(HullType type);
 	/// change type
 	void mutate(HullType newtype);
 
 	///
 	int defaultColSpace(col_type col);
 	///
+	int displayColSpace(col_type col) const;
+	///
 	char defaultColAlign(col_type col);
 	///
 	char displayColAlign(idx_type idx) const;
@@ -150,7 +158,7 @@ public:
 	/// 
 	void toString(odocstream &) const;
 	///
-	void forOutliner(docstring &, size_t) const;
+	void forOutliner(docstring &, size_t const, bool const) const;
 
 	/// get notification when the cursor leaves this inset
 	bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
@@ -162,6 +170,9 @@ public:
 	/// Recreates the preview if preview is enabled.
 	void reloadPreview(DocIterator const & pos) const;
 	///
+	void usedMacros(MathData const & md, DocIterator const & pos,
+	                MacroNameSet & macros, MacroNameSet & defs) const;
+	///
 	void initUnicodeMath() const;
 
 	///
@@ -176,6 +187,10 @@ public:
 	std::string contextMenuName() const;
 	///
 	InsetCode lyxCode() const { return MATH_HULL_CODE; }
+	///
+	bool canPaintChange(BufferView const &) const;
+	///
+	bool confirmDeletion() const { return nargs() != 1 || !cell(0).empty(); }
 
 protected:
 	InsetMathHull(InsetMathHull const &);
@@ -185,6 +200,12 @@ protected:
 	/// do we want to handle this event?
 	bool getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & status) const;
+	/// override to set to 0 for inline equation
+	int leftMargin() const;
+	/// override to set to 0 for inline equation
+	int rightMargin() const;
+	/// override to set to 0 for inline equation
+	int border() const;
 	///
 	docstring eolString(row_type row, bool fragile, bool latex,
 			bool last_eoln) const;
@@ -226,11 +247,13 @@ private:
 	/// change number of columns, split or combine columns if necessary.
 	void changeCols(col_type);
 	///
-	docstring standardFont() const;
+	std::string standardFont() const;
 	///
 	ColorCode standardColor() const;
 	/// consistency check
 	void check() const;
+	/// does it understand tabular-feature commands?
+	bool allowsTabularFeatures() const;
 	/// can this change its number of rows?
 	bool rowChangeOK() const;
 	/// can this change its number of cols?
@@ -247,9 +270,7 @@ private:
 	///
 	std::vector<InsetLabel *> label_;
 	///
-	boost::scoped_ptr<RenderPreview> preview_;
-	///
-	mutable bool use_preview_;
+	unique_ptr<RenderPreview> preview_;
 	///
 	DocIterator docit_;
 	///
@@ -273,6 +294,8 @@ public:
 	Inset * editXY(Cursor & cur, int x, int y);
 	///
 	DisplayType display() const;
+	///
+	int indent(BufferView const &) const;
 
 protected:
 	///