Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

[lyx.git] / src / mathed / InsetMathBox.h

diff --git a/src/mathed/InsetMathBox.h b/src/mathed/InsetMathBox.h
index b68280aaacf7ae60e3d9d2a8e5f8f16f9228d5bf..7138f25dce0c4b247df6290471e230df6ed7ca7c 100644 (file)
--- a/src/mathed/InsetMathBox.h
+++ b/src/mathed/InsetMathBox.h
@@ -36,6 +36,8 @@ public:
        void normalize(NormalStream & ns) const;
        ///
        void infoize(odocstream & os) const;
+       ///
+       void validate(LaTeXFeatures & features) const;
 
 private:
        Inset * clone() const { return new InsetMathBox(*this); }
@@ -67,32 +69,11 @@ private:
 };
 
 
-/// Extra nesting
-class InsetMathFrameBox : public InsetMathNest {
-public:
-       ///
-       InsetMathFrameBox();
-       ///
-       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;
-       ///
-       mode_type currentMode() const { return TEXT_MODE; }
-private:
-       Inset * clone() const { return new InsetMathFrameBox(*this); }
-};
-
-
-/// Extra nesting: \\makebox.
-// consolidate with InsetMathFrameBox?
+/// Extra nesting: \\makebox or \\framebox.
 class InsetMathMakebox : public InsetMathNest {
 public:
        ///
-       InsetMathMakebox();
+       InsetMathMakebox(bool framebox);
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
@@ -107,8 +88,8 @@ public:
        void infoize(odocstream & os) const;
 private:
        Inset * clone() const { return new InsetMathMakebox(*this); }
-       /// width of '[' in current font
-       mutable int w_;
+       ///
+       bool framebox_;
 };