Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index 11a51d9228578183ea1960e5e5bda991b31aea7e..8f71fa0f8ec65d3c1553c9d77d7b971d8b804006 100644 (file)
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -1,63 +1,158 @@
+/**
+ * \file math_spaceinset.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_spaceinset.h"
+#include "math_data.h"
+#include "math_mathmlstream.h"
+
+#include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "Painter.h"
-#include "mathed/support.h"
+
+#include "frontends/Painter.h"
+
+using std::string;
+using std::auto_ptr;
+
+
+char const * latex_mathspace[] = {
+       "!", "negmedspace", "negthickspace",  // negative space
+       ",", ":", ";", "quad", "qquad",       // positive space
+       "lyxnegspace", "lyxposspace"          // LyX special ("unvisible space")
+};
+
+int const nSpace = sizeof(latex_mathspace)/sizeof(char *);
 
 
-void MathSpaceInset::Metrics()
+MathSpaceInset::MathSpaceInset(int sp)
+       : space_(sp)
+{}
+
+
+MathSpaceInset::MathSpaceInset(string const & name)
+       : space_(1)
 {
-       width = space ? space * 2 : 2;
-       if (space > 3) width *= 2;
-       if (space == 5) width *= 2;
-       width += 4;
-       ascent = 4; descent = 0;
+       for (int i = 0; i < nSpace; ++i)
+               if (latex_mathspace[i] == name)
+                       space_ = i;
 }
 
 
-void MathSpaceInset::SetSpace(int sp)
-{ 
-       space = sp;
-       Metrics();
+auto_ptr<InsetBase> MathSpaceInset::doClone() const
+{
+       return auto_ptr<InsetBase>(new MathSpaceInset(*this));
 }
 
 
-MathSpaceInset::MathSpaceInset(int sp, short ot, short st)
-       : MathedInset("", ot, st), space(sp)
-{}
+int MathSpaceInset::width() const
+{
+       switch (space_) {
+               case 0: return 6;
+               case 1: return 8;
+               case 2: return 10;
+               case 3: return 6;
+               case 4: return 8;
+               case 5: return 10;
+               case 6: return 20;
+               case 7: return 40;
+               case 8: return -2;
+               case 9: return  2;
+               default: return 6;
+       }
+}
+
+
+int MathSpaceInset::ascent() const
+{
+       return 4;
+}
+
+
+int MathSpaceInset::descent() const
+{
+       return 0;
+}
 
 
-MathedInset * MathSpaceInset::Clone()
+void MathSpaceInset::metrics(MetricsInfo &, Dimension & dim) const
 {
-       return new MathSpaceInset(space, GetType(), GetStyle());
+       dim.wid = width();
+       dim.asc = ascent();
+       dim.des = descent();
 }
 
 
-void
-MathSpaceInset::draw(Painter & pain, int x, int y)
-{ 
-       
-// XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
-       
-// Sadly, HP-UX CC can't handle that kind of initialization.
-       
+void MathSpaceInset::draw(PainterInfo & pi, int x, int y) const
+{
+       // Sadly, HP-UX CC can't handle that kind of initialization.
+       // XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
+       if (space_ >= nSpace - 2)
+               return;
+
        int xp[4];
        int yp[4];
-       
-       xp[0] = ++x;            yp[0] = y - 3;
-       xp[1] = x;                 yp[1] = y;
-       xp[2] = x + width - 2;  yp[2] = y;
-       xp[3] = x + width - 2;  yp[3] = y - 3;
-       
-       pain.lines(xp, yp, 4, (space) ? LColor::latex : LColor::math);
+       int w = width();
+
+       xp[0] = ++x;        yp[0] = y - 3;
+       xp[1] = x;          yp[1] = y;
+       xp[2] = x + w - 2;  yp[2] = y;
+       xp[3] = x + w - 2;  yp[3] = y - 3;
+
+       pi.pain.lines(xp, yp, 4, (space_ < 3) ? LColor::latex : LColor::math);
+}
+
+
+void MathSpaceInset::incSpace()
+{
+       space_ = (space_ + 1) % (nSpace - 2);
+}
+
+
+void MathSpaceInset::validate(LaTeXFeatures & features) const
+{
+       if (space_ >= 0 && space_< nSpace) {
+               if ((latex_mathspace[space_] == string("negmedspace"))
+                || (latex_mathspace[space_] == string("negthickspace")))
+                       features.require("amsmath");
+       }
+}
+
+
+void MathSpaceInset::maple(MapleStream & os) const
+{
+       os << ' ';
+}
+
+void MathSpaceInset::mathematica(MathematicaStream & os) const
+{
+       os << ' ';
+}
+
+
+void MathSpaceInset::octave(OctaveStream & os) const
+{
+       os << ' ';
+}
+
+
+void MathSpaceInset::normalize(NormalStream & os) const
+{
+       os << "[space " << int(space_) << "] ";
 }
 
 
-void
-MathSpaceInset::Write(ostream & os, bool /* fragile */)
+void MathSpaceInset::write(WriteStream & os) const
 {
-   if (space >= 0 && space < 6) {
-          os << '\\' << latex_mathspace[space] << ' ';
-   }
+       if (space_ >= 0 && space_ < nSpace) {
+               os << '\\' << latex_mathspace[space_];
+               os.pendingSpace(true);
+       }
 }