} else {
MathMatrixInset * mt =
static_cast<MathMatrixInset*>(par);
} else {
MathMatrixInset * mt =
static_cast<MathMatrixInset*>(par);
- MathedRowSt const * crow = mt->getRowSt();
+ MathedRowContainer::iterator crow = mt->getRowSt().begin();
while (crow) {
int const y = baseline + crow->getBaseline();
if (crow->isNumbered()) {
while (crow) {
int const y = baseline + crow->getBaseline();
if (crow->isNumbered()) {
str = "(#)";
pain.text(int(x + 20), y, str, wfont);
}
str = "(#)";
pain.text(int(x + 20), y, str, wfont);
}
- crow = crow->getNext();
if (is_multi_numbered(par->GetType())) {
MathMatrixInset * mt = static_cast<MathMatrixInset*>(par);
if (is_multi_numbered(par->GetType())) {
MathMatrixInset * mt = static_cast<MathMatrixInset*>(par);
- MathedRowSt const * crow = mt->getRowSt();
+ MathedRowContainer::iterator crow = mt->getRowSt().begin();
while (crow) {
if (!crow->getLabel().empty())
label_list.push_back(crow->getLabel());
while (crow) {
if (!crow->getLabel().empty())
label_list.push_back(crow->getLabel());
- crow = crow->getNext();
}
} else if (!label_.empty())
label_list.push_back(label_);
}
} else if (!label_.empty())
label_list.push_back(label_);
row_ = r;
else
ro->setNext(r);
row_ = r;
else
ro->setNext(r);
- mrow = mrow->getNext();
{
MathedRowSt * r = row_.data_;
while (r) {
{
MathedRowSt * r = row_.data_;
while (r) {
- MathedRowSt * q = r->getNext();
+ MathedRowSt * q = r->next_;
ascent = h - hl;
break;
default:
ascent = h - hl;
break;
default:
- ascent = (row_.data_->getNext()) ? h / 2 : h - hl;
+ ascent = (row_.begin().is_last()) ? h / 2 : h - hl;
break;
}
descent = h - ascent + 2;
break;
}
descent = h - ascent + 2;
virtual bool isMatrix() const;
/// Use this to manage the extra information independently of paragraph
virtual bool isMatrix() const;
/// Use this to manage the extra information independently of paragraph
- MathedRowSt * getRowSt() const;
+ MathedRowContainer & getRowSt();
- void setRowSt(MathedRowSt * r);
+ void setRowSt(MathedRowContainer & r);
private:
/// Number of columns & rows
int nc_;
private:
/// Number of columns & rows
int nc_;
-MathedRowSt * MathMatrixInset::getRowSt() const
+MathedRowContainer & MathMatrixInset::getRowSt()
-void MathMatrixInset::setRowSt(MathedRowSt * r)
+void MathMatrixInset::setRowSt(MathedRowContainer & r)
extern int number_of_newlines;
extern int number_of_newlines;
-MathedRowSt * MathParInset::getRowSt() const
+MathedRowContainer & MathParInset::getRowSt()
+ static MathedRowContainer dummy;
+ return dummy;
latexkeys const * l;
MathedIter data(&array);
// hack
latexkeys const * l;
MathedIter data(&array);
// hack
- MathedRowSt const * crow = getRowSt();
+ MathedRowContainer::iterator crow = getRowSt().begin();
data.Reset();
if (!Permit(LMPF_FIXED_SIZE)) {
data.Reset();
if (!Permit(LMPF_FIXED_SIZE)) {
<< crow->getLabel()
<< "} ";
}
<< crow->getLabel()
<< "} ";
}
- crow = crow->getNext();
}
if (fragile)
os << "\\protect";
}
if (fragile)
os << "\\protect";
///
virtual void SetStyle(short);
///
///
virtual void SetStyle(short);
///
- virtual MathedRowSt * getRowSt() const;
+ virtual MathedRowContainer & getRowSt();
- virtual void setRowSt(MathedRowSt *);
+ virtual void setRowSt(MathedRowContainer &);
///
virtual bool Permit(short f) const;
///
///
virtual bool Permit(short f) const;
///
-void MathParInset::setRowSt(MathedRowSt *)
+void MathParInset::setRowSt(MathedRowContainer &)
int acc_brace = 0;
int acc_braces[8];
MathParInset * mt = (mtx) ? *mtx : 0;
int acc_brace = 0;
int acc_braces[8];
MathParInset * mt = (mtx) ? *mtx : 0;
- MathedRowSt * crow = (mt) ? mt->getRowSt() : 0;
+ MathedRowSt * crow = (mt) ? mt->getRowSt().data_ : 0;
++plevel;
MathedIter data(&array);
++plevel;
MathedIter data(&array);
}
mt->SetStyle(size);
mt->SetType(mathed_env);
}
mt->SetStyle(size);
mt->SetType(mathed_env);
+ crow = mt->getRowSt().data_;
}
lyxerr[Debug::MATHED] << "MATH BEGIN[" << mathed_env << "]" << endl;
}
lyxerr[Debug::MATHED] << "MATH BEGIN[" << mathed_env << "]" << endl;
x_ = y_ = 0;
array = &p_->GetData();
ncols = p_->GetColumns();
x_ = y_ = 0;
array = &p_->GetData();
ncols = p_->GetColumns();
- crow_ = p_->getRowSt();
+ crow_ = p_->getRowSt().data_;
if (p_->Permit(LMPF_ALLOW_CR))
flags |= MthIF_CR;
if (p_->Permit(LMPF_ALLOW_TAB))
if (p_->Permit(LMPF_ALLOW_CR))
flags |= MthIF_CR;
if (p_->Permit(LMPF_ALLOW_TAB))
x_ = y_ = 0;
sw_ = sx_ = 0;
if (p_) {
x_ = y_ = 0;
sw_ = sx_ = 0;
if (p_) {
- crow_ = p_->getRowSt();
+ crow_ = p_->getRowSt().data_;
if (crow_) {
x_ = crow_->getTab(0);
y_ = crow_->getBaseline();
if (crow_) {
x_ = crow_->getTab(0);
y_ = crow_->getBaseline();
x_ = stck.x;
y_ = stck.y;
if (p_) {
x_ = stck.x;
y_ = stck.y;
if (p_) {
- crow_ = p_->getRowSt();
+ crow_ = p_->getRowSt().data_;
if (crow_)
for (int i = 0; i < row; ++i)
crow_ = crow_->getNext();
if (crow_)
for (int i = 0; i < row; ++i)
crow_ = crow_->getNext();