Sort the language nesting mess with polyglossia

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index fce431294c55b8ec82bae34ce422e7db237cb2fe..f3ea8a8166d5a4036907d3aa06e0214c730a47a7 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -17,12 +17,13 @@
 #include "DocIterator.h"
 #include "OutputEnums.h"
 
-#include <boost/scoped_ptr.hpp>
+#include "support/unique_ptr.h"
 
 
 namespace lyx {
 
 class InsetLabel;
+class MacroNameSet;
 class ParConstIterator;
 class RenderPreview;
 
@@ -50,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 &);
        ///
@@ -103,16 +105,19 @@ public:
 
        /// get type
        HullType getType() const;
+       /// is mutation implemented for this type?
+       static bool isMutable(HullType type);
        /// change type
        void mutate(HullType newtype);
 
        ///
        int defaultColSpace(col_type col);
        ///
-       char defaultColAlign(col_type col);
+       int displayColSpace(col_type col) const;
        ///
+       char defaultColAlign(col_type col);
        ///
-       char displayColAlign(col_type col, row_type row) const;
+       char displayColAlign(idx_type idx) const;
        ///
        bool idxFirst(Cursor &) const;
        ///
@@ -151,7 +156,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);
@@ -163,6 +168,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;
 
        ///
@@ -177,6 +185,8 @@ public:
        std::string contextMenuName() const;
        ///
        InsetCode lyxCode() const { return MATH_HULL_CODE; }
+       ///
+       bool canPaintChange(BufferView const &) const;
 
 protected:
        InsetMathHull(InsetMathHull const &);
@@ -227,11 +237,13 @@ private:
        /// change number of columns, split or combine columns if necessary.
        void changeCols(col_type);
        ///
-       docstring standardFont() const;
+       std::string standardFont() const;
        ///
        ColorCode standardColor() const;
        /// consistency check
        void check() const;
+       /// does it understand tabular-feature commands?
+       bool allowsTabularFeatures() const;
        /// can this change its number of rows?
        bool rowChangeOK() const;
        /// can this change its number of cols?
@@ -248,9 +260,7 @@ private:
        ///
        std::vector<InsetLabel *> label_;
        ///
-       boost::scoped_ptr<RenderPreview> preview_;
-       ///
-       mutable bool use_preview_;
+       unique_ptr<RenderPreview> preview_;
        ///
        DocIterator docit_;
        ///