#include "InsetMathRef.h"
#include "Buffer.h"
+#include "buffer_funcs.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "CutAndPaste.h"
}
}
+static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull()
- : InsetMathGrid(1, 1), type_(hullNone), nonum_(1, false), label_(1, 0),
+ : 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, false), label_(1, 0),
+ : InsetMathGrid(getCols(type), 1), type_(type), nonum_(1, false), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
initMath();
InsetMathHull::~InsetMathHull()
{
- for (size_t i = 0; i < label_.size(); ++i) {
- if (label_[i])
- delete label_[i];
- }
+ for (size_t i = 0; i < label_.size(); ++i)
+ delete label_[i];
}
InsetMathGrid::operator=(other);
type_ = other.type_;
nonum_ = other.nonum_;
- for (size_t i = 0; i < label_.size(); ++i) {
- if (label_[i])
- delete label_[i];
- }
+ 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])
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);
}
-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);
}
}
{
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);
{
//lyxerr << "setting label '" << label << "' for row " << row << endl;
if (label_[row]) {
- label_[row]->updateCommand(label);
+ if (label.empty()) {
+ delete label_[row];
+ label_[row] = dummy_pointer;
+ } else
+ label_[row]->updateCommand(label);
return;
}
InsetCommandParams p(LABEL_CODE);
}
-void InsetMathHull::getLabelList(vector<docstring> & labels) const
-{
- for (row_type row = 0; row < nrows(); ++row)
- if (label_[row] && !nonum_[row])
- labels.push_back(label_[row]->screenLabel());
-}
-
-
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, 0);
+
+ 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);
- if (label_[row])
- delete label_[row];
+ delete label_[row];
label_.erase(label_.begin() + row);
}
return docstring();
if (!label_[row])
return from_ascii("(#)");
- return '(' + label_[row]->screenLabel() + ')';
+ return '(' + label_[row]->screenLabel() + from_ascii(", #)");
}
docstring res;
if (numberedType()) {
if (label_[row] && !nonum_[row])
- res += "\\label{" + label_[row]->screenLabel() + '}';
+ res += "\\label{" + label_[row]->getParam("name") + '}';
if (nonum_[row] && (type_ != hullMultline))
res += "\\nonumber ";
}
// just swallow this
break;
- case LFUN_NEW_LINE:
+ case LFUN_NEWLINE_INSERT:
// some magic for the common case
if (type_ == hullSimple || type_ == hullEquation) {
cur.recordUndoInset();
InsetCommandParams p(LABEL_CODE);
p["name"] = cmd.argument().empty() ? old_label : cmd.argument();
- string const data = InsetCommandMailer::params2string("label", p);
+ string const data = InsetCommand::params2string("label", p);
if (cmd.argument().empty())
cur.bv().showDialog("label", data);
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;
+ // 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();
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;
}
case LFUN_FINISHED_LEFT:
case LFUN_UP:
case LFUN_DOWN:
- case LFUN_NEW_LINE:
+ case LFUN_NEWLINE_INSERT:
case LFUN_MATH_EXTERN:
case LFUN_MATH_MUTATE:
case LFUN_MATH_DISPLAY:
}
+docstring InsetMathHull::contextMenu(BufferView const &, int, int) const
+{
+ return from_ascii("context-math");
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff