When inserting math inset over selection, place cursor better

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 084fff67c0590c7daf216c0ecf06b92bf45f06d6..73de59f0a2367fb9d06f479720e7f26622277f1d 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -17,7 +17,7 @@
 #include "DocIterator.h"
 #include "OutputEnums.h"
 
-#include <boost/scoped_ptr.hpp>
+#include "support/unique_ptr.h"
 
 
 namespace lyx {
@@ -52,14 +52,14 @@ public:
        void updateBuffer(ParIterator const &, UpdateType);
        ///
        void addToToc(DocIterator const & di, bool output_active,
-                                 UpdateType utype) const;
+                                 UpdateType utype, TocBackend & backend) const;
        ///
        InsetMathHull & operator=(InsetMathHull const &);
        ///
        mode_type currentMode() const;
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
-       /// 
+       ///
        void drawBackground(PainterInfo & pi, int x, int y) const;
        ///
        void draw(PainterInfo &, int x, int y) const;
@@ -86,6 +86,8 @@ public:
        ///
        bool ams() const;
        ///
+       bool outerDisplay() const;
+       ///
        void validate(LaTeXFeatures & features) const;
        /// identifies HullInset
        InsetMathHull const * asHullInset() const { return this; }
@@ -105,21 +107,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);
        ///
-       int displayColSpace(col_type col) const;\r
-       ///\r
+       int displayColSpace(col_type col) const;
+       ///
        char defaultColAlign(col_type col);
        ///
        char displayColAlign(idx_type idx) const;
-       ///
-       bool idxFirst(Cursor &) const;
-       ///
-       bool idxLast(Cursor &) const;
 
        ///
        void write(WriteStream & os) const;
@@ -139,7 +139,7 @@ public:
        ///
        bool readQuiet(Lexer & lex);
        ///
-       int plaintext(odocstringstream &, OutputParams const &, 
+       int plaintext(odocstringstream &, OutputParams const &,
                      size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
@@ -151,7 +151,7 @@ public:
        void htmlize(HtmlStream &) const;
        ///
        void mathAsLatex(WriteStream &) const;
-       /// 
+       ///
        void toString(odocstream &) const;
        ///
        void forOutliner(docstring &, size_t const, bool const) const;
@@ -171,9 +171,6 @@ public:
        ///
        void initUnicodeMath() const;
 
-       ///
-       static int displayMargin() { return 12; }
-       
        /// Force inset into LTR environment if surroundings are RTL
        virtual bool forceLTR() const { return true; }
        ///
@@ -183,6 +180,10 @@ public:
        std::string contextMenuName() const;
        ///
        InsetCode lyxCode() const { return MATH_HULL_CODE; }
+       ///
+       bool canPaintChange(BufferView const &) const;
+       ///
+       bool confirmDeletion() const { return nargs() != 1 || !cell(0).empty(); }
 
 protected:
        InsetMathHull(InsetMathHull const &);
@@ -192,6 +193,12 @@ protected:
        /// do we want to handle this event?
        bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
+       /// override to set to 0 for inline equation
+       int leftMargin() const;
+       /// override to set to 0 for inline equation
+       int rightMargin() const;
+       /// override to set to 0 for inline equation
+       int border() const;
        ///
        docstring eolString(row_type row, bool fragile, bool latex,
                        bool last_eoln) const;
@@ -203,7 +210,7 @@ private:
        /// 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 
+       /// like reloadPreview, but forces load
        /// used by image export
        void loadPreview(DocIterator const & pos) const;
        ///
@@ -233,17 +240,21 @@ 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?
        bool colChangeOK() const;
        /// are any of the equations numbered?
        bool haveNumbers() const;
+       /// draw four angular markers
+       virtual void drawMarkers(PainterInfo & pi, int x, int y) const;
 
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
@@ -254,9 +265,7 @@ private:
        ///
        std::vector<InsetLabel *> label_;
        ///
-       boost::scoped_ptr<RenderPreview> preview_;
-       ///
-       mutable bool use_preview_;
+       unique_ptr<RenderPreview> preview_;
        ///
        DocIterator docit_;
        ///
@@ -270,16 +279,16 @@ public:
        ///
        virtual void mutateToText();
        ///
-       virtual void revealCodes(Cursor & cur) const;
-       ///
        bool editable() const { return true; }
        ///
-       void edit(Cursor & cur, bool front, 
+       void edit(Cursor & cur, bool front,
                EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
        ///
        Inset * editXY(Cursor & cur, int x, int y);
        ///
        DisplayType display() const;
+       ///
+       int indent(BufferView const &) const;
 
 protected:
        ///
@@ -289,8 +298,6 @@ protected:
        void handleFont2(Cursor & cur, docstring const & arg);
        ///
        bool previewState(BufferView const * const bv) const;
-       ///
-       bool previewTooSmall(Dimension const & dim) const;
 };