perhaps a fix for the latest crashes

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

diff --git a/src/mathed/math_data.h b/src/mathed/math_data.h
index 007d75850ee8ea4bd80f283b878712495aeebfa3..b537e51d700dfb531211e47b494a3e08db036886 100644 (file)
--- a/src/mathed/math_data.h
+++ b/src/mathed/math_data.h
@@ -13,23 +13,16 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef MATHEDARRAY_H
-#define MATHEDARRAY_H
+#ifndef MATH_DATA_H
+#define MATH_DATA_H
 
 #include <vector>
 
 #include "math_atom.h"
-#include "LString.h"
 
-class MathScriptInset;
 class MathMacro;
-class MathWriteInfo;
-class MathMetricsInfo;
 class LaTeXFeatures;
-class NormalStream;
-class MapleStream;
-class MathMLStream;
-class OctaveStream;
+class ReplaceData;
 
 
 #ifdef __GNUG__
@@ -56,12 +49,18 @@ public:
        typedef buffer_type::iterator        iterator;
        ///
        typedef buffer_type::size_type       size_type;
+       ///
+       typedef buffer_type::size_type       idx_type;
+       ///
+       typedef buffer_type::size_type       pos_type;
 
 public:
        ///
        MathArray();
        ///
        MathArray(MathArray const &, size_type from, size_type to);
+       ///
+       MathArray(iterator from, iterator to);
 
        ///
        size_type size() const;
@@ -77,6 +76,10 @@ public:
        ///
        void insert(size_type pos, MathArray const &);
 
+       ///
+       void erase(iterator pos1, iterator pos2);
+       ///
+       void erase(iterator pos);
        ///
        void erase(size_type pos1, size_type pos2);
        ///
@@ -93,21 +96,26 @@ public:
        ///
        MathAtom & back();
 
+       ///
+       MathAtom & front();
+       ///
+       MathAtom const & front() const;
+
        ///
        void dump() const;
        ///
        void dump2() const;
        ///
        void substitute(MathMacro const &);
+       ///
+       bool match(MathArray const &) const;
+       ///
+       void replace(ReplaceData &);
 
        ///
        MathAtom & at(size_type pos);
        ///
        MathAtom const & at(size_type pos) const;
-       /// glue chars if necessary
-       void write(MathWriteInfo & os) const;
-       ///
-       void writeNormal(NormalStream &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
@@ -118,22 +126,6 @@ public:
        iterator begin();
        ///
        iterator end();
-       ///
-       MathScriptInset const * asScript(const_iterator it) const;
-       /// glues chars with the same attributes into MathStringInsets
-       MathArray glueChars() const;
-       /// insert asterisks in "suitable" places
-       MathArray guessAsterisks() const;
-
-       /// interface to Octave
-       void octavize(OctaveStream &) const;
-       /// interface to Maple
-       void maplize(MapleStream &) const;
-       /// interface to MathML
-       void mathmlize(MathMLStream &) const;
-
-       ///
-       bool isMatrix() const;
 
 private:
        /// Buffer