Fix bug #6315: counters in insets that don't produce output have ghost values.

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 7b2b48ba793189331f9e0f28aa9782ebd47377eb..7f161f22357ca1365efbab44d09ac2fc5495ad7b 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,6 +14,10 @@
 
 #include "InsetMathGrid.h"
 
+#include "Color.h"
+#include "DocIterator.h"
+#include "OutputEnums.h"
+
 #include <boost/scoped_ptr.hpp>
 
 
@@ -32,11 +36,11 @@ public:
        ///
        InsetMathHull(Buffer * buf, HullType type);
        ///
-       ~InsetMathHull();
+       virtual ~InsetMathHull();
        ///
        void setBuffer(Buffer &);
        ///
-       void updateLabels(ParIterator const &, bool);
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
        void addToToc(DocIterator const &);
        ///
@@ -58,7 +62,9 @@ public:
        ///
        void label(row_type row, docstring const & label);
        ///
-       ColorCode backgroundColor() const { return Color_mathbg; }
+       std::vector<InsetLabel *> const & getLabels() { return label_; }
+       ///
+       ColorCode backgroundColor(PainterInfo const &) const;
        ///
        void numbered(row_type row, bool num);
        ///
@@ -123,7 +129,7 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        /// the string that is passed to the TOC
        void tocString(odocstream &) const;
 
@@ -134,17 +140,18 @@ public:
        ///
        void addPreview(DocIterator const & inset_pos,
                graphics::PreviewLoader &) const;
-       /// Prepare the preview if preview is enabled. A subsequent
-       /// call to reloadPreview will recreate the preview.
-       void preparePreview(DocIterator const & pos) const;
+       /// Recreates the preview if preview is enabled.
+       void reloadPreview(DocIterator const & pos) const;
        ///
        void initUnicodeMath() const;
 
        ///
        static int displayMargin() { return 12; }
        
-       /// Force inset into LTR environment if surroundings are RTL?
+       /// Force inset into LTR environment if surroundings are RTL
        virtual bool forceLTR() const { return true; }
+       ///
+       void recordLocation(DocIterator const & di);
 
        ///
        virtual docstring contextMenu(BufferView const &, int, int) const;
@@ -160,10 +167,19 @@ protected:
        bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
        ///
-       docstring eolString(row_type row, bool fragile) 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);
        ///
@@ -173,7 +189,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.
@@ -192,6 +208,8 @@ private:
        void changeCols(col_type);
        ///
        docstring standardFont() const;
+       ///
+       ColorCode standardColor() const;
        /// consistency check
        void check() const;
        /// can this change its number of rows?
@@ -202,13 +220,15 @@ private:
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
        ///
-       std::vector<bool> nonum_;
+       std::vector<bool> numbered_;
        ///
        std::vector<InsetLabel *> label_;
        ///
        boost::scoped_ptr<RenderPreview> preview_;
        ///
        mutable bool use_preview_;
+       ///
+       DocIterator docit_;
 //
 // Incorporate me
 //