Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/mathed/InsetMathXYMatrix.h b/src/mathed/InsetMathXYMatrix.h
index 797b9f19bb4b72b5cd0bb5ea07d5bcdfc53dcf3c..72f48efe46534799c9f4dea52093e00d07a3da5b 100644 (file)
--- a/src/mathed/InsetMathXYMatrix.h
+++ b/src/mathed/InsetMathXYMatrix.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,7 +12,7 @@
 #ifndef MATH_XYMATRIX_H
 #define MATH_XYMATRIX_H
 
-#include "LyXLength.h"
+#include "Length.h"
 #include "InsetMathGrid.h"
 
 
@@ -22,9 +22,10 @@ namespace lyx {
 class InsetMathXYMatrix : public InsetMathGrid {
 public:
        ///
-       InsetMathXYMatrix(LyXLength const & = LyXLength(), char c = '\0');
+       InsetMathXYMatrix(Buffer * buf, Length const & = Length(), char c = '\0',
+               bool equal_spacing = false);
        ///
-       bool metrics(MetricsInfo &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
        InsetMathXYMatrix const * asXYMatrixInset() const { return this; }
        ///
@@ -32,8 +33,6 @@ public:
        ///
        virtual int rowsep() const;
 
-       ///
-       void normalize();
        ///
        void write(WriteStream & os) const;
        ///
@@ -44,13 +43,22 @@ public:
        void maple(MapleStream &) const;
        ///
        void validate(LaTeXFeatures & features) const;
+       ///
+       InsetCode lyxCode() const { return MATH_XYMATRIX_CODE; }
+       ///
+       void mathmlize(MathStream &) const;
+       ///
+       void htmlize(HtmlStream &) const;
+
 private:
        ///
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
        /// extra spacing, may be empty
-       LyXLength spacing_;
+       Length spacing_;
        ///
        char spacing_code_;
+       ///
+       bool equal_spacing_;
 };