Another warning.

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 7e72cef6373eb4084cec604ebad5b2b8b4cd78c2..7f161f22357ca1365efbab44d09ac2fc5495ad7b 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,6 +14,7 @@
 
 #include "InsetMathGrid.h"
 
+#include "Color.h"
 #include "DocIterator.h"
 #include "OutputEnums.h"
 
@@ -105,7 +106,7 @@ public:
        bool idxLast(Cursor &) const;
 
        ///
-       void write(WriteStream & os, bool do_header = true) const;
+       void write(WriteStream & os) const;
        ///
        void mathmlize(MathStream &) const;
        ///
@@ -139,10 +140,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;
 
@@ -168,10 +167,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 +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.
@@ -201,7 +209,7 @@ private:
        ///
        docstring standardFont() const;
        ///
-       docstring standardColor() const;
+       ColorCode standardColor() const;
        /// consistency check
        void check() const;
        /// can this change its number of rows?
@@ -212,7 +220,7 @@ private:
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
        ///
-       std::vector<bool> nonum_;
+       std::vector<bool> numbered_;
        ///
        std::vector<InsetLabel *> label_;
        ///