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 7e72cef6373eb4084cec604ebad5b2b8b4cd78c2..af00eaf04e9ac9cb5ca55ca601995c5af6b95b89 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -41,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 &);
        ///
@@ -100,14 +100,15 @@ public:
        ///
        char defaultColAlign(col_type col);
        ///
+       ///
+       char displayColAlign(col_type col, row_type row) const;
+       ///
        bool idxFirst(Cursor &) const;
        ///
        bool idxLast(Cursor &) const;
 
        ///
-       void write(WriteStream & os, bool do_header = true) const;
-       ///
-       void mathmlize(MathStream &) const;
+       void write(WriteStream & os) const;
        ///
        void normalize(NormalStream &) const;
        ///
@@ -124,13 +125,22 @@ 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;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       ///
+       void mathmlize(MathStream &) const;
+       ///
+       void htmlize(HtmlStream &) const;
+       ///
+       void mathAsLatex(WriteStream &) const;
+       /// 
+       void toString(odocstream &) const;
+       ///
+       void forToc(docstring &, size_t) const;
 
        /// get notification when the cursor leaves this inset
        bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
@@ -139,10 +149,8 @@ public:
        ///
        void addPreview(DocIterator const & inset_pos,
                graphics::PreviewLoader &) const;
-       /// Prepare the preview if preview is enabled.
-       void preparePreview(DocIterator const & pos) const;
        /// Recreates the preview if preview is enabled.
-       void reloadPreview(DocIterator const & pos, bool wait = false) const;
+       void reloadPreview(DocIterator const & pos) const;
        ///
        void initUnicodeMath() const;
 
@@ -155,7 +163,7 @@ public:
        void recordLocation(DocIterator const & di);
 
        ///
-       virtual docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenuName() const;
        ///
        InsetCode lyxCode() const { return MATH_HULL_CODE; }
 
@@ -168,10 +176,19 @@ protected:
        bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
        ///
-       docstring eolString(row_type row, bool fragile, bool last_eoln) const;
+       docstring eolString(row_type row, bool fragile, bool latex,
+                       bool last_eoln) const;
 
 private:
        virtual Inset * clone() const;
+       /// Prepare the preview if preview is enabled.
+       /// \param forexport: whether this is intended for export
+       /// If so, we ignore LyXRC and wait for the image to be generated.
+       void preparePreview(DocIterator const & pos,
+                           bool forexport = false) const;
+       /// like reloadPreview, but forces load 
+       /// used by image export
+       void loadPreview(DocIterator const & pos) const;
        ///
        void setType(HullType type);
        ///
@@ -181,7 +198,7 @@ private:
        ///
        void doExtern(Cursor & cur, FuncRequest & func);
        ///
-       void glueall();
+       void glueall(HullType type);
        /*!
         * split every row at the first relation operator.
         * The number of columns must be 1. One column is added.
@@ -201,18 +218,22 @@ private:
        ///
        docstring standardFont() const;
        ///
-       docstring standardColor() const;
+       ColorCode standardColor() const;
        /// consistency check
        void check() const;
        /// can this change its number of rows?
        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_;
        ///
-       std::vector<bool> nonum_;
+       std::vector<bool> numbered_;
+       ///
+       std::vector<docstring> numbers_;
        ///
        std::vector<InsetLabel *> label_;
        ///
@@ -221,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
 //