Revert "DocBook: make openParTag/closeTag use paragraphs instead of layouts."

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index bae26530c3c5ac824da884cef448f3fff1aa7042..42144a3f4bfebbd07bbd210d60b766b5f092478a 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -41,7 +41,7 @@ public:
                NOTAG
        };
        ///
-       InsetMathHull(Buffer * buf);
+       explicit InsetMathHull(Buffer * buf);
        ///
        InsetMathHull(Buffer * buf, HullType type);
        ///
@@ -49,7 +49,7 @@ public:
        ///
        void setBuffer(Buffer &);
        ///
-       void updateBuffer(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
        ///
        void addToToc(DocIterator const & di, bool output_active,
                                  UpdateType utype, TocBackend & backend) const;
@@ -59,7 +59,7 @@ public:
        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;
@@ -88,6 +88,8 @@ public:
        ///
        bool outerDisplay() const;
        ///
+       OutputParams::CtObject CtObject(OutputParams const &) const;
+       ///
        void validate(LaTeXFeatures & features) const;
        /// identifies HullInset
        InsetMathHull const * asHullInset() const { return this; }
@@ -120,10 +122,6 @@ public:
        char defaultColAlign(col_type col);
        ///
        char displayColAlign(idx_type idx) const;
-       ///
-       bool idxFirst(Cursor &) const;
-       ///
-       bool idxLast(Cursor &) const;
 
        ///
        void write(WriteStream & os) const;
@@ -143,19 +141,19 @@ 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;
+       void docbook(XMLStream &, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void mathmlize(MathStream &) const;
        ///
        void htmlize(HtmlStream &) const;
        ///
        void mathAsLatex(WriteStream &) const;
-       /// 
+       ///
        void toString(odocstream &) const;
        ///
        void forOutliner(docstring &, size_t const, bool const) const;
@@ -175,11 +173,8 @@ public:
        ///
        void initUnicodeMath() const;
 
-       ///
-       static int displayMargin() { return 12; }
-       
        /// Force inset into LTR environment if surroundings are RTL
-       virtual bool forceLTR() const { return true; }
+       virtual bool forceLTR(OutputParams const &) const { return true; }
        ///
        void recordLocation(DocIterator const & di);
 
@@ -217,7 +212,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;
        ///
@@ -260,6 +255,8 @@ private:
        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_;
@@ -284,16 +281,19 @@ 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;
+       RowFlags rowFlags() const;
+       /// helper function
+       bool display() const { return rowFlags() & Display; }
+
+       ///
+       int indent(BufferView const &) const;
 
 protected:
        ///
@@ -303,8 +303,6 @@ protected:
        void handleFont2(Cursor & cur, docstring const & arg);
        ///
        bool previewState(BufferView const * const bv) const;
-       ///
-       bool previewTooSmall(Dimension const & dim) const;
 };