Replace LString.h with support/std_string.h,

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

diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h
index 6f189c9ab473247de72eb5a494211064a25becc1..6d2a23b66193761d2ac3db5c0445a34913cc2215 100644 (file)
--- a/src/mathed/math_decorationinset.h
+++ b/src/mathed/math_decorationinset.h
@@ -1,36 +1,59 @@
 // -*- C++ -*-
+/**
+ * \file math_decorationinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_DECORATIONINSET_H
 #define MATH_DECORATIONINSET_H
 
-#include "math_inset.h"
+#include "math_nestinset.h"
+#include "support/std_string.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-/** Decorations over (below) a math object
-    \author Alejandro Aguilar Sierra
- */
-class MathDecorationInset : public MathInset {
+class latexkeys;
+
+/// Decorations and accents over (below) a math object
+class MathDecorationInset : public MathNestInset {
 public:
        ///
-       explicit MathDecorationInset(int);
+       explicit MathDecorationInset(latexkeys const * key);
+       ///
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       MathInset * clone() const;
+       void draw(PainterInfo &, int x, int y) const;
        ///
-       void draw(Painter &, int, int);
+       void write(WriteStream & os) const;
        ///
-       void Write(std::ostream &, bool fragile) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void Metrics(MathStyles st, int asc = 0, int des = 0);
+       void normalize(NormalStream & 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