architectural changes to tex2lyx

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

diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index 201916eabf9f7063065e6eda64580c7ba11b796a..bd054206ae745b1b3486979b1794e925812581a4 100644 (file)
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -1,3 +1,4 @@
+#include <config.h>
 
 #include "math_scriptinset.h"
 #include "math_support.h"
@@ -7,8 +8,11 @@
 #include "support/LAssert.h"
 #include "debug.h"
 
+using namespace lyx::support;
 
 using std::max;
+using std::auto_ptr;
+using std::endl;
 
 
 MathScriptInset::MathScriptInset()
@@ -37,9 +41,9 @@ MathScriptInset::MathScriptInset(MathAtom const & at, bool up)
 
 
 
-MathInset * MathScriptInset::clone() const
+auto_ptr<InsetBase> MathScriptInset::clone() const
 {
-       return new MathScriptInset(*this);
+       return auto_ptr<InsetBase>(new MathScriptInset(*this));
 }
 
 
@@ -144,21 +148,21 @@ int MathScriptInset::dy1() const
 
 int MathScriptInset::dx0() const
 {
-       lyx::Assert(hasDown());
-       return hasLimits() ? (dim_.w - down().width()) / 2 : nwid();
+       Assert(hasDown());
+       return hasLimits() ? (dim_.wid - down().width()) / 2 : nwid();
 }
 
 
 int MathScriptInset::dx1() const
 {
-       lyx::Assert(hasUp());
-       return hasLimits() ? (dim_.w - up().width()) / 2 : nwid();
+       Assert(hasUp());
+       return hasLimits() ? (dim_.wid - up().width()) / 2 : nwid();
 }
 
 
 int MathScriptInset::dxx() const
 {
-       return hasLimits() ? (dim_.w - nwid()) / 2  :  0;
+       return hasLimits() ? (dim_.wid - nwid()) / 2  :  0;
 }
 
 
@@ -180,33 +184,34 @@ int MathScriptInset::ndes() const
 }
 
 
-void MathScriptInset::metrics(MathMetricsInfo & mi) const
+void MathScriptInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(2).metrics(mi);
-       MathScriptChanger dummy(mi.base);
+       ScriptChanger dummy(mi.base);
        cell(0).metrics(mi);
        cell(1).metrics(mi);
-       dim_.w = 0;
+       dim_.wid = 0;
        if (hasLimits()) {
-               dim_.w = nwid();
+               dim_.wid = nwid();
                if (hasUp())
-                       dim_.w = max(dim_.w, up().width());
+                       dim_.wid = max(dim_.wid, up().width());
                if (hasDown())
-                       dim_.w = max(dim_.w, down().width());
+                       dim_.wid = max(dim_.wid, down().width());
        } else {
                if (hasUp())
-                       dim_.w = max(dim_.w, up().width());
+                       dim_.wid = max(dim_.wid, up().width());
                if (hasDown())
-                       dim_.w = max(dim_.w, down().width());
-               dim_.w += nwid();
+                       dim_.wid = max(dim_.wid, down().width());
+               dim_.wid += nwid();
        }
-       dim_.a = dy1() + (hasUp() ? up().ascent() : 0);
-       dim_.d = dy0() + (hasDown() ? down().descent() : 0);
-       metricsMarkers2();
+       dim_.asc = dy1() + (hasUp() ? up().ascent() : 0);
+       dim_.des = dy0() + (hasDown() ? down().descent() : 0);
+       metricsMarkers();
+       dim = dim_;
 }
 
 
-void MathScriptInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathScriptInset::draw(PainterInfo & pi, int x, int y) const
 {
        if (nuc().size())
                nuc().draw(pi, x + dxx(), y);
@@ -215,22 +220,22 @@ void MathScriptInset::draw(MathPainterInfo & pi, int x, int y) const
                if (editing())
                        drawStr(pi, pi.base.font, x + dxx(), y, ".");
        }
-       MathScriptChanger dummy(pi.base);
+       ScriptChanger dummy(pi.base);
        if (hasUp())
                up().draw(pi, x + dx1(), y - dy1());
        if (hasDown())
                down().draw(pi, x + dx0(), y + dy0());
-       drawMarkers2(pi, x, y);
+       drawMarkers(pi, x, y);
 }
 
 
-void MathScriptInset::metricsT(TextMetricsInfo const & mi) const
+void MathScriptInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
        if (hasUp())
-               up().metricsT(mi);
+               up().metricsT(mi, dim);
        if (hasDown())
-               down().metricsT(mi);
-       nuc().metricsT(mi);
+               down().metricsT(mi, dim);
+       nuc().metricsT(mi, dim);
 }
 
 
@@ -357,7 +362,8 @@ void MathScriptInset::write(WriteStream & os) const
                //}
        } else {
                if (os.firstitem())
-                       lyxerr[Debug::MATHED] << "suppressing {} when writing\n";
+                       lyxerr[Debug::MATHED] << "suppressing {} when writing"
+                                             << endl;
                else
                        os << "{}";
        }
@@ -493,7 +499,7 @@ void MathScriptInset::notifyCursorLeaves(idx_type idx)
 }
 
 
-MathInset::result_type MathScriptInset::dispatch
+dispatch_result MathScriptInset::dispatch
        (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
 {
        if (cmd.action == LFUN_MATH_LIMITS) {