Fix misparsing of alternative simple formulas

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 2fd936916af9a34837b4c90034ec1017992edc0e..af00eaf04e9ac9cb5ca55ca601995c5af6b95b89 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,7 +14,6 @@
 
 #include "InsetMathGrid.h"
 
-#include "Color.h"
 #include "DocIterator.h"
 #include "OutputEnums.h"
 
@@ -42,7 +41,7 @@ public:
        ///
        void updateBuffer(ParIterator const &, UpdateType);
        ///
-       void addToToc(DocIterator const &);
+       void addToToc(DocIterator const & di, bool output_active) const;
        ///
        InsetMathHull & operator=(InsetMathHull const &);
        ///
@@ -101,6 +100,9 @@ public:
        ///
        char defaultColAlign(col_type col);
        ///
+       ///
+       char displayColAlign(col_type col, row_type row) const;
+       ///
        bool idxFirst(Cursor &) const;
        ///
        bool idxLast(Cursor &) const;
@@ -108,8 +110,6 @@ public:
        ///
        void write(WriteStream & os) const;
        ///
-       void mathmlize(MathStream &) const;
-       ///
        void normalize(NormalStream &) const;
        ///
        void infoize(odocstream & os) const;
@@ -125,11 +125,18 @@ public:
        ///
        bool readQuiet(Lexer & lex);
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream &, OutputParams const &, 
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       ///
+       void mathmlize(MathStream &) const;
+       ///
+       void htmlize(HtmlStream &) const;
+       ///
+       void mathAsLatex(WriteStream &) const;
        /// 
        void toString(odocstream &) const;
        ///
@@ -156,7 +163,7 @@ public:
        void recordLocation(DocIterator const & di);
 
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        InsetCode lyxCode() const { return MATH_HULL_CODE; }
 
@@ -218,6 +225,8 @@ private:
        bool rowChangeOK() const;
        /// can this change its number of cols?
        bool colChangeOK() const;
+       /// are any of the equations numbered?
+       bool haveNumbers() const;
 
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
@@ -233,6 +242,10 @@ private:
        mutable bool use_preview_;
        ///
        DocIterator docit_;
+       ///
+       typedef std::map<docstring, int> CounterMap;
+       /// used to store current values of important counters
+       CounterMap counter_map;
 //
 // Incorporate me
 //