//
/////////////////////////////////////////////////////////////////////////
-MetricsBase::MetricsBase()
- : bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"), textwidth(0),
+MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
+ : bv(b), font(move(f)), fontname("mathnormal"),
+ textwidth(w), macro_nesting(0),
solid_line_thickness_(1), solid_line_offset_(1), dotted_line_thickness_(1)
{
- if (lyxrc.zoom >= 200) {
+ if (lyxrc.currentZoom >= 200) {
// derive the line thickness from zoom factor
// the zoom is given in percent
// (increase thickness at 250%, 450% etc.)
- solid_line_thickness_ = (lyxrc.zoom + 50) / 200;
+ solid_line_thickness_ = (lyxrc.currentZoom + 150) / 200;
// adjust line_offset_ too
solid_line_offset_ = 1 + solid_line_thickness_ / 2;
}
- if (lyxrc.zoom >= 100) {
+ if (lyxrc.currentZoom >= 100) {
// derive the line thickness from zoom factor
// the zoom is given in percent
// (increase thickness at 150%, 250% etc.)
- dotted_line_thickness_ = (lyxrc.zoom + 50) / 100;
+ dotted_line_thickness_ = (lyxrc.currentZoom + 50) / 100;
}
}
-MetricsBase::MetricsBase(BufferView * b, FontInfo f, int w)
- : MetricsBase()
+Changer MetricsBase::changeFontSet(string const & name)
{
- bv = b;
- font = f;
- textwidth = w;
+ RefChanger<MetricsBase> rc = make_save(*this);
+ ColorCode oldcolor = font.color();
+ string const oldname = fontname;
+ fontname = name;
+ if (isMathFont(name) || isMathFont(oldname))
+ font = sane_font;
+ augmentFont(font, name);
+ font.setSize(rc->old.font.size());
+ font.setStyle(rc->old.font.style());
+ 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);
+#endif
}
-Changer MetricsBase::changeFontSet(string const & name, bool cond)
+Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
{
- RefChanger<MetricsBase> rc = make_save(*this);
- if (!cond)
- rc->keep();
- else {
- ColorCode oldcolor = font.color();
- string const oldname = fontname;
- fontname = name;
- font = sane_font;
- augmentFont(font, name);
- font.setSize(rc->old.font.size());
- if (name != "lyxtex"
- && ((isTextFont(oldname) && oldcolor != Color_foreground)
- || (isMathFont(oldname) && oldcolor != Color_math)))
- font.setColor(oldcolor);
+ switch (mode) {
+ case Inset::UNDECIDED_MODE:
+ return Changer();
+ case Inset::TEXT_MODE:
+ return isMathFont(fontname) ? changeFontSet("textnormal") : Changer();
+ case Inset::MATH_MODE:
+ // FIXME:
+ // \textit{\ensuremath{\text{a}}}
+ // should appear in italics
+ return isTextFont(fontname) ? changeFontSet("mathnormal"): Changer();
}
- return move(rc);
+ return Changer();
}
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) {
+ 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())
+ if (change_.changed())
return change_.color();
if (selected)
return Color_selectiontext;
}
-Changer MetricsBase::changeScript(bool cond)
+Changer MetricsBase::changeScript()
{
- switch (style) {
+ switch (font.style()) {
case LM_ST_DISPLAY:
case LM_ST_TEXT:
- return changeStyle(LM_ST_SCRIPT, cond);
+ return font.changeStyle(LM_ST_SCRIPT);
case LM_ST_SCRIPT:
case LM_ST_SCRIPTSCRIPT:
- return changeStyle(LM_ST_SCRIPTSCRIPT, cond);
+ return font.changeStyle(LM_ST_SCRIPTSCRIPT);
}
//remove Warning
- LASSERT(false, return Changer());
+ return Changer();
}
-Changer MetricsBase::changeFrac(bool cond)
+Changer MetricsBase::changeFrac()
{
- switch (style) {
+ switch (font.style()) {
case LM_ST_DISPLAY:
- return changeStyle(LM_ST_TEXT, cond);
+ return font.changeStyle(LM_ST_TEXT);
case LM_ST_TEXT:
- return changeStyle(LM_ST_SCRIPT, cond);
+ return font.changeStyle(LM_ST_SCRIPT);
case LM_ST_SCRIPT:
case LM_ST_SCRIPTSCRIPT:
- return changeStyle(LM_ST_SCRIPTSCRIPT, cond);
+ return font.changeStyle(LM_ST_SCRIPTSCRIPT);
}
//remove Warning
return Changer();
}
-Changer MetricsBase::changeStyle(Styles new_style, bool cond)
+Changer MetricsBase::changeArray()
{
- static const int diff[4][4] =
- { { 0, 0, -3, -5 },
- { 0, 0, -3, -5 },
- { 3, 3, 0, -2 },
- { 5, 5, 2, 0 } };
- int t = diff[style][new_style];
- RefChanger<MetricsBase> rc = make_save(*this);
- if (!cond)
- rc->keep();
- else {
- if (t > 0)
- while (t--)
- font.incSize();
- else
- while (t++)
- font.decSize();
- style = new_style;
- }
- return move(rc);
+ return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT)
+ : Changer();
}
projects / lyx.git / blobdiff