X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=809c0cec68997f7f7b81533c7715ba4ee6a5f6dd;hb=5366666c831b6ad726e848a60d738b57ec8b0501;hp=e7de5d0ea5d7973c729e7a385a39cea28980ced3;hpb=a71b96ac426438abb4fe835d0ad000c769693421;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index e7de5d0ea5..809c0cec68 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -10,11 +10,10 @@
 
 #include <config.h>
 
-#include "BufferView.h"
-#include "ColorSet.h"
-#include "LyXRC.h"
 #include "MetricsInfo.h"
 
+#include "LyXRC.h"
+
 #include "insets/Inset.h"
 
 #include "mathed/MathSupport.h"
@@ -22,10 +21,6 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/docstring.h"
-#include "support/lassert.h"
-#include "support/RefChanger.h"
-
 using namespace std;
 
 
@@ -86,16 +81,16 @@ Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
 {
 	switch (mode) {
 	case Inset::UNDECIDED_MODE:
-		return Changer();
+		return noChange();
 	case Inset::TEXT_MODE:
-		return isMathFont(fontname) ? changeFontSet("textnormal") : Changer();
+		return isMathFont(fontname) ? changeFontSet("textnormal") : noChange();
 	case Inset::MATH_MODE:
 		// FIXME:
 		//   \textit{\ensuremath{\text{a}}}
 		// should appear in italics
-		return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer();
+		return isTextFont(fontname) ? changeFontSet("mathnormal"): noChange();
 	}
-	return Changer();
+	return noChange();
 }
 
 
@@ -119,8 +114,8 @@ int MetricsBase::inPixels(Length const & len) const
 /////////////////////////////////////////////////////////////////////////
 
 MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
-                         MacroContext const & mc)
-	: base(bv, font, textwidth), macrocontext(mc)
+                         MacroContext const & mc, bool vm)
+	: base(bv, font, textwidth), macrocontext(mc), vmode(vm)
 {}
 
 
@@ -199,10 +194,10 @@ Changer MetricsBase::changeScript()
 		return font.changeStyle(SCRIPTSCRIPT_STYLE);
 	case INHERIT_STYLE:
 	case IGNORE_STYLE:
-		return Changer();
+		return noChange();
 	}
 	//remove Warning
-	return Changer();
+	return noChange();
 }
 
 
@@ -218,10 +213,10 @@ Changer MetricsBase::changeFrac()
 		return font.changeStyle(SCRIPTSCRIPT_STYLE);
 	case INHERIT_STYLE:
 	case IGNORE_STYLE:
-		return Changer();
+		return noChange();
 	}
 	//remove Warning
-	return Changer();
+	return noChange();
 }
 
 
@@ -230,7 +225,7 @@ Changer MetricsBase::changeArray(bool small)
 	if (small)
 		return font.changeStyle(SCRIPT_STYLE);
 	return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
-		: Changer();
+		: noChange();
 }