X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.h;h=1dbeae249a49725f05576b8533c9e12f744aad94;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=3f18724cb72313e23df648116519c42f1317f69d;hpb=e2bc7ffae3eb387661064be8b9dc927742f9e7e8;p=lyx.git

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 3f18724cb7..1dbeae249a 100644
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -32,50 +32,46 @@ class Inset;
 class MacroContext;
 
 
-/// Standard Sizes (mode styles)
-/// note: These values are hard-coded in changeStyle
-enum Styles {
-	///
-	LM_ST_DISPLAY = 0,
-	///
-	LM_ST_TEXT,
-	///
-	LM_ST_SCRIPT,
-	///
-	LM_ST_SCRIPTSCRIPT
-};
-
-
 //
 // This is the part common to MetricsInfo and PainterInfo
 //
 class MetricsBase {
 public:
 	///
-	MetricsBase();
-	///
-	MetricsBase(BufferView * bv, FontInfo const & font, int textwidth);
+	MetricsBase(BufferView * bv = 0, FontInfo font = FontInfo(),
+	            int textwidth = 0);
 
 	/// the current view
 	BufferView * bv;
 	/// current font
 	FontInfo font;
-	/// current math style (display/text/script/..)
-	Styles style;
 	/// name of current font - mathed specific
 	std::string fontname;
 	/// This is the width available in pixels
 	int textwidth;
+	/// count wether the current mathdata is nested in macro(s)
+	int macro_nesting;
 
 	/// Temporarily change a full font.
-	Changer changeFontSet(docstring const & font, bool cond = true);
-	Changer changeFontSet(char const * font, bool cond = true);
-	/// Temporarily change the font size and the math style.
-	Changer changeStyle(Styles style, bool cond = true);
+	Changer changeFontSet(std::string const & font);
+	/// Temporarily change the font to math if needed.
+	Changer changeEnsureMath();
 	// Temporarily change to the style suitable for use in fractions
-	Changer changeFrac(bool cond = true);
+	Changer changeFrac();
+	// Temporarily change to the style suitable for use in arrays
+	Changer changeArray();
 	// Temporarily change the style to (script)script style
-	Changer changeScript(bool cond = true);
+	Changer changeScript();
+	///
+	int solidLineThickness() const { return solid_line_thickness_; }
+	///
+	int solidLineOffset() const { return solid_line_offset_; }
+	///
+	int dottedLineThickness() const { return dotted_line_thickness_; }
+private:
+	int solid_line_thickness_;
+	int solid_line_offset_;
+	int dotted_line_thickness_;
 };
 
 
@@ -88,7 +84,8 @@ public:
 	///
 	MetricsInfo();
 	///
-	MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, MacroContext const & mc);
+	MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
+	            MacroContext const & mc);
 
 	///
 	MetricsBase base;