#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"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
-#include "support/docstring.h"
-#include "support/lassert.h"
-#include "support/RefChanger.h"
+#include <map>
using namespace std;
/////////////////////////////////////////////////////////////////////////
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)
{
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 != "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
}
+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) {
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();
}
/////////////////////////////////////////////////////////////////////////
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)
{}
/////////////////////////////////////////////////////////////////////////
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)
{
// 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)
return font.changeStyle(SCRIPTSCRIPT_STYLE);
case INHERIT_STYLE:
case IGNORE_STYLE:
- return Changer();
+ return noChange();
}
//remove Warning
- return Changer();
+ return noChange();
}
return font.changeStyle(SCRIPTSCRIPT_STYLE);
case INHERIT_STYLE:
case IGNORE_STYLE:
- return Changer();
+ return noChange();
}
//remove Warning
- return Changer();
+ return noChange();
}
if (small)
return font.changeStyle(SCRIPT_STYLE);
return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
- : Changer();
+ : noChange();
}