X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=0e90876f19fa898b872675ed0b6964d9354d74d3;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=3f2b13bc6da5c82dac223779d9372042a539f462;hpb=e449e70e3854da3aeda8dca1de22cabaf6ae0557;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 3f2b13bc6d..0e90876f19 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -19,6 +19,7 @@
 
 #include "mathed/MathSupport.h"
 
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "support/docstring.h"
@@ -41,19 +42,19 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
 	  textwidth(w), macro_nesting(0),
 	  solid_line_thickness_(1), solid_line_offset_(1), dotted_line_thickness_(1)
 {
-	if (lyxrc.zoom >= 200) {
+	if (lyxrc.currentZoom >= 200) {
 		// derive the line thickness from zoom factor
 		// the zoom is given in percent
 		// (increase thickness at 250%, 450% etc.)
-		solid_line_thickness_ = (lyxrc.zoom + 150) / 200;
+		solid_line_thickness_ = (lyxrc.currentZoom + 150) / 200;
 		// adjust line_offset_ too
 		solid_line_offset_ = 1 + solid_line_thickness_ / 2;
 	}
-	if (lyxrc.zoom >= 100) {
+	if (lyxrc.currentZoom >= 100) {
 		// derive the line thickness from zoom factor
 		// the zoom is given in percent
 		// (increase thickness at 150%, 250% etc.)
-		dotted_line_thickness_ = (lyxrc.zoom + 50) / 100;
+		dotted_line_thickness_ = (lyxrc.currentZoom + 50) / 100;
 	}
 }
 
@@ -77,6 +78,36 @@ Changer MetricsBase::changeFontSet(string const & name)
 }
 
 
+Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
+{
+	switch (mode) {
+	case Inset::UNDECIDED_MODE:
+		return Changer();
+	case Inset::TEXT_MODE:
+		return isMathFont(fontname) ? changeFontSet("textnormal") : Changer();
+	case Inset::MATH_MODE:
+		// FIXME:
+		//   \textit{\ensuremath{\text{a}}}
+		// should appear in italics
+		return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer();
+	}
+	return Changer();
+}
+
+
+int MetricsBase::inPixels(Length const & len) const
+{
+	FontInfo fi = font;
+	if (len.unit() == Length::MU)
+		// mu is 1/18th of an em in the math symbol font
+		fi.setFamily(SYMBOL_FAMILY);
+	else
+		// Math style is only taken into account in the case of mu
+		fi.setStyle(LM_ST_TEXT);
+	return len.inPixels(textwidth, theFontMetrics(fi).em());
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 //
 // MetricsInfo
@@ -140,7 +171,7 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 
 Color PainterInfo::textColor(Color const & color) const
 {
-	if (change_.changed()) 
+	if (change_.changed())
 		return change_.color();
 	if (selected)
 		return Color_selectiontext;
@@ -157,6 +188,9 @@ Changer MetricsBase::changeScript()
 	case LM_ST_SCRIPT:
 	case LM_ST_SCRIPTSCRIPT:
 		return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+	case LM_ST_INHERIT:
+	case LM_ST_IGNORE:
+		return Changer();
 	}
 	//remove Warning
 	return Changer();
@@ -173,6 +207,9 @@ Changer MetricsBase::changeFrac()
 	case LM_ST_SCRIPT:
 	case LM_ST_SCRIPTSCRIPT:
 		return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+	case LM_ST_INHERIT:
+	case LM_ST_IGNORE:
+		return Changer();
 	}
 	//remove Warning
 	return Changer();