Amend 207eaeee9071cb

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 9bab1a32c9b4c2e642696b49a21b226aeaa4b146..3fa8973e01279616a70847323f4617cab75149f3 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -21,6 +21,8 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include <map>
+
 using namespace std;
 
 
@@ -33,7 +35,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)
 {
@@ -61,9 +63,12 @@ Changer MetricsBase::changeFontSet(string const & name)
        string const oldname = fontname;
        fontname = name;
        if (isMathFont(name) || isMathFont(oldname))
-               font = sane_font;
+               font = isTextFont(name) ? outer_font : sane_font;
        augmentFont(font, name);
-       font.setSize(rc->old.font.size());
+       if (isTextFont(name) && isMathFont(oldname))
+               font.setSize(rc->old.outer_font.size());
+       else
+               font.setSize(rc->old.font.size());
        font.setStyle(rc->old.font.style());
        if (name == "emph") {
                font.setColor(oldcolor);
@@ -78,11 +83,37 @@ Changer MetricsBase::changeFontSet(string const & name)
 #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
 }
 
 
+Changer MetricsBase::changeFontSize(string const & size, bool mathmode)
+{
+       map<string, FontSize> sizes = {
+               {"tiny", TINY_SIZE},
+               {"scriptsize", SCRIPT_SIZE},
+               {"footnotesize", FOOTNOTE_SIZE},
+               {"small", SMALL_SIZE},
+               {"normalsize", NORMAL_SIZE},
+               {"large", LARGE_SIZE},
+               {"Large", LARGER_SIZE},
+               {"LARGE", LARGEST_SIZE},
+               {"huge", HUGE_SIZE},
+               {"Huge", HUGER_SIZE}
+       };
+       RefChanger<MetricsBase> rc = make_save(*this);
+       // In math mode we only record the size in outer_font
+       if (mathmode)
+               outer_font.setSize(sizes[size]);
+       else
+               font.setSize(sizes[size]);
+       return rc;
+}
+
+
 Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
 {
        switch (mode) {
@@ -120,8 +151,9 @@ 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),
+         extrawidth(0)
 {}
 
 
@@ -132,7 +164,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)
 {
@@ -160,9 +193,11 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 
        // special handling for inset background
        if (inset != nullptr) {
-               if (pain.develMode() && !inset->isBufferValid())
+               if (pain.develMode() && !inset->isBufferValid()) {
+                       LYXERR0("Invalid or no buffer set in " << insetName(inset->lyxCode()));
                        // This inset is in error
                        return Color_error;
+               }
 
                ColorCode const color_bg = inset->backgroundColor(*this);
                if (color_bg != Color_none)