cursor is no more damaging the background. L-shaped cursor is broken right now....

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

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 91a1d1d86b1a537458db663e70e4c0b53b2b1fec..3cfc107e580166c51b3dc4f695cfe9c1f3cf57eb 100644 (file)
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -17,7 +17,8 @@
 
 #include "insets/insetbase.h"
 
-#include <string>
+
+namespace lyx {
 
 enum HullType {
        hullNone,
@@ -33,8 +34,8 @@ enum HullType {
        hullGather
 };
 
-HullType hullType(std::string const & name);
-std::string hullName(HullType type);
+HullType hullType(docstring const & name);
+docstring hullName(HullType type);
 
 /**
 
@@ -76,7 +77,7 @@ class OctaveStream;
 class MapleStream;
 class MaximaStream;
 class MathematicaStream;
-class MathMLStream;
+class MathStream;
 class WriteStream;
 class InfoStream;
 
@@ -152,12 +153,12 @@ public:
        virtual bool extraBraces() const { return false; }
 
        /// return the content as char if the inset is able to do so
-       virtual char getChar() const { return 0; }
+       virtual char_type getChar() const { return 0; }
        /// identifies things that can get \limits or \nolimits
        virtual bool takesLimits() const { return false; }
 
        /// char char code if possible
-       virtual void handleFont(std::string const &) {}
+       virtual void handleFont(docstring const &) {}
        /// replace things by other things
        virtual void replace(ReplaceData &) {}
        /// do we contain a given subsequence?
@@ -178,7 +179,7 @@ public:
        /// write content as something readable by Mathematica
        virtual void mathematica(MathematicaStream &) const;
        /// write content as something resembling MathML
-       virtual void mathmlize(MathMLStream &) const;
+       virtual void mathmlize(MathStream &) const;
        /// write content as something readable by Octave
        virtual void octave(OctaveStream &) const;
 
@@ -192,15 +193,21 @@ public:
        /// change type
        virtual void mutate(HullType /*newtype*/) {}
        /// usually the latex name
-       virtual std::string name() const;
+       virtual docstring name() const;
 
        /// math stuff usually isn't allowed in text mode
        virtual bool allowedIn(mode_type mode) const { return mode == MATH_MODE; }
 };
 
+///
 std::ostream & operator<<(std::ostream &, MathAtom const &);
+///
+odocstream & operator<<(odocstream &, MathAtom const &);
 
 // initialize math
 void initMath();
 
+
+} // namespace lyx
+
 #endif