Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index 641549513e56b9d37dce6477ab0faa69c6b14dd4..8f71fa0f8ec65d3c1553c9d77d7b971d8b804006 100644 (file)
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -1,20 +1,35 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \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_support.h"
+#include "math_data.h"
+#include "math_mathmlstream.h"
+
+#include "LaTeXFeatures.h"
 #include "LColor.h"
+
 #include "frontends/Painter.h"
-#include "math_mathmlstream.h"
 
+using std::string;
+using std::auto_ptr;
 
 
 char const * latex_mathspace[] = {
-       "!", ",", ";", ":", "quad", "qquad", "lyxnegspace", "lyxposspace"
+       "!", "negmedspace", "negthickspace",  // negative space
+       ",", ":", ";", "quad", "qquad",       // positive space
+       "lyxnegspace", "lyxposspace"          // LyX special ("unvisible space")
 };
 
-
+int const nSpace = sizeof(latex_mathspace)/sizeof(char *);
 
 
 MathSpaceInset::MathSpaceInset(int sp)
@@ -25,75 +40,104 @@ MathSpaceInset::MathSpaceInset(int sp)
 MathSpaceInset::MathSpaceInset(string const & name)
        : space_(1)
 {
-       for (int i = 0; i < 8; ++i) 
-               if (latex_mathspace[i] == name) 
+       for (int i = 0; i < nSpace; ++i)
+               if (latex_mathspace[i] == name)
                        space_ = i;
 }
 
 
-
-MathInset * MathSpaceInset::clone() const
+auto_ptr<InsetBase> MathSpaceInset::doClone() const
 {
-       return new MathSpaceInset(*this);
+       return auto_ptr<InsetBase>(new MathSpaceInset(*this));
 }
 
 
-void MathSpaceInset::metrics(MathMetricsInfo &) const
+int MathSpaceInset::width() const
 {
        switch (space_) {
-               case 0: width_ = 6; break;
-               case 1: width_ = 6; break;
-               case 2: width_ = 8; break;
-               case 3: width_ = 10; break;
-               case 4: width_ = 20; break;
-               case 5: width_ = 40; break;
-               case 6: width_ = -2; break;
-               case 7: width_ =  2; break;
-               default: width_ = 6; break;
+               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;
        }
-       ascent_  = 4;
-       descent_ = 0;
 }
 
 
-void MathSpaceInset::draw(MathPainterInfo & pain, int x, int y) const
+int MathSpaceInset::ascent() const
 {
+       return 4;
+}
+
+
+int MathSpaceInset::descent() const
+{
+       return 0;
+}
+
 
-// 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_ > 6)
+void MathSpaceInset::metrics(MetricsInfo &, Dimension & dim) const
+{
+       dim.wid = width();
+       dim.asc = ascent();
+       dim.des = descent();
+}
+
+
+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];
+       int w = width();
 
-       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;
+       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;
 
-       pain.pain.lines(xp, yp, 4, space_ ? LColor::latex : LColor::math);
+       pi.pain.lines(xp, yp, 4, (space_ < 3) ? LColor::latex : LColor::math);
 }
 
 
 void MathSpaceInset::incSpace()
 {
-       space_ = (space_ + 1) % 6;
+       space_ = (space_ + 1) % (nSpace - 2);
 }
 
 
-void MathSpaceInset::maplize(MapleStream & os) const
+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::mathematicize(MathematicaStream & os) const
+void MathSpaceInset::mathematica(MathematicaStream & os) const
 {
        os << ' ';
 }
 
 
-void MathSpaceInset::octavize(OctaveStream & os) const
+void MathSpaceInset::octave(OctaveStream & os) const
 {
        os << ' ';
 }
@@ -101,12 +145,14 @@ void MathSpaceInset::octavize(OctaveStream & os) const
 
 void MathSpaceInset::normalize(NormalStream & os) const
 {
-       os << "[space " << space_ << "] ";
+       os << "[space " << int(space_) << "] ";
 }
 
 
 void MathSpaceInset::write(WriteStream & os) const
 {
-       if (space_ >= 0 && space_ < 8)
-               os << '\\' << latex_mathspace[space_] << ' ';
+       if (space_ >= 0 && space_ < nSpace) {
+               os << '\\' << latex_mathspace[space_];
+               os.pendingSpace(true);
+       }
 }