Cmake export tests: Added sublabel handling also to revertedTests

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 6eb74e7283d2a8727fa126dd66e015989fad19b4..9598ad4281d092497f92acbdb7053e8ed72540b5 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -23,6 +23,7 @@
 namespace lyx {
 
 class InsetLabel;
+class MacroNameSet;
 class ParConstIterator;
 class RenderPreview;
 
@@ -30,6 +31,15 @@ class RenderPreview;
 /// This provides an interface between "LyX insets" and "LyX math insets"
 class InsetMathHull : public InsetMathGrid {
 public:
+       /// How a line is numbered
+       enum Numbered {
+               /// not numbered, LaTeX code \\nonumber if line differs from inset
+               NONUMBER,
+               /// numbered, LaTeX code \\number if line differs from inset
+               NUMBER,
+               /// not numbered, LaTeX code \\notag if line differs from inset
+               NOTAG
+       };
        ///
        InsetMathHull(Buffer * buf);
        ///
@@ -41,7 +51,8 @@ public:
        ///
        void updateBuffer(ParIterator const &, UpdateType);
        ///
-       void addToToc(DocIterator const & di, bool output_active) const;
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype) const;
        ///
        InsetMathHull & operator=(InsetMathHull const &);
        ///
@@ -65,7 +76,9 @@ public:
        ///
        ColorCode backgroundColor(PainterInfo const &) const;
        ///
-       void numbered(row_type row, bool num);
+       void numbered(row_type row, bool num) { numbered(row, num ? NUMBER : NONUMBER); }
+       ///
+       void numbered(row_type row, Numbered num);
        ///
        bool numbered(row_type row) const;
        ///
@@ -100,8 +113,7 @@ public:
        ///
        char defaultColAlign(col_type col);
        ///
-       ///
-       char displayColAlign(col_type col, row_type row) const;
+       char displayColAlign(idx_type idx) const;
        ///
        bool idxFirst(Cursor &) const;
        ///
@@ -140,7 +152,7 @@ public:
        /// 
        void toString(odocstream &) const;
        ///
-       void forOutliner(docstring &, size_t) const;
+       void forOutliner(docstring &, size_t const, bool const) const;
 
        /// get notification when the cursor leaves this inset
        bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
@@ -152,6 +164,9 @@ public:
        /// Recreates the preview if preview is enabled.
        void reloadPreview(DocIterator const & pos) const;
        ///
+       void usedMacros(MathData const & md, DocIterator const & pos,
+                       MacroNameSet & macros, MacroNameSet & defs) const;
+       ///
        void initUnicodeMath() const;
 
        ///
@@ -231,7 +246,7 @@ private:
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
        ///
-       std::vector<bool> numbered_;
+       std::vector<Numbered> numbered_;
        ///
        std::vector<docstring> numbers_;
        ///