Fix to bug 2362: Deleting superscript also deletes subscript.

[lyx.git] / src / mathed / math_fboxinset.C

diff --git a/src/mathed/math_fboxinset.C b/src/mathed/math_fboxinset.C
index 54532bf8a39d02fafdb73cc012c9db1750f48eb9..6fbbb38c8b5d0d185578b011f87a2fbed30ad083 100644 (file)
--- a/src/mathed/math_fboxinset.C
+++ b/src/mathed/math_fboxinset.C
@@ -16,17 +16,19 @@
 #include "math_parser.h"
 #include "math_streamstr.h"
 #include "LColor.h"
+
+#include "support/std_ostream.h"
 #include "frontends/Painter.h"
 
 using std::auto_ptr;
 
 
-MathFboxInset::MathFboxInset(latexkeys const * key)
-       : MathNestInset(1), key_(key)
+MathFboxInset::MathFboxInset()
+       : MathNestInset(1)
 {}
 
 
-auto_ptr<InsetBase> MathFboxInset::clone() const
+auto_ptr<InsetBase> MathFboxInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathFboxInset(*this));
 }
@@ -34,21 +36,15 @@ auto_ptr<InsetBase> MathFboxInset::clone() const
 
 MathInset::mode_type MathFboxInset::currentMode() const
 {
-       if (key_->name == "fbox")
-               return TEXT_MODE;
-       return MATH_MODE;
+       return TEXT_MODE;
 }
 
 
 void MathFboxInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (key_->name == "fbox") {
-               FontSetChanger dummy(mi.base, "textnormal");
-               cell(0).metrics(mi, dim);
-       } else {
-               cell(0).metrics(mi, dim);
-       }
-       metricsMarkers(dim, 5); // 5 pixels margin
+       FontSetChanger dummy(mi.base, "textnormal");
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim, 3); // 1 pixel space, 1 frame, 1 space
        dim_ = dim;
 }
 
@@ -57,23 +53,25 @@ void MathFboxInset::draw(PainterInfo & pi, int x, int y) const
 {
        pi.pain.rectangle(x + 1, y - dim_.ascent() + 1,
                dim_.width() - 2, dim_.height() - 2, LColor::foreground);
-       if (key_->name == "fbox") {
-               FontSetChanger dummy(pi.base, "textnormal");
-               cell(0).draw(pi, x + 5, y);
-       } else {
-               cell(0).draw(pi, x + 5, y);
-       }
+       FontSetChanger dummy(pi.base, "textnormal");
+       cell(0).draw(pi, x + 3, y);
        setPosCache(pi, x, y);
 }
 
 
 void MathFboxInset::write(WriteStream & os) const
 {
-       os << '\\' << key_->name << '{' << cell(0) << '}';
+       os << "\\fbox{" << cell(0) << '}';
 }
 
 
 void MathFboxInset::normalize(NormalStream & os) const
 {
-       os << '[' << key_->name << ' ' << cell(0) << ']';
+       os << "[fbox " << cell(0) << ']';
+}
+
+
+void MathFboxInset::infoize(std::ostream & os) const
+{
+       os << "FBox: ";
 }