Fix bug #12772

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 5aeb9a29801be0e5e12bd60d48de10fca494bf0a..89196f3fb3be765fd000b1a18ace026a16054f47 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -21,8 +21,6 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/RefChanger.h"
-
 using namespace std;
 
 
@@ -35,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)
 {
@@ -67,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
 }
 
@@ -83,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();
 }
 
 
@@ -116,8 +122,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)
 {}
 
 
@@ -128,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)
 {
@@ -196,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();
 }
 
 
@@ -215,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();
 }
 
 
@@ -227,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();
 }