Move <algorithm> from DocIterator.h

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

diff --git a/src/mathed/InsetMathMatrix.h b/src/mathed/InsetMathMatrix.h
index 0b65634c64d94032405154ffa5b88335f3ea0fdf..6f13b0f6293dd97453bf4d2866b2ab716bb88a9c 100644 (file)
--- a/src/mathed/InsetMathMatrix.h
+++ b/src/mathed/InsetMathMatrix.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.
  */
@@ -13,38 +13,49 @@
 #define MATH_MATRIXINSET_H
 
 #include "InsetMathGrid.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {
 
 
-// "shortcut" for DelimInset("(",ArrayInset,")")
+// "shortcut" for DelimInset("(",ArrayInset,")") used by MathExtern
 
 class InsetMathMatrix : public InsetMathGrid {
 public:
        ///
-       explicit InsetMathMatrix(InsetMathGrid const &);
-       ///
-       explicit InsetMathMatrix(docstring const & str);
+       explicit InsetMathMatrix(InsetMathGrid const &,
+                       docstring const & left, docstring const & right);
        /// identifies MatrixInsets
-       InsetMathMatrix const * asMatrixInset() const { return this; }
+       InsetMathMatrix const * asMatrixInset() const override { return this; }
 
        ///
-       void write(WriteStream & os) const;
+       void write(WriteStream & os) const override;
+       ///
+       void normalize(NormalStream &) const override;
+       ///
+       void maple(MapleStream &) const override;
+       ///
+       void maxima(MaximaStream &) const override;
        ///
-       void normalize(NormalStream &) const;
+       void mathematica(MathematicaStream &) const override;
        ///
-       void maple(MapleStream &) const;
+       void mathmlize(MathStream &) const override;
        ///
-       void maxima(MaximaStream &) const;
+       void htmlize(HtmlStream &) const override;
        ///
-       void mathematica(MathematicaStream &) const;
+       void octave(OctaveStream &) const override;
        ///
-       void mathmlize(MathStream &) const;
+       InsetCode lyxCode() const override { return MATH_MATRIX_CODE; }
        ///
-       void octave(OctaveStream &) const;
+       bool handlesMulticolumn() const override { return true; }
+
 private:
-       virtual std::auto_ptr<Inset> doClone() const;
+       Inset * clone() const override;
+       ///
+       docstring left_;
+       ///
+       docstring right_;
 };