architectural changes to tex2lyx

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

diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C
index de0588783a83e2c7ba7e98e7c9c441c74c60e11b..60d9833f4acc9a4b011169f873ac5e0004084875 100644 (file)
--- a/src/mathed/math_data.C
+++ b/src/mathed/math_data.C
@@ -12,13 +12,16 @@
 #include "debug.h"
 #include "support/LAssert.h"
 #include "metricsinfo.h"
+#include "math_data.h"
 #include "frontends/Painter.h"
 #include "textpainter.h"
 
+using namespace lyx::support;
 
 using std::max;
 using std::min;
 using std::abs;
+using std::endl;
 
 
 MathArray::MathArray()
@@ -38,16 +41,16 @@ void MathArray::substitute(MathMacro const & m)
 }
 
 
-MathAtom & MathArray::operator[](size_type pos)
+MathAtom & MathArray::operator[](pos_type pos)
 {
-       lyx::Assert(pos < size());
+       Assert(pos < size());
        return base_type::operator[](pos);
 }
 
 
-MathAtom const & MathArray::operator[](size_type pos) const
+MathAtom const & MathArray::operator[](pos_type pos) const
 {
-       lyx::Assert(pos < size());
+       Assert(pos < size());
        return base_type::operator[](pos);
 }
 
@@ -60,7 +63,7 @@ void MathArray::insert(size_type pos, MathAtom const & t)
 
 void MathArray::insert(size_type pos, MathArray const & ar)
 {
-       lyx::Assert(pos <= size());
+       Assert(pos <= size());
        base_type::insert(begin() + pos, ar.begin(), ar.end());
 }
 
@@ -142,7 +145,7 @@ void MathArray::replace(ReplaceData & rep)
        for (size_type i = 0; i < size(); ++i) {
                if (find1(rep.from, i)) {
                        // match found
-                       lyxerr << "match found!\n";
+                       lyxerr << "match found!" << endl;
                        erase(i, i + rep.from.size());
                        insert(i, rep.to);
                }
@@ -158,7 +161,7 @@ void MathArray::replace(ReplaceData & rep)
 
 bool MathArray::find1(MathArray const & ar, size_type pos) const
 {
-       //lyxerr << "finding '" << ar << "' in '" << *this << "'\n";
+       //lyxerr << "finding '" << ar << "' in '" << *this << "'" << endl;
        for (size_type i = 0, n = ar.size(); i < n; ++i)
                if (!operator[](pos + i)->match(ar[i]))
                        return false;
@@ -220,8 +223,9 @@ void MathArray::metrics(MetricsInfo & mi) const
 
        if (!empty()) {
                dim_.wid = 0;
+               Dimension d;
                for (const_iterator it = begin(), et = end(); it != et; ++it) {
-                       Dimension d = (*it)->metrics(mi);
+                       (*it)->metrics(mi, d);
                        dim_ += d;
                        it->width_ = d.wid;
                }