X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathSupport.h;h=09954960a79dc4fab98d76d81db922d1d29440ba;hb=7f17f13bfc2ad4e7cdd8ecfce23374e2b3d0c646;hp=626181aeeca961083b3731ab21a860ffa29dd824;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/mathed/MathSupport.h b/src/mathed/MathSupport.h
index 626181aeec..09954960a7 100644
--- a/src/mathed/MathSupport.h
+++ b/src/mathed/MathSupport.h
@@ -16,44 +16,47 @@
 #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 &, char_type c, Dimension & dim);
-int mathed_char_width(LyXFont const &, char_type 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, docstring const & s, Dimension & dim);
-int mathed_string_width(LyXFont const &, docstring const & s);
+void mathed_string_dim(Font const & font,
+		       docstring const & s,
+		       Dimension & dim);
+
+int mathed_string_width(Font const &, docstring const & s);
 
 void drawStrRed(PainterInfo & pi, int x, int y, docstring const & s);
 void drawStrBlack(PainterInfo & pi, int x, int y, docstring const & s);
 
-void math_font_max_dim(LyXFont const &, int & asc, int & desc);
+void math_font_max_dim(Font const &, int & asc, int & desc);
 
-void augmentFont(LyXFont & f, std::string const & cmd);
+void augmentFont(Font & f, docstring const & cmd);
 
-bool isFontName(std::string const & name);
+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(docstring const & str, MathArray & ar);
-
+void asArray(docstring const & str, MathData & ar);
 
 } // namespace lyx