*
* \author Alejandro Aguilar Sierra
* \author André Pönitz
+ * \author Stefan Schimanski
*
* Full author contact details are available in file CREDITS.
*/
#include "MathStream.h"
#include "Buffer.h"
-#include "Cursor.h"
-#include "debug.h"
#include "BufferView.h"
+#include "CoordCache.h"
+#include "Cursor.h"
+#include "support/debug.h"
#include "LaTeXFeatures.h"
+#include "FuncStatus.h"
+#include "FuncRequest.h"
+#include "Undo.h"
+
#include "frontends/Painter.h"
+#include <ostream>
+#include <vector>
-namespace lyx {
+using namespace std;
-using std::string;
-using std::max;
+namespace lyx {
-/// This class is the value of a macro argument, technically
-/// a wrapper of the cells of MathMacro.
-class MathMacroArgumentValue : public InsetMath {
+/// A proxy for the macro values
+class ArgumentProxy : public InsetMath {
public:
///
- MathMacroArgumentValue(MathMacro const & mathMacro, size_t idx)
+ ArgumentProxy(MathMacro & mathMacro, size_t idx)
: mathMacro_(mathMacro), idx_(idx) {}
///
- void metrics(MetricsInfo & mi, Dimension & dim) const;
+ ArgumentProxy(MathMacro & mathMacro, size_t idx, docstring const & def)
+ : mathMacro_(mathMacro), idx_(idx)
+ {
+ asArray(def, def_);
+ }
///
- void draw(PainterInfo &, int x, int y) const;
+ void metrics(MetricsInfo & mi, Dimension & dim) const {
+ mathMacro_.macro()->unlock();
+ if (!mathMacro_.editMetrics(mi.base.bv)
+ && mathMacro_.cell(idx_).empty())
+ def_.metrics(mi, dim);
+ else {
+ CoordCache & coords = mi.base.bv->coordCache();
+ dim = coords.arrays().dim(&mathMacro_.cell(idx_));
+ }
+ mathMacro_.macro()->lock();
+ }
///
- int kerning() const { return mathMacro_.cell(idx_).kerning(); }
+ void draw(PainterInfo & pi, int x, int y) const {
+ if (mathMacro_.editMetrics(pi.base.bv)) {
+ // The only way a ArgumentProxy can appear is in a cell of the
+ // MathMacro. Moreover the cells are only drawn in the DISPLAY_FOLDED
+ // mode and then, if the macro is edited the monochrome
+ // mode is entered by the MathMacro before calling the cells' draw
+ // method. Then eventually this code is reached and the proxy leaves
+ // monochrome mode temporarely. Hence, if it is not in monochrome
+ // here (and the assert triggers in pain.leaveMonochromeMode())
+ // it's a bug.
+ pi.pain.leaveMonochromeMode();
+ mathMacro_.cell(idx_).draw(pi, x, y);
+ pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
+ } else if (mathMacro_.cell(idx_).empty()) {
+ mathMacro_.cell(idx_).setXY(*pi.base.bv, x, y);
+ def_.draw(pi, x, y);
+ } else
+ mathMacro_.cell(idx_).draw(pi, x, y);
+ }
+ ///
+ size_t idx() const { return idx_; }
+ ///
+ int kerning(BufferView const * bv) const
+ {
+ if (mathMacro_.editMetrics(bv)
+ || !mathMacro_.cell(idx_).empty())
+ return mathMacro_.cell(idx_).kerning(bv);
+ else
+ return def_.kerning(bv);
+ }
private:
- Inset * clone() const;
- MathMacro const & mathMacro_;
+ ///
+ Inset * clone() const
+ {
+ return new ArgumentProxy(*this);
+ }
+ ///
+ MathMacro & mathMacro_;
+ ///
size_t idx_;
+ ///
+ MathData def_;
};
-Inset * MathMacroArgumentValue::clone() const
+MathMacro::MathMacro(docstring const & name)
+ : InsetMathNest(0), name_(name), displayMode_(DISPLAY_INIT),
+ attachedArgsNum_(0), optionals_(0), nextFoldMode_(true),
+ macro_(0), needsUpdate_(false)
+{}
+
+
+Inset * MathMacro::clone() const
{
- return new MathMacroArgumentValue(*this);
+ MathMacro * copy = new MathMacro(*this);
+ copy->needsUpdate_ = true;
+ copy->expanded_.cell(0).clear();
+ return copy;
}
-void MathMacroArgumentValue::metrics(MetricsInfo & mi, Dimension & dim) const
+docstring MathMacro::name() const
{
- // unlock outer macro in arguments, and lock it again later
- MacroData const & macro = MacroTable::globalMacros().get(mathMacro_.name());
- macro.unlock();
- mathMacro_.cell(idx_).metrics(mi, dim);
- macro.lock();
+ if (displayMode_ == DISPLAY_UNFOLDED)
+ return asString(cell(0));
+ else
+ return name_;
}
-void MathMacroArgumentValue::draw(PainterInfo & pi, int x, int y) const
+void MathMacro::cursorPos(BufferView const & bv,
+ CursorSlice const & sl, bool boundary, int & x, int & y) const
{
- // unlock outer macro in arguments, and lock it again later
- MacroData const & macro = MacroTable::globalMacros().get(mathMacro_.name());
- macro.unlock();
- mathMacro_.cell(idx_).draw(pi, x, y);
- macro.lock();
+ // We may have 0 arguments, but InsetMathNest requires at least one.
+ if (nargs() > 0)
+ InsetMathNest::cursorPos(bv, sl, boundary, x, y);
}
-MathMacro::MathMacro(docstring const & name, int numargs)
- : InsetMathNest(numargs), name_(name), editing_(false)
-{}
+bool MathMacro::editMode(BufferView const * bv) const {
+ // find this in cursor trace
+ Cursor const & cur = bv->cursor();
+ for (size_t i = 0; i != cur.depth(); ++i)
+ if (&cur[i].inset() == this) {
+ // look if there is no other macro in edit mode above
+ ++i;
+ for (; i != cur.depth(); ++i) {
+ MathMacro const * macro = dynamic_cast<MathMacro const *>(&cur[i].inset());
+ if (macro && macro->displayMode() == DISPLAY_NORMAL)
+ return false;
+ }
+ // ok, none found, I am the highest one
+ return true;
+ }
-Inset * MathMacro::clone() const
-{
- MathMacro * x = new MathMacro(*this);
- x->expanded_ = MathData();
- x->macroBackup_ = MacroData();
- return x;
+ return false;
}
-docstring MathMacro::name() const
+bool MathMacro::editMetrics(BufferView const * bv) const
{
- return name_;
+ return editing_[bv];
}
-void MathMacro::cursorPos(BufferView const & bv,
- CursorSlice const & sl, bool boundary, int & x, int & y) const
+void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
{
- // We may have 0 arguments, but InsetMathNest requires at least one.
- if (nargs() > 0)
- InsetMathNest::cursorPos(bv, sl, boundary, x, y);
+ // set edit mode for which we will have calculated metrics. But only
+ editing_[mi.base.bv] = editMode(mi.base.bv);
+
+ // calculate new metrics according to display mode
+ if (displayMode_ == DISPLAY_INIT || displayMode_ == DISPLAY_INTERACTIVE_INIT) {
+ mathed_string_dim(mi.base.font, from_ascii("\\") + name(), dim);
+ } else if (displayMode_ == DISPLAY_UNFOLDED) {
+ cell(0).metrics(mi, dim);
+ Dimension bsdim;
+ mathed_string_dim(mi.base.font, from_ascii("\\"), bsdim);
+ dim.wid += bsdim.width() + 1;
+ dim.asc = max(bsdim.ascent(), dim.ascent());
+ dim.des = max(bsdim.descent(), dim.descent());
+ metricsMarkers(dim);
+ } else {
+ BOOST_ASSERT(macro_ != 0);
+
+ // metrics are computed here for the cells,
+ // in the proxy we will then use the dim from the cache
+ InsetMathNest::metrics(mi);
+
+ // calculate metrics finally
+ macro_->lock();
+ expanded_.cell(0).metrics(mi, dim);
+ macro_->unlock();
+
+ // calculate dimension with label while editing
+ if (editing_[mi.base.bv]) {
+ FontInfo font = mi.base.font;
+ augmentFont(font, from_ascii("lyxtex"));
+ Dimension namedim;
+ mathed_string_dim(font, name(), namedim);
+#if 0
+ dim.wid += 2 + namedim.wid + 2 + 2;
+ dim.asc = max(dim.asc, namedim.asc) + 2;
+ dim.des = max(dim.des, namedim.des) + 2;
+#endif
+ dim.wid = max(1 + namedim.wid + 1, 2 + dim.wid + 2);
+ dim.asc += 1 + namedim.height() + 1;
+ dim.des += 2;
+ }
+ }
}
-void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
+int MathMacro::kerning(BufferView const * bv) const {
+ if (displayMode_ == DISPLAY_NORMAL && !editing_[bv])
+ return expanded_.kerning(bv);
+ else
+ return 0;
+}
+
+
+void MathMacro::updateMacro(MacroContext const & mc)
{
- kerning_ = 0;
- if (!MacroTable::globalMacros().has(name())) {
- mathed_string_dim(mi.base.font, "Unknown: " + name(), dim);
+ if (validName()) {
+ macro_ = mc.get(name());
+ if (macro_ && macroBackup_ != *macro_) {
+ macroBackup_ = *macro_;
+ needsUpdate_ = true;
+ }
} else {
- MacroData const & macro = MacroTable::globalMacros().get(name());
+ macro_ = 0;
+ }
+}
- if (macroBackup_ != macro)
- updateExpansion();
- if (macro.locked()) {
- mathed_string_dim(mi.base.font, "Self reference: " + name(), dim);
- } else if (editing(mi.base.bv)) {
- FontInfo font = mi.base.font;
- augmentFont(font, from_ascii("lyxtex"));
- tmpl_.metrics(mi, dim);
- // FIXME UNICODE
- dim.wid += mathed_string_width(font, name()) + 10;
- // FIXME UNICODE
- int ww = mathed_string_width(font, from_ascii("#1: "));
- for (idx_type i = 0; i < nargs(); ++i) {
- MathData const & c = cell(i);
- Dimension dimc;
- c.metrics(mi, dimc);
- dim.wid = max(dim.wid, dimc.width() + ww);
- dim.des += dimc.height() + 10;
- }
- editing_ = true;
- } else {
- macro.lock();
- expanded_.metrics(mi, dim);
- macro.unlock();
- kerning_ = expanded_.kerning();
- editing_ = false;
+void MathMacro::updateRepresentation(Cursor const * bvCur)
+{
+ // known macro?
+ if (macro_ == 0)
+ return;
+
+ // update requires
+ requires_ = macro_->requires();
+
+ // non-normal mode? We are done!
+ if (displayMode_ != DISPLAY_NORMAL)
+ 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));
}
- // Cache the inset dimension.
- setDimCache(mi, dim);
}
void MathMacro::draw(PainterInfo & pi, int x, int y) const
{
- if (!MacroTable::globalMacros().has(name())) {
- // FIXME UNICODE
- drawStrRed(pi, x, y, "Unknown: " + name());
+ Dimension const dim = dimension(*pi.base.bv);
+
+ setPosCache(pi, x, y);
+ int expx = x;
+ int expy = y;
+
+ if (displayMode_ == DISPLAY_INIT || displayMode_ == DISPLAY_INTERACTIVE_INIT) {
+ PainterInfo pi2(pi.base.bv, pi.pain);
+ pi2.base.font.setColor(macro_ ? Color_latex : Color_error);
+ //pi2.base.style = LM_ST_TEXT;
+ pi2.pain.text(x, y, from_ascii("\\") + name(), pi2.base.font);
+ } else if (displayMode_ == DISPLAY_UNFOLDED) {
+ PainterInfo pi2(pi.base.bv, pi.pain);
+ pi2.base.font.setColor(macro_ ? Color_latex : Color_error);
+ //pi2.base.style = LM_ST_TEXT;
+ pi2.pain.text(x, y, from_ascii("\\"), pi2.base.font);
+ x += mathed_string_width(pi2.base.font, from_ascii("\\")) + 1;
+ cell(0).draw(pi2, x, y);
+ drawMarkers(pi2, expx, expy);
} else {
- MacroData const & macro = MacroTable::globalMacros().get(name());
-
- // warm up cache
+ // warm up cells
for (size_t i = 0; i < nargs(); ++i)
cell(i).setXY(*pi.base.bv, x, y);
- if (macro.locked()) {
- // FIXME UNICODE
- drawStrRed(pi, x, y, "Self reference: " + name());
- } else if (editing_) {
+ if (editing_[pi.base.bv]) {
+ // draw header and rectangle around
FontInfo font = pi.base.font;
augmentFont(font, from_ascii("lyxtex"));
- Dimension const dim = dimension(*pi.base.bv);
- Dimension const & dim_tmpl = tmpl_.dimension(*pi.base.bv);
- int h = y - dim.ascent() + 2 + dim_tmpl.ascent();
- pi.pain.text(x + 3, h, name(), font);
- int const w = mathed_string_width(font, name());
- tmpl_.draw(pi, x + w + 12, h);
- h += dim_tmpl.descent();
- Dimension ldim;
- docstring t = from_ascii("#1: ");
- mathed_string_dim(font, t, ldim);
- for (idx_type i = 0; i < nargs(); ++i) {
- MathData const & c = cell(i);
- Dimension const & dimc = c.dimension(*pi.base.bv);
- h += max(dimc.ascent(), ldim.asc) + 5;
- c.draw(pi, x + ldim.wid, h);
- char_type str[] = { '#', '1', ':', '\0' };
- str[1] += static_cast<char_type>(i);
- pi.pain.text(x + 3, h, str, font);
- h += max(dimc.descent(), ldim.des) + 5;
- }
- } else {
- macro.lock();
- expanded_.draw(pi, x, y);
- macro.unlock();
- }
-
- // edit mode changed?
- if (editing_ != editing(pi.base.bv) || macroBackup_ != macro)
- pi.base.bv->cursor().updateFlags(Update::Force);
+ font.setSize(FONT_SIZE_TINY);
+ font.setColor(Color_mathmacrolabel);
+ Dimension namedim;
+ mathed_string_dim(font, name(), namedim);
+#if 0
+ pi.pain.fillRectangle(x, y - dim.asc, 2 + namedim.width() + 2, dim.height(), Color_mathmacrobg);
+ pi.pain.text(x + 2, y, name(), font);
+ expx += 2 + namew + 2;
+#endif
+ pi.pain.fillRectangle(x, y - dim.asc, dim.wid, 1 + namedim.height() + 1, Color_mathmacrobg);
+ pi.pain.text(x + 1, y - dim.asc + namedim.asc + 2, name(), font);
+ expx += (dim.wid - expanded_.cell(0).dimension(*pi.base.bv).width()) / 2;
+
+ pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
+ expanded_.cell(0).draw(pi, expx, expy);
+ pi.pain.leaveMonochromeMode();
+ } else
+ expanded_.cell(0).draw(pi, expx, expy);
+
+ // draw frame while editing
+ if (editing_[pi.base.bv])
+ pi.pain.rectangle(x, y - dim.asc, dim.wid, dim.height(), Color_mathmacroframe);
}
+
+ // edit mode changed?
+ if (editing_[pi.base.bv] != editMode(pi.base.bv))
+ pi.base.bv->cursor().updateFlags(Update::Force);
}
void MathMacro::drawSelection(PainterInfo & pi, int x, int y) const
{
// We may have 0 arguments, but InsetMathNest requires at least one.
- if (nargs() > 0)
+ if (cells_.size() > 0)
InsetMathNest::drawSelection(pi, x, y);
}
+void MathMacro::setDisplayMode(MathMacro::DisplayMode mode)
+{
+ if (displayMode_ != mode) {
+ // transfer name if changing from or to DISPLAY_UNFOLDED
+ if (mode == DISPLAY_UNFOLDED) {
+ cells_.resize(1);
+ asArray(name_, cell(0));
+ } else if (displayMode_ == DISPLAY_UNFOLDED) {
+ name_ = asString(cell(0));
+ cells_.resize(0);
+ }
+
+ displayMode_ = mode;
+ needsUpdate_ = true;
+ }
+}
+
+
+MathMacro::DisplayMode MathMacro::computeDisplayMode() const
+{
+ if (nextFoldMode_ == true && macro_ && !macro_->locked())
+ return DISPLAY_NORMAL;
+ else
+ return DISPLAY_UNFOLDED;
+}
+
+
+bool MathMacro::validName() const
+{
+ docstring n = name();
+
+ // empty name?
+ if (n.size() == 0)
+ return false;
+
+ // converting back and force doesn't swallow anything?
+ /*MathData ma;
+ asArray(n, ma);
+ if (asString(ma) != n)
+ return false;*/
+
+ // valid characters?
+ for (size_t i = 0; i<n.size(); ++i) {
+ if (!(n[i] >= 'a' && n[i] <= 'z') &&
+ !(n[i] >= 'A' && n[i] <= 'Z'))
+ return false;
+ }
+
+ return true;
+}
+
+
void MathMacro::validate(LaTeXFeatures & features) const
{
- string const require = MacroTable::globalMacros().get(name()).requires();
- if (!require.empty())
- features.require(require);
+ if (!requires_.empty())
+ features.require(requires_);
if (name() == "binom" || name() == "mathcircumflex")
features.require(to_utf8(name()));
}
+void MathMacro::edit(Cursor & cur, bool left)
+{
+ cur.updateFlags(Update::Force);
+ InsetMathNest::edit(cur, left);
+}
+
+
Inset * MathMacro::editXY(Cursor & cur, int x, int y)
{
// We may have 0 arguments, but InsetMathNest requires at least one.
if (nargs() > 0) {
- // Prevent crash due to cold coordcache
- // FIXME: This is only a workaround, the call of
- // InsetMathNest::editXY is correct. The correct fix would
- // ensure that the coordcache of the arguments is valid.
- if (!editing(&cur.bv())) {
- edit(cur, true);
- return this;
+ cur.updateFlags(Update::Force);
+ 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());
+ cells_.erase(cells_.begin() + pos);
+ if (size_t(pos) < attachedArgsNum_)
+ --attachedArgsNum_;
+ if (size_t(pos) < optionals_) {
+ --optionals_;
}
- return InsetMathNest::editXY(cur, x, y);
+
+ needsUpdate_ = true;
+ }
+}
+
+
+void MathMacro::insertArgument(Inset::pos_type pos) {
+ if (displayMode_ == DISPLAY_NORMAL) {
+ BOOST_ASSERT(size_t(pos) <= cells_.size());
+ cells_.insert(cells_.begin() + pos, MathData());
+ if (size_t(pos) < attachedArgsNum_)
+ ++attachedArgsNum_;
+ if (size_t(pos) < optionals_)
+ ++optionals_;
+
+ needsUpdate_ = true;
}
- return this;
}
-bool MathMacro::idxFirst(Cursor & cur) const
+void MathMacro::detachArguments(vector<MathData> & args, bool strip)
+{
+ BOOST_ASSERT(displayMode_ == DISPLAY_NORMAL);
+ args = cells_;
+
+ // strip off empty cells, but not more than arity-attachedArgsNum_
+ if (strip) {
+ size_t i;
+ for (i = cells_.size(); i > attachedArgsNum_; --i)
+ if (!cell(i - 1).empty()) break;
+ args.resize(i);
+ }
+
+ attachedArgsNum_ = 0;
+ expanded_.cell(0) = MathData();
+ cells_.resize(0);
+
+ needsUpdate_ = true;
+}
+
+
+void MathMacro::attachArguments(vector<MathData> const & args, size_t arity, int optionals)
+{
+ BOOST_ASSERT(displayMode_ == DISPLAY_NORMAL);
+ cells_ = args;
+ attachedArgsNum_ = args.size();
+ cells_.resize(arity);
+ expanded_.cell(0) = MathData();
+ optionals_ = optionals;
+
+ needsUpdate_ = true;
+}
+
+
+bool MathMacro::idxFirst(Cursor & cur) const
{
cur.updateFlags(Update::Force);
return InsetMathNest::idxFirst(cur);
}
-bool MathMacro::idxLast(Cursor & cur) const
+bool MathMacro::idxLast(Cursor & cur) const
{
cur.updateFlags(Update::Force);
return InsetMathNest::idxLast(cur);
}
-bool MathMacro::idxUpDown(Cursor & cur, bool up) const
+bool MathMacro::notifyCursorLeaves(Cursor & cur)
{
- if (up) {
- if (cur.idx() == 0)
- return false;
- --cur.idx();
- } else {
- if (cur.idx() + 1 >= nargs())
- return false;
- ++cur.idx();
+ cur.updateFlags(Update::Force);
+ return InsetMathNest::notifyCursorLeaves(cur);
+}
+
+
+void MathMacro::fold(Cursor & cur)
+{
+ if (!nextFoldMode_) {
+ nextFoldMode_ = true;
+ cur.updateFlags(Update::Force);
}
- cur.pos() = cell(cur.idx()).x2pos(cur.x_target());
- return true;
}
-bool MathMacro::notifyCursorLeaves(Cursor & cur)
+void MathMacro::unfold(Cursor & cur)
{
- cur.updateFlags(Update::Force);
- return InsetMathNest::notifyCursorLeaves(cur);
+ if (nextFoldMode_) {
+ nextFoldMode_ = false;
+ cur.updateFlags(Update::Force);
+ }
}
-void MathMacro::maple(MapleStream & os) const
+bool MathMacro::folded() const
{
- updateExpansion();
- lyx::maple(expanded_, os);
+ return nextFoldMode_;
}
-void MathMacro::mathmlize(MathStream & os) const
+void MathMacro::write(WriteStream & os) const
{
- updateExpansion();
- lyx::mathmlize(expanded_, os);
+ // non-normal mode
+ if (displayMode_ != DISPLAY_NORMAL) {
+ os << "\\" << name() << " ";
+ os.pendingSpace(true);
+ return;
+ }
+
+ // normal mode
+ BOOST_ASSERT(macro_);
+
+ // optional arguments make macros fragile
+ if (optionals_ > 0 && os.fragile())
+ os << "\\protect";
+
+ os << "\\" << name();
+ bool first = true;
+
+ // Optional arguments:
+ // First find last non-empty optional argument
+ idx_type emptyOptFrom = 0;
+ idx_type i = 0;
+ for (; i < cells_.size() && i < optionals_; ++i) {
+ if (!cell(i).empty())
+ emptyOptFrom = i + 1;
+ }
+
+ // print out optionals
+ for (i=0; i < cells_.size() && i < emptyOptFrom; ++i) {
+ first = false;
+ os << "[" << cell(i) << "]";
+ }
+
+ // skip the tailing empty optionals
+ i = optionals_;
+
+ // Print remaining macros
+ for (; i < cells_.size(); ++i) {
+ if (cell(i).size() == 1
+ && cell(i)[0].nucleus()->asCharInset()) {
+ if (first)
+ os << " ";
+ os << cell(i);
+ } else
+ os << "{" << cell(i) << "}";
+ first = false;
+ }
+
+ // add space if there was no argument
+ if (first)
+ os.pendingSpace(true);
}
-void MathMacro::octave(OctaveStream & os) const
+void MathMacro::maple(MapleStream & os) const
+{
+ lyx::maple(expanded_.cell(0), os);
+}
+
+
+void MathMacro::mathmlize(MathStream & os) const
{
- updateExpansion();
- lyx::octave(expanded_, os);
+ lyx::mathmlize(expanded_.cell(0), os);
}
-void MathMacro::updateExpansion() const
+void MathMacro::octave(OctaveStream & os) const
{
- MacroData const & macro = MacroTable::globalMacros().get(name());
-
- // create MathMacroArgumentValue object pointing to the cells of the macro
- std::vector<MathData> values(nargs());
- for (size_t i = 0; i != nargs(); ++i)
- values[i].insert(0, MathAtom(new MathMacroArgumentValue(*this, i)));
- macro.expand(values, expanded_);
- asArray(macro.def(), tmpl_);
- macroBackup_ = macro;
+ lyx::octave(expanded_.cell(0), os);
}