X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathSupport.h;h=09954960a79dc4fab98d76d81db922d1d29440ba;hb=fc6ce7cd08562fd7bab4427880b46390bb7d2f07;hp=3874735e1e58a389179433d1a44cc44e3824f3ed;hpb=e89625ef28143545a511cdabc67dee8b7be1b216;p=lyx.git

diff --git a/src/mathed/MathSupport.h b/src/mathed/MathSupport.h
index 3874735e1e..09954960a7 100644
--- a/src/mathed/MathSupport.h
+++ b/src/mathed/MathSupport.h
@@ -13,42 +13,51 @@
 #ifndef MATH_SUPPORT_H
 #define MATH_SUPPORT_H
 
+#include "support/docstring.h"
+
 #include <string>
+#include <vector>
+
+namespace lyx {
 
 class PainterInfo;
-class LyXFont;
+class Font;
 class Dimension;
-class MathArray;
+class MathData;
 class MathAtom;
 class InsetMath;
 
 
-void mathed_char_dim(LyXFont const &, unsigned char c, Dimension & dim);
-int mathed_char_width(LyXFont const &, unsigned char c);
-int mathed_char_ascent(LyXFont const &, unsigned char c);
-int mathed_char_descent(LyXFont const &, unsigned char c);
+int mathed_char_width(Font const &, char_type c);
+
+int mathed_char_kerning(Font const &, char_type c);
 
 void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
-	std::string const & name);
+	docstring const & name);
 
-void mathed_string_dim(LyXFont const & font, std::string const & s, Dimension & dim);
-int mathed_string_width(LyXFont const &, std::string const & s);
+void mathed_string_dim(Font const & font,
+		       docstring const & s,
+		       Dimension & dim);
 
-void drawStrRed(PainterInfo & pi, int x, int y, std::string const & s);
-void drawStrBlack(PainterInfo & pi, int x, int y, std::string const & s);
+int mathed_string_width(Font const &, docstring const & s);
 
-void math_font_max_dim(LyXFont const &, int & asc, int & desc);
+void drawStrRed(PainterInfo & pi, int x, int y, docstring const & s);
+void drawStrBlack(PainterInfo & pi, int x, int y, docstring const & s);
 
-void augmentFont(LyXFont & f, std::string const & cmd);
+void math_font_max_dim(Font const &, int & asc, int & desc);
 
-bool isFontName(std::string const & name);
+void augmentFont(Font & f, docstring const & cmd);
+
+bool isFontName(docstring const & name);
 
 // converts single cell to string
-std::string asString(MathArray const & ar);
+docstring asString(MathData const & ar);
 // converts single inset to string
-std::string asString(InsetMath const &);
-std::string asString(MathAtom const &);
+docstring asString(InsetMath const &);
+docstring asString(MathAtom const &);
 // converts string to single cell
-void asArray(std::string const & str, MathArray & ar);
+void asArray(docstring const & str, MathData & ar);
+
+} // namespace lyx
 
 #endif