#include "InsetMathRef.h"
#include "Buffer.h"
+#include "buffer_funcs.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "CutAndPaste.h"
#include "FuncStatus.h"
#include "LaTeXFeatures.h"
#include "Cursor.h"
-#include "debug.h"
#include "DispatchResult.h"
#include "FuncRequest.h"
-#include "gettext.h"
#include "LyXRC.h"
#include "OutputParams.h"
+#include "ParIterator.h"
#include "sgml.h"
#include "Text.h"
#include "TextPainter.h"
+#include "TocBackend.h"
#include "insets/RenderPreview.h"
#include "insets/InsetLabel.h"
#include "frontends/Painter.h"
-#include "support/lyxlib.h"
+#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include <sstream>
+using namespace std;
+using namespace lyx::support;
namespace lyx {
using cap::grabAndEraseSelection;
-using support::bformat;
-using support::subst;
-
-using std::endl;
-using std::max;
-using std::ostream;
-using std::istringstream;
-using std::ostringstream;
-using std::swap;
-using std::vector;
-
namespace {
}
}
+static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull()
- : InsetMathGrid(1, 1), type_(hullNone), nonum_(1), label_(1),
+ : InsetMathGrid(1, 1), type_(hullNone), nonum_(1, false), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
//lyxerr << "sizeof InsetMath: " << sizeof(InsetMath) << endl;
InsetMathHull::InsetMathHull(HullType type)
- : InsetMathGrid(getCols(type), 1), type_(type), nonum_(1), label_(1),
+ : InsetMathGrid(getCols(type), 1), type_(type), nonum_(1, false), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
initMath();
InsetMathHull::InsetMathHull(InsetMathHull const & other)
- : InsetMathGrid(other),
- type_(other.type_), nonum_(other.nonum_), label_(other.label_),
- preview_(new RenderPreview(*other.preview_, this))
-{}
+{
+ operator=(other);
+}
InsetMathHull::~InsetMathHull()
-{}
+{
+ for (size_t i = 0; i < label_.size(); ++i)
+ delete label_[i];
+}
Inset * InsetMathHull::clone() const
{
if (this == &other)
return *this;
- *static_cast<InsetMathGrid*>(this) = InsetMathGrid(other);
+ InsetMathGrid::operator=(other);
type_ = other.type_;
nonum_ = other.nonum_;
+ for (size_t i = 0; i < label_.size(); ++i)
+ delete label_[i];
label_ = other.label_;
+ for (size_t i = 0; i != label_.size(); ++i) {
+ if (label_[i])
+ label_[i] = new InsetLabel(*label_[i]);
+ }
preview_.reset(new RenderPreview(*other.preview_, this));
return *this;
}
+void InsetMathHull::setBuffer(Buffer & buffer)
+{
+ buffer_ = &buffer;
+ for (idx_type i = 0, n = nargs(); i != n; ++i) {
+ MathData & data = cell(i);
+ for (size_t j = 0; j != data.size(); ++j)
+ data[j].nucleus()->setBuffer(buffer);
+ }
+
+ for (size_t i = 0; i != label_.size(); ++i) {
+ if (label_[i])
+ label_[i]->setBuffer(buffer);
+ }
+}
+
+
+void InsetMathHull::updateLabels(ParIterator const & it)
+{
+ if (!buffer_) {
+ //FIXME: buffer_ should be set at creation for this inset! Problem is
+ // This inset is created at too many places (see Parser::parse1() in
+ // MathParser.cpp).
+ return;
+ }
+ for (size_t i = 0; i != label_.size(); ++i) {
+ if (label_[i])
+ label_[i]->updateLabels(it);
+ }
+}
+
+
+void InsetMathHull::addToToc(ParConstIterator const & pit) const
+{
+ if (!buffer_) {
+ //FIXME: buffer_ should be set at creation for this inset! Problem is
+ // This inset is created at too many places (see Parser::parse1() in
+ // MathParser.cpp).
+ return;
+ }
+
+ // FIXME: it would be way better to directly use InsetLabel instead of this
+ // label list. But it should be possible to copy&paste the code in
+ // InsetLabel::addToToc() anyway.
+
+ Toc & toc = buffer().tocBackend().toc("equation");
+
+ for (row_type row = 0; row != nrows(); ++row) {
+ if (nonum_[row])
+ continue;
+ if (label_[row])
+ label_[row]->addToToc(pit);
+ toc.push_back(TocItem(pit, 0, nicelabel(row)));
+ }
+}
+
+
Inset * InsetMathHull::editXY(Cursor & cur, int x, int y)
{
if (use_preview_) {
{
if (type_ == hullEqnArray)
return "rcl"[col];
+ if (type_ == hullGather)
+ return 'c';
if (type_ >= hullAlign)
return "rl"[col & 1];
return 'c';
}
-namespace {
-
-docstring const latex_string(InsetMathHull const & inset)
+static docstring latexString(InsetMathHull const & inset)
{
odocstringstream ls;
WriteStream wi(ls, false, false);
return ls.str();
}
-} // namespace anon
-
void InsetMathHull::addPreview(graphics::PreviewLoader & ploader) const
{
if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
- docstring const snippet = latex_string(*this);
+ docstring const snippet = latexString(*this);
preview_->addPreview(snippet, ploader);
}
}
-bool InsetMathHull::notifyCursorLeaves(Cursor & cur)
+bool InsetMathHull::notifyCursorLeaves(Cursor const & /*old*/, Cursor & cur)
{
if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
Buffer const & buffer = cur.buffer();
- docstring const snippet = latex_string(*this);
+ docstring const snippet = latexString(*this);
preview_->addPreview(snippet, buffer);
preview_->startLoading(buffer);
cur.updateFlags(Update::Force);
docstring InsetMathHull::label(row_type row) const
{
BOOST_ASSERT(row < nrows());
- return label_[row];
+ if (InsetLabel * il = label_[row])
+ return il->screenLabel();
+ return docstring();
}
void InsetMathHull::label(row_type row, docstring const & label)
{
//lyxerr << "setting label '" << label << "' for row " << row << endl;
- label_[row] = label;
+ if (label_[row]) {
+ if (label.empty()) {
+ delete label_[row];
+ label_[row] = dummy_pointer;
+ } else
+ label_[row]->updateCommand(label);
+ return;
+ }
+ InsetCommandParams p(LABEL_CODE);
+ p["name"] = label;
+ label_[row] = new InsetLabel(p);
+ if (buffer_)
+ label_[row]->setBuffer(buffer());
}
void InsetMathHull::numbered(row_type row, bool num)
{
nonum_[row] = !num;
- if (nonum_[row])
- label_[row].clear();
+ if (nonum_[row] && label_[row]) {
+ delete label_[row];
+ label_[row] = 0;
+ }
}
}
-void InsetMathHull::getLabelList(Buffer const &, vector<docstring> & labels) const
-{
- for (row_type row = 0; row < nrows(); ++row)
- if (!label_[row].empty() && nonum_[row] != 1)
- labels.push_back(label_[row]);
-}
-
-
bool InsetMathHull::numberedType() const
{
if (type_ == hullNone)
//if (features.amsstyle)
// return;
- features.require("boldsymbol");
//features.binom = true;
InsetMathGrid::validate(features);
{
if (!rowChangeOK())
return;
- nonum_.insert(nonum_.begin() + row + 1, !numberedType());
- label_.insert(label_.begin() + row + 1, docstring());
+
+ bool numbered = numberedType();
+ if (type_ == hullMultline) {
+ if (row + 1 == nrows())
+ nonum_[row] = true;
+ else
+ numbered = false;
+ }
+
+ nonum_.insert(nonum_.begin() + row + 1, !numbered);
+ label_.insert(label_.begin() + row + 1, dummy_pointer);
InsetMathGrid::addRow(row);
}
return;
if (row + 1 == nrows())
--row;
- swap(nonum_[row], nonum_[row + 1]);
+ // gcc implements the standard std::vector<bool> which is *not* a container:
+ // http://www.gotw.ca/publications/N1185.pdf
+ // As a results, it doesn't like this:
+ // swap(nonum_[row], nonum_[row + 1]);
+ // so we do it manually:
+ bool const b = nonum_[row];
+ nonum_[row] = nonum_[row + 1];
+ nonum_[row + 1] = b;
swap(label_[row], label_[row + 1]);
InsetMathGrid::swapRow(row);
}
if (row == nrows() + 1)
row--;
nonum_.erase(nonum_.begin() + row);
+ delete label_[row];
label_.erase(label_.begin() + row);
}
{
if (nonum_[row])
return docstring();
- if (label_[row].empty())
+ if (!label_[row])
return from_ascii("(#)");
- return '(' + label_[row] + ')';
+ return '(' + label_[row]->screenLabel() + from_ascii(", #)");
}
else if (type_ == hullEqnArray) {
if (newtype < type_) {
// set correct (no)numbering
- bool allnonum = true;
- for (row_type row = 0; row < nrows(); ++row)
- if (!nonum_[row])
- allnonum = false;
+ nonum_[0] = true;
+ for (row_type row = 0; row < nrows(); ++row) {
+ if (!nonum_[row]) {
+ nonum_[0] = false;
+ break;
+ }
+ }
// set first non-empty label
- docstring label;
for (row_type row = 0; row < nrows(); ++row) {
- if (!label_[row].empty()) {
- label = label_[row];
+ if (label_[row]) {
+ label_[0] = label_[row];
break;
}
}
glueall();
- nonum_[0] = allnonum;
- label_[0] = label;
mutate(newtype);
} else { // align & Co.
changeCols(2);
{
docstring res;
if (numberedType()) {
- if (!label_[row].empty() && !nonum_[row])
- res += "\\label{" + label_[row] + '}';
+ if (label_[row] && !nonum_[row])
+ res += "\\label{" + label_[row]->getParam("name") + '}';
if (nonum_[row] && (type_ != hullMultline))
res += "\\nonumber ";
}
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);
cur.undispatched();
break;
// just swallow this
break;
- case LFUN_BREAK_LINE:
+ case LFUN_NEWLINE_INSERT:
// some magic for the common case
if (type_ == hullSimple || type_ == hullEquation) {
cur.recordUndoInset();
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 = InsetCommand::params2string("label", p);
if (cmd.argument().empty())
- cur.bv().showInsetDialog("label", data, 0);
+ cur.bv().showDialog("label", data);
else {
FuncRequest fr(LFUN_INSET_INSERT, data);
dispatch(cur, fr);
break;
}
+ case LFUN_WORD_DELETE_FORWARD:
+ case LFUN_CHAR_DELETE_FORWARD:
+ if (col(cur.idx()) + 1 == ncols()
+ && cur.pos() == cur.lastpos()) {
+ if (!label(row(cur.idx())).empty()) {
+ cur.recordUndoInset();
+ label(row(cur.idx()), docstring());
+ } else if (numbered(row(cur.idx()))) {
+ cur.recordUndoInset();
+ numbered(row(cur.idx()), false);
+ } else {
+ InsetMathGrid::doDispatch(cur, cmd);
+ return;
+ }
+ } else {
+ InsetMathGrid::doDispatch(cur, cmd);
+ return;
+ }
+ break;
+
case LFUN_INSET_INSERT: {
//lyxerr << "arg: " << to_utf8(cmd.argument()) << endl;
- std::string const name = cmd.getArg(0);
+ // FIXME: this should be cleaned up to use InsetLabel methods directly.
+ string const name = cmd.getArg(0);
if (name == "label") {
InsetCommandParams p(LABEL_CODE);
- InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), p);
+ InsetCommand::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 (str != old) {
- cur.bv().buffer().changeRefsIfUnique(old, str,
- REF_CODE);
- label(r, str);
+ if (label_[r])
+ // The label will take care of the reference update.
+ label(r, str);
+ else {
+ label(r, str);
+ // Newly created inset so initialize it.
+ label_[r]->initView();
+ }
}
break;
}
}
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_BREAK_LINE:
- case LFUN_MATH_NUMBER:
- case LFUN_MATH_NONUMBER:
+ case LFUN_NEWLINE_INSERT:
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.
}
-docstring const InsetMathHull::editMessage() const
+docstring InsetMathHull::editMessage() const
{
return _("Math editor mode");
}
#endif
-void InsetMathHull::write(Buffer const &, std::ostream & os) const
+void InsetMathHull::write(ostream & os) const
{
odocstringstream oss;
WriteStream wi(oss, false, false);
}
-void InsetMathHull::read(Buffer const &, Lexer & lex)
+void InsetMathHull::read(Lexer & lex)
{
MathAtom at;
mathed_parse_normal(at, lex);
}
-int InsetMathHull::plaintext(Buffer const &, odocstream & os,
- OutputParams const &) const
+int InsetMathHull::plaintext(odocstream & os, OutputParams const &) const
{
if (0 && display()) {
Dimension dim;
}
-int InsetMathHull::docbook(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+int InsetMathHull::docbook(odocstream & os, OutputParams const & runparams) const
{
MathStream ms(os);
int res = 0;
docstring bname = name;
if (!label(0).empty())
- bname += " id='" + sgml::cleanID(buf, runparams, label(0)) + "'";
+ bname += " id='" + sgml::cleanID(buffer(), runparams, label(0)) + "'";
++ms.tab(); ms.cr(); ms.os() << '<' << bname << '>';
ms << ETag("math");
} else {
ms << MTag("alt role='tex'");
- res = latex(buf, ls, runparams);
+ res = latex(ls, runparams);
ms << from_utf8(subst(subst(to_utf8(ls.str()), "&", "&"), "<", "<"));
ms << ETag("alt");
}
ms << from_ascii("<graphic fileref=\"eqn/");
if (!label(0).empty())
- ms << sgml::cleanID(buf, runparams, label(0));
+ ms << sgml::cleanID(buffer(), runparams, label(0));
else
ms << sgml::uniqueID(from_ascii("anon"));
}
-void InsetMathHull::textString(Buffer const & buf, odocstream & os) const
+void InsetMathHull::textString(odocstream & os) const
+{
+ plaintext(os, OutputParams(0));
+}
+
+
+docstring InsetMathHull::contextMenu(BufferView const &, int, int) const
{
- plaintext(buf, os, OutputParams(0));
+ return from_ascii("context-math");
}
projects / lyx.git / blobdiff