X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathScript.cpp;h=487c17b4770f1cbd38aece12bc599dd3e9447f16;hb=7f17f13bfc2ad4e7cdd8ecfce23374e2b3d0c646;hp=ee18314316dd703d5c2dec937b9a90100b7dbc44;hpb=42123ab8a71080b6d15fca4e0c43ae76abf00a1e;p=lyx.git

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index ee18314316..487c17b477 100644
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathScript.h"
-#include "MathArray.h"
+#include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "InsetMathSymbol.h"
@@ -52,9 +52,9 @@ InsetMathScript::InsetMathScript(MathAtom const & at, bool up)
 }
 
 
-auto_ptr<InsetBase> InsetMathScript::doClone() const
+auto_ptr<Inset> InsetMathScript::doClone() const
 {
-	return auto_ptr<InsetBase>(new InsetMathScript(*this));
+	return auto_ptr<Inset>(new InsetMathScript(*this));
 }
 
 
@@ -86,7 +86,7 @@ bool InsetMathScript::idxLast(Cursor & cur) const
 }
 
 
-MathArray const & InsetMathScript::down() const
+MathData const & InsetMathScript::down() const
 {
 	if (nargs() == 3)
 		return cell(2);
@@ -95,7 +95,7 @@ MathArray const & InsetMathScript::down() const
 }
 
 
-MathArray & InsetMathScript::down()
+MathData & InsetMathScript::down()
 {
 	if (nargs() == 3)
 		return cell(2);
@@ -104,14 +104,14 @@ MathArray & InsetMathScript::down()
 }
 
 
-MathArray const & InsetMathScript::up() const
+MathData const & InsetMathScript::up() const
 {
 	BOOST_ASSERT(nargs() > 1);
 	return cell(1);
 }
 
 
-MathArray & InsetMathScript::up()
+MathData & InsetMathScript::up()
 {
 	BOOST_ASSERT(nargs() > 1);
 	return cell(1);
@@ -122,26 +122,26 @@ void InsetMathScript::ensure(bool up)
 {
 	if (nargs() == 1) {
 		// just nucleus so far
-		cells_.push_back(MathArray());
+		cells_.push_back(MathData());
 		cell_1_is_up_ = up;
 	} else if (nargs() == 2 && !has(up)) {
 		if (up) {
 			cells_.push_back(cell(1));
 			cell(1).clear();
 		} else {
-			cells_.push_back(MathArray());
+			cells_.push_back(MathData());
 		}
 	}
 }
 
 
-MathArray const & InsetMathScript::nuc() const
+MathData const & InsetMathScript::nuc() const
 {
 	return cell(0);
 }
 
 
-MathArray & InsetMathScript::nuc()
+MathData & InsetMathScript::nuc()
 {
 	return cell(0);
 }
@@ -157,7 +157,7 @@ bool isAlphaSymbol(MathAtom const & at)
 		return true;
 
 	if (at->asFontInset()) {
-		MathArray const & ar = at->asFontInset()->cell(0);
+		MathData const & ar = at->asFontInset()->cell(0);
 		for (size_t i = 0; i < ar.size(); ++i) {
 			if (!(ar[i]->asCharInset() ||
 					(ar[i]->asSymbolInset() &&
@@ -340,7 +340,7 @@ void InsetMathScript::draw(PainterInfo & pi, int x, int y) const
 	else {
 		nuc().setXY(*pi.base.bv, x + dxx(), y);
 		if (editing(pi.base.bv))
-                        pi.draw(x + dxx(), y, char_type('.'));
+			pi.draw(x + dxx(), y, char_type('.'));
 	}
 	ScriptChanger dummy(pi.base);
 	if (hasUp())
@@ -440,7 +440,7 @@ bool InsetMathScript::hasDown() const
 }
 
 
-InsetBase::idx_type InsetMathScript::idxOfScript(bool up) const
+Inset::idx_type InsetMathScript::idxOfScript(bool up) const
 {
 	if (nargs() == 1)
 		return 0;
@@ -484,7 +484,7 @@ bool InsetMathScript::idxUpDown(Cursor & cur, bool up) const
 	}
 
 	// Are we 'up'?
-	if (has(up) && cur.idx() == idxOfScript(true)) {
+	if (cur.idx() == idxOfScript(true)) {
 		// can't go further up
 		if (up)
 			return false;
@@ -495,7 +495,7 @@ bool InsetMathScript::idxUpDown(Cursor & cur, bool up) const
 	}
 
 	// Are we 'down'?
-	if (has(up) && cur.idx() == idxOfScript(false)) {
+	if (cur.idx() == idxOfScript(false)) {
 		// can't go further down
 		if (!up)
 			return false;
@@ -676,7 +676,7 @@ bool InsetMathScript::notifyCursorLeaves(Cursor & cur)
 		// invoke notifyCursorLeaves again and does not touch
 		// cur (since the top slice will be deleted
 		// afterwards))
-		MathArray ar = cell(0);
+		MathData ar = cell(0);
 		Cursor tmpcur = cur;
 		tmpcur.pop();
 		tmpcur.cell().erase(tmpcur.pos());