mathed108.diff

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

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index f2a473642fee8dad84ae8ce54a7e88207a5428de..b5980fc019530eeea4bbb7a63ff6fdc26233793b 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -15,24 +15,20 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_inset.h"
-#include "mathed/support.h"
-#include "Painter.h"
 #include "debug.h"
 
 
 int MathInset::workwidth;
 
 
-MathInset::MathInset(string const & name, MathInsetTypes ot, int nargs)
+MathInset::MathInset(int nargs, string const & name, MathInsetTypes ot)
        : name_(name), objtype(ot), width_(0), ascent_(0), descent_(0),
-               size_(LM_ST_TEXT), cells_(nargs), xo_(0), yo_(0)
+               size_(LM_ST_DISPLAY), cells_(nargs), xo_(0), yo_(0)
 {}
 
 
@@ -70,12 +66,6 @@ void MathInset::limits(int)
 {
 }
 
-bool MathInset::hasLimits() const
-{
-       return false;
-}
-
-
 string const & MathInset::name() const
 {
        return name_;
@@ -172,12 +162,6 @@ MathArray const & MathInset::cell(int i) const
 }
 
 
-void MathInset::setData(MathArray const & a, int idx)
-{
-       cells_[idx].data_ = a;
-}
-
-
 void MathInset::substitute(MathArray & array, MathMacro const & m) const
 {
        MathInset * p = clone();
@@ -202,7 +186,7 @@ void MathInset::draw(Painter & pain, int x, int y)
 }
 
 
-bool MathInset::idxRight(int & idx, int & pos) const
+bool MathInset::idxNext(int & idx, int & pos) const
 {
        if (idx + 1 >= nargs())
                return false;
@@ -212,7 +196,13 @@ bool MathInset::idxRight(int & idx, int & pos) const
 }
 
 
-bool MathInset::idxLeft(int & idx, int & pos) const
+bool MathInset::idxRight(int & idx, int & pos) const
+{
+       return idxNext(idx, pos);
+}
+
+
+bool MathInset::idxPrev(int & idx, int & pos) const
 {
        if (idx == 0)
                return false;
@@ -222,6 +212,11 @@ bool MathInset::idxLeft(int & idx, int & pos) const
 }
 
 
+bool MathInset::idxLeft(int & idx, int & pos) const
+{
+       return idxPrev(idx, pos);
+}
+
 bool MathInset::idxUp(int &, int &) const
 {
        return false;
@@ -283,11 +278,15 @@ bool MathInset::idxFirstDown(int &, int &) const
        return false;
 }
 
-bool MathInset::idxDelete(int)
+void MathInset::idxDelete(int &, bool & popit, bool & deleteit)
 {
-       return false;
+       popit    = false;
+       deleteit = false;
 }
 
+void MathInset::idxDeleteRange(int, int)
+{}
+
 
 bool MathInset::idxLastUp(int &, int &) const
 {
@@ -335,7 +334,7 @@ void MathInset::dump() const
 }
 
 
-void MathInset::push_back(byte ch, MathTextCodes fcode)
+void MathInset::push_back(unsigned char ch, MathTextCodes fcode)
 {
        if (nargs())
                cells_.back().data_.push_back(ch, fcode);
@@ -362,3 +361,16 @@ bool MathInset::covers(int x, int y) const
                y <= yo_ + descent_;
 }
 
+void MathInset::Validate(LaTeXFeatures & features) const
+{
+       for (int i = 0; i < nargs(); ++i)
+               cell(i).Validate(features);
+}
+
+std::vector<int> MathInset::idxBetween(int from, int to) const
+{
+       std::vector<int> res;
+       for (int i = from; i <= to; ++i)
+               res.push_back(i);
+       return res;
+}