#include "frontends/Painter.h"
-#include "support/lyxlib.h"
#include "support/lstrings.h"
#include <sstream>
{
if (type_ == hullEqnArray)
return "rcl"[col];
+ if (type_ == hullGather)
+ return 'c';
if (type_ >= hullAlign)
return "rl"[col & 1];
return 'c';
iss >> dlang >> extra;
if (extra.empty())
extra = from_ascii("noextra");
- std::string const lang = to_ascii(dlang);
+ string const lang = to_ascii(dlang);
// FIXME: temporarily disabled
//if (cur.selection()) {
case LFUN_FINISHED_BACKWARD:
case LFUN_FINISHED_FORWARD:
+ case LFUN_FINISHED_RIGHT:
+ case LFUN_FINISHED_LEFT:
//lyxerr << "action: " << cmd.action << endl;
InsetMathGrid::doDispatch(cur, cmd);
notifyCursorLeaves(cur);
InsetMathGrid::doDispatch(cur, cmd);
break;
- case LFUN_MATH_NUMBER:
+ case LFUN_MATH_NUMBER_TOGGLE: {
//lyxerr << "toggling all numbers" << endl;
- if (display()) {
- cur.recordUndoInset();
- bool old = numberedType();
- if (type_ == hullMultline)
- numbered(nrows() - 1, !old);
- else
- for (row_type row = 0; row < nrows(); ++row)
- numbered(row, !old);
-
- cur.message(old ? _("No number") : _("Number"));
- }
+ cur.recordUndoInset();
+ bool old = numberedType();
+ if (type_ == hullMultline)
+ numbered(nrows() - 1, !old);
+ else
+ for (row_type row = 0; row < nrows(); ++row)
+ numbered(row, !old);
+
+ cur.message(old ? _("No number") : _("Number"));
break;
+ }
- case LFUN_MATH_NONUMBER:
- if (display()) {
- cur.recordUndoInset();
- row_type r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
- bool old = numbered(r);
- cur.message(old ? _("No number") : _("Number"));
- numbered(r, !old);
- }
+ case LFUN_MATH_NUMBER_LINE_TOGGLE: {
+ cur.recordUndoInset();
+ row_type r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
+ bool old = numbered(r);
+ cur.message(old ? _("No number") : _("Number"));
+ numbered(r, !old);
break;
+ }
case LFUN_LABEL_INSERT: {
cur.recordUndoInset();
InsetCommandParams p(LABEL_CODE);
p["name"] = cmd.argument().empty() ? old_label : cmd.argument();
- std::string const data = InsetCommandMailer::params2string("label", p);
+ string const data = InsetCommandMailer::params2string("label", p);
if (cmd.argument().empty())
cur.bv().showDialog("label", data);
case LFUN_INSET_INSERT: {
//lyxerr << "arg: " << to_utf8(cmd.argument()) << endl;
- std::string const name = cmd.getArg(0);
+ string const name = cmd.getArg(0);
if (name == "label") {
InsetCommandParams p(LABEL_CODE);
InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), p);
docstring str = p["name"];
cur.recordUndoInset();
row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
- str = support::trim(str);
+ str = trim(str);
if (!str.empty())
numbered(r, true);
docstring old = label(r);
}
if (cur.pos() > cur.lastpos())
cur.pos() = cur.lastpos();
+
+ // FIXME: find some more clever handling of the selection,
+ // i.e. preserve it.
+ cur.clearSelection();
//cur.dispatched(FINISHED);
break;
}
switch (cmd.action) {
case LFUN_FINISHED_BACKWARD:
case LFUN_FINISHED_FORWARD:
+ case LFUN_FINISHED_RIGHT:
+ case LFUN_FINISHED_LEFT:
case LFUN_UP:
case LFUN_DOWN:
- status.enabled(true);
- return true;
case LFUN_NEW_LINE:
- case LFUN_MATH_NUMBER:
- case LFUN_MATH_NONUMBER:
case LFUN_MATH_EXTERN:
case LFUN_MATH_MUTATE:
case LFUN_MATH_DISPLAY:
// we handle these
status.enabled(true);
return true;
+ case LFUN_MATH_NUMBER_TOGGLE:
+ // FIXME: what is the right test, this or the one of
+ // LABEL_INSERT?
+ status.enabled(display());
+ status.setOnOff(numberedType());
+ return true;
+ case LFUN_MATH_NUMBER_LINE_TOGGLE: {
+ // FIXME: what is the right test, this or the one of
+ // LABEL_INSERT?
+ status.enabled(display());
+ row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
+ status.setOnOff(numbered(r));
+ return true;
+ }
case LFUN_LABEL_INSERT:
status.enabled(type_ != hullSimple);
return true;
return InsetMathGrid::getStatus(cur, cmd, status);
case LFUN_TABULAR_FEATURE: {
istringstream is(to_utf8(cmd.argument()));
- std::string s;
+ string s;
is >> s;
if (!rowChangeOK()
&& (s == "append-row"
}
-void InsetMathHull::edit(Cursor & cur, bool front)
+void InsetMathHull::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
cur.push(*this);
- front ? idxFirst(cur) : idxLast(cur);
+ bool enter_front = (entry_from == Inset::ENTRY_DIRECTION_LEFT ||
+ (entry_from == Inset::ENTRY_DIRECTION_IGNORE && front));
+ enter_front ? idxFirst(cur) : idxLast(cur);
// The inset formula dimension is not necessarily the same as the
// one of the instant preview image, so we have to indicate to the
// BufferView that a metrics update is needed.
#endif
-void InsetMathHull::write(Buffer const &, std::ostream & os) const
+void InsetMathHull::write(Buffer const &, ostream & os) const
{
odocstringstream oss;
WriteStream wi(oss, false, false);