-#include <config.h>
+/**
+ * \file math_hullinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
#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"
-#include "debug.h"
#include "textpainter.h"
+#include "BufferView.h"
+#include "dispatchresult.h"
+#include "debug.h"
#include "funcrequest.h"
-#include "Lsstream.h"
+#include "gettext.h"
#include "LaTeXFeatures.h"
-#include "support/LAssert.h"
-#include "frontends/Painter.h"
+#include "LColor.h"
+#include "lyxrc.h"
#include "frontends/Alert.h"
-#include "lyxrc.h"
-#include "gettext.h"
-#include "BufferView.h"
-#include <vector>
+#include "support/std_sstream.h"
+
+
+using lyx::support::trim;
-using std::vector;
-using std::max;
using std::endl;
+using std::max;
+
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostringstream;
using std::pair;
+
namespace {
int getCols(string const & type)
return 3;
if (type == "align")
return 2;
+ if (type == "flalign")
+ return 2;
if (type == "alignat")
return 2;
if (type == "xalignat")
if (s == "xxalignat") return 7;
if (s == "multline") return 8;
if (s == "gather") return 9;
- lyxerr << "unknown hull type '" << s << "'\n";
+ if (s == "flalign") return 10;
+ lyxerr << "unknown hull type '" << s << "'" << endl;
return 0;
}
}
-MathInset * MathHullInset::clone() const
+auto_ptr<InsetBase> MathHullInset::clone() const
{
- return new MathHullInset(*this);
+ return auto_ptr<InsetBase>(new MathHullInset(*this));
}
}
-bool MathHullInset::idxFirst(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxFirst(LCursor & cur) const
{
- idx = 0;
- pos = 0;
+ cur.idx() = 0;
+ cur.pos() = 0;
return true;
}
-bool MathHullInset::idxLast(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxLast(LCursor & cur) const
{
- idx = nargs() - 1;
- pos = cell(idx).size();
+ cur.idx() = nargs() - 1;
+ cur.pos() = cur.lastpos();
return true;
}
return 0;
if (type_ == "xalignat")
return (col & 1) ? 20 : 0;
- if (type_ == "xxalignat")
+ if (type_ == "xxalignat" || type_ == "flalign")
return (col & 1) ? 40 : 0;
return 0;
}
}
-void MathHullInset::metrics(MathMetricsInfo & mi) const
+void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
- MathFontSetChanger dummy1(mi.base, standardFont());
- MathStyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+ FontSetChanger dummy1(mi.base, standardFont());
+ StyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
// let the cells adjust themselves
MathGridInset::metrics(mi);
if (display()) {
- dim_.a += 12;
- dim_.d += 12;
+ dim_.asc += 12;
+ dim_.des += 12;
}
if (numberedType()) {
- MathFontSetChanger dummy(mi.base, "mathbf");
+ FontSetChanger dummy(mi.base, "mathbf");
int l = 0;
for (row_type row = 0; row < nrows(); ++row)
l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
if (l)
- dim_.w += 30 + l;
+ dim_.wid += 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);
- dim_.a = max(dim_.a, asc);
- dim_.d = max(dim_.d, des);
+ dim_.asc = max(dim_.asc, asc);
+ dim_.des = max(dim_.des, des);
// for markers
metricsMarkers2();
+ dim = dim_;
}
-void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathHullInset::draw(PainterInfo & pi, int x, int y) const
{
- MathFontSetChanger dummy1(pi.base, standardFont());
- MathStyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+ FontSetChanger dummy1(pi.base, standardFont());
+ StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
MathGridInset::draw(pi, x + 1, y);
if (numberedType()) {
int const xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
for (row_type row = 0; row < nrows(); ++row) {
int const yy = y + rowinfo_[row].offset_;
- MathFontSetChanger dummy(pi.base, "mathrm");
+ FontSetChanger dummy(pi.base, "mathrm");
drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
}
}
}
-void MathHullInset::metricsT(TextMetricsInfo const & mi) const
+void MathHullInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
{
if (display()) {
- MathGridInset::metricsT(mi);
+ MathGridInset::metricsT(mi, dim);
} else {
ostringstream os;
WriteStream wi(os, false, true);
write(wi);
- dim_.w = os.str().size();
- dim_.a = 1;
- dim_.d = 0;
+ dim.wid = os.str().size();
+ dim.asc = 1;
+ dim.des = 0;
}
}
string MathHullInset::label(row_type row) const
{
row_type n = nrows();
- lyx::Assert(row < n);
+ BOOST_ASSERT(row < n);
return label_[row];
}
{
return
type_ == "align" ||
+ type_ == "flalign" ||
type_ == "multline" ||
type_ == "gather" ||
type_ == "alignat" ||
}
-void MathHullInset::getLabelList(std::vector<string> & labels) const
+void MathHullInset::getLabelList(Buffer const &,
+ std::vector<string> & labels) const
{
for (row_type row = 0; row < nrows(); ++row)
if (!label_[row].empty() && nonum_[row] != 1)
features.require("boldsymbol");
//features.binom = true;
- MathNestInset::validate(features);
+ MathGridInset::validate(features);
}
os << "\\[\n";
}
- else if (type_ == "eqnarray" || type_ == "align")
+ 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_ == "alignat"
- || type_ == "xalignat")
- os << "\n\\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")
- os << "\n\\end{" << type_ << "}\n";
+ else if (type_ == "xxalignat")
+ os << "\\end{" << type_ << "}\n";
else
- os << "\\end{unknown" << star(n) << "}";
+ os << "\\end{unknown" << star(n) << '}';
+}
+
+
+bool MathHullInset::colChangeOK() const
+{
+ return
+ type_ == "align" || type_ == "flalign" ||type_ == "alignat" ||
+ type_ == "xalignat" || type_ == "xxalignat";
}
}
+void MathHullInset::swapRow(row_type row)
+{
+ if (nrows() == 1)
+ return;
+ if (row + 1 == nrows())
+ --row;
+ std::swap(nonum_[row], nonum_[row + 1]);
+ std::swap(label_[row], label_[row + 1]);
+ MathGridInset::swapRow(row);
+}
+
+
void MathHullInset::delRow(row_type row)
{
+ if (nrows() <= 1)
+ return;
MathGridInset::delRow(row);
nonum_.erase(nonum_.begin() + row);
label_.erase(label_.begin() + row);
}
-void MathHullInset::addFancyCol(col_type col)
+void MathHullInset::addCol(col_type col)
{
- if (type_ == "equation")
- mutate("eqnarray");
-
- else if (type_ == "eqnarray") {
- mutate("align");
- addFancyCol(col);
- }
-
- else if (type_ == "align" || type_ == "alignat"
- || type_ == "xalignat" || type_ == "xxalignat")
+ if (colChangeOK())
MathGridInset::addCol(col);
+ else
+ lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
}
-void MathHullInset::delFancyCol(col_type col)
+void MathHullInset::delCol(col_type col)
{
- if (type_ == "alignat" || type_ == "xalignat" || type_ == "xxalignat")
+ if (colChangeOK())
MathGridInset::delCol(col);
+ else
+ lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
}
return string();
if (label_[row].empty())
return string("(#)");
- return "(" + label_[row] + ")";
+ return '(' + label_[row] + ')';
}
void MathHullInset::mutate(string const & newtype)
{
- //lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'\n";
+ lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
// we try to move along the chain
// none <-> simple <-> equation <-> eqnarray
}
else if (type_ == "multline") {
- if (newtype == "gather") {
- setType("gather");
+ if (newtype == "gather" || newtype == "align" ||
+ newtype == "xalignat" || newtype == "xxalignat" || newtype == "flalign")
+ setType(newtype);
+ else if (newtype == "eqnarray") {
+ MathGridInset::addCol(1);
+ MathGridInset::addCol(1);
+ setType("eqnarray");
} else {
lyxerr << "mutation from '" << type_
- << "' to '" << newtype << "' not implemented"
- << endl;
+ << "' to '" << newtype << "' not implemented" << endl;
}
}
{
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 << "] ";
}
void MathHullInset::check() const
{
- lyx::Assert(nonum_.size() == nrows());
- lyx::Assert(label_.size() == nrows());
+ BOOST_ASSERT(nonum_.size() == nrows());
+ BOOST_ASSERT(label_.size() == nrows());
}
-void MathHullInset::doExtern
- (FuncRequest const & func, idx_type & idx, pos_type & pos)
+void MathHullInset::doExtern(LCursor & cur, FuncRequest const & func)
{
string lang;
string extra;
//if (selection()) {
// MathArray ar;
// selGet(ar);
- // lyxerr << "use selection: " << ar << "\n";
+ // lyxerr << "use selection: " << ar << endl;
// insert(pipeThroughExtern(lang, extra, ar));
// return;
//}
eq.push_back(MathAtom(new MathCharInset('=')));
// go to first item in line
- idx -= idx % ncols();
- pos = 0;
+ cur.idx() -= cur.idx() % ncols();
+ cur.pos() = 0;
if (getType() == "simple") {
- size_type pos = cell(idx).find_last(eq);
+ size_type pos = cur.cell().find_last(eq);
MathArray ar;
- if (pos == cell(idx).size()) {
- ar = cell(idx);
- lyxerr << "use whole cell: " << ar << "\n";
+ if (mathcursor && mathcursor->selection()) {
+ asArray(mathcursor->grabAndEraseSelection(cur), ar);
+ } else if (pos == cur.cell().size()) {
+ ar = cur.cell();
+ lyxerr << "use whole cell: " << ar << endl;
} else {
- ar = MathArray(cell(idx).begin() + pos + 1, cell(idx).end());
- lyxerr << "use partial cell form pos: " << pos << "\n";
+ ar = MathArray(cur.cell().begin() + pos + 1, cur.cell().end());
+ lyxerr << "use partial cell form pos: " << pos << endl;
}
- cell(idx).append(eq);
- cell(idx).append(pipeThroughExtern(lang, extra, ar));
- pos = cell(idx).size();
+ cur.cell().append(eq);
+ cur.cell().append(pipeThroughExtern(lang, extra, ar));
+ cur.pos() = cur.lastpos();
return;
}
if (getType() == "equation") {
- lyxerr << "use equation inset\n";
+ lyxerr << "use equation inset" << endl;
mutate("eqnarray");
- MathArray & ar = cell(idx);
- lyxerr << "use cell: " << ar << "\n";
- cell(idx + 1) = eq;
- cell(idx + 2) = pipeThroughExtern(lang, extra, ar);
+ MathArray & ar = cur.cell();
+ lyxerr << "use cell: " << ar << endl;
+ ++cur.idx();
+ cur.cell() = eq;
+ ++cur.idx();
+ cur.cell() = pipeThroughExtern(lang, extra, ar);
// move to end of line
- idx += 2;
- pos = cell(idx).size();
+ cur.pos() = cur.lastpos();
return;
}
{
- lyxerr << "use eqnarray\n";
- idx -= idx % ncols();
- idx += 2;
- pos = 0;
- MathArray ar = cell(idx);
- lyxerr << "use cell: " << ar << "\n";
+ lyxerr << "use eqnarray" << endl;
+ cur.idx() += 2 - cur.idx() % ncols();
+ cur.pos() = 0;
+ MathArray ar = cur.cell();
+ lyxerr << "use cell: " << ar << endl;
#ifdef WITH_WARNINGS
#warning temporarily disabled
#endif
- addRow(row(idx));
- cell(idx + 2) = eq;
- cell(idx + 3) = pipeThroughExtern(lang, extra, ar);
- idx += 3;
- pos = cell(idx).size();
+ addRow(cur.row());
+ ++cur.idx();
+ ++cur.idx();
+ cur.cell() = eq;
+ ++cur.idx();
+ cur.cell() = pipeThroughExtern(lang, extra, ar);
+ cur.pos() = cur.lastpos();
}
}
-MathInset::result_type MathHullInset::dispatch
- (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult
+MathHullInset::priv_dispatch(BufferView & bv, FuncRequest const & cmd)
{
+ CursorSlice & cur = cursorTip(bv);
switch (cmd.action) {
case LFUN_BREAKLINE:
if (type_ == "simple" || type_ == "equation") {
mutate("eqnarray");
- idx = 1;
- pos = 0;
- return DISPATCHED_POP;
+ cur.idx() = 1;
+ cur.pos() = 0;
+ return DispatchResult(true, FINISHED);
}
- return MathGridInset::dispatch(cmd, idx, pos);
+ return MathGridInset::priv_dispatch(bv, cmd);
case LFUN_MATH_NUMBER:
- //lyxerr << "toggling all numbers\n";
+ //lyxerr << "toggling all numbers" << endl;
if (display()) {
- //bv->lockedInsetStoreUndo(Undo::INSERT);
+ //recordUndo(bv, 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);
}
- return DISPATCHED;
+ return DispatchResult(true, true);
case LFUN_MATH_NONUMBER:
if (display()) {
- //bv->lockedInsetStoreUndo(Undo::INSERT);
- bool old = numbered(row(idx));
+ row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+ //recordUndo(bv, Undo::INSERT);
+ bool old = numbered(r);
//bv->owner()->message(old ? _("No number") : _("Number"));
- numbered(row(idx), !old);
- //updateLocal(bv, true);
+ numbered(r, !old);
}
- return DISPATCHED;
+ return DispatchResult(true, true);
case LFUN_INSERT_LABEL: {
- row_type r = row(idx);
+ row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
string old_label = label(r);
string new_label = cmd.argument;
? Alert::askForText(_("Enter new label to insert:"), default_label)
: Alert::askForText(_("Enter label:"), old_label);
if (!res.first)
- break;
+ return DispatchResult(false);
new_label = trim(res.second);
}
if (!new_label.empty())
numbered(r, true);
-
-#warning FIXME: please check you really mean repaint() ... is it needed,
-#warning and if so, should it be update() instead ?
- if (!new_label.empty()
- && cmd.view()->ChangeRefsIfUnique(old_label, new_label))
- cmd.view()->repaint();
-
label(r, new_label);
- return DISPATCHED;
+ return DispatchResult(true, true);
}
- case LFUN_MATH_HALIGN:
- case LFUN_MATH_VALIGN:
- // we explicitly don't want the default behaviour here
- return UNDISPATCHED;
-
case LFUN_MATH_EXTERN:
- doExtern(cmd, idx, pos);
- return DISPATCHED_POP;
+ doExtern(bv.fullCursor(), cmd);
+ return DispatchResult(true, FINISHED);
case LFUN_MATH_MUTATE: {
- row_type r = row(idx);
- col_type c = col(idx);
+ lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
+ row_type r = cur.row();
+ col_type c = cur.col();
mutate(cmd.argument);
- idx = r * ncols() + c;
- if (idx >= nargs())
- idx = nargs() - 1;
- if (pos > cell(idx).size())
- pos = cell(idx).size();
- return DISPATCHED_POP;
+ cur.idx() = r * ncols() + c;
+ if (cur.idx() >= nargs())
+ cur.idx() = nargs() - 1;
+ if (cur.pos() > cur.lastpos())
+ cur.pos() = cur.lastpos();
+ return DispatchResult(true, FINISHED);
}
case LFUN_MATH_DISPLAY: {
mutate(type_ == "simple" ? "equation" : "simple");
- idx = 0;
- pos = cell(idx).size();
- return DISPATCHED_POP;
+ cur.idx() = 0;
+ cur.pos() = cur.lastpos();
+ return DispatchResult(true, FINISHED);
}
default:
- return MathGridInset::dispatch(cmd, idx, pos);
-
+ return MathGridInset::priv_dispatch(bv, cmd);
}
- return UNDISPATCHED;
+}
+
+
+string MathHullInset::fileInsetLabel() const
+{
+ return "Formula";
}
projects / lyx.git / blobdiff