further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/support.h b/src/mathed/support.h
index 51353904f929142be050c804103ded4ccbf009f8..3352ec379f6e1a226f60b0bcb521d06687305dd9 100644 (file)
--- a/src/mathed/support.h
+++ b/src/mathed/support.h
@@ -3,51 +3,42 @@
 #ifndef MATH_SUPPORT_H
 #define MATH_SUPPORT_H
 
-#include "lyxfont.h"
 #include "math_defs.h"
-
-#ifndef byte
-#define byte unsigned char
-#endif
+#include "LString.h"
 
 class Painter;
-class MathArray;
-class MathMatrixInset;
+class latexkeys;
 
-struct math_deco_struct {
-       int code;
-       float const * data;
-       int angle;
-};
-
-extern char const * math_font_name[];
 extern char const * latex_mathspace[];
 
-int mathed_char_height(short type, int size, byte c, int & asc, int & des);
-int mathed_char_width(short type, int size, byte c);
-void mathed_char_dim(short type, int size, byte c, int & asc, int & des, int & wid);
-
-void mathed_draw_deco(Painter & pain, int x, int y, int w, int h, int code);
+int mathed_char_height(MathTextCodes type, MathStyles size, unsigned char c,
+       int & asc, int & des);
+void mathed_char_dim(MathTextCodes type, MathStyles size, unsigned char c,
+       int & asc, int & des, int & wid);
+int mathed_char_width(MathTextCodes type, MathStyles size, unsigned char c);
+int mathed_char_ascent(MathTextCodes type, MathStyles size, unsigned char c);
+int mathed_char_descent(MathTextCodes type, MathStyles size, unsigned char c);
 
-LyXFont mathed_get_font(short type, int size);
+void mathed_draw_deco(Painter & pain, int x, int y, int w, int h,
+       string const & name);
 
-void mathed_string_dim(short type, int size, string const & s,
+void mathed_string_dim(MathTextCodes type, MathStyles size, string const & s,
   int & asc, int & des, int & wid);
-int mathed_string_height(short type, int size, string const & s,
+int mathed_string_height(MathTextCodes type, MathStyles size, string const & s,
   int & asc, int & des);
-int mathed_string_width(short type, int size, string const & s);
 
-math_deco_struct const * search_deco(int code);
+int mathed_string_width(MathTextCodes type, MathStyles size, string const & s);
+int mathed_string_ascent(MathTextCodes type, MathStyles size, string const & s);
+int mathed_string_descent(MathTextCodes type, MathStyles size, string const & s);
 
-bool MathIsInset(short x);
-bool MathIsAlphaFont(short x);
-bool MathIsBOPS(short x);
-bool MathIsBinary(short x);
-bool MathIsSymbol(short x);
-bool MathIsRelOp(byte c, MathTextCodes f);
-
-void drawStr(Painter & pain, short type, int siz,
+void drawStr(Painter & pain, MathTextCodes type, MathStyles siz,
        int x, int y, string const & s);
-void drawChar(Painter & pain, short type, int siz,
+void drawChar(Painter & pain, MathTextCodes type, MathStyles siz,
        int x, int y, char c);
+
+void math_font_max_dim
+       (MathTextCodes code, MathStyles siz, int & asc, int & desc);
+
+bool math_font_available(MathTextCodes code);
+
 #endif