#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
+#include <map>
+
using namespace std;
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);
&& ((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;
}
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)
{}
// 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)