fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 4460f0bfd5d54c352cf0aba3ee66d91f7915e4e0..ee8059c03dc7d6409ec93883d656b4de651e309c 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 /*
  *  File:        math_macro.h
- *  Purpose:     Declaration of macro class for mathed 
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Purpose:     Declaration of macro class for mathed
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     November 1996
  *  Description: WYSIWYG math macros
  *
@@ -48,16 +48,10 @@ public:
        ///
        MathInset * clone() const;
        ///
-       void write(MathWriteInfo & os) const;
-       ///
-       void writeNormal(std::ostream &) const;
-       ///
        void dump() const;
 
        ///
-       bool idxUp(idx_type &, pos_type &) const;
-       ///
-       bool idxDown(idx_type &, pos_type &) const;
+       bool idxUpDown(idx_type &, bool up) const;
        ///
        bool idxLeft(idx_type &, pos_type &) const;
        ///
@@ -67,6 +61,19 @@ public:
        void validate(LaTeXFeatures &) const;
        ///
        bool isMacro() const { return true; }
+       ///
+       bool match(MathInset *) const { return false; }
+
+       ///
+       void normalize(NormalStream &) const;
+       ///
+       void maplize(MapleStream &) const;
+       ///
+       void mathmlize(MathMLStream &) const;
+       ///
+       void octavize(OctaveStream &) const;
+       ///
+       void write(WriteStream & os) const;
 
 private:
        ///
@@ -74,14 +81,20 @@ private:
        ///
        char const * name() const;
        ///
-       bool editing() const;
-       ///
        bool defining() const;
+       ///
+       void updateExpansion() const;
+       ///
+       void expand() const;
 
        ///
        MathAtom & tmplate_;
        ///
        mutable MathXArray expanded_;
+       ///
+       mutable MathMetricsInfo mi_;
+       ///
+       mutable LyXFont font_;
 };