X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathHull.h;h=f8c04dfe2be2793a44c5b3a641ebeb837a67a373;hb=cdc847fd304019a19425a0d5d9d42a556a937097;hp=fada2035310b53497a925f9787449cc5abb60a74;hpb=68c43a2b1834e02c47d33a82061021c3bad6a43f;p=lyx.git

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index fada203531..f8c04dfe2b 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,16 +14,16 @@
 
 #include "InsetMathGrid.h"
 
-#include "Color.h"
 #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;
 
@@ -31,6 +31,15 @@ class RenderPreview;
 /// This provides an interface between "LyX insets" and "LyX math insets"
 class InsetMathHull : public InsetMathGrid {
 public:
+	/// How a line is numbered
+	enum Numbered {
+		/// not numbered, LaTeX code \\nonumber if line differs from inset
+		NONUMBER,
+		/// numbered, LaTeX code \\number if line differs from inset
+		NUMBER,
+		/// not numbered, LaTeX code \\notag if line differs from inset
+		NOTAG
+	};
 	///
 	InsetMathHull(Buffer * buf);
 	///
@@ -42,7 +51,8 @@ public:
 	///
 	void updateBuffer(ParIterator const &, UpdateType);
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype) const;
 	///
 	InsetMathHull & operator=(InsetMathHull const &);
 	///
@@ -66,7 +76,9 @@ public:
 	///
 	ColorCode backgroundColor(PainterInfo const &) const;
 	///
-	void numbered(row_type row, bool num);
+	void numbered(row_type row, bool num) { numbered(row, num ? NUMBER : NONUMBER); }
+	///
+	void numbered(row_type row, Numbered num);
 	///
 	bool numbered(row_type row) const;
 	///
@@ -74,6 +86,8 @@ public:
 	///
 	bool ams() const;
 	///
+	bool outerDisplay() const;
+	///
 	void validate(LaTeXFeatures & features) const;
 	/// identifies HullInset
 	InsetMathHull const * asHullInset() const { return this; }
@@ -93,14 +107,20 @@ 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;
@@ -123,7 +143,8 @@ public:
 	///
 	bool readQuiet(Lexer & lex);
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream &, OutputParams const &, 
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
@@ -137,7 +158,7 @@ public:
 	/// 
 	void toString(odocstream &) const;
 	///
-	void forToc(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);
@@ -149,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;
 
 	///
@@ -160,9 +184,11 @@ public:
 	void recordLocation(DocIterator const & di);
 
 	///
-	docstring contextMenuName() const;
+	std::string contextMenuName() const;
 	///
 	InsetCode lyxCode() const { return MATH_HULL_CODE; }
+	///
+	bool canPaintChange(BufferView const &) const;
 
 protected:
 	InsetMathHull(InsetMathHull const &);
@@ -213,30 +239,36 @@ 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;
 
 	/// "none", "simple", "display", "eqnarray",...
 	HullType type_;
 	///
-	std::vector<bool> numbered_;
+	std::vector<Numbered> numbered_;
 	///
 	std::vector<docstring> numbers_;
 	///
 	std::vector<InsetLabel *> label_;
 	///
-	boost::scoped_ptr<RenderPreview> preview_;
-	///
-	mutable bool use_preview_;
+	unique_ptr<RenderPreview> preview_;
 	///
 	DocIterator docit_;
+	///
+	typedef std::map<docstring, int> CounterMap;
+	/// used to store current values of important counters
+	CounterMap counter_map;
 //
 // Incorporate me
 //
@@ -262,7 +294,9 @@ protected:
 	///
 	void handleFont2(Cursor & cur, docstring const & arg);
 	///
-	bool previewState(BufferView * bv) const;
+	bool previewState(BufferView const * const bv) const;
+	///
+	bool previewTooSmall(Dimension const & dim) const;
 };