"fix" bug #3332 (plain text export depends on the menu language)

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 9add217f75bd819ceff0232f092752565bb0494d..f858e76f9cccb760cf644ed655d73b8752f7cb7a 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -15,6 +15,9 @@
 #include "InsetMathGrid.h"
 #include <boost/scoped_ptr.hpp>
 
+
+namespace lyx {
+
 class RenderPreview;
 
 
@@ -32,7 +35,7 @@ public:
        ///
        mode_type currentMode() const;
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo &, int x, int y) const;
        ///
@@ -40,9 +43,9 @@ public:
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///
-       std::string label(row_type row) const;
+       docstring label(row_type row) const;
        ///
-       void label(row_type row, std::string const & label);
+       void label(row_type row, docstring const & label);
        ///
        void numbered(row_type row, bool num);
        ///
@@ -53,7 +56,7 @@ public:
        bool ams() const;
        /// Appends \c list with all labels found within this inset.
        void getLabelList(Buffer const &,
-                         std::vector<std::string> & list) const;
+                         std::vector<docstring> & list) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies HullInset
@@ -82,39 +85,38 @@ public:
        ///
        char defaultColAlign(col_type col);
        ///
-       bool idxFirst(LCursor &) const;
+       bool idxFirst(Cursor &) const;
        ///
-       bool idxLast(LCursor &) const;
+       bool idxLast(Cursor &) const;
 
        ///
        void write(WriteStream & os) const;
        ///
-       void mathmlize(MathMLStream &) const;
+       void mathmlize(MathStream &) const;
        ///
        void normalize(NormalStream &) const;
        ///
-       void infoize(std::ostream & os) const;
+       void infoize(odocstream & os) const;
 
        ///
        void write(Buffer const &, std::ostream & os) const;
        ///
-       void read(Buffer const &, LyXLex & lex);
+       void read(Buffer const &, Lexer & lex);
        ///
-       int plaintext(Buffer const &, std::ostream &,
-                 OutputParams const &) const;
+       int plaintext(Buffer const &, odocstream &,
+                     OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
-                   OutputParams const &) const;
+       int docbook(Buffer const &, odocstream &,
+                   OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual int textString(Buffer const &, std::ostream & os,
-               OutputParams const &) const;
+       virtual void textString(Buffer const &, odocstream &) const;
 
        /// get notification when the cursor leaves this inset
-       bool notifyCursorLeaves(LCursor & cur);
+       bool notifyCursorLeaves(Cursor & cur);
        ///
        //bool insetAllowed(Code code) const;
        ///
-       void addPreview(lyx::graphics::PreviewLoader &) const;
+       void addPreview(graphics::PreviewLoader &) const;
 
        ///
        static int displayMargin() { return 12; }
@@ -122,16 +124,16 @@ public:
 protected:
        InsetMathHull(InsetMathHull const &);
 
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 
        /// do we want to handle this event?
-       bool getStatus(LCursor & cur, FuncRequest const & cmd,
+       bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
        ///
-       std::string eolString(row_type row, bool emptyline, bool fragile) const;
+       docstring eolString(row_type row, bool emptyline, bool fragile) const;
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual std::auto_ptr<Inset> doClone() const;
        ///
        void setType(HullType type);
        ///
@@ -141,9 +143,9 @@ private:
        ///
        void footer_write(WriteStream &) const;
        ///
-       std::string nicelabel(row_type row) const;
+       docstring nicelabel(row_type row) const;
        ///
-       void doExtern(LCursor & cur, FuncRequest & func);
+       void doExtern(Cursor & cur, FuncRequest & func);
        ///
        void glueall();
        /*!
@@ -163,7 +165,7 @@ private:
        /// change number of columns, split or combine columns if necessary.
        void changeCols(col_type);
        ///
-       char const * standardFont() const;
+       docstring standardFont() const;
        /// consistency check
        void check() const;
        /// can this change its number of rows?
@@ -176,7 +178,7 @@ private:
        ///
        std::vector<int> nonum_;
        ///
-       std::vector<std::string> label_;
+       std::vector<docstring> label_;
        ///
        boost::scoped_ptr<RenderPreview> preview_;
        ///
@@ -186,17 +188,17 @@ private:
 //
 public:
        /// what appears in the minibuffer when opening
-       virtual lyx::docstring const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
        virtual void mutateToText();
        ///
-       virtual void revealCodes(LCursor & cur) const;
+       virtual void revealCodes(Cursor & cur) const;
        ///
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
-       void edit(LCursor & cur, bool left);
+       void edit(Cursor & cur, bool left);
        ///
-       InsetBase * editXY(LCursor & cur, int x, int y);
+       Inset * editXY(Cursor & cur, int x, int y);
        ///
        bool display() const;
        ///
@@ -204,12 +206,15 @@ public:
 
 protected:
        ///
-       void handleFont(LCursor & cur, std::string const & arg,
-               std::string const & font);
+       void handleFont(Cursor & cur, docstring const & arg,
+               docstring const & font);
        ///
-       void handleFont2(LCursor & cur, std::string const & arg);
+       void handleFont2(Cursor & cur, docstring const & arg);
        ///
        bool previewState(BufferView * bv) const;
 };
 
+
+
+} // namespace lyx
 #endif