architectural changes to tex2lyx

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 9cb757079870e11317c2ec6009fc214e5f3ec491..99a8d53277f9b912c1404a82eece081b6d42e286 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,6 +1,5 @@
 #include <config.h>
 
-
 #include "math_deliminset.h"
 #include "math_parser.h"
 #include "math_support.h"
@@ -10,6 +9,7 @@
 
 
 using std::max;
+using std::auto_ptr;
 
 namespace {
 
@@ -53,9 +53,9 @@ MathDelimInset::MathDelimInset
 }
 
 
-MathInset * MathDelimInset::clone() const
+auto_ptr<InsetBase> MathDelimInset::clone() const
 {
-       return new MathDelimInset(*this);
+       return auto_ptr<InsetBase>(new MathDelimInset(*this));
 }
 
 
@@ -73,38 +73,33 @@ void MathDelimInset::normalize(NormalStream & os) const
 }
 
 
-int MathDelimInset::dw() const
-{
-       int w = height() / 5;
-       if (w > 8)
-               w = 8;
-       if (w < 4)
-               w = 4;
-       return w;
-}
-
-
-void MathDelimInset::metrics(MathMetricsInfo & mi) const
+void MathDelimInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi);
        Dimension t;
        mathed_char_dim(mi.base.font, 'I', t);
-       int h0 = (t.a + t.d) / 2;
-       int a0 = max(cell(0).ascent(), t.a)   - h0;
-       int d0 = max(cell(0).descent(), t.d)  + h0;
-       dim_.a = max(a0, d0) + h0;
-       dim_.d = max(a0, d0) - h0;
-       dim_.w = cell(0).width() + 2 * dw() + 8;
+       int h0 = (t.asc + t.des) / 2;
+       int a0 = max(cell(0).ascent(), t.asc)   - h0;
+       int d0 = max(cell(0).descent(), t.des)  + h0;
+       dw_ = cell(0).height() / 5;
+       if (dw_ > 8)
+               dw_ = 8;
+       if (dw_ < 4)
+               dw_ = 4;
+       dim_.wid = cell(0).width() + 2 * dw_ + 8;
+       dim_.asc = max(a0, d0) + h0;
+       dim_.des = max(a0, d0) - h0;
+       dim = dim_;
 }
 
 
-void MathDelimInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathDelimInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int const w = dw();
-       int const b = y - ascent();
-       cell(0).draw(pi, x + w + 4, y);
-       mathed_draw_deco(pi, x + 4, b, w, height(), left_);
-       mathed_draw_deco(pi, x + width() - w - 4, b, w, height(), right_);
+       int const b = y - dim_.asc;
+       cell(0).draw(pi, x + dw_ + 4, y);
+       mathed_draw_deco(pi, x + 4, b, dw_, dim_.height(), left_);
+       mathed_draw_deco(pi, x + dim_.width() - dw_ - 4,
+               b, dw_, dim_.height(), right_);
 }
 
 
@@ -126,7 +121,7 @@ bool MathDelimInset::isAbs() const
 }
 
 
-void MathDelimInset::maplize(MapleStream & os) const
+void MathDelimInset::maple(MapleStream & os) const
 {
        if (isAbs()) {
                if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
@@ -138,7 +133,7 @@ void MathDelimInset::maplize(MapleStream & os) const
                os << left_ << cell(0) << right_;
 }
 
-void MathDelimInset::maximize(MaximaStream & os) const
+void MathDelimInset::maxima(MaximaStream & os) const
 {
        if (isAbs()) {
                if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
@@ -151,7 +146,7 @@ void MathDelimInset::maximize(MaximaStream & os) const
 }
 
 
-void MathDelimInset::mathematicize(MathematicaStream & os) const
+void MathDelimInset::mathematica(MathematicaStream & os) const
 {
        if (isAbs()) {
                if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
@@ -171,7 +166,7 @@ void MathDelimInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathDelimInset::octavize(OctaveStream & os) const
+void MathDelimInset::octave(OctaveStream & os) const
 {
        if (isAbs())
                os << "det(" << cell(0) << ')';