#include "debug.h"
#include "frontends/Painter.h"
#include "textpainter.h"
+#include "funcrequest.h"
#include "Lsstream.h"
#include "LaTeXFeatures.h"
#include "support/LAssert.h"
}
-MathHullInset::MathHullInset(string const & type, MathGridInset const & grid)
- : MathGridInset(grid), type_(type), nonum_(1), label_(1)
-{
- setDefaults();
-}
-
-
-MathHullInset::MathHullInset(string const & type, col_type cols)
- : MathGridInset(cols, 1), type_(type), nonum_(1), label_(1)
+MathInset * MathHullInset::clone() const
{
- setDefaults();
+ return new MathHullInset(*this);
}
-MathInset * MathHullInset::clone() const
+MathInset::mode_type MathHullInset::currentMode() const
{
- return new MathHullInset(*this);
+ if (type_ == "none")
+ return UNDECIDED_MODE;
+ // definitely math mode ...
+ return MATH_MODE;
}
void MathHullInset::metrics(MathMetricsInfo & mi) const
{
- MathFontSetChanger dummy(mi.base, standardFont());
+ MathFontSetChanger dummy1(mi.base, standardFont());
+ MathStyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
// let the cells adjust themselves
MathGridInset::metrics(mi);
if (display()) {
- ascent_ += 12;
- descent_ += 12;
+ dim_.a += 12;
+ dim_.d += 12;
}
if (numberedType()) {
l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
if (l)
- width_ += 30 + l;
+ dim_.w += 30 + l;
}
// make it at least as high as the current font
int asc = 0;
int des = 0;
math_font_max_dim(mi.base.font, asc, des);
- ascent_ = max(ascent_, asc);
- descent_ = max(descent_, des);
+ dim_.a = max(dim_.a, asc);
+ dim_.d = max(dim_.d, des);
// for markers
- width_ += 2;
- descent_ += 1;
+ metricsMarkers2();
}
void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
{
- MathFontSetChanger dummy(pi.base, standardFont());
+ MathFontSetChanger dummy1(pi.base, standardFont());
+ MathStyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
MathGridInset::draw(pi, x + 1, y);
if (numberedType()) {
}
}
- drawMarkers(pi, x, y);
+ drawMarkers2(pi, x, y);
}
-void MathHullInset::metricsT(TextMetricsInfo const &) const
+void MathHullInset::metricsT(TextMetricsInfo const & mi) const
{
-#if 0
if (display()) {
MathGridInset::metricsT(mi);
- } else
-#endif
- {
+ } else {
ostringstream os;
WriteStream wi(os, false, true);
write(wi);
- width_ = os.str().size();
- ascent_ = 1;
- descent_ = 0;
+ dim_.w = os.str().size();
+ dim_.a = 1;
+ dim_.d = 0;
}
}
void MathHullInset::drawT(TextPainter & pain, int x, int y) const
{
-#if 0
if (display()) {
MathGridInset::drawT(pain, x, y);
- } else
-#endif
- {
+ } else {
ostringstream os;
WriteStream wi(os, false, true);
write(wi);
void MathHullInset::label(row_type row, string const & label)
{
+ //lyxerr << "setting label '" << label << "' for row " << row << endl;
label_[row] = label;
}
}
-vector<string> MathHullInset::getLabelList() const
+void MathHullInset::getLabelList(std::vector<string> & labels) const
{
- vector<string> res;
for (row_type row = 0; row < nrows(); ++row)
if (!label_[row].empty() && nonum_[row] != 1)
- res.push_back(label_[row]);
- return res;
+ labels.push_back(label_[row]);
}
else if (type_ == "eqnarray" || type_ == "align")
os << "\\begin{" << type_ << star(n) << "}\n";
- else if (type_ == "alignat" || type_ == "xalignat" || type_ == "xxalignat")
+ else if (type_ == "alignat" || type_ == "xalignat")
os << "\\begin{" << type_ << star(n) << "}"
- << "{" << static_cast<unsigned int>(ncols()/2) << "}\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";
addFancyCol(col);
}
- else if (type_ == "align") {
- mutate("alignat");
- addFancyCol(col);
- }
-
- else if (type_ == "alignat" || type_ == "xalignat" || type_ == "xxalignat") {
+ else if (type_ == "align" || type_ == "alignat"
+ || type_ == "xalignat" || type_ == "xxalignat")
MathGridInset::addCol(col);
- MathGridInset::addCol(col + 1);
- }
}
void MathHullInset::delFancyCol(col_type col)
{
- if (type_ == "alignat" || type_ == "xalignat" || type_ == "xxalignat") {
- MathGridInset::delCol(col + 1);
+ if (type_ == "alignat" || type_ == "xalignat" || type_ == "xxalignat")
MathGridInset::delCol(col);
- }
}
{
MathArray ar;
for (idx_type i = 0; i < nargs(); ++i)
- ar.push_back(cell(i));
+ ar.append(cell(i));
*this = MathHullInset("simple");
cell(0) = ar;
setDefaults();
// split it "nicely" on the firest relop
pos_type pos = firstRelOp(cell(0));
- cell(1) = MathArray(cell(0), pos, cell(0).size());
+ cell(1) = MathArray(cell(0).begin() + pos, cell(0).end());
cell(0).erase(pos, cell(0).size());
if (cell(1).size()) {
- cell(2) = MathArray(cell(1), 1, cell(1).size());
+ cell(2) = MathArray(cell(1).begin() + 1, cell(1).end());
cell(1).erase(1, cell(1).size());
}
setType("eqnarray");
mutate(newtype);
- } else {
+ } else if (newtype == "multline" || newtype == "gather") {
+ setType(newtype);
+ numbered(0, false);
+ } else {
MathGridInset::addCol(1);
// split it "nicely"
pos_type pos = firstRelOp(cell(0));
} else { // align & Co.
for (row_type row = 0; row < nrows(); ++row) {
idx_type c = 3 * row + 1;
- cell(c).push_back(cell(c + 1));
+ cell(c).append(cell(c + 1));
}
MathGridInset::delCol(2);
setType("align");
}
-
-
-
-//
-// MathParInset
-//
-
-MathParInset::MathParInset()
-{
- lyxerr << "constructing MathParInset\n";
-}
-
-
-void MathParInset::metrics(MathMetricsInfo & mi) const
+MathInset::result_type MathHullInset::dispatch
+ (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
{
- MathFontSetChanger dummy(mi.base, "textnormal");
- MathGridInset::metrics(mi);
-}
+ switch (cmd.action) {
+ case LFUN_BREAKLINE:
+ if (type_ == "simple" || type_ == "equation") {
+ mutate("eqnarray");
+ idx = 1;
+ pos = 0;
+ return DISPATCHED_POP;
+ }
+ return MathGridInset::dispatch(cmd, idx, pos);
-void MathParInset::draw(MathPainterInfo & pi, int x, int y) const
-{
- MathFontSetChanger dummy(pi.base, "textnormal");
- MathGridInset::draw(pi, x, y);
-}
-
-
-void MathParInset::write(WriteStream & os) const
-{
- for (idx_type i = 0; i < nargs(); ++i)
- os << cell(i) << "\n";
-}
-
+ case LFUN_MATH_NUMBER:
+ //lyxerr << "toggling all numbers\n";
+ if (display()) {
+ //bv->lockedInsetStoreUndo(Undo::INSERT);
+ bool old = numberedType();
+ for (row_type row = 0; row < nrows(); ++row)
+ numbered(row, !old);
+ //bv->owner()->message(old ? _("No number") : _("Number"));
+ //updateLocal(bv, true);
+ }
+ return DISPATCHED;
+
+ case LFUN_MATH_NONUMBER:
+ if (display()) {
+ //bv->lockedInsetStoreUndo(Undo::INSERT);
+ bool old = numbered(row(idx));
+ //bv->owner()->message(old ? _("No number") : _("Number"));
+ numbered(row(idx), !old);
+ //updateLocal(bv, true);
+ }
+ return DISPATCHED;
-void MathParInset::infoize(std::ostream & os) const
-{
- os << "Type: Paragraph ";
+ default:
+ return UNDISPATCHED;
+ }
+ return UNDISPATCHED;
}