X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathHull.h;h=7f161f22357ca1365efbab44d09ac2fc5495ad7b;hb=5eb7add4092708a5a0dbabf303164be624aff72f;hp=f441687b5f2e99080bde86928090d5237614ada5;hpb=1e51e87f680a7a903d1c24bccf26598459efec47;p=lyx.git

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index f441687b5f..7f161f2235 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,6 +14,10 @@
 
 #include "InsetMathGrid.h"
 
+#include "Color.h"
+#include "DocIterator.h"
+#include "OutputEnums.h"
+
 #include <boost/scoped_ptr.hpp>
 
 
@@ -28,15 +32,15 @@ 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 &);
 	///
@@ -45,6 +49,8 @@ public:
 	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;
 	///
@@ -56,6 +62,10 @@ public:
 	///
 	void label(row_type row, docstring const & label);
 	///
+	std::vector<InsetLabel *> const & getLabels() { return label_; }
+	///
+	ColorCode backgroundColor(PainterInfo const &) const;
+	///
 	void numbered(row_type row, bool num);
 	///
 	bool numbered(row_type row) const;
@@ -107,29 +117,46 @@ public:
 	///
 	void write(std::ostream & os) const;
 	///
+	void header_write(WriteStream &) const;
+	///
+	void footer_write(WriteStream &) const;
+	///
 	void read(Lexer & lex);
 	///
+	bool readQuiet(Lexer & lex);
+	///
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
+	///
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	/// the string that is passed to the TOC
-	void textString(odocstream &) const;
+	void tocString(odocstream &) 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;
+	///
+	InsetCode lyxCode() const { return MATH_HULL_CODE; }
 
 protected:
 	InsetMathHull(InsetMathHull const &);
@@ -140,24 +167,29 @@ 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);
 	///
 	void validate1(LaTeXFeatures & features);
 	///
-	void header_write(WriteStream &) const;
-	///
-	void footer_write(WriteStream &) const;
-	///
 	docstring nicelabel(row_type row) const;
 	///
 	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.
@@ -176,6 +208,8 @@ private:
 	void changeCols(col_type);
 	///
 	docstring standardFont() const;
+	///
+	ColorCode standardColor() const;
 	/// consistency check
 	void check() const;
 	/// can this change its number of rows?
@@ -186,25 +220,25 @@ private:
 	/// "none", "simple", "display", "eqnarray",...
 	HullType type_;
 	///
-	std::vector<bool> nonum_;
+	std::vector<bool> numbered_;
 	///
 	std::vector<InsetLabel *> label_;
 	///
 	boost::scoped_ptr<RenderPreview> preview_;
 	///
 	mutable bool use_preview_;
+	///
+	DocIterator docit_;
 //
 // Incorporate me
 //
 public:
-	/// what appears in the minibuffer when opening
-	docstring editMessage() const;
 	///
 	virtual void mutateToText();
 	///
 	virtual void revealCodes(Cursor & cur) const;
 	///
-	EDITABLE editable() const { return HIGHLY_EDITABLE; }
+	bool editable() const { return true; }
 	///
 	void edit(Cursor & cur, bool front, 
 		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
@@ -212,8 +246,6 @@ public:
 	Inset * editXY(Cursor & cur, int x, int y);
 	///
 	DisplayType display() const;
-	///
-	InsetCode lyxCode() const;
 
 protected:
 	///