X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=60a004573e2d3d61c1c4bc3d4fe71d077f32a8b0;hb=22e6659780390a19174d1bf896317a5baf9e40d7;hp=ea3bf0247e4fcf5083d358e85abd190bc3be19ff;hpb=3cf0cbb3c69e73d72b6cee3723de7b67e69c4c0a;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index ea3bf0247e..60a004573e 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -37,49 +37,63 @@ namespace lyx {
 /////////////////////////////////////////////////////////////////////////
 
 MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
-	: bv(b), font(move(f)), style(LM_ST_TEXT), fontname("mathnormal"),
-	  textwidth(w), solid_line_thickness_(1), solid_line_offset_(1),
-	  dotted_line_thickness_(1)
+	: bv(b), font(move(f)), fontname("mathnormal"),
+	  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;
 	}
 }
 
 
-Changer MetricsBase::changeFontSet(string const & name, bool cond)
+Changer MetricsBase::changeFontSet(string const & name)
 {
 	RefChanger<MetricsBase> rc = make_save(*this);
-	if (!cond)
-		rc->keep();
-	else {
-		ColorCode oldcolor = font.color();
-		string const oldname = fontname;
-		fontname = name;
-		if (isMathFont(name) || isMathFont(oldname))
-			font = sane_font;
-		augmentFont(font, name);
-		font.setSize(rc->old.font.size());
-		if (name != "lyxtex"
-		    && ((isTextFont(oldname) && oldcolor != Color_foreground)
-		        || (isMathFont(oldname) && oldcolor != Color_math)))
-			font.setColor(oldcolor);
-	}
+	ColorCode oldcolor = font.color();
+	string const oldname = fontname;
+	fontname = name;
+	if (isMathFont(name) || isMathFont(oldname))
+		font = sane_font;
+	augmentFont(font, name);
+	font.setSize(rc->old.font.size());
+	font.setStyle(rc->old.font.style());
+	if (name != "lyxtex"
+	    && ((isTextFont(oldname) && oldcolor != Color_foreground)
+	        || (isMathFont(oldname) && oldcolor != Color_math)))
+		font.setColor(oldcolor);
 	return move(rc);
 }
 
 
+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();
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 //
 // MetricsInfo
@@ -143,7 +157,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;
@@ -151,58 +165,41 @@ Color PainterInfo::textColor(Color const & color) const
 }
 
 
-Changer MetricsBase::changeScript(bool cond)
+Changer MetricsBase::changeScript()
 {
-	switch (style) {
+	switch (font.style()) {
 	case LM_ST_DISPLAY:
 	case LM_ST_TEXT:
-		return changeStyle(LM_ST_SCRIPT, cond);
+		return font.changeStyle(LM_ST_SCRIPT);
 	case LM_ST_SCRIPT:
 	case LM_ST_SCRIPTSCRIPT:
-		return changeStyle(LM_ST_SCRIPTSCRIPT, cond);
+		return font.changeStyle(LM_ST_SCRIPTSCRIPT);
 	}
 	//remove Warning
-	LASSERT(false, return Changer());
+	return Changer();
 }
 
 
-Changer MetricsBase::changeFrac(bool cond)
+Changer MetricsBase::changeFrac()
 {
-	switch (style) {
+	switch (font.style()) {
 	case LM_ST_DISPLAY:
-		return changeStyle(LM_ST_TEXT, cond);
+		return font.changeStyle(LM_ST_TEXT);
 	case LM_ST_TEXT:
-		return changeStyle(LM_ST_SCRIPT, cond);
+		return font.changeStyle(LM_ST_SCRIPT);
 	case LM_ST_SCRIPT:
 	case LM_ST_SCRIPTSCRIPT:
-		return changeStyle(LM_ST_SCRIPTSCRIPT, cond);
+		return font.changeStyle(LM_ST_SCRIPTSCRIPT);
 	}
 	//remove Warning
 	return Changer();
 }
 
 
-Changer MetricsBase::changeStyle(Styles new_style, bool cond)
+Changer MetricsBase::changeArray()
 {
-	static const int diff[4][4] =
-		{ { 0, 0, -3, -5 },
-		  { 0, 0, -3, -5 },
-		  { 3, 3,  0, -2 },
-		  { 5, 5,  2,  0 } };
-	int t = diff[style][new_style];
-	RefChanger<MetricsBase> rc = make_save(*this);
-	if (!cond)
-		rc->keep();
-	else {
-		if (t > 0)
-			while (t--)
-				font.incSize();
-		else
-			while (t++)
-				font.decSize();
-		style = new_style;
-	}
-	return move(rc);
+	return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT)
+		: Changer();
 }