architectural changes to tex2lyx

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

diff --git a/src/mathed/math_support.h b/src/mathed/math_support.h
index 5092aa48c225463cadcb0f41e11e694b7fb64a76..9ecf7d8d05be52fd5ddd9b8e42cd549621c57070 100644 (file)
--- a/src/mathed/math_support.h
+++ b/src/mathed/math_support.h
@@ -5,37 +5,27 @@
 
 #include "LString.h"
 
-class MathPainterInfo;
-class TextPainter;
-class latexkeys;
-class MathMetricsInfo;
-class MathInset;
+class PainterInfo;
 class LyXFont;
+class Dimension;
+class MathArray;
 
-void mathed_char_dim(LyXFont const &, unsigned char c,
-       int & asc, int & des, int & wid);
+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);
 
-void mathed_draw_deco(MathPainterInfo & pain, int x, int y, int w, int h,
+void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
        string const & name);
 
-void mathed_draw_framebox(MathPainterInfo & pain, int x, int y, MathInset const *);
-
-void mathed_string_dim(LyXFont const &,
-       string const & s, int & asc, int & des, int & wid);
-
+void mathed_string_dim(LyXFont const & font, string const & s, Dimension & dim);
 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(MathPainterInfo & pain,
+void drawStr(PainterInfo & pi,
        LyXFont const &, int x, int y, string const & s);
-void drawStrRed(MathPainterInfo & pain, int x, int y, string const & s);
-void drawStrBlack(MathPainterInfo & pain, int x, int y, string const & s);
-void drawChar(MathPainterInfo & pain,
-       LyXFont const & font, int x, int y, char c);
+void drawStrRed(PainterInfo & pi, int x, int y, string const & s);
+void drawStrBlack(PainterInfo & pi, int x, int y, string const & s);
+void drawChar(PainterInfo & pi, LyXFont const & font, int x, int y, char c);
 
 void math_font_max_dim(LyXFont const &, int & asc, int & desc);
 
@@ -43,4 +33,9 @@ void augmentFont(LyXFont & f, string const & cmd);
 
 bool isFontName(string const & name);
 
+// converts single cell to string
+string asString(MathArray const & ar);
+// converts string to single cell
+void asArray(string const & str, MathArray & ar);
+
 #endif