X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=93782f94765882948b245d7959d7965796b44d00;hb=99174acff85c4db06e677b87e36a99d4a16dd967;hp=ef9803d8315576ff8dca0b1c84eda0a5cf8bca7e;hpb=eadc55b8b38a489202e2e168521578dae119fd59;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index ef9803d831..93782f9476 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,12 +78,33 @@ Changer MetricsBase::changeFontSet(string const & name)
 }
 
 
-Changer MetricsBase::changeEnsureMath()
+Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
 {
-	// FIXME:
-	//   \textit{\ensuremath{\text{a}}}
-	// should appear in italics
-	return isTextFont(fontname) ? changeFontSet("mathnormal") : Changer();
+	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());
 }
 
 
@@ -149,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;