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 1808b2f474d42775e0e4273ffb91d1ff11e1418e..97c56ba383852185d75f3d481ae8b05a8dc033be 100644 (file)
--- a/src/mathed/math_decorationinset.h
+++ b/src/mathed/math_decorationinset.h
@@ -5,28 +5,31 @@
 #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 latexkeys;
+
 class MathDecorationInset : public MathNestInset {
 public:
        ///
-       explicit MathDecorationInset(string const & name);
+       explicit MathDecorationInset(latexkeys const * key);
        ///
        MathInset * clone() const;
        ///
-       void draw(Painter &, int x, int y) const;
+       void draw(MathPainterInfo &, int x, int y) const;
        ///
-       void write(MathWriteInfo & os) const;
+       void write(WriteStream & os) const;
        ///
-       void metrics(MathMetricsInfo const & st) const;
+       void metrics(MathMetricsInfo & mi) const;
        ///
-       void writeNormal(std::ostream & os) const;
+       void normalize(NormalStream & os) const;
+       ///
+       void infoize(std::ostream & os) const;
        ///
        bool isScriptable() const;
 
@@ -39,12 +42,12 @@ private:
        bool wide() const;
 
        ///
-       string const name_;
+       latexkeys const * key_;
        /// height cache of deco
        mutable int dh_;
        /// vertical offset cache of deco
        mutable int dy_;
-       ///
-       mutable MathMetricsInfo size_;
+       /// width for non-wide deco
+       mutable int dw_;
 };
 #endif