Reimplement support for numbering of equation previews

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 0b085a11f948d5f934b3d91ca404f1a1040f068c..92903c5e424b034a584c9f42b501749d538a690c 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -88,7 +88,7 @@ public:
        ///
        bool outerDisplay() const;
        ///
-       OutputParams::CtObject CtObject(OutputParams const &) const override;
+       CtObject getCtObject(OutputParams const &) const override;
        ///
        void validate(LaTeXFeatures & features) const override;
        /// identifies HullInset
@@ -124,7 +124,7 @@ public:
        char displayColAlign(idx_type idx) const override;
 
        ///
-       void write(WriteStream & os) const override;
+       void write(TeXMathStream & os) const override;
        ///
        void normalize(NormalStream &) const override;
        ///
@@ -133,9 +133,9 @@ public:
        ///
        void write(std::ostream & os) const override;
        ///
-       void header_write(WriteStream &) const;
+       void header_write(TeXMathStream &) const;
        ///
-       void footer_write(WriteStream &) const;
+       void footer_write(TeXMathStream &) const;
        ///
        void read(Lexer & lex) override;
        ///
@@ -148,11 +148,11 @@ public:
        ///
        docstring xhtml(XMLStream &, OutputParams const &) const override;
        ///
-       void mathmlize(MathStream &) const override;
+       void mathmlize(MathMLStream &) const override;
        ///
        void htmlize(HtmlStream &) const override;
        ///
-       void mathAsLatex(WriteStream &) const;
+       void mathAsLatex(TeXMathStream &) const;
        ///
        void toString(odocstream &) const override;
        ///
@@ -202,8 +202,8 @@ protected:
        /// override to set to 0 for inline equation
        int border() const override;
        ///
-       docstring eolString(row_type row, bool fragile, bool latex,
-                       bool last_eoln) const override;
+       void eol(TeXMathStream & os, row_type row, bool fragile, bool latex,
+                bool last_eoln) const override;
 
 private:
        Inset * clone() const override;
@@ -270,10 +270,6 @@ private:
        unique_ptr<RenderPreview> preview_;
        ///
        DocIterator docit_;
-       ///
-       typedef std::map<docstring, int> CounterMap;
-       /// used to store current values of important counters
-       CounterMap counter_map;
 //
 // Incorporate me
 //
@@ -288,7 +284,7 @@ public:
        ///
        Inset * editXY(Cursor & cur, int x, int y) override;
        ///
-       RowFlags rowFlags() const override;
+       int rowFlags() const override;
        /// helper function
        bool display() const { return rowFlags() & Display; }