X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathHull.h;h=8c0ed98265d36663420dfefc5edb8cf69fd245ed;hb=ef7a142f3f4e5937dabf7fb8fc7957bf351e166d;hp=12b3acd7d7072f7bcfabebf550e8a8a747ed0e9c;hpb=0facb603fefec1ecc927f77bcf6228ca1f035444;p=lyx.git

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 12b3acd7d7..8c0ed98265 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,6 +14,10 @@
 
 #include "InsetMathGrid.h"
 
+#include "Color.h"
+#include "DocIterator.h"
+#include "OutputEnums.h"
+
 #include <boost/scoped_ptr.hpp>
 
 
@@ -28,17 +32,17 @@ class RenderPreview;
 class InsetMathHull : public InsetMathGrid {
 public:
 	///
-	InsetMathHull();
+	InsetMathHull(Buffer * buf);
 	///
-	explicit InsetMathHull(HullType type);
+	InsetMathHull(Buffer * buf, HullType type);
 	///
-	~InsetMathHull();
+	virtual ~InsetMathHull();
 	///
 	void setBuffer(Buffer &);
 	///
-	void updateLabels(ParIterator const &);
+	void updateBuffer(ParIterator const &, UpdateType);
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const &) const;
 	///
 	InsetMathHull & operator=(InsetMathHull const &);
 	///
@@ -58,7 +62,9 @@ public:
 	///
 	void label(row_type row, docstring const & label);
 	///
-	ColorCode backgroundColor() const { return Color_mathbg; }
+	std::vector<InsetLabel *> const & getLabels() { return label_; }
+	///
+	ColorCode backgroundColor(PainterInfo const &) const;
 	///
 	void numbered(row_type row, bool num);
 	///
@@ -102,8 +108,6 @@ public:
 	///
 	void write(WriteStream & os) const;
 	///
-	void mathmlize(MathStream &) const;
-	///
 	void normalize(NormalStream &) const;
 	///
 	void infoize(odocstream & os) const;
@@ -122,26 +126,41 @@ public:
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
-	/// the string that is passed to the TOC
-	void tocString(odocstream &) const;
+	///
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	///
+	void mathmlize(MathStream &) const;
+	///
+	void htmlize(HtmlStream &) const;
+	///
+	void mathAsLatex(WriteStream &) const;
+	/// 
+	void toString(odocstream &) const;
+	///
+	void forToc(docstring &, size_t) const;
 
 	/// get notification when the cursor leaves this inset
 	bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
 	///
 	//bool insetAllowed(InsetCode code) const;
 	///
-	void addPreview(graphics::PreviewLoader &) const;
+	void addPreview(DocIterator const & inset_pos,
+		graphics::PreviewLoader &) const;
+	/// Recreates the preview if preview is enabled.
+	void reloadPreview(DocIterator const & pos) const;
 	///
 	void initUnicodeMath() const;
 
 	///
 	static int displayMargin() { return 12; }
 	
-	/// Force inset into LTR environment if surroundings are RTL?
+	/// Force inset into LTR environment if surroundings are RTL
 	virtual bool forceLTR() const { return true; }
+	///
+	void recordLocation(DocIterator const & di);
 
 	///
-	virtual docstring contextMenu(BufferView const &, int, int) const;
+	docstring contextMenuName() const;
 	///
 	InsetCode lyxCode() const { return MATH_HULL_CODE; }
 
@@ -154,10 +173,19 @@ protected:
 	bool getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & status) const;
 	///
-	docstring eolString(row_type row, bool emptyline, bool fragile) const;
+	docstring eolString(row_type row, bool fragile, bool latex,
+			bool last_eoln) const;
 
 private:
 	virtual Inset * clone() const;
+	/// Prepare the preview if preview is enabled.
+	/// \param forexport: whether this is intended for export
+	/// 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 
+	/// used by image export
+	void loadPreview(DocIterator const & pos) const;
 	///
 	void setType(HullType type);
 	///
@@ -167,7 +195,7 @@ private:
 	///
 	void doExtern(Cursor & cur, FuncRequest & func);
 	///
-	void glueall();
+	void glueall(HullType type);
 	/*!
 	 * split every row at the first relation operator.
 	 * The number of columns must be 1. One column is added.
@@ -186,23 +214,35 @@ private:
 	void changeCols(col_type);
 	///
 	docstring standardFont() const;
+	///
+	ColorCode standardColor() const;
 	/// consistency check
 	void check() 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;
 
 	/// "none", "simple", "display", "eqnarray",...
 	HullType type_;
 	///
-	std::vector<bool> nonum_;
+	std::vector<bool> numbered_;
+	///
+	std::vector<docstring> numbers_;
 	///
 	std::vector<InsetLabel *> label_;
 	///
 	boost::scoped_ptr<RenderPreview> preview_;
 	///
 	mutable bool use_preview_;
+	///
+	DocIterator docit_;
+	///
+	typedef std::map<docstring, int> CounterMap;
+	/// used to store current values of important counters
+	CounterMap counter_map;
 //
 // Incorporate me
 //