fix reading UTF8 encoded symbol file

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

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index f00db9781325bfb641ef74cd98631ce51627d1e7..a01198749ad231fa1df2ea0f327b5a3675600ffb 100644 (file)
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -15,6 +15,9 @@
 #include "InsetMathDim.h"
 
 
+namespace lyx {
+
+
 /** Abstract base class for all math objects that contain nested items.
     This is basically everything that is not a single character or a
     single symbol.
@@ -93,7 +96,7 @@ public:
        /// writes [, name(), and args in []
        void normalize(NormalStream & os) const;
        ///
-       int latex(Buffer const &, std::ostream & os,
+       int latex(Buffer const &, odocstream & os,
                        OutputParams const & runparams) const;
 
 protected:
@@ -104,22 +107,24 @@ protected:
                FuncStatus & status) const;
        ///
        void handleFont(LCursor & cur,
-               std::string const & arg, std::string const & font);
+               docstring const & arg, docstring const & font);
+       void handleFont(LCursor & cur,
+               docstring const & arg, char const * const font);
        ///
-       void handleFont2(LCursor & cur, std::string const & arg);
+       void handleFont2(LCursor & cur, docstring const & arg);
 
        /// interpret \p c and insert the result at the current position of
        /// of \p cur. Return whether the cursor should stay in the formula.
-       bool interpretChar(LCursor & cur, char c);
+       bool interpretChar(LCursor & cur, char_type c);
        ///
        bool script(LCursor & cur, bool,
-               std::string const & save_selection = std::string());
+               docstring const & save_selection = docstring());
 
 public:
        /// interpret \p str and insert the result at the current position of
        /// \p cur if it is something known. Return whether \p cur was
        /// inserted.
-       bool interpretString(LCursor & cur, std::string const & str);
+       bool interpretString(LCursor & cur, docstring const & str);
 
 private:
        /// lfun handler
@@ -138,4 +143,7 @@ protected:
        bool lock_;
 };
 
+
+
+} // namespace lyx
 #endif