X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.h;h=2f6ba483d9794bb18a44e3cb712c57eb1982a84b;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=b217dc57fa288778d1ad8c64b783082510cf0181;hpb=fc6ce7cd08562fd7bab4427880b46390bb7d2f07;p=lyx.git

diff --git a/src/mathed/InsetMathBox.h b/src/mathed/InsetMathBox.h
index b217dc57fa..2f6ba483d9 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,24 +14,18 @@
 
 #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; }
 	///
-	bool metrics(MetricsInfo & mi, Dimension & dim) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
@@ -39,16 +33,109 @@ 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 std::auto_ptr<Inset> doClone() 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; }
+	///
+	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);
+	///
+	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