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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 55275371fd..42144a3f4b 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;
 
@@ -40,7 +41,7 @@ public:
 		NOTAG
 	};
 	///
-	InsetMathHull(Buffer * buf);
+	explicit InsetMathHull(Buffer * buf);
 	///
 	InsetMathHull(Buffer * buf, HullType type);
 	///
@@ -48,16 +49,17 @@ public:
 	///
 	void setBuffer(Buffer &);
 	///
-	void updateBuffer(ParIterator const &, UpdateType);
+	void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
 	///
-	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 &);
 	///
 	mode_type currentMode() const;
 	///
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
-	/// 
+	///
 	void drawBackground(PainterInfo & pi, int x, int y) const;
 	///
 	void draw(PainterInfo &, int x, int y) const;
@@ -84,6 +86,10 @@ public:
 	///
 	bool ams() const;
 	///
+	bool outerDisplay() const;
+	///
+	OutputParams::CtObject CtObject(OutputParams const &) const;
+	///
 	void validate(LaTeXFeatures & features) const;
 	/// identifies HullInset
 	InsetMathHull const * asHullInset() const { return this; }
@@ -103,19 +109,19 @@ 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;
-	///
-	bool idxFirst(Cursor &) const;
-	///
-	bool idxLast(Cursor &) const;
 
 	///
 	void write(WriteStream & os) const;
@@ -135,22 +141,22 @@ public:
 	///
 	bool readQuiet(Lexer & lex);
 	///
-	int plaintext(odocstringstream &, OutputParams const &, 
+	int plaintext(odocstringstream &, OutputParams const &,
 	              size_t max_length = INT_MAX) const;
 	///
-	int docbook(odocstream &, OutputParams const &) const;
+	void docbook(XMLStream &, OutputParams const &) const;
 	///
-	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	docstring xhtml(XMLStream &, OutputParams const &) const;
 	///
 	void mathmlize(MathStream &) const;
 	///
 	void htmlize(HtmlStream &) const;
 	///
 	void mathAsLatex(WriteStream &) const;
-	/// 
+	///
 	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,13 +168,13 @@ 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;
 
-	///
-	static int displayMargin() { return 12; }
-	
 	/// Force inset into LTR environment if surroundings are RTL
-	virtual bool forceLTR() const { return true; }
+	virtual bool forceLTR(OutputParams const &) const { return true; }
 	///
 	void recordLocation(DocIterator const & di);
 
@@ -176,6 +182,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 +195,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;
@@ -196,7 +212,7 @@ private:
 	/// If so, we ignore LyXRC and wait for the image to be generated.
 	void preparePreview(DocIterator const & pos,
 	                    bool forexport = false) const;
-	/// like reloadPreview, but forces load 
+	/// like reloadPreview, but forces load
 	/// used by image export
 	void loadPreview(DocIterator const & pos) const;
 	///
@@ -226,17 +242,21 @@ 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?
 	bool colChangeOK() const;
 	/// are any of the equations numbered?
 	bool haveNumbers() const;
+	/// draw four angular markers
+	virtual void drawMarkers(PainterInfo & pi, int x, int y) const;
 
 	/// "none", "simple", "display", "eqnarray",...
 	HullType type_;
@@ -247,9 +267,7 @@ private:
 	///
 	std::vector<InsetLabel *> label_;
 	///
-	boost::scoped_ptr<RenderPreview> preview_;
-	///
-	mutable bool use_preview_;
+	unique_ptr<RenderPreview> preview_;
 	///
 	DocIterator docit_;
 	///
@@ -263,16 +281,19 @@ public:
 	///
 	virtual void mutateToText();
 	///
-	virtual void revealCodes(Cursor & cur) const;
-	///
 	bool editable() const { return true; }
 	///
-	void edit(Cursor & cur, bool front, 
+	void edit(Cursor & cur, bool front,
 		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 	///
-	DisplayType display() const;
+	RowFlags rowFlags() const;
+	/// helper function
+	bool display() const { return rowFlags() & Display; }
+
+	///
+	int indent(BufferView const &) const;
 
 protected:
 	///
@@ -282,8 +303,6 @@ protected:
 	void handleFont2(Cursor & cur, docstring const & arg);
 	///
 	bool previewState(BufferView const * const bv) const;
-	///
-	bool previewTooSmall(Dimension const & dim) const;
 };