X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.h;h=3dfe2286c3a13e49f79ff3cbfa848b247d384f72;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=b68280aaacf7ae60e3d9d2a8e5f8f16f9228d5bf;hpb=a085842f14c47e3c222ed2d887595d6cc6a61dd6;p=lyx.git

diff --git a/src/mathed/InsetMathBox.h b/src/mathed/InsetMathBox.h
index b68280aaac..3dfe2286c3 100644
--- a/src/mathed/InsetMathBox.h
+++ b/src/mathed/InsetMathBox.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.
  */
@@ -23,7 +23,7 @@ namespace lyx {
 class InsetMathBox : public InsetMathNest {
 public:
 	///
-	explicit InsetMathBox(docstring const & name);
+	explicit InsetMathBox(Buffer * buf, docstring const & name);
 	///
 	mode_type currentMode() const { return TEXT_MODE; }
 	///
@@ -35,7 +35,15 @@ public:
 	///
 	void normalize(NormalStream & ns) const;
 	///
+	void mathmlize(MathStream & ms) const;
+	///
+	void htmlize(HtmlStream & ms) const;
+	///
 	void infoize(odocstream & os) const;
+	///
+	void validate(LaTeXFeatures & features) const;
+	///
+	InsetCode lyxCode() const { return MATH_BOX_CODE; }
 
 private:
 	Inset * clone() const { return new InsetMathBox(*this); }
@@ -48,7 +56,7 @@ private:
 class InsetMathFBox : public InsetMathNest {
 public:
 	///
-	InsetMathFBox();
+	InsetMathFBox(Buffer * buf);
 	///
 	mode_type currentMode() const { return TEXT_MODE; }
 	///
@@ -60,18 +68,24 @@ public:
 	/// write normalized content
 	void normalize(NormalStream & ns) const;
 	///
+	void mathmlize(MathStream & ms) const;
+	///
+	void htmlize(HtmlStream & ms) const;
+	///
 	void infoize(odocstream & os) const;
+	///
+	void validate(LaTeXFeatures & features) const;
 private:
 	///
 	Inset * clone() const { return new InsetMathFBox(*this); }
 };
 
 
-/// Extra nesting
-class InsetMathFrameBox : public InsetMathNest {
+/// Extra nesting: \\makebox or \\framebox.
+class InsetMathMakebox : public InsetMathNest {
 public:
 	///
-	InsetMathFrameBox();
+	InsetMathMakebox(Buffer * buf, bool framebox);
 	///
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
@@ -81,34 +95,19 @@ public:
 	/// write normalized content
 	void normalize(NormalStream & ns) const;
 	///
-	mode_type currentMode() const { return TEXT_MODE; }
-private:
-	Inset * clone() const { return new InsetMathFrameBox(*this); }
-};
-
-
-/// Extra nesting: \\makebox.
-// consolidate with InsetMathFrameBox?
-class InsetMathMakebox : public InsetMathNest {
-public:
-	///
-	InsetMathMakebox();
-	///
-	void metrics(MetricsInfo & mi, Dimension & dim) const;
+	void mathmlize(MathStream & ms) const;
 	///
-	void draw(PainterInfo & pi, int x, int y) const;
-	///
-	void write(WriteStream & os) const;
-	/// write normalized content
-	void normalize(NormalStream & ns) const;
+	void htmlize(HtmlStream & ms) const;
 	///
 	mode_type currentMode() const { return TEXT_MODE; }
 	///
 	void infoize(odocstream & os) const;
+	///
+	void validate(LaTeXFeatures & features) const;
 private:
 	Inset * clone() const { return new InsetMathMakebox(*this); }
-	/// width of '[' in current font
-	mutable int w_;
+	///
+	bool framebox_;
 };
 
 
@@ -117,7 +116,7 @@ private:
 class InsetMathBoxed : public InsetMathNest {
 public:
 	///
-	InsetMathBoxed();
+	InsetMathBoxed(Buffer * buf);
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
@@ -126,6 +125,10 @@ public:
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
 	void write(WriteStream & os) const;
+	///
+	void mathmlize(MathStream & ms) const;
+	///
+	void htmlize(HtmlStream & ms) const;
 	/// write normalized content
 	void normalize(NormalStream & ns) const;
 	///