X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.h;h=af166c19c71b5cf75df874a2d8cb8be522393e05;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=c27aa3d0a26e05fd15ad5c025bf50afcf6fb9a56;hpb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;p=lyx.git

diff --git a/src/mathed/InsetMathBox.h b/src/mathed/InsetMathBox.h
index c27aa3d0a2..af166c19c7 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.
  */
@@ -14,20 +14,14 @@
 
 #include "InsetMathNest.h"
 
-#include <string>
-
 
 namespace lyx {
 
-
-class Font;
-
 /// Support for \\mbox
-
 class InsetMathBox : public InsetMathNest {
 public:
 	///
-	explicit InsetMathBox(docstring const & name);
+	explicit InsetMathBox(Buffer * buf, docstring const & name);
 	///
 	mode_type currentMode() const { return TEXT_MODE; }
 	///
@@ -39,16 +33,113 @@ 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:
-	virtual Inset * clone() const;
+	Inset * clone() const { return new InsetMathBox(*this); }
 	///
 	docstring name_;
 };
 
 
+/// Non-AMS-style frame
+class InsetMathFBox : public InsetMathNest {
+public:
+	///
+	InsetMathFBox(Buffer * buf);
+	///
+	mode_type currentMode() const { return TEXT_MODE; }
+	///
+	marker_type marker(BufferView const *) const { return NO_MARKER; }
+	///
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
+	///
+	void draw(PainterInfo & pi, int x, int y) const;
+	///
+	void write(WriteStream & os) const;
+	/// 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: \\makebox or \\framebox.
+class InsetMathMakebox : public InsetMathNest {
+public:
+	///
+	InsetMathMakebox(Buffer * buf, bool framebox);
+	///
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
+	///
+	void draw(PainterInfo & pi, int x, int y) const;
+	///
+	void write(WriteStream & os) const;
+	/// write normalized content
+	void normalize(NormalStream & ns) const;
+	///
+	void mathmlize(MathStream & ms) 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); }
+	///
+	bool framebox_;
+};
+
+
+
+/// AMS-style frame
+class InsetMathBoxed : public InsetMathNest {
+public:
+	///
+	InsetMathBoxed(Buffer * buf);
+	///
+	marker_type marker(BufferView const *) const { return NO_MARKER; }
+	///
+	void validate(LaTeXFeatures & features) const;
+	///
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
+	///
+	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;
+	///
+	void infoize(odocstream & os) const;
+private:
+	Inset * clone() const { return new InsetMathBoxed(*this); }
+};
+
 
 } // namespace lyx
 
-#endif
+#endif // MATH_MBOX