architectural changes to tex2lyx

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

diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index 168234db7d790f7d3b802a2b8e5b38b04a755555..155d955f0fa277257c991a7baf658b5ccf170fd0 100644 (file)
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -1,5 +1,5 @@
-
 #include "math_spaceinset.h"
+#include "math_data.h"
 #include "math_support.h"
 #include "LColor.h"
 #include "frontends/Painter.h"
@@ -7,6 +7,8 @@
 #include "LaTeXFeatures.h"
 #include "debug.h"
 
+using std::auto_ptr;
+
 
 char const * latex_mathspace[] = {
        "!", "negmedspace", "negthickspace",  // negative space
@@ -31,34 +33,33 @@ MathSpaceInset::MathSpaceInset(string const & name)
 }
 
 
-
-MathInset * MathSpaceInset::clone() const
+auto_ptr<InsetBase> MathSpaceInset::clone() const
 {
-       return new MathSpaceInset(*this);
+       return auto_ptr<InsetBase>(new MathSpaceInset(*this));
 }
 
 
-void MathSpaceInset::metrics(MathMetricsInfo &) const
+void MathSpaceInset::metrics(MetricsInfo &, Dimension & dim) const
 {
        switch (space_) {
-               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;
+               case 0: dim.wid = 6; break;
+               case 1: dim.wid = 8; break;
+               case 2: dim.wid = 10; break;
+               case 3: dim.wid = 6; break;
+               case 4: dim.wid = 8; break;
+               case 5: dim.wid = 10; break;
+               case 6: dim.wid = 20; break;
+               case 7: dim.wid = 40; break;
+               case 8: dim.wid = -2; break;
+               case 9: dim.wid =  2; break;
+               default: dim.wid = 6;
        }
-       dim_.a = 4;
-       dim_.d = 0;
+       dim.asc = 4;
+       dim.des = 0;
 }
 
 
-void MathSpaceInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathSpaceInset::draw(PainterInfo & pi, int x, int y) const
 {
 
 // Sadly, HP-UX CC can't handle that kind of initialization.
@@ -69,10 +70,10 @@ void MathSpaceInset::draw(MathPainterInfo & pi, int x, int y) const
        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 + pi.width - 2;  yp[2] = y;
+       xp[3] = x + pi.width - 2;  yp[3] = y - 3;
 
        pi.pain.lines(xp, yp, 4, (space_ < 3) ? LColor::latex : LColor::math);
 }
@@ -83,6 +84,7 @@ void MathSpaceInset::incSpace()
        space_ = (space_ + 1) % (nSpace - 2);
 }
 
+
 void MathSpaceInset::validate(LaTeXFeatures & features) const
 {
        if (space_ >= 0 && space_< nSpace) {