rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h
index d9bc68393076582ad591acebd5d14820784a64c3..97c56ba383852185d75f3d481ae8b05a8dc033be 100644 (file)
--- a/src/mathed/math_decorationinset.h
+++ b/src/mathed/math_decorationinset.h
@@ -2,37 +2,52 @@
 #ifndef MATH_DECORATIONINSET_H
 #define MATH_DECORATIONINSET_H
 
-#include "math_inset.h"
+#include "math_nestinset.h"
+#include "LString.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Decorations and accents over (below) a math object
-    \author Alejandro Aguilar Sierra
+ *  \author Alejandro Aguilar Sierra
+ *
+ * Full author contact details are available in file CREDITS
  */
-class MathDecorationInset : public MathInset {
+
+class latexkeys;
+
+class MathDecorationInset : public MathNestInset {
 public:
        ///
-       MathDecorationInset(string const & name, int);
+       explicit MathDecorationInset(latexkeys const * key);
        ///
        MathInset * clone() const;
        ///
-       void draw(Painter &, int, int);
+       void draw(MathPainterInfo &, int x, int y) const;
+       ///
+       void write(WriteStream & os) const;
        ///
-       void write(std::ostream &, bool fragile) const;
+       void metrics(MathMetricsInfo & mi) const;
        ///
-       void metrics(MathStyles st);
+       void normalize(NormalStream & os) const;
        ///
-       void writeNormal(std::ostream & os) const;
+       void infoize(std::ostream & os) const;
+       ///
+       bool isScriptable() const;
+
 private:
        ///
-       int deco_;
+       bool upper() const;
+       ///
+       bool protect() const;
+       /// is it a wide decoration?
+       bool wide() const;
+
        ///
-       bool upper_;
-       /// height of deco
-       int dh_;
-       /// vertical offset of deco
-       int dy_;
+       latexkeys const * key_;
+       /// height cache of deco
+       mutable int dh_;
+       /// vertical offset cache of deco
+       mutable int dy_;
+       /// width for non-wide deco
+       mutable int dw_;
 };
 #endif