X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=89196f3fb3be765fd000b1a18ace026a16054f47;hb=dfc3db773ac79e33b828b2d2b4a008c8a37cd4e9;hp=e7bbefbf0dbe62beb36b1efcbf967e8027469e17;hpb=732395ef1e7b0a4fe3567d1205af0ebd92f598e6;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index e7bbefbf0d..89196f3fb3 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;
 
 
@@ -38,7 +33,7 @@ namespace lyx {
 /////////////////////////////////////////////////////////////////////////
 
 MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
-	: bv(b), font(move(f)), fontname("mathnormal"),
+	: bv(b), font(std::move(f)), fontname("mathnormal"),
 	  textwidth(w), macro_nesting(0),
 	  solid_line_thickness_(1), solid_line_offset_(1), dotted_line_thickness_(1)
 {
@@ -70,14 +65,22 @@ 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);
 #if __cplusplus >= 201402L
 	return rc;
 #else
-	return move(rc);
+	/** In theory, this is not needed with C++11, and modern compilers
+	 * will complain in C++11 mode, but gcc 4.9 requires this. */
+	return std::move(rc);
 #endif
 }
 
@@ -86,16 +89,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 +122,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, bool tight)
+	: base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight)
 {}
 
 
@@ -131,7 +134,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)
 {
@@ -153,31 +157,35 @@ void PainterInfo::draw(int x, int y, docstring const & str)
 
 ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 {
-	ColorCode const color_bg = inset->backgroundColor(*this);
-
 	if (selected && sel)
 		// This inset is in a selection
 		return Color_selection;
-	else {
+
+	// special handling for inset background
+	if (inset != nullptr) {
+		if (pain.develMode() && !inset->isBufferValid())
+			// This inset is in error
+			return Color_error;
+
+		ColorCode const color_bg = inset->backgroundColor(*this);
 		if (color_bg != Color_none)
 			// This inset has its own color
 			return color_bg;
-		else {
-			if (background_color == Color_none)
-				// This inset has no own color and does not inherit a color
-				return Color_background;
-			else
-				// This inset has no own color, but inherits a color
-				return background_color;
-		}
 	}
+
+	if (background_color == Color_none)
+		// This inset has no own color and does not inherit a color
+		return Color_background;
+
+	// This inset has no own color, but inherits a color
+	return background_color;
 }
 
 
 Color PainterInfo::textColor(Color const & color) const
 {
-	if (change_.changed())
-		return change_.color();
+	if (change.changed())
+		return change.color();
 	if (selected)
 		return Color_selectiontext;
 	return color;
@@ -195,10 +203,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 +222,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 +234,7 @@ Changer MetricsBase::changeArray(bool small)
 	if (small)
 		return font.changeStyle(SCRIPT_STYLE);
 	return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
-		: Changer();
+		: noChange();
 }