X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=4688d128eb7cbd30d03be6c8710ffcbe7ed1370f;hb=d79637a88e368d8e67e4b38ddcf25a4b7f40176e;hp=15e772ea712b24b0320799d88f2533ac24dbfed7;hpb=196d9caeb0b9f74d02750f774de1ca63a483803f;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 15e772ea71..4688d128eb 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "LyXRC.h"
 #include "MetricsInfo.h"
 
+#include "LyXRC.h"
+
 #include "insets/Inset.h"
 
 #include "mathed/MathSupport.h"
@@ -20,8 +21,6 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/RefChanger.h"
-
 using namespace std;
 
 
@@ -66,7 +65,13 @@ Changer MetricsBase::changeFontSet(string const & name)
 	augmentFont(font, name);
 	font.setSize(rc->old.font.size());
 	font.setStyle(rc->old.font.style());
-	if (name != "lyxtex"
+	if (name == "emph") {
+		font.setColor(oldcolor);
+		if (rc->old.font.shape() != UP_SHAPE)
+			font.setShape(UP_SHAPE);
+		else
+			font.setShape(ITALIC_SHAPE);
+	} else if (name != "lyxtex"
 	    && ((isTextFont(oldname) && oldcolor != Color_foreground)
 	        || (isMathFont(oldname) && oldcolor != Color_math)))
 		font.setColor(oldcolor);
@@ -82,16 +87,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();
 }
 
 
@@ -115,8 +120,8 @@ int MetricsBase::inPixels(Length const & len) const
 /////////////////////////////////////////////////////////////////////////
 
 MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
-                         MacroContext const & mc, bool vm)
-	: base(bv, font, textwidth), macrocontext(mc), vmode(vm)
+                         MacroContext const & mc, bool vm, bool tight)
+	: base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight)
 {}
 
 
@@ -127,7 +132,8 @@ MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
 /////////////////////////////////////////////////////////////////////////
 
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
-	: pain(painter), ltr_pos(false), change(), selected(false),
+	: pain(painter), ltr_pos(false), change(),
+	  selected(false), selected_left(false), selected_right(false),
 	  do_spellcheck(true), full_repaint(true), background_color(Color_background),
 	  leftx(0), rightx(0)
 {
@@ -195,10 +201,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();
 }
 
 
@@ -214,10 +220,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();
 }
 
 
@@ -226,7 +232,7 @@ Changer MetricsBase::changeArray(bool small)
 	if (small)
 		return font.changeStyle(SCRIPT_STYLE);
 	return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
-		: Changer();
+		: noChange();
 }