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

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

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index 47a6bbeb8d016e0c757788e87eeeac8424dbd50c..c2747fb14e232f03add99f3335114d224a15ddff 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -25,10 +25,6 @@ public:
        ///
        MathInset * clone() const;
        ///
-       void write(MathWriteInfo & os) const;
-       ///
-       void writeNormal(NormalStream &) const;
-       ///
        void metrics(MathMetricsInfo const & st) const;
        ///
        void draw(Painter &, int x, int y) const;
@@ -51,9 +47,9 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies MatrixInsets
-       virtual MathHullInset const * asMatrixInset() const { return this; }
-       /// identifies MatrixInsets
-       virtual MathHullInset * asMatrixInset() { return this; }
+       MathHullInset const * asHullInset() const { return this; }
+       /// identifies HullInset
+       MathHullInset * asHullInset() { return this; }
 
        ///
        void addRow(row_type);
@@ -79,7 +75,11 @@ public:
        ///
        MathInsetTypes getType() const;
        ///
+       void write(WriteStream & os) const;
+       ///
        void mathmlize(MathMLStream &) const;
+       ///
+       void normalize(NormalStream &) const;
 
 private:
        ///
@@ -87,13 +87,15 @@ private:
        ///
        void validate1(LaTeXFeatures & features);
        ///
-       void header_write(std::ostream &) const;
+       void header_write(WriteStream &) const;
        ///
-       void footer_write(std::ostream &) const;
+       void footer_write(WriteStream &) const;
        ///
        void glueall();
        ///
        string nicelabel(row_type row) const;
+       /// consistency check
+       void check() const;
 
        ///
        MathInsetTypes objtype_;