* Licence details can be found in the file COPYING.
*
* \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
class MathMacro : public InsetMathNest {
public:
/// A macro can be built from an existing template
- MathMacro(docstring const & name);
+ MathMacro(Buffer * buf, docstring const & name);
///
virtual MathMacro * asMacro() { return this; }
///
bool idxLast(Cursor &) const;
///
- virtual bool notifyCursorLeaves(Cursor &);
+ virtual bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
/// Remove cell (starting from 0)
void removeArgument(pos_type pos);
///
void write(WriteStream & os) const;
///
+ void normalize(NormalStream & os) const;
+ ///
void maple(MapleStream &) const;
///
void mathmlize(MathStream &) const;
///
+ void htmlize(HtmlStream &) const;
+ ///
void octave(OctaveStream &) const;
///
void infoize(odocstream &) const;
DISPLAY_INIT,
DISPLAY_INTERACTIVE_INIT,
DISPLAY_UNFOLDED,
- DISPLAY_NORMAL,
+ DISPLAY_NORMAL
};
///
if (n <= int(nargs()))
optionals_ = n;
}
-
+ /// Return the maximal number of arguments the macro is greedy for.
+ size_t appetite() const { return appetite_; }
+ ///
+ InsetCode lyxCode() const { return MATH_MACRO_CODE; }
+
protected:
friend class MathData;
friend class ArgumentProxy;
friend class Cursor;
/// update the display mode (should only be called after detaching arguments)
- void setDisplayMode(DisplayMode mode);
+ void setDisplayMode(DisplayMode mode, int appetite = -1);
/// compute the next display mode
DisplayMode computeDisplayMode() const;
/// update macro definition
void updateMacro(MacroContext const & mc);
/// check if macro definition changed, argument changed etc. and adapt
- void updateRepresentation(Cursor const * bvCur);
+ void updateRepresentation();
/// empty macro, put arguments into args, possibly strip arity-attachedArgsNum_ empty ones.
/// Includes the optional arguments.
void detachArguments(std::vector<MathData> & args, bool strip);
MacroData const * macro() { return macro_; }
///
bool editMetrics(BufferView const * bv) const;
-
+
private:
///
virtual Inset * clone() const;
std::string requires_;
/// update macro representation
bool needsUpdate_;
+ /// maximal number of arguments the macro is greedy for
+ size_t appetite_;
public:
///
///
bool automaticPopupCompletion() const;
///
- CompletionListPtr completionList(Cursor const & cur) const;
+ CompletionList const * createCompletionList(Cursor const & cur) const;
///
docstring completionPrefix(Cursor const & cur) const;
///