fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_support.h b/src/mathed/math_support.h
index ba2d711c80a5649ca2dbbebc3b2860562b53f714..abe0a39e8318512f5142e487306fc4ecbf3b2c69 100644 (file)
--- a/src/mathed/math_support.h
+++ b/src/mathed/math_support.h
@@ -7,47 +7,34 @@
 #include "LString.h"
 
 class Painter;
+class TextPainter;
 class latexkeys;
 class MathMetricsInfo;
 class MathInset;
+class LyXFont;
 
-extern char const * latex_mathspace[];
-
-int mathed_char_height(MathTextCodes type, MathMetricsInfo const & size,
-       unsigned char c, int & asc, int & des);
-void mathed_char_dim(MathTextCodes type, MathMetricsInfo const & size,
-       unsigned char c, int & asc, int & des, int & wid);
-int mathed_char_width(MathTextCodes type, MathMetricsInfo const & size,
-       unsigned char c);
-int mathed_char_ascent(MathTextCodes type, MathMetricsInfo const & size,
-       unsigned char c);
-int mathed_char_descent(MathTextCodes type, MathMetricsInfo const & size,
-       unsigned char c);
+void mathed_char_dim(LyXFont const &, unsigned char c,
+       int & asc, int & des, int & wid);
+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);
 
 void mathed_draw_deco(Painter & pain, int x, int y, int w, int h,
        string const & name);
 
 void mathed_draw_framebox(Painter & pain, int x, int y, MathInset const *);
 
-void mathed_string_dim(MathTextCodes type, MathMetricsInfo const & size,
+void mathed_string_dim(LyXFont const &,
        string const & s, int & asc, int & des, int & wid);
-int mathed_string_height(MathTextCodes type, MathMetricsInfo const & size,
-       string const & s, int & asc, int & des);
 
-int mathed_string_width(MathTextCodes type, MathMetricsInfo const & size,
-       string const & s);
-int mathed_string_ascent(MathTextCodes type, MathMetricsInfo const & size,
-       string const & s);
-int mathed_string_descent(MathTextCodes type, MathMetricsInfo const & size,
-       string const & s);
+int mathed_string_width(LyXFont const &, string const & s);
+int mathed_string_ascent(LyXFont const &, string const & s);
+int mathed_string_descent(LyXFont const &, string const & s);
 
-void drawStr(Painter & pain, MathTextCodes type, MathMetricsInfo const & siz,
-       int x, int y, string const & s);
-void drawChar(Painter & pain, MathTextCodes type, MathMetricsInfo const & siz,
-       int x, int y, char c);
+void drawStr(Painter & pain, LyXFont const &, int x, int y, string const & s);
+void drawChar(Painter & pain, LyXFont const & font, int x, int y, char c);
 
-void math_font_max_dim(MathTextCodes code, MathMetricsInfo const & siz,
-       int & asc, int & desc);
+void math_font_max_dim(LyXFont const &, int & asc, int & desc);
 
 bool math_font_available(MathTextCodes code);
 
@@ -61,4 +48,6 @@ char const * math_font_name(MathTextCodes type);
 
 string convertDelimToLatexName(string const & name);
 
+void whichFont(LyXFont & f, MathTextCodes type, MathMetricsInfo const & size);
+
 #endif