#include <config.h>
#include "MathMacro.h"
-#include "MathSupport.h"
+
+#include "MathCompletionList.h"
#include "MathExtern.h"
#include "MathStream.h"
+#include "MathSupport.h"
#include "Buffer.h"
#include "BufferView.h"
#include "frontends/Painter.h"
+#include "support/lassert.h"
#include "support/debug.h"
#include <ostream>
MathMacro::MathMacro(docstring const & name)
: InsetMathNest(0), name_(name), displayMode_(DISPLAY_INIT),
attachedArgsNum_(0), optionals_(0), nextFoldMode_(true),
- macro_(0), needsUpdate_(false)
+ macro_(0), needsUpdate_(false), appetite_(9)
{}
&& editing_[mi.base.bv]) {
// Macro will be edited in a old-style list mode here:
- BOOST_ASSERT(macro_ != 0);
+ LASSERT(macro_ != 0, /**/);
Dimension fontDim;
FontInfo labelFont = sane_font;
math_font_max_dim(labelFont, fontDim.asc, fontDim.des);
dim.wid += 2;
metricsMarkers2(dim);
} else {
- BOOST_ASSERT(macro_ != 0);
+ LASSERT(macro_ != 0, /**/);
// metrics are computed here for the cells,
// in the proxy we will then use the dim from the cache
}
-void MathMacro::updateRepresentation(Cursor const * bvCur)
+void MathMacro::updateRepresentation()
{
// known macro?
if (macro_ == 0)
return;
// macro changed?
- if (needsUpdate_) {
- needsUpdate_ = false;
-
- // get default values of macro
- vector<docstring> const & defaults = macro_->defaults();
-
- // create MathMacroArgumentValue objects pointing to the cells of the macro
- vector<MathData> values(nargs());
- for (size_t i = 0; i < nargs(); ++i) {
- ArgumentProxy * proxy;
- if (i < defaults.size())
- proxy = new ArgumentProxy(*this, i, defaults[i]);
- else
- proxy = new ArgumentProxy(*this, i);
- values[i].insert(0, MathAtom(proxy));
- }
-
- // expanding macro with the values
- macro_->expand(values, expanded_.cell(0));
-
- // get definition for list edit mode
- docstring const & display = macro_->display();
- asArray(display.empty() ? macro_->definition() : display, definition_);
+ if (!needsUpdate_)
+ return;
+
+ needsUpdate_ = false;
+
+ // get default values of macro
+ vector<docstring> const & defaults = macro_->defaults();
+
+ // create MathMacroArgumentValue objects pointing to the cells of the macro
+ vector<MathData> values(nargs());
+ for (size_t i = 0; i < nargs(); ++i) {
+ ArgumentProxy * proxy;
+ if (i < defaults.size())
+ proxy = new ArgumentProxy(*this, i, defaults[i]);
+ else
+ proxy = new ArgumentProxy(*this, i);
+ values[i].insert(0, MathAtom(proxy));
}
+
+ // expanding macro with the values
+ macro_->expand(values, expanded_.cell(0));
+ // get definition for list edit mode
+ docstring const & display = macro_->display();
+ asArray(display.empty() ? macro_->definition() : display, definition_);
}
// edit mode changed?
if (editing_[pi.base.bv] != editMode(pi.base.bv))
- pi.base.bv->cursor().updateFlags(Update::Force);
+ pi.base.bv->cursor().updateFlags(Update::SinglePar);
}
}
-void MathMacro::setDisplayMode(MathMacro::DisplayMode mode)
+void MathMacro::setDisplayMode(MathMacro::DisplayMode mode, int appetite)
{
if (displayMode_ != mode) {
// transfer name if changing from or to DISPLAY_UNFOLDED
displayMode_ = mode;
needsUpdate_ = true;
}
+
+ // the interactive init mode is non-greedy by default
+ if (appetite == -1)
+ appetite_ = (mode == DISPLAY_INTERACTIVE_INIT) ? 0 : 9;
+ else
+ appetite_ = size_t(appetite);
}
// valid characters?
for (size_t i = 0; i<n.size(); ++i) {
- if (!(n[i] >= 'a' && n[i] <= 'z') &&
- !(n[i] >= 'A' && n[i] <= 'Z'))
+ if (!(n[i] >= 'a' && n[i] <= 'z')
+ && !(n[i] >= 'A' && n[i] <= 'Z')
+ && n[i] != '*')
return false;
}
if (name() == "binom" || name() == "mathcircumflex")
features.require(to_utf8(name()));
+
+ // validate the cells and the definition
+ if (displayMode() == DISPLAY_NORMAL) {
+ definition_.validate(features);
+ InsetMathNest::validate(features);
+ }
}
void MathMacro::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
- cur.updateFlags(Update::Force);
+ cur.updateFlags(Update::SinglePar);
InsetMathNest::edit(cur, front, entry_from);
}
{
// We may have 0 arguments, but InsetMathNest requires at least one.
if (nargs() > 0) {
- cur.updateFlags(Update::Force);
+ cur.updateFlags(Update::SinglePar);
return InsetMathNest::editXY(cur, x, y);
} else
return this;
void MathMacro::removeArgument(Inset::pos_type pos) {
if (displayMode_ == DISPLAY_NORMAL) {
- BOOST_ASSERT(size_t(pos) < cells_.size());
+ LASSERT(size_t(pos) < cells_.size(), /**/);
cells_.erase(cells_.begin() + pos);
if (size_t(pos) < attachedArgsNum_)
--attachedArgsNum_;
void MathMacro::insertArgument(Inset::pos_type pos) {
if (displayMode_ == DISPLAY_NORMAL) {
- BOOST_ASSERT(size_t(pos) <= cells_.size());
+ LASSERT(size_t(pos) <= cells_.size(), /**/);
cells_.insert(cells_.begin() + pos, MathData());
if (size_t(pos) < attachedArgsNum_)
++attachedArgsNum_;
void MathMacro::detachArguments(vector<MathData> & args, bool strip)
{
- BOOST_ASSERT(displayMode_ == DISPLAY_NORMAL);
+ LASSERT(displayMode_ == DISPLAY_NORMAL, /**/);
args = cells_;
// strip off empty cells, but not more than arity-attachedArgsNum_
void MathMacro::attachArguments(vector<MathData> const & args, size_t arity, int optionals)
{
- BOOST_ASSERT(displayMode_ == DISPLAY_NORMAL);
+ LASSERT(displayMode_ == DISPLAY_NORMAL, /**/);
cells_ = args;
attachedArgsNum_ = args.size();
cells_.resize(arity);
bool MathMacro::idxFirst(Cursor & cur) const
{
- cur.updateFlags(Update::Force);
+ cur.updateFlags(Update::SinglePar);
return InsetMathNest::idxFirst(cur);
}
bool MathMacro::idxLast(Cursor & cur) const
{
- cur.updateFlags(Update::Force);
+ cur.updateFlags(Update::SinglePar);
return InsetMathNest::idxLast(cur);
}
-bool MathMacro::notifyCursorLeaves(Cursor & cur)
+bool MathMacro::notifyCursorLeaves(Cursor const & old, Cursor & cur)
{
cur.updateFlags(Update::Force);
- return InsetMathNest::notifyCursorLeaves(cur);
+ return InsetMathNest::notifyCursorLeaves(old, cur);
}
{
if (!nextFoldMode_) {
nextFoldMode_ = true;
- cur.updateFlags(Update::Force);
+ cur.updateFlags(Update::SinglePar);
}
}
{
if (nextFoldMode_) {
nextFoldMode_ = false;
- cur.updateFlags(Update::Force);
+ cur.updateFlags(Update::SinglePar);
}
}
}
// normal mode
- BOOST_ASSERT(macro_);
+ LASSERT(macro_, /**/);
// optional arguments make macros fragile
if (optionals_ > 0 && os.fragile())
}
-Inset::CompletionListPtr MathMacro::completionList(Cursor const & cur) const
+CompletionList const *
+MathMacro::createCompletionList(Cursor const & cur) const
{
if (displayMode() != DISPLAY_UNFOLDED)
- return InsetMathNest::completionList(cur);
+ return InsetMathNest::createCompletionList(cur);
- return CompletionListPtr(new MathCompletionList(cur.bv().cursor()));
+ return new MathCompletionList(cur.bv().cursor());
}
docstring newName = name() + s;
asArray(newName, cell(0));
cur.bv().cursor().pos() = name().size();
- cur.updateFlags(Update::Force);
+ cur.updateFlags(Update::SinglePar);
// finish macro
if (finished) {
-#if 0
- // FIXME: this creates duplicates in the completion popup
- // which looks ugly. Moreover the changes the list lengths
- // which seems to confuse the popup as well.
- MathCompletionList::addToFavorites(inset->name());
-#endif
cur.bv().cursor().pop();
++cur.bv().cursor().pos();
- cur.updateFlags(Update::Force | Update::SinglePar);
+ cur.updateFlags(Update::SinglePar);
}
return true;
projects / lyx.git / blobdiff