make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 32ab637300641da3bf61a9dc9b4aefed833db9dc..6113621b43f1b8e583467055f433d5dc562c5775 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -3,70 +3,67 @@
 #endif
 
 #include "math_nestinset.h"
+#include "math_mathmlstream.h"
 #include "debug.h"
 
 
-MathNestInset::MathNestInset(int nargs)
+MathNestInset::MathNestInset(idx_type nargs)
        : MathDimInset(), cells_(nargs)
 {}
 
 
-int MathNestInset::nargs() const
+MathInset::idx_type MathNestInset::nargs() const
 {
        return cells_.size();
 }
 
 
-MathXArray & MathNestInset::xcell(int i)
+MathXArray & MathNestInset::xcell(idx_type i)
 {
        return cells_[i];
 }
 
 
-MathXArray const & MathNestInset::xcell(int i) const
+MathXArray const & MathNestInset::xcell(idx_type i) const
 {
        return cells_[i];
 }
 
 
-MathArray & MathNestInset::cell(int i)
+MathArray & MathNestInset::cell(idx_type i)
 {
        return cells_[i].data_;
 }
 
 
-MathArray const & MathNestInset::cell(int i) const
+MathArray const & MathNestInset::cell(idx_type i) const
 {
        return cells_[i].data_;
 }
 
 
-void MathNestInset::substitute(MathArray & array, MathMacro const & m) const
+void MathNestInset::substitute(MathMacro const & m)
 {
-       array.push_back(clone());
-       for (int i = 0; i < nargs(); ++i)
-               array.back()->cell(i).substitute(m);
+       for (idx_type i = 0; i < nargs(); ++i)
+               cell(i).substitute(m);
 }
 
 
-void MathNestInset::metrics(MathStyles st) const
+void MathNestInset::metrics(MathMetricsInfo const & mi) const
 {
-       size_ = st;
-       for (int i = 0; i < nargs(); ++i)
-               xcell(i).metrics(st);
+       for (idx_type i = 0; i < nargs(); ++i)
+               xcell(i).metrics(mi);
 }
 
 
 void MathNestInset::draw(Painter & pain, int x, int y) const
 {
-       xo(x);
-       yo(y);
-       for (int i = 0; i < nargs(); ++i)
+       for (idx_type i = 0; i < nargs(); ++i)
                xcell(i).draw(pain, x + xcell(i).xo(), y + xcell(i).yo());
 }
 
 
-bool MathNestInset::idxNext(int & idx, int & pos) const
+bool MathNestInset::idxNext(idx_type & idx, pos_type & pos) const
 {
        if (idx + 1 >= nargs())
                return false;
@@ -76,13 +73,13 @@ bool MathNestInset::idxNext(int & idx, int & pos) const
 }
 
 
-bool MathNestInset::idxRight(int & idx, int & pos) const
+bool MathNestInset::idxRight(idx_type & idx, pos_type & pos) const
 {
        return idxNext(idx, pos);
 }
 
 
-bool MathNestInset::idxPrev(int & idx, int & pos) const
+bool MathNestInset::idxPrev(idx_type & idx, pos_type & pos) const
 {
        if (idx == 0)
                return false;
@@ -92,13 +89,13 @@ bool MathNestInset::idxPrev(int & idx, int & pos) const
 }
 
 
-bool MathNestInset::idxLeft(int & idx, int & pos) const
+bool MathNestInset::idxLeft(idx_type & idx, pos_type & pos) const
 {
        return idxPrev(idx, pos);
 }
 
 
-bool MathNestInset::idxFirst(int & i, int & pos) const
+bool MathNestInset::idxFirst(idx_type & i, pos_type & pos) const
 {
        if (nargs() == 0)
                return false;
@@ -108,7 +105,7 @@ bool MathNestInset::idxFirst(int & i, int & pos) const
 }
 
 
-bool MathNestInset::idxLast(int & i, int & pos) const
+bool MathNestInset::idxLast(idx_type & i, pos_type & pos) const
 {
        if (nargs() == 0)
                return false;
@@ -118,7 +115,7 @@ bool MathNestInset::idxLast(int & i, int & pos) const
 }
 
 
-bool MathNestInset::idxHome(int & /* idx */, int & pos) const
+bool MathNestInset::idxHome(idx_type & /* idx */, pos_type & pos) const
 {
        if (pos == 0)
                return false;
@@ -127,47 +124,48 @@ bool MathNestInset::idxHome(int & /* idx */, int & pos) const
 }
 
 
-bool MathNestInset::idxEnd(int & idx, int & pos) const
+bool MathNestInset::idxEnd(idx_type & idx, pos_type & pos) const
 {
-       if (pos == cell(idx).size())
+       pos_type n = cell(idx).size();
+       if (pos == n)
                return false;
-
-       pos = cell(idx).size();
+       pos = n;
        return true;
 }
 
 
 void MathNestInset::dump() const
 {
-       lyxerr << "---------------------------------------------\n";
-       write(lyxerr, false);
-       lyxerr << "\n";
-       for (int i = 0; i < nargs(); ++i)
-               lyxerr << cell(i) << "\n";
-       lyxerr << "---------------------------------------------\n";
+       WriteStream os(lyxerr);
+       os << "---------------------------------------------\n";
+       write(os);
+       os << "\n";
+       for (idx_type i = 0; i < nargs(); ++i)
+               os << cell(i) << "\n";
+       os << "---------------------------------------------\n";
 }
 
 
-void MathNestInset::push_back(unsigned char ch, MathTextCodes fcode)
+void MathNestInset::validate(LaTeXFeatures & features) const
 {
-       if (nargs())
-               cells_.back().data_.push_back(ch, fcode);
-       else
-               lyxerr << "can't push without a cell\n";
+       for (idx_type i = 0; i < nargs(); ++i)
+               cell(i).validate(features);
 }
 
 
-void MathNestInset::push_back(MathInset * p)
+bool MathNestInset::match(MathInset * p) const
 {
-       if (nargs())
-               cells_.back().data_.push_back(p);
-       else
-               lyxerr << "can't push without a cell\n";
+       if (nargs() != p->nargs())
+               return false;
+       for (idx_type i = 0; i < nargs(); ++i)
+               if (!cell(i).match(p->cell(i)))
+                       return false;
+       return true;
 }
 
 
-void MathNestInset::validate(LaTeXFeatures & features) const
+void MathNestInset::replace(ReplaceData & rep)
 {
-       for (int i = 0; i < nargs(); ++i)
-               cell(i).validate(features);
+       for (idx_type i = 0; i < nargs(); ++i)
+               cell(i).replace(rep);
 }