enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h
index 54024c14d8a20f7ba488804da587cdb1d5c248a2..a0ff67b805e545869f940762a12f8e891ada2d21 100644 (file)
--- a/src/mathed/math_decorationinset.h
+++ b/src/mathed/math_decorationinset.h
@@ -3,6 +3,7 @@
 #define MATH_DECORATIONINSET_H
 
 #include "math_nestinset.h"
+#include "LString.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -12,34 +13,38 @@
     \author Alejandro Aguilar Sierra
  */
 
-struct latexkeys;
-
 class MathDecorationInset : public MathNestInset {
 public:
        ///
-       explicit MathDecorationInset(latexkeys const *);
+       explicit MathDecorationInset(string const & name);
        ///
        MathInset * clone() const;
        ///
        void draw(Painter &, int x, int y) const;
        ///
-       void write(std::ostream &, bool fragile) const;
+       void write(WriteStream & os) const;
+       ///
+       void metrics(MathMetricsInfo const & st) const;
        ///
-       void metrics(MathStyles st) const;
+       void normalize(NormalStream & os) const;
        ///
-       void writeNormal(std::ostream & os) const;
+       bool isScriptable() const;
 
 private:
        ///
        bool upper() const;
        ///
        bool protect() const;
+       /// is it a wide decoration?
+       bool wide() const;
 
        ///
-       latexkeys const * key_;
+       string const name_;
        /// height cache of deco
        mutable int dh_;
        /// vertical offset cache of deco
        mutable int dy_;
+       ///
+       mutable MathMetricsInfo size_;
 };
 #endif