Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_unknowninset.C b/src/mathed/math_unknowninset.C
index 32c311523ed769fe3cc3ed020c53ac09cc026019..12a29cab568d8a34ba62b86d2c54640fd87db1a6 100644 (file)
--- a/src/mathed/math_unknowninset.C
+++ b/src/mathed/math_unknowninset.C
@@ -1,20 +1,33 @@
-#include <config.h>
+/**
+ * \file math_unknowninset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
+#include <config.h>
 
 #include "math_unknowninset.h"
 #include "math_support.h"
+#include "math_atom.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 
+using std::string;
+using std::auto_ptr;
+
 
 MathUnknownInset::MathUnknownInset(string const & nm, bool final, bool black)
        : name_(nm), final_(final), black_(black)
 {}
 
 
-MathInset * MathUnknownInset::clone() const
+auto_ptr<InsetBase> MathUnknownInset::doClone() const
 {
-       return new MathUnknownInset(*this);
+       return auto_ptr<InsetBase>(new MathUnknownInset(*this));
 }
 
 
@@ -30,31 +43,26 @@ void MathUnknownInset::setName(string const & name)
 }
 
 
-bool MathUnknownInset::match(MathAtom const & at) const
-{
-       MathUnknownInset const * q = at->asUnknownInset();
-       return q && name_ == q->name_;
-}
-
-
 void MathUnknownInset::normalize(NormalStream & os) const
 {
        os << "[unknown " << name_ << ']';
 }
 
 
-void MathUnknownInset::metrics(MathMetricsInfo & mi) const
+void MathUnknownInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mathed_string_dim(mi.base.font, name_, dim_);
+       mathed_string_dim(mi.base.font, name_, dim);
+       dim_ = dim;
 }
 
 
-void MathUnknownInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathUnknownInset::draw(PainterInfo & pi, int x, int y) const
 {
        if (black_)
                drawStrBlack(pi, x, y, name_);
        else
                drawStrRed(pi, x, y, name_);
+       setPosCache(pi, x, y);
 }
 
 
@@ -70,12 +78,13 @@ bool MathUnknownInset::final() const
 }
 
 
-void MathUnknownInset::maplize(MapleStream & os) const
+void MathUnknownInset::maple(MapleStream & os) const
 {
        os << name_;
 }
 
-void MathUnknownInset::mathematicize(MathematicaStream & os) const
+
+void MathUnknownInset::mathematica(MathematicaStream & os) const
 {
        os << name_;
 }
@@ -87,7 +96,7 @@ void MathUnknownInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathUnknownInset::octavize(OctaveStream & os) const
+void MathUnknownInset::octave(OctaveStream & os) const
 {
        os << name_;
 }