#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "math_hullinset.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
+#include "math_cursor.h"
#include "math_support.h"
#include "math_extern.h"
#include "math_charinset.h"
int asc = 0;
int des = 0;
math_font_max_dim(mi.base.font, asc, des);
- dim_.a = max(dim_.a, asc);
+ dim_.a = max(dim_.a, asc);
dim_.d = max(dim_.d, des);
// for markers
os << "\\[\n";
}
- else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign")
+ else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+ || type_ == "gather" || type_ == "multline")
os << "\\begin{" << type_ << star(n) << "}\n";
else if (type_ == "alignat" || type_ == "xalignat")
- os << "\\begin{" << type_ << star(n) << "}"
- << "{" << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
+ os << "\\begin{" << type_ << star(n) << '}'
+ << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
else if (type_ == "xxalignat")
- os << "\\begin{" << type_ << "}"
- << "{" << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
-
- else if (type_ == "multline" || type_ == "gather")
- os << "\\begin{" << type_ << "}\n";
+ os << "\\begin{" << type_ << '}'
+ << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
else
- os << "\\begin{unknown" << star(n) << "}";
+ os << "\\begin{unknown" << star(n) << '}';
}
else
os << "\\]\n";
- else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
- || type_ == "alignat" || type_ == "xalignat")
- os << "\\end{" << type_ << star(n) << "}\n";
+ else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+ || type_ == "alignat" || type_ == "xalignat"
+ || type_ == "gather" || type_ == "multline")
+ os << "\\end{" << type_ << star(n) << "}\n";
- else if (type_ == "xxalignat" || type_ == "multline" || type_ == "gather")
+ else if (type_ == "xxalignat")
os << "\\end{" << type_ << "}\n";
else
- os << "\\end{unknown" << star(n) << "}";
+ os << "\\end{unknown" << star(n) << '}';
}
void MathHullInset::addCol(col_type col)
{
- if (colChangeOK())
+ if (colChangeOK())
MathGridInset::addCol(col);
else
lyxerr << "Can't change number of columns in '" << type_ << "'\n";
void MathHullInset::delCol(col_type col)
{
- if (colChangeOK())
+ if (colChangeOK())
MathGridInset::delCol(col);
else
lyxerr << "Can't change number of columns in '" << type_ << "'\n";
return string();
if (label_[row].empty())
return string("(#)");
- return "(" + label_[row] + ")";
+ return '(' + label_[row] + ')';
}
}
else if (type_ == "multline") {
- if (newtype == "gather" || newtype == "align" ||
+ if (newtype == "gather" || newtype == "align" ||
newtype == "xalignat" || newtype == "xxalignat" || newtype == "flalign")
setType(newtype);
else if (newtype == "eqnarray") {
{
string res;
if (numberedType()) {
- if (!label_[row].empty())
- res += "\\label{" + label_[row] + "}";
- if (nonum_[row])
+ if (!label_[row].empty() && !nonum_[row])
+ res += "\\label{" + label_[row] + '}';
+ if (nonum_[row] && (type_ != "multline"))
res += "\\nonumber ";
}
return res + MathGridInset::eolString(row, fragile);
void MathHullInset::normalize(NormalStream & os) const
{
- os << "[formula " << type_ << " ";
+ os << "[formula " << type_ << ' ';
MathGridInset::normalize(os);
os << "] ";
}
if (getType() == "simple") {
size_type pos = cell(idx).find_last(eq);
MathArray ar;
- if (pos == cell(idx).size()) {
+ if (mathcursor && mathcursor->selection()) {
+ ar = asArray(mathcursor->grabAndEraseSelection());
+ } else if (pos == cell(idx).size()) {
ar = cell(idx);
lyxerr << "use whole cell: " << ar << "\n";
} else {
}
-MathInset::result_type MathHullInset::dispatch
+dispatch_result MathHullInset::dispatch
(FuncRequest const & cmd, idx_type & idx, pos_type & pos)
{
switch (cmd.action) {
if (display()) {
//bv->lockedInsetStoreUndo(Undo::INSERT);
bool old = numberedType();
- for (row_type row = 0; row < nrows(); ++row)
- numbered(row, !old);
+ if (type_ == "multline")
+ numbered(nrows() - 1, !old);
+ else
+ for (row_type row = 0; row < nrows(); ++row)
+ numbered(row, !old);
//bv->owner()->message(old ? _("No number") : _("Number"));
//updateLocal(bv, true);
}
case LFUN_MATH_NONUMBER:
if (display()) {
+ row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
//bv->lockedInsetStoreUndo(Undo::INSERT);
- bool old = numbered(row(idx));
+ bool old = numbered(r);
//bv->owner()->message(old ? _("No number") : _("Number"));
- numbered(row(idx), !old);
+ numbered(r, !old);
//updateLocal(bv, true);
}
return DISPATCHED;
case LFUN_INSERT_LABEL: {
- row_type r = row(idx);
+ row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
string old_label = label(r);
string new_label = cmd.argument;
idx = r * ncols() + c;
if (idx >= nargs())
idx = nargs() - 1;
- if (pos > cell(idx).size())
+ if (pos > cell(idx).size())
pos = cell(idx).size();
return DISPATCHED_POP;
}