X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathSupport.h;h=d9301453dde5bb9c2cb5330c6430f9089e96c213;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=a1396e2338eb8ce06f42a943ce0542cdce69116a;hpb=de6418f37765fe452f135f96dee6d49897bff215;p=lyx.git

diff --git a/src/mathed/MathSupport.h b/src/mathed/MathSupport.h
index a1396e2338..d9301453dd 100644
--- a/src/mathed/MathSupport.h
+++ b/src/mathed/MathSupport.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,49 +13,81 @@
 #ifndef MATH_SUPPORT_H
 #define MATH_SUPPORT_H
 
-#include "support/docstring.h"
-
-#include <string>
-#include <vector>
+#include "MathParser_flags.h"
+#include "support/strfwd.h"
 
 namespace lyx {
 
+class MetricsBase;
+class MetricsInfo;
 class PainterInfo;
-class LyXFont;
+class FontInfo;
 class Dimension;
-class MathArray;
+class MathData;
 class MathAtom;
 class InsetMath;
+class latexkeys;
+class LaTeXFeatures;
+
+
+int mathed_font_em(FontInfo const &);
+
+int mathed_font_x_height(FontInfo const & font);
+
+int mathed_mu(FontInfo const & font, double mu);
+
+int mathed_thinmuskip(FontInfo const & font);
+
+int mathed_medmuskip(FontInfo const & font);
+
+int mathed_thickmuskip(FontInfo const & font);
 
+int mathed_char_width(FontInfo const &, char_type c);
 
-void mathed_char_dim(LyXFont const &, char_type c, Dimension & dim);
-int mathed_char_width(LyXFont const &, char_type c);
+int mathed_char_kerning(FontInfo const &, char_type c);
 
 void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
 	docstring const & name);
 
-void mathed_string_dim(LyXFont const & font,
+void mathed_string_dim(FontInfo const & font,
 		       docstring const & s,
 		       Dimension & dim);
 
-int mathed_string_width(LyXFont const &, docstring const & s);
+int mathed_string_width(FontInfo const &, docstring const & s);
+
+void mathedSymbolDim(MetricsBase & mb, Dimension & dim, latexkeys const * sym);
+
+void mathedSymbolDraw(PainterInfo & pi, int x, int y, latexkeys const * sym);
+
+void metricsStrRedBlack(MetricsInfo & mi, Dimension & dim, 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(FontInfo const &, int & asc, int & desc);
+
+void augmentFont(FontInfo & f, std::string const & cmd);
 
-void augmentFont(LyXFont & f, docstring const & cmd);
+bool isFontName(std::string const & name);
 
-bool isFontName(docstring const & name);
+bool isMathFont(std::string const & name);
+
+bool isTextFont(std::string const & name);
+
+bool isAlphaSymbol(MathAtom const & at);
 
 // converts single cell to string
-docstring asString(MathArray const & ar);
+docstring asString(MathData const & ar);
 // converts single inset to string
 docstring asString(InsetMath const &);
 docstring asString(MathAtom const &);
 // converts string to single cell
-void asArray(docstring const & str, MathArray & ar);
+void asArray(docstring const &, MathData &, Parse::flags f = Parse::NORMAL);
+
+// simulate axis height (font dimension sigma 22)
+int axis_height(MetricsBase & mb);
+
+void validate_math_word(LaTeXFeatures & features, docstring const & word);
 
 } // namespace lyx