X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroTemplate.cpp;h=7db428faf3734d18ee95dea1e898b382dc5122a5;hb=b79d8e5e2d20e8f294d47fe924c20de17dbd5c0b;hp=11b9ae90c6e096f20cf30691bc403e745bae272b;hpb=ab9a074f20f1b4b7d16115f86fcf58525f423ea6;p=lyx.git diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp index 11b9ae90c6..7db428faf3 100644 --- a/src/mathed/MathMacroTemplate.cpp +++ b/src/mathed/MathMacroTemplate.cpp @@ -3,7 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz + * \author Stefan Schimanski * * Full author contact details are available in file CREDITS. */ @@ -16,6 +17,7 @@ #include "LaTeXFeatures.h" #include "InsetMathBrace.h" #include "InsetMathChar.h" +#include "InsetMathHull.h" #include "InsetMathSqrt.h" #include "MathMacro.h" #include "MathMacroArgument.h" @@ -32,10 +34,13 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "Lexer.h" +#include "LyXRC.h" #include "Undo.h" #include "frontends/Painter.h" +#include "insets/RenderPreview.h" + #include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" @@ -56,9 +61,9 @@ using support::bformat; class InsetLabelBox : public InsetMathNest { public: /// - InsetLabelBox(MathAtom const & atom, docstring label, + InsetLabelBox(Buffer * buf, MathAtom const & atom, docstring label, MathMacroTemplate const & parent, bool frame = false); - InsetLabelBox(docstring label, MathMacroTemplate const & parent, + InsetLabelBox(Buffer * buf, docstring label, MathMacroTemplate const & parent, bool frame = false); /// void metrics(MetricsInfo & mi, Dimension & dim) const; @@ -77,17 +82,17 @@ protected: }; -InsetLabelBox::InsetLabelBox(MathAtom const & atom, docstring label, +InsetLabelBox::InsetLabelBox(Buffer * buf, MathAtom const & atom, docstring label, MathMacroTemplate const & parent, bool frame) - : InsetMathNest(1), parent_(parent), label_(label), frame_(frame) + : InsetMathNest(buf, 1), parent_(parent), label_(label), frame_(frame) { cell(0).insert(0, atom); } -InsetLabelBox::InsetLabelBox(docstring label, +InsetLabelBox::InsetLabelBox(Buffer * buf, docstring label, MathMacroTemplate const & parent, bool frame) - : InsetMathNest(1), parent_(parent), label_(label), frame_(frame) + : InsetMathNest(buf, 1), parent_(parent), label_(label), frame_(frame) { } @@ -180,7 +185,7 @@ void InsetLabelBox::draw(PainterInfo & pi, int x, int y) const class DisplayLabelBox : public InsetLabelBox { public: /// - DisplayLabelBox(MathAtom const & atom, docstring label, + DisplayLabelBox(Buffer * buf, MathAtom const & atom, docstring label, MathMacroTemplate const & parent); /// @@ -194,10 +199,10 @@ protected: }; -DisplayLabelBox::DisplayLabelBox(MathAtom const & atom, +DisplayLabelBox::DisplayLabelBox(Buffer * buf, MathAtom const & atom, docstring label, MathMacroTemplate const & parent) - : InsetLabelBox(atom, label, parent, true) + : InsetLabelBox(buf, atom, label, parent, true) { } @@ -278,9 +283,9 @@ void InsetMathWrapper::draw(PainterInfo & pi, int x, int y) const class InsetColoredCell : public InsetMathNest { public: /// - InsetColoredCell(ColorCode min, ColorCode max); + InsetColoredCell(Buffer * buf, ColorCode min, ColorCode max); /// - InsetColoredCell(ColorCode min, ColorCode max, MathAtom const & atom); + InsetColoredCell(Buffer * buf, ColorCode min, ColorCode max, MathAtom const & atom); /// void draw(PainterInfo &, int x, int y) const; /// @@ -296,14 +301,14 @@ protected: }; -InsetColoredCell::InsetColoredCell(ColorCode min, ColorCode max) - : InsetMathNest(1), min_(min), max_(max) +InsetColoredCell::InsetColoredCell(Buffer * buf, ColorCode min, ColorCode max) + : InsetMathNest(buf, 1), min_(min), max_(max) { } -InsetColoredCell::InsetColoredCell(ColorCode min, ColorCode max, MathAtom const & atom) - : InsetMathNest(1), min_(min), max_(max) +InsetColoredCell::InsetColoredCell(Buffer * buf, ColorCode min, ColorCode max, MathAtom const & atom) + : InsetMathNest(buf, 1), min_(min), max_(max) { cell(0).insert(0, atom); } @@ -389,19 +394,18 @@ void InsetNameWrapper::draw(PainterInfo & pi, int x, int y) const /////////////////////////////////////////////////////////////////////// -MathMacroTemplate::MathMacroTemplate() - : InsetMathNest(3), numargs_(0), argsInLook_(0), optionals_(0), +MathMacroTemplate::MathMacroTemplate(Buffer * buf) + : InsetMathNest(buf, 3), numargs_(0), argsInLook_(0), optionals_(0), type_(MacroTypeNewcommand), lookOutdated_(true) { initMath(); } -MathMacroTemplate::MathMacroTemplate(docstring const & name, int numargs, - int optionals, MacroType type, - vector const & optionalValues, +MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int numargs, + int optionals, MacroType type, vector const & optionalValues, MathData const & def, MathData const & display) - : InsetMathNest(optionals + 3), numargs_(numargs), argsInLook_(numargs), + : InsetMathNest(buf, optionals + 3), numargs_(numargs), argsInLook_(numargs), optionals_(optionals), optionalValues_(optionalValues), type_(type), lookOutdated_(true) { @@ -422,14 +426,15 @@ MathMacroTemplate::MathMacroTemplate(docstring const & name, int numargs, } -MathMacroTemplate::MathMacroTemplate(docstring const & str) - : InsetMathNest(3), numargs_(0), optionals_(0), +MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & str) + : InsetMathNest(buf, 3), numargs_(0), optionals_(0), type_(MacroTypeNewcommand), lookOutdated_(true) { + buffer_ = buf; initMath(); - MathData ar; - mathed_parse_cell(ar, str); + MathData ar(buf); + mathed_parse_cell(ar, str, Parse::NORMAL); if (ar.size() != 1 || !ar[0]->asMacroTemplate()) { lyxerr << "Cannot read macro from '" << ar << "'" << endl; asArray(from_ascii("invalidmacro"), cell(0)); @@ -478,21 +483,23 @@ void MathMacroTemplate::createLook(int args) const argsInLook_ = args; // \foo - look_.push_back(MathAtom(new InsetLabelBox(_("Name"), *this, false))); + look_.push_back(MathAtom( + new InsetLabelBox(buffer_, _("Name"), *this, false))); MathData & nameData = look_[look_.size() - 1].nucleus()->cell(0); nameData.push_back(MathAtom(new InsetNameWrapper(&cell(0), *this))); // [#1][#2] int i = 0; if (optionals_ > 0) { - look_.push_back(MathAtom(new InsetLabelBox(_("optional"), *this, false))); + look_.push_back(MathAtom( + new InsetLabelBox(buffer_, _("optional"), *this, false))); MathData * optData = &look_[look_.size() - 1].nucleus()->cell(0); for (; i < optionals_; ++i) { // color it light grey, if it is to be removed when the cursor leaves if (i == argsInLook_) { optData->push_back(MathAtom( - new InsetColoredCell(Color_mathbg, Color_mathmacrooldarg))); + new InsetColoredCell(buffer_, Color_mathbg, Color_mathmacrooldarg))); optData = &(*optData)[optData->size() - 1].nucleus()->cell(0); } @@ -507,7 +514,7 @@ void MathMacroTemplate::createLook(int args) const MathData arg; arg.push_back(MathAtom(new MathMacroArgument(i + 1))); if (i >= argsInLook_) { - look_.push_back(MathAtom(new InsetColoredCell( + look_.push_back(MathAtom(new InsetColoredCell(buffer_, Color_mathbg, Color_mathmacrooldarg, MathAtom(new InsetMathBrace(arg))))); } else @@ -516,7 +523,7 @@ void MathMacroTemplate::createLook(int args) const for (; i < argsInLook_; ++i) { MathData arg; arg.push_back(MathAtom(new MathMacroArgument(i + 1))); - look_.push_back(MathAtom(new InsetColoredCell( + look_.push_back(MathAtom(new InsetColoredCell(buffer_, Color_mathbg, Color_mathmacronewarg, MathAtom(new InsetMathBrace(arg))))); } @@ -527,12 +534,12 @@ void MathMacroTemplate::createLook(int args) const // definition look_.push_back(MathAtom( - new InsetLabelBox(MathAtom( + new InsetLabelBox(buffer_, MathAtom( new InsetMathWrapper(&cell(defIdx()))), _("TeX"), *this, true))); // display look_.push_back(MathAtom( - new DisplayLabelBox(MathAtom( + new DisplayLabelBox(buffer_, MathAtom( new InsetMathWrapper(&cell(displayIdx()))), _("LyX"), *this))); } @@ -616,24 +623,21 @@ void MathMacroTemplate::edit(Cursor & cur, bool front, EntryDirection entry_from bool MathMacroTemplate::notifyCursorLeaves(Cursor const & old, Cursor & cur) { - // find this in cursor old - Cursor insetCur = old; - int scriptSlice = insetCur.find(this); - LASSERT(scriptSlice != -1, /**/); - insetCur.cutOff(scriptSlice); - - commitEditChanges(insetCur); + commitEditChanges(cur, old); updateLook(); cur.updateFlags(Update::Force); return InsetMathNest::notifyCursorLeaves(old, cur); } -void MathMacroTemplate::removeArguments(Cursor & cur, int from, int to) { - for (DocIterator it = doc_iterator_begin(*this); it; it.forwardChar()) { +void MathMacroTemplate::removeArguments(Cursor & cur, + DocIterator const & /*inset_pos*/, int from, int to) +{ + DocIterator it = doc_iterator_begin(&buffer(), this); + for (; it; it.forwardChar()) { if (!it.nextInset()) continue; - if (it.nextInset()->lyxCode() != MATHMACROARG_CODE) + if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; MathMacroArgument * arg = static_cast(it.nextInset()); int n = arg->number() - 1; @@ -650,11 +654,12 @@ void MathMacroTemplate::removeArguments(Cursor & cur, int from, int to) { } -void MathMacroTemplate::shiftArguments(size_t from, int by) { - for (DocIterator it = doc_iterator_begin(*this); it; it.forwardChar()) { +void MathMacroTemplate::shiftArguments(size_t from, int by) +{ + for (DocIterator it = doc_iterator_begin(&buffer(), this); it; it.forwardChar()) { if (!it.nextInset()) continue; - if (it.nextInset()->lyxCode() != MATHMACROARG_CODE) + if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; MathMacroArgument * arg = static_cast(it.nextInset()); if (arg->number() >= int(from) + 1) @@ -667,14 +672,15 @@ void MathMacroTemplate::shiftArguments(size_t from, int by) { int MathMacroTemplate::maxArgumentInDefinition() const { + // We don't have a buffer when pasting from the clipboard (bug 6014). + Buffer const * macro_buffer = isBufferLoaded() ? &buffer() : 0; int maxArg = 0; - MathMacroTemplate * nonConst = const_cast(this); - DocIterator it = doc_iterator_begin(*nonConst); + DocIterator it = doc_iterator_begin(macro_buffer, this); it.idx() = defIdx(); for (; it; it.forwardChar()) { if (!it.nextInset()) continue; - if (it.nextInset()->lyxCode() != MATHMACROARG_CODE) + if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; MathMacroArgument * arg = static_cast(it.nextInset()); maxArg = std::max(int(arg->number()), maxArg); @@ -689,12 +695,12 @@ void MathMacroTemplate::insertMissingArguments(int maxArg) idx_type idx = cell(displayIdx()).empty() ? defIdx() : displayIdx(); // search for #n macros arguments - DocIterator it = doc_iterator_begin(*this); + DocIterator it = doc_iterator_begin(&buffer(), this); it.idx() = idx; for (; it && it[0].idx() == idx; it.forwardChar()) { if (!it.nextInset()) continue; - if (it.nextInset()->lyxCode() != MATHMACROARG_CODE) + if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) continue; MathMacroArgument * arg = static_cast(it.nextInset()); found[arg->number() - 1] = true; @@ -710,68 +716,98 @@ void MathMacroTemplate::insertMissingArguments(int maxArg) } -void MathMacroTemplate::changeArity(Cursor & cur, int newNumArg) +void MathMacroTemplate::changeArity(Cursor & cur, + DocIterator const & inset_pos, int newNumArg) { // remove parameter which do not appear anymore in the definition for (int i = numargs_; i > newNumArg; --i) - removeParameter(cur, numargs_ - 1, false); + removeParameter(cur, inset_pos, numargs_ - 1, false); // add missing parameter for (int i = numargs_; i < newNumArg; ++i) - insertParameter(cur, numargs_, false, false); + insertParameter(cur, inset_pos, numargs_, false, false); } -void MathMacroTemplate::commitEditChanges(Cursor & cur) +/// +class AddRemoveMacroInstanceFix { - int argsInDef = maxArgumentInDefinition(); - if (argsInDef != numargs_) { - cur.recordUndoFullDocument(); - changeArity(cur, argsInDef); +public: + /// + AddRemoveMacroInstanceFix(int n, bool insert) : n_(n), insert_(insert) {} + /// + void operator()(MathMacro * macro) { + if (macro->folded()) { + if (insert_) + macro->insertArgument(n_); + else + macro->removeArgument(n_); + } } - insertMissingArguments(argsInDef); -} +private: + /// + int n_; + /// + bool insert_; +}; -// FIXME: factorize those functions here with a functional style, maybe using Boost's function -// objects? -void fixMacroInstancesAddRemove(Cursor const & from, docstring const & name, int n, bool insert) { - Cursor dit = from; +/// +class OptionalsMacroInstanceFix +{ +public: + /// + OptionalsMacroInstanceFix(int optionals) : optionals_(optionals) {} + /// + void operator()(MathMacro * macro) { + macro->setOptionals(optionals_); + } - for (; dit; dit.forwardPos()) { - // only until a macro is redefined - if (dit.inset().lyxCode() == MATHMACRO_CODE) { - MathMacroTemplate const & macroTemplate - = static_cast(dit.inset()); - if (macroTemplate.name() == name) - break; - } +private: + /// + int optionals_; +}; - // in front of macro instance? - Inset * inset = dit.nextInset(); - if (!inset) - continue; - InsetMath * insetMath = inset->asInsetMath(); - if (!insetMath) - continue; - MathMacro * macro = insetMath->asMacro(); - if (macro && macro->name() == name && macro->folded()) { - // found macro instance - if (insert) - macro->insertArgument(n); - else - macro->removeArgument(n); - } - } -} +/// +class NullMacroInstanceFix +{ +public: + /// + void operator()(MathMacro * ) {} +}; + +template +void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos, + docstring const & name, F & fix) +{ + // goto position behind macro template + DocIterator dit = inset_pos; + dit.pop_back(); + dit.top().forwardPos(); -void fixMacroInstancesOptional(Cursor const & from, docstring const & name, int optionals) { - Cursor dit = from; + // remember hull to trigger preview reload + DocIterator hull(dit.buffer()); + bool preview_reload_needed = false; + // iterate over all positions until macro is redefined for (; dit; dit.forwardPos()) { + // left the outer hull? + if (!hull.empty() && dit.depth() == hull.depth()) { + // reload the preview if necessary + if (preview_reload_needed) { + InsetMathHull * inset_hull = + hull.nextInset()->asInsetMath()->asHullInset(); + LASSERT(inset_hull, /**/); + inset_hull->reloadPreview(hull); + cur.updateFlags(Update::Force); + preview_reload_needed = false; + } + hull.clear(); + } + // only until a macro is redefined if (dit.inset().lyxCode() == MATHMACRO_CODE) { MathMacroTemplate const & macroTemplate @@ -787,44 +823,42 @@ void fixMacroInstancesOptional(Cursor const & from, docstring const & name, int InsetMath * insetMath = inset->asInsetMath(); if (!insetMath) continue; + + // in front of outer hull? + InsetMathHull * inset_hull = insetMath->asHullInset(); + if (inset_hull && hull.empty()) { + // remember this for later preview reload + hull = dit; + } + MathMacro * macro = insetMath->asMacro(); if (macro && macro->name() == name && macro->folded()) { - // found macro instance - macro->setOptionals(optionals); + fix(macro); + if (RenderPreview::status() == LyXRC::PREVIEW_ON) + preview_reload_needed = true; } } } -template -void fixMacroInstancesFunctional(Cursor const & from, - docstring const & name, F & fix) { - Cursor dit = from; - - for (; dit; dit.forwardPos()) { - // only until a macro is redefined - if (dit.inset().lyxCode() == MATHMACRO_CODE) { - MathMacroTemplate const & macroTemplate - = static_cast(dit.inset()); - if (macroTemplate.name() == name) - break; - } - - // in front of macro instance? - Inset * inset = dit.nextInset(); - if (!inset) - continue; - InsetMath * insetMath = inset->asInsetMath(); - if (!insetMath) - continue; - MathMacro * macro = insetMath->asMacro(); - if (macro && macro->name() == name && macro->folded()) - F(macro); +void MathMacroTemplate::commitEditChanges(Cursor & cur, + DocIterator const & inset_pos) +{ + int args_in_def = maxArgumentInDefinition(); + if (args_in_def != numargs_) { + cur.recordUndoFullDocument(); + changeArity(cur, inset_pos, args_in_def); } + insertMissingArguments(args_in_def); + + // make sure the preview are up to date + NullMacroInstanceFix fix; + fixMacroInstances(cur, inset_pos, name(), fix); } -void MathMacroTemplate::insertParameter(Cursor & cur, int pos, bool greedy, bool addarg) +void MathMacroTemplate::insertParameter(Cursor & cur, + DocIterator const & inset_pos, int pos, bool greedy, bool addarg) { if (pos <= numargs_ && pos >= optionals_ && numargs_ < 9) { ++numargs_; @@ -839,13 +873,9 @@ void MathMacroTemplate::insertParameter(Cursor & cur, int pos, bool greedy, bool } if (!greedy) { - Cursor dit = cur; - dit.leaveInset(*this); - // TODO: this was dit.forwardPosNoDescend before. Check that this is the same - dit.top().forwardPos(); - // fix macro instances - fixMacroInstancesAddRemove(dit, name(), pos, true); + AddRemoveMacroInstanceFix fix(pos, true); + fixMacroInstances(cur, inset_pos, name(), fix); } } @@ -853,11 +883,12 @@ void MathMacroTemplate::insertParameter(Cursor & cur, int pos, bool greedy, bool } -void MathMacroTemplate::removeParameter(Cursor & cur, int pos, bool greedy) +void MathMacroTemplate::removeParameter(Cursor & cur, + DocIterator const & inset_pos, int pos, bool greedy) { if (pos < numargs_ && pos >= 0) { --numargs_; - removeArguments(cur, pos, pos); + removeArguments(cur, inset_pos, pos, pos); shiftArguments(pos + 1, -1); // removed optional parameter? @@ -880,13 +911,8 @@ void MathMacroTemplate::removeParameter(Cursor & cur, int pos, bool greedy) if (!greedy) { // fix macro instances - //boost::function fix = _1->insertArgument(n); - //fixMacroInstancesFunctional(dit, name(), fix); - Cursor dit = cur; - dit.leaveInset(*this); - // TODO: this was dit.forwardPosNoDescend before. Check that this is the same - dit.top().forwardPos(); - fixMacroInstancesAddRemove(dit, name(), pos, false); + AddRemoveMacroInstanceFix fix(pos, false); + fixMacroInstances(cur, inset_pos, name(), fix); } } @@ -894,7 +920,9 @@ void MathMacroTemplate::removeParameter(Cursor & cur, int pos, bool greedy) } -void MathMacroTemplate::makeOptional(Cursor & cur) { +void MathMacroTemplate::makeOptional(Cursor & cur, + DocIterator const & inset_pos) +{ if (numargs_ > 0 && optionals_ < numargs_) { ++optionals_; cells_.insert(cells_.begin() + optIdx(optionals_ - 1), optionalValues_[optionals_ - 1]); @@ -904,18 +932,17 @@ void MathMacroTemplate::makeOptional(Cursor & cur) { ++cur[macroSlice].idx(); // fix macro instances - Cursor dit = cur; - dit.leaveInset(*this); - // TODO: this was dit.forwardPosNoDescend before. Check that this is the same - dit.top().forwardPos(); - fixMacroInstancesOptional(dit, name(), optionals_); + OptionalsMacroInstanceFix fix(optionals_); + fixMacroInstances(cur, inset_pos, name(), fix); } updateLook(); } -void MathMacroTemplate::makeNonOptional(Cursor & cur) { +void MathMacroTemplate::makeNonOptional(Cursor & cur, + DocIterator const & inset_pos) +{ if (numargs_ > 0 && optionals_ > 0) { --optionals_; @@ -936,11 +963,8 @@ void MathMacroTemplate::makeNonOptional(Cursor & cur) { } // fix macro instances - Cursor dit = cur; - dit.leaveInset(*this); - // TODO: this was dit.forwardPosNoDescend before. Check that this is the same - dit.top().forwardPos(); - fixMacroInstancesOptional(dit, name(), optionals_); + OptionalsMacroInstanceFix fix(optionals_); + fixMacroInstances(cur, inset_pos, name(), fix); } updateLook(); @@ -950,81 +974,81 @@ void MathMacroTemplate::makeNonOptional(Cursor & cur) { void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) { string const arg = to_utf8(cmd.argument()); - switch (cmd.action) { + switch (cmd.action()) { case LFUN_MATH_MACRO_ADD_PARAM: if (numargs_ < 9) { - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); size_t pos = numargs_; if (arg.size() != 0) pos = (size_t)convert(arg) - 1; // it is checked for >=0 in getStatus - insertParameter(cur, pos); + insertParameter(cur, cur, pos); } break; case LFUN_MATH_MACRO_REMOVE_PARAM: if (numargs_ > 0) { - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); size_t pos = numargs_ - 1; if (arg.size() != 0) pos = (size_t)convert(arg) - 1; // it is checked for >=0 in getStatus - removeParameter(cur, pos); + removeParameter(cur, cur, pos); } break; case LFUN_MATH_MACRO_APPEND_GREEDY_PARAM: if (numargs_ < 9) { - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); - insertParameter(cur, numargs_, true); + insertParameter(cur, cur, numargs_, true); } break; case LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM: if (numargs_ > 0) { - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); - removeParameter(cur, numargs_ - 1, true); + removeParameter(cur, cur, numargs_ - 1, true); } break; case LFUN_MATH_MACRO_MAKE_OPTIONAL: - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); - makeOptional(cur); + makeOptional(cur, cur); break; case LFUN_MATH_MACRO_MAKE_NONOPTIONAL: - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); - makeNonOptional(cur); + makeNonOptional(cur, cur); break; case LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM: if (numargs_ < 9) { - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); - insertParameter(cur, optionals_); - makeOptional(cur); + insertParameter(cur, cur, optionals_); + makeOptional(cur, cur); } break; case LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM: if (optionals_ > 0) { - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); - removeParameter(cur, optionals_ - 1); + removeParameter(cur, cur, optionals_ - 1); } break; case LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM: if (numargs_ == optionals_) { - commitEditChanges(cur); + commitEditChanges(cur, cur); cur.recordUndoFullDocument(); - insertParameter(cur, 0, true); - makeOptional(cur); + insertParameter(cur, cur, 0, true); + makeOptional(cur, cur); } break; @@ -1040,7 +1064,7 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd, { bool ret = true; string const arg = to_utf8(cmd.argument()); - switch (cmd.action) { + switch (cmd.action()) { case LFUN_MATH_MACRO_ADD_PARAM: { int num = numargs_ + 1; if (arg.size() != 0) @@ -1101,8 +1125,8 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd, void MathMacroTemplate::read(Lexer & lex) { - MathData ar; - mathed_parse_cell(ar, lex.getStream()); + MathData ar(buffer_); + mathed_parse_cell(ar, lex.getStream(), Parse::TRACKMACRO); if (ar.size() != 1 || !ar[0]->asMacroTemplate()) { lyxerr << "Cannot read macro from '" << ar << "'" << endl; lyxerr << "Read: " << to_utf8(asString(ar)) << endl; @@ -1117,7 +1141,7 @@ void MathMacroTemplate::read(Lexer & lex) void MathMacroTemplate::write(ostream & os) const { odocstringstream oss; - WriteStream wi(oss, false, false, false); + WriteStream wi(oss, false, false, WriteStream::wsDefault); oss << "FormulaMacro\n"; write(wi); os << to_utf8(oss.str()); @@ -1130,12 +1154,15 @@ void MathMacroTemplate::write(WriteStream & os) const } -void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const +int MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) const { + int num_lines = 0; + if (os.latex()) { if (optionals_ > 0) { // macros with optionals use the xargs package, e.g.: // \newcommandx{\foo}[2][usedefault, addprefix=\global,1=default]{#1,#2} + // \long is implicit by xargs if (redefinition_ && !overwriteRedefinition) os << "\\renewcommandx"; else @@ -1156,9 +1183,11 @@ void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) cons } os << "]"; } else { - // macros without optionals use standard _global_ \def macros: - // \global\def\foo#1#2{#1,#2} - os << "\\global\\def\\" << name(); + // Macros without optionals use standard _global_ \def macros: + // \global\def\long\foo#1#2{#1,#2} + // We use the \long prefix as this is the equivalent to \newcommand. + // We cannot use \newcommand directly because \global does not work with it. + os << "\\global\\long\\def\\" << name(); docstring param = from_ascii("#0"); for (int i = 1; i <= numargs_; ++i) { param[1] = '0' + i; @@ -1168,7 +1197,7 @@ void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) cons } else { // in LyX output we use some pseudo syntax which is implementation // independent, e.g. - // \newcommand{\foo}[2][default}{#1,#2} + // \newcommand{\foo}[2][default]{#1,#2} if (redefinition_ && !overwriteRedefinition) os << "\\renewcommand"; else @@ -1191,14 +1220,24 @@ void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) cons if (os.latex()) { // writing .tex. done. os << "\n"; + ++num_lines; } else { // writing .lyx, write special .tex export only if necessary - if (!cell(displayIdx()).empty()) + if (!cell(displayIdx()).empty()) { os << "\n{" << cell(displayIdx()) << '}'; + ++num_lines; + } } + + return num_lines; } +docstring MathMacroTemplate::xhtml(XHTMLStream &, OutputParams const &) const +{ + return docstring(); +} + int MathMacroTemplate::plaintext(odocstream & os, OutputParams const &) const {