Amend 207eaeee9071cb

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 92ed4a7eb3e273beb4ca44a888400e08c205be59..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;
 
 
@@ -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);
@@ -75,6 +80,36 @@ Changer MetricsBase::changeFontSet(string const & name)
            && ((isTextFont(oldname) && oldcolor != Color_foreground)
                || (isMathFont(oldname) && oldcolor != Color_math)))
                font.setColor(oldcolor);
+#if __cplusplus >= 201402L
+       return rc;
+#else
+       /** 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;
 }
 
@@ -117,7 +152,8 @@ int MetricsBase::inPixels(Length const & len) const
 
 MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
                          MacroContext const & mc, bool vm, bool tight)
-       : base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight)
+       : base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight),
+         extrawidth(0)
 {}
 
 
@@ -157,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)