use stream-like syntax for LaTeX output

[lyx.git] / src / mathed / math_macroarg.h

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index 1129c2972a35e72c2b853d0aaf9dcec816943e3c..c8855d9a87d1d177703ceef742d94c9117ae95ca 100644 (file)
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -2,7 +2,7 @@
 #ifndef MATHMACROARGUMENT_H
 #define MATHMACROARGUMENT_H
 
-#include "math_parinset.h"
+#include "math_nestinset.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -11,31 +11,32 @@
 /** A macro argument
     \author Alejandro Aguilar Sierra
 */
-class MathMacroArgument: public MathParInset {
+class MathMacroArgument : public MathNestInset {
 public:
        ///
-       MathMacroArgument();
+       explicit MathMacroArgument(int);
        ///
-       explicit
-       MathMacroArgument(int);
+       MathInset * clone() const;
        ///
-       MathedInset * Clone();
+       void metrics(MathMetricsInfo const & st) const;
        ///
-       void Metrics();
+       void draw(Painter &, int x, int y) const;
        ///
-       void draw(Painter &, int x, int baseline);
+       void write(MathWriteInfo & os) const;
        ///
-       void Write(std::ostream &, bool fragile);
+       void writeNormal(std::ostream &) const;
        ///
-       void setNumber(int n);
-       /// Is expanded or not
-       void setExpand(bool e);
-       /// Is expanded or not
-       bool getExpand() const;
+       void substitute(MathMacro const & macro);
+       ///
+       bool isActive() const { return false; }
+
 private:
+       /// A number between 1 and 9
+       int number_;
        ///
-       bool expnd_mode_;
+       char str_[3];
        ///
-       int number_;
+       bool expanded_;
 };
+
 #endif