X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmathed%2FMathRow.h;h=de63ec965ff7a4442191cd044e28be11a07edce4;hb=c8230ab0d0a919530c43c29395f4d9961498bf15;hp=760ac18eb1cf8cd718ffa8e4076e4158426fbad8;hpb=ce8929e9b237af569934b434154d199634363268;p=lyx.git diff --git a/src/mathed/MathRow.h b/src/mathed/MathRow.h index 760ac18eb1..de63ec965f 100644 --- a/src/mathed/MathRow.h +++ b/src/mathed/MathRow.h @@ -30,7 +30,6 @@ class PainterInfo; class InsetMath; class MathData; -class MathMacro; /* * While for editing purpose it is important that macros are counted @@ -49,10 +48,8 @@ public: enum Type { INSET, // this element is a plain inset BOX, // an empty box - BEG_MACRO, // a macro begins here - END_MACRO, // a macro ends here - BEG_ARG, // a macro argument begins here - END_ARG, // a macro argument ends here + BEGIN, // an inset and/or a math array begins here + END, // an inset and/or a math array ends here DUMMY // a dummy element (used before or after row) }; @@ -74,18 +71,14 @@ public: InsetMath::marker_type marker; /// When type is INSET - /// the math inset + /// the math inset (also for BEGIN and END) InsetMath const * inset; // Non empty when there is a completion to draw docstring compl_text; // the number of characters forming the unique part. size_t compl_unique_to; - /// When type is BEG_MACRO, END_MACRO, BEG_ARG, END_ARG - /// the math macro - MathMacro const * macro; - - // type is BEG_ARG, END_ARG + // type is BEGIN, END MathData const * ar; // type is BOX @@ -118,7 +111,7 @@ public: MathRow(MetricsInfo & mi, MathData const * ar); // - void metrics(MetricsInfo & mi, Dimension & dim) const; + void metrics(MetricsInfo & mi, Dimension & dim); // void draw(PainterInfo & pi, int const x, int const y) const;