Compile fix gcc 2.95 + stlport

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

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index 22b108da3380e7d7258d1e53b47c8c085c14bdcd..e88b6576e3ed770cd8f833034867ad8e67df3997 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -15,17 +15,15 @@
 #include "math_gridinset.h"
 
 
-class LaTeXFeatures;
-
 /// This provides an interface between "LyX insets" and "LyX math insets"
 class MathHullInset : public MathGridInset {
 public:
        ///
        MathHullInset();
        ///
-       explicit MathHullInset(string const & type);
+       explicit MathHullInset(std::string const & type);
        ///
-       virtual std::auto_ptr<InsetBase> clone() const;
+       std::auto_ptr<InsetBase> clone() const;
        ///
        mode_type currentMode() const;
        ///
@@ -37,9 +35,9 @@ public:
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///
-       string label(row_type row) const;
+       std::string label(row_type row) const;
        ///
-       void label(row_type row, string const & label);
+       void label(row_type row, std::string const & label);
        ///
        void numbered(row_type row, bool num);
        ///
@@ -47,14 +45,10 @@ public:
        ///
        bool numberedType() const;
        ///
-       bool display() const;
-       ///
        bool ams() const;
-       /// local dispatcher
-       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
        /// Appends \c list with all labels found within this inset.
        void getLabelList(Buffer const &,
-                         std::vector<string> & list) const;
+                         std::vector<std::string> & list) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies MatrixInsets
@@ -74,21 +68,21 @@ public:
        void delCol(col_type col);
 
        /// get type
-       string const & getType() const;
+       std::string const & getType() const;
        /// change type
-       void mutate(string const &);
+       void mutate(std::string const &);
 
        ///
        int defaultColSpace(col_type col);
        ///
        char defaultColAlign(col_type col);
        ///
-       bool idxFirst(idx_type &, pos_type &) const;
+       bool idxFirst(LCursor &) const;
        ///
-       bool idxLast(idx_type &, pos_type &) const;
+       bool idxLast(LCursor &) const;
 
        ///
-       string fileInsetLabel() const;
+       std::string fileInsetLabel() const;
        ///
        void write(WriteStream & os) const;
        ///
@@ -98,13 +92,38 @@ public:
        ///
        void infoize(std::ostream & os) const;
 
+       ///
+       void write(Buffer const &, std::ostream & os) const;
+       ///
+       void read(Buffer const &, LyXLex & lex);
+       ///
+       int latex(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
+       ///
+       int plaintext(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
+       ///
+       int linuxdoc(Buffer const &, std::ostream &,
+                    OutputParams const &) const;
+       ///
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const &) const;
+
+       ///
+       //bool insetAllowed(Code code) const;
+       ///
+       //void addPreview(lyx::graphics::PreviewLoader &) const;
+
+
 protected:
        ///
-       string eolString(row_type row, bool fragile) const;
+       DispatchResult priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+       ///
+       std::string eolString(row_type row, bool fragile) const;
 
 private:
        ///
-       void setType(string const & type);
+       void setType(std::string const & type);
        ///
        void validate1(LaTeXFeatures & features);
        ///
@@ -112,9 +131,9 @@ private:
        ///
        void footer_write(WriteStream &) const;
        ///
-       string nicelabel(row_type row) const;
+       std::string nicelabel(row_type row) const;
        ///
-       void doExtern(FuncRequest const & func, idx_type & idx, pos_type & pos);
+       void doExtern(LCursor & cur, FuncRequest const & func);
        ///
        void glueall();
        ///
@@ -125,11 +144,86 @@ private:
        bool colChangeOK() const;
 
        /// "none", "simple", "display", "eqnarray",...
-       string type_;
+       std::string type_;
        ///
        std::vector<int> nonum_;
        ///
-       std::vector<string> label_;
+       std::vector<std::string> label_;
+
+//
+// Incorporate me
+//
+public:
+       /// lowest x coordinate
+       int xlow() const;
+       /// highest x coordinate
+       int xhigh() const;
+       /// lowest y coordinate
+       int ylow() const;
+       /// highest y coordinate
+       int yhigh() const;
+
+
+       /// what appears in the minibuffer when opening
+       virtual std::string const editMessage() const;
+       ///
+       virtual void getCursorDim(int &, int &) const;
+       ///
+       virtual void insetUnlock(BufferView & bv);
+
+       /// To allow transparent use of math editing functions
+       //virtual void status(FuncRequest const &);
+
+       ///
+       virtual bool searchForward(BufferView *, std::string const &,
+                                  bool = true, bool = false);
+       ///
+       virtual bool searchBackward(BufferView *, std::string const &,
+                                   bool = true, bool = false);
+       ///
+       virtual bool isTextInset() const { return true; }
+       ///
+       virtual void mutateToText();
+       ///
+       virtual void revealCodes(LCursor & cur) const;
+       ///
+       virtual EDITABLE editable() const { return HIGHLY_EDITABLE; }
+       ///
+       bool display() const;
+       ///
+       void edit(LCursor & cur, bool left);
+       ///
+       Code lyxCode() const;
+
+private:
+       /// common base for handling accents
+       void handleAccent(BufferView & bv, std::string const & arg,
+               std::string const & name);
+
+       /// lfun handler
+       DispatchResult lfunMousePress(LCursor &, FuncRequest const &);
+       ///
+       DispatchResult lfunMouseRelease(LCursor &, FuncRequest const &);
+       ///
+       DispatchResult lfunMouseMotion(LCursor &, FuncRequest const &);
+
+protected:
+
+       /** Find the PreviewLoader, add a LaTeX snippet to it and
+        *  start the loading process.
+        *
+        *  Most insets have no interest in this capability, so the method
+        *  defaults to empty.
+        */
+       virtual void generatePreview(Buffer const &) const {}
+
+       ///
+       void handleFont(LCursor &, std::string const & arg, std::string const & font);
+       ///
+       void handleFont2(LCursor &, std::string const & arg);
 };
 
+// We don't really want to mess around with mathed stuff outside mathed.
+// So do it here.
+void mathDispatch(LCursor & cur, FuncRequest const & cmd);
 #endif