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 + 150) / 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;
}
}
-Changer MetricsBase::changeFontSet(string const & name, bool cond)
+Changer MetricsBase::changeFontSet(string const & name)
{
RefChanger<MetricsBase> rc = make_save(*this);
- if (!cond)
- rc->keep();
- else {
- 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);
- }
+ 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);
return move(rc);
}
+Changer MetricsBase::changeEnsureMath(Inset::mode_type mode)
+{
+ 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 Changer();
+}
+
+
/////////////////////////////////////////////////////////////////////////
//
// MetricsInfo
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 (font.style()) {
case LM_ST_DISPLAY:
case LM_ST_TEXT:
- return font.changeStyle(LM_ST_SCRIPT, cond);
+ return font.changeStyle(LM_ST_SCRIPT);
case LM_ST_SCRIPT:
case LM_ST_SCRIPTSCRIPT:
- return font.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 (font.style()) {
case LM_ST_DISPLAY:
- return font.changeStyle(LM_ST_TEXT, cond);
+ return font.changeStyle(LM_ST_TEXT);
case LM_ST_TEXT:
- return font.changeStyle(LM_ST_SCRIPT, cond);
+ return font.changeStyle(LM_ST_SCRIPT);
case LM_ST_SCRIPT:
case LM_ST_SCRIPTSCRIPT:
- return font.changeStyle(LM_ST_SCRIPTSCRIPT, cond);
+ return font.changeStyle(LM_ST_SCRIPTSCRIPT);
}
//remove Warning
return Changer();
}
+Changer MetricsBase::changeArray()
+{
+ return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT)
+ : Changer();
+}
+
+
} // namespace lyx