the up/down stuff reworked

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

diff --git a/src/mathed/math_data.h b/src/mathed/math_data.h
index 2e029e2aa195ca0e8a44a74c902e911f35ffa9d3..920746412d8b32e32e198a7ec589278b119d8561 100644 (file)
--- 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)
@@ -33,110 +33,86 @@ class ReplaceData;
 
 /** \class MathArray
     \brief Low level container for math insets
-    
+
     \author Alejandro Aguilar Sierra
     \author André Pönitz
     \author Lars Gullik Bjønnes
     \version February 2001
   */
 
-class MathArray  {
+class MathArray : private std::vector<MathAtom> {
 public:
-       ///
-       typedef std::vector<MathAtom>        buffer_type;
-       ///
-       typedef buffer_type::const_iterator  const_iterator;
-       ///
-       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;
-
+       /// re-use inhertited stuff
+       typedef std::vector<MathAtom> base_type;
+       using base_type::const_iterator;
+       using base_type::iterator;
+       using base_type::size_type;
+       using base_type::difference_type;
+       using base_type::size;
+       using base_type::empty;
+       using base_type::clear;
+       using base_type::begin;
+       using base_type::end;
+       using base_type::push_back;
+       using base_type::pop_back;
+       using base_type::back;
+       using base_type::front;
+       using base_type::swap;
+       ///
+       typedef size_type idx_type;
+       typedef size_type pos_type;
+       
 public:
        ///
-       MathArray();
+       MathArray() {}
        ///
-       MathArray(MathArray const &, size_type from, size_type to);
+       MathArray(const_iterator from, const_iterator to);
        ///
-       MathArray(iterator from, iterator to);
+       void append(MathArray const & ar);
 
-       ///
-       size_type size() const;
-       ///
-       bool empty() const;
-       ///
-       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);
-       ///
-       void erase();
-
-       ///
-       void push_back(MathAtom const &);
-       ///
-       void push_back(MathArray const &);
-       ///
-       void pop_back();
-       ///
-       MathAtom & back();
-
-       ///
-       MathAtom & front();
-       ///
-       MathAtom const & front() const;
 
        ///
        void dump() const;
        ///
        void dump2() const;
        ///
-       void substitute(MathMacro const &);
-       /// looks for exact match
-       bool match(MathArray const &) const;
-       /// looks for inclusion match starting at pos
-       bool matchpart(MathArray const &, pos_type pos) const;
-       /// looks for containment
-       const_iterator find(MathArray const &) const;
+       void substitute(MathMacro const & macro);
        ///
        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;
        ///
-       MathAtom & at(size_type pos);
-       ///
-       MathAtom const & at(size_type pos) const;
+       bool contains(MathArray const & ar) const;
        ///
        void validate(LaTeXFeatures &) const;
-       ///
-       const_iterator begin() const;   
-       ///
-       const_iterator end() const;     
-       ///
-       iterator begin();
-       ///
-       iterator end();
 
+       /// checked write access
+       MathAtom & operator[](pos_type);
+       /// checked read access
+       MathAtom const & operator[](pos_type) const;
 private:
-       /// Buffer
-       buffer_type bf_;
+       /// is this an exact match at this position?
+       bool find1(MathArray const & ar, size_type pos) const;
 };
 
 ///