rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index c41de6bf80f1cfd28f5d33b35e9f855b178c79ea..d2d2232595e995ec7bfcbdc1ed698ea61f51dc68 100644 (file)
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -1,18 +1,20 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_spaceinset.h"
 #include "math_support.h"
 #include "LColor.h"
 #include "frontends/Painter.h"
 #include "math_mathmlstream.h"
+#include "LaTeXFeatures.h"
+#include "debug.h"
 
 
 char const * latex_mathspace[] = {
-       "!", ",", ":", ";", "quad", "qquad", "lyxnegspace"
+       "!", "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)
@@ -20,6 +22,16 @@ MathSpaceInset::MathSpaceInset(int sp)
 {}
 
 
+MathSpaceInset::MathSpaceInset(string const & name)
+       : space_(1)
+{
+       for (int i = 0; i < nSpace; ++i)
+               if (latex_mathspace[i] == name)
+                       space_ = i;
+}
+
+
+
 MathInset * MathSpaceInset::clone() const
 {
        return new MathSpaceInset(*this);
@@ -29,53 +41,71 @@ MathInset * MathSpaceInset::clone() const
 void MathSpaceInset::metrics(MathMetricsInfo &) 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;
-               default: width_ = 6; break;
+               case 0: dim_.w = 6; break;
+               case 1: dim_.w = 8; break;
+               case 2: dim_.w = 10; break;
+               case 3: dim_.w = 6; break;
+               case 4: dim_.w = 8; break;
+               case 5: dim_.w = 10; break;
+               case 6: dim_.w = 20; break;
+               case 7: dim_.w = 40; break;
+               case 8: dim_.w = -2; break;
+               case 9: dim_.w =  2; break;
+               default: dim_.w = 6;
        }
-       ascent_  = 4;
-       descent_ = 0;
+       dim_.a = 4;
+       dim_.d = 0;
 }
 
 
-void MathSpaceInset::draw(MathPainterInfo & pain, int x, int y) const
+void MathSpaceInset::draw(MathPainterInfo & 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_ == 6)
+       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;
+       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.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_] == "negmedspace")
+                || (latex_mathspace[space_] == "negthickspace"))
+                       features.require("amsmath");
+       }
+}
+
+
+void MathSpaceInset::maple(MapleStream & os) const
+{
+       os << ' ';
+}
+
+void MathSpaceInset::mathematica(MathematicaStream & os) const
 {
        os << ' ';
 }
 
 
-void MathSpaceInset::octavize(OctaveStream & os) const
+void MathSpaceInset::octave(OctaveStream & os) const
 {
        os << ' ';
 }
@@ -83,12 +113,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_ < 7)
-               os << '\\' << latex_mathspace[space_] << ' ';
+       if (space_ >= 0 && space_ < nSpace) {
+               os << '\\' << latex_mathspace[space_];
+               os.pendingSpace(true);
+       }
 }