X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_data.h;h=66994e7ccc27d6692a4e85e0767659b21e860cdf;hb=6aa8d56bddcb29d2c266dc520a4e725958c31db1;hp=007d75850ee8ea4bd80f283b878712495aeebfa3;hpb=f34e4919f71ca3af1a56b7b24134254481539249;p=lyx.git

diff --git a/src/mathed/math_data.h b/src/mathed/math_data.h
index 007d75850e..66994e7ccc 100644
--- a/src/mathed/math_data.h
+++ b/src/mathed/math_data.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /*
- *  Purpose:     A general purpose resizable array.  
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Purpose:     A general purpose resizable array.
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     January 1996
  *
  *  Dependencies: None (almost)
@@ -13,23 +13,17 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef MATHEDARRAY_H
-#define MATHEDARRAY_H
+#ifndef MATH_DATA_H
+#define MATH_DATA_H
 
+#include <iosfwd>
 #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__
@@ -39,7 +33,7 @@ class OctaveStream;
 
 /** \class MathArray
     \brief Low level container for math insets
-    
+
     \author Alejandro Aguilar Sierra
     \author André Pönitz
     \author Lars Gullik Bjønnes
@@ -56,12 +50,20 @@ public:
 	typedef buffer_type::iterator        iterator;
 	///
 	typedef buffer_type::size_type       size_type;
+	///
+	typedef buffer_type::difference_type difference_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(MathArray const & ar, size_type from, size_type to);
+	///
+	MathArray(iterator from, iterator to);
 
 	///
 	size_type size() const;
@@ -71,73 +73,87 @@ public:
 	void clear();
 	///
 	void swap(MathArray &);
-	
-	///
-	void insert(size_type pos, MathAtom const &);
-	///
-	void insert(size_type pos, MathArray const &);
 
-	///
+	/// inserts single atom at position pos
+	void insert(size_type pos, MathAtom const & at);
+	/// inserts multiple atoms at position pos
+	void insert(size_type pos, MathArray const & ar);
+
+	/// erase range from pos1 to pos2
+	void erase(iterator pos1, iterator pos2);
+	/// erase single atom
+	void erase(iterator pos);
+	/// erase range from pos1 to pos2
 	void erase(size_type pos1, size_type pos2);
-	///
+	/// erase single atom
 	void erase(size_type pos);
-	///
+	/// erase everythng
 	void erase();
 
 	///
-	void push_back(MathAtom const &);
+	void push_back(MathAtom const & at);
 	///
-	void push_back(MathArray const &);
+	void push_back(MathArray const & ar);
 	///
 	void pop_back();
 	///
 	MathAtom & back();
 
 	///
-	void dump() const;
+	MathAtom & front();
 	///
-	void dump2() const;
-	///
-	void substitute(MathMacro const &);
+	MathAtom const & front() const;
 
 	///
-	MathAtom & at(size_type pos);
+	void dump() const;
 	///
-	MathAtom const & at(size_type pos) const;
-	/// glue chars if necessary
-	void write(MathWriteInfo & os) const;
+	void dump2() const;
 	///
-	void writeNormal(NormalStream &) const;
+	void substitute(MathMacro const & macro);
 	///
-	void validate(LaTeXFeatures &) const;
+	void replace(ReplaceData &);
+
+	/// looks for exact match
+	bool match(MathArray const & ar) const;
+	/// looks for inclusion match starting at pos
+	bool matchpart(MathArray const & ar, pos_type pos) const;
+	/// looks for containment, return == size mean not found
+	size_type find(MathArray const & ar) const;
+	/// looks for containment, return == size mean not found
+	size_type find_last(MathArray const & ar) const;
+	///
+	bool contains(MathArray const & ar) const;
+
+	/// write acccess to single atom
+	MathAtom & operator[](size_type pos) { return at(pos); }
+	/// read access o single atom
+	MathAtom const & operator[](size_type pos) const { return at(pos); }
 	///
-	const_iterator begin() const;	
+	const_iterator begin() const;
 	///
-	const_iterator end() const;	
+	const_iterator end() const;
 	///
 	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;
+	void validate(LaTeXFeatures &) const;
 
 private:
+	/// is this an exact match at this position?
+	bool find1(MathArray const & ar, size_type pos) const;
+	/// write acccess to single atom
+	MathAtom & at(size_type pos);
+	/// read access o single atom
+	MathAtom const & at(size_type pos) const;
+
 	/// Buffer
 	buffer_type bf_;
 };
 
+///
+std::ostream & operator<<(std::ostream & os, MathArray const & ar);
+
+
 #endif