#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"
-
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)
{
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);
- return move(rc);
+#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
}
{
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();
}
fi.setFamily(SYMBOL_FAMILY);
else
// Math style is only taken into account in the case of mu
- fi.setStyle(LM_ST_TEXT);
+ fi.setStyle(TEXT_STYLE);
return len.inPixels(textwidth, theFontMetrics(fi).em());
}
/////////////////////////////////////////////////////////////////////////
MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
- MacroContext const & mc)
- : base(bv, font, textwidth), macrocontext(mc)
+ 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),
- do_spellcheck(true), full_repaint(true), background_color(Color_background)
+ : 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)
{
base.bv = bv;
}
ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
{
- ColorCode const color_bg = inset->backgroundColor(*this);
-
if (selected && sel)
// This inset is in a selection
return Color_selection;
- else {
+
+ // special handling for inset background
+ if (inset != nullptr) {
+ if (pain.develMode() && !inset->isBufferValid())
+ // This inset is in error
+ return Color_error;
+
+ ColorCode const color_bg = inset->backgroundColor(*this);
if (color_bg != Color_none)
// This inset has its own color
return color_bg;
- else {
- if (background_color == Color_none)
- // This inset has no own color and does not inherit a color
- return Color_background;
- else
- // This inset has no own color, but inherits a color
- return background_color;
- }
}
+
+ if (background_color == Color_none)
+ // This inset has no own color and does not inherit a color
+ return Color_background;
+
+ // This inset has no own color, but inherits a color
+ return background_color;
}
Color PainterInfo::textColor(Color const & color) const
{
- if (change_.changed())
- return change_.color();
+ if (change.changed())
+ return change.color();
if (selected)
return Color_selectiontext;
return color;
Changer MetricsBase::changeScript()
{
switch (font.style()) {
- case LM_ST_DISPLAY:
- case LM_ST_TEXT:
- return font.changeStyle(LM_ST_SCRIPT);
- case LM_ST_SCRIPT:
- case LM_ST_SCRIPTSCRIPT:
- return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+ case DISPLAY_STYLE:
+ case TEXT_STYLE:
+ return font.changeStyle(SCRIPT_STYLE);
+ case SCRIPT_STYLE:
+ case SCRIPTSCRIPT_STYLE:
+ return font.changeStyle(SCRIPTSCRIPT_STYLE);
+ case INHERIT_STYLE:
+ case IGNORE_STYLE:
+ return noChange();
}
//remove Warning
- return Changer();
+ return noChange();
}
Changer MetricsBase::changeFrac()
{
switch (font.style()) {
- case LM_ST_DISPLAY:
- return font.changeStyle(LM_ST_TEXT);
- case LM_ST_TEXT:
- return font.changeStyle(LM_ST_SCRIPT);
- case LM_ST_SCRIPT:
- case LM_ST_SCRIPTSCRIPT:
- return font.changeStyle(LM_ST_SCRIPTSCRIPT);
+ case DISPLAY_STYLE:
+ return font.changeStyle(TEXT_STYLE);
+ case TEXT_STYLE:
+ return font.changeStyle(SCRIPT_STYLE);
+ case SCRIPT_STYLE:
+ case SCRIPTSCRIPT_STYLE:
+ return font.changeStyle(SCRIPTSCRIPT_STYLE);
+ case INHERIT_STYLE:
+ case IGNORE_STYLE:
+ return noChange();
}
//remove Warning
- return Changer();
+ return noChange();
}
-Changer MetricsBase::changeArray()
+Changer MetricsBase::changeArray(bool small)
{
- return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT)
- : Changer();
+ if (small)
+ return font.changeStyle(SCRIPT_STYLE);
+ return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE)
+ : noChange();
}
projects / lyx.git / blobdiff