X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=537efd351b875b086b091914f32b7c2ae19ae1e7;hb=861c6167ca5f1329e16dd788489a7c03772e2332;hp=b75ec811086a70ebdaa777191ed27cdf2dc66033;hpb=f07ffaee84cef2b28c9d49e388d30f1f8e22cfc5;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index b75ec81108..537efd351b 100644 --- a/src/MetricsInfo.cpp +++ b/src/MetricsInfo.cpp @@ -12,16 +12,19 @@ #include "BufferView.h" #include "ColorSet.h" +#include "LyXRC.h" #include "MetricsInfo.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; @@ -34,16 +37,79 @@ namespace lyx { // ///////////////////////////////////////////////////////////////////////// -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.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.currentZoom + 150) / 200; + // adjust line_offset_ too + solid_line_offset_ = 1 + solid_line_thickness_ / 2; + } + 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.currentZoom + 50) / 100; + } +} -MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w) - : bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"), - textwidth(w) -{} +Changer MetricsBase::changeFontSet(string const & name) +{ + RefChanger 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::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(); +} + + +int MetricsBase::inPixels(Length const & len) const +{ + FontInfo fi = font; + if (len.unit() == Length::MU) + // mu is 1/18th of an em in the math symbol font + fi.setFamily(SYMBOL_FAMILY); + else + // Math style is only taken into account in the case of mu + fi.setStyle(TEXT_STYLE); + return len.inPixels(textwidth, theFontMetrics(fi).em()); +} ///////////////////////////////////////////////////////////////////////// @@ -52,8 +118,8 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w) // ///////////////////////////////////////////////////////////////////////// -MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, - MacroContext const & mc) +MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth, + MacroContext const & mc) : base(bv, font, textwidth), macrocontext(mc) {} @@ -65,8 +131,9 @@ MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, ///////////////////////////////////////////////////////////////////////// PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter) - : pain(painter), ltr_pos(false), change_(), selected(false), - full_repaint(true), background_color(Color_background) + : pain(painter), ltr_pos(false), change(), selected(false), + do_spellcheck(true), full_repaint(true), background_color(Color_background), + leftx(0), rightx(0) { base.bv = bv; } @@ -91,236 +158,77 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const if (selected && sel) // This inset is in a selection return Color_selection; - else { - 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; - } - } -} - - -Color PainterInfo::textColor(Color const & color) const -{ - if (change_.changed()) - return change_.color(); - if (selected) - return Color_selectiontext; - return color; -} - - -///////////////////////////////////////////////////////////////////////// -// -// ScriptChanger -// -///////////////////////////////////////////////////////////////////////// -Styles smallerScriptStyle(Styles st) -{ - switch (st) { - case LM_ST_DISPLAY: - case LM_ST_TEXT: - return LM_ST_SCRIPT; - case LM_ST_SCRIPT: - case LM_ST_SCRIPTSCRIPT: - default: // shut up compiler - return LM_ST_SCRIPTSCRIPT; - } -} - - -ScriptChanger::ScriptChanger(MetricsBase & mb) - : StyleChanger(mb, smallerScriptStyle(mb.style)) -{} + if (pain.develMode() && !inset->isBufferValid()) + // This inset is in error + return Color_error; + if (color_bg != Color_none) + // This inset has its own color + return color_bg; -///////////////////////////////////////////////////////////////////////// -// -// FracChanger -// -///////////////////////////////////////////////////////////////////////// + if (background_color == Color_none) + // This inset has no own color and does not inherit a color + return Color_background; -Styles smallerFracStyle(Styles st) -{ - switch (st) { - case LM_ST_DISPLAY: - return LM_ST_TEXT; - case LM_ST_TEXT: - return LM_ST_SCRIPT; - case LM_ST_SCRIPT: - case LM_ST_SCRIPTSCRIPT: - default: // shut up compiler - return LM_ST_SCRIPTSCRIPT; - } + // This inset has no own color, but inherits a color + return background_color; } -FracChanger::FracChanger(MetricsBase & mb) - : StyleChanger(mb, smallerFracStyle(mb.style)) -{} - - -///////////////////////////////////////////////////////////////////////// -// -// ArrayChanger -// -///////////////////////////////////////////////////////////////////////// - -ArrayChanger::ArrayChanger(MetricsBase & mb) - : StyleChanger(mb, mb.style == LM_ST_DISPLAY ? LM_ST_TEXT : mb.style) -{} - - -///////////////////////////////////////////////////////////////////////// -// -// ShapeChanger -// -///////////////////////////////////////////////////////////////////////// - -ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape) - : Changer(font, font.shape()) -{ - orig_.setShape(shape); -} - - -ShapeChanger::~ShapeChanger() -{ - orig_.setShape(save_); -} - - -///////////////////////////////////////////////////////////////////////// -// -// StyleChanger -// -///////////////////////////////////////////////////////////////////////// - -StyleChanger::StyleChanger(MetricsBase & mb, Styles style) - : Changer(mb) -{ - 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[mb.style][style]; - if (t > 0) - while (t--) - mb.font.incSize(); - else - while (t++) - mb.font.decSize(); - mb.style = style; -} - - -StyleChanger::~StyleChanger() -{ - orig_ = save_; -} - - -///////////////////////////////////////////////////////////////////////// -// -// FontSetChanger -// -///////////////////////////////////////////////////////////////////////// - -FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name, - bool really_change_font) - : Changer(mb), change_(really_change_font) +Color PainterInfo::textColor(Color const & color) const { - if (change_) { - FontSize oldsize = save_.font.size(); - ColorCode oldcolor = save_.font.color(); - docstring const oldname = from_ascii(save_.fontname); - mb.fontname = name; - mb.font = sane_font; - augmentFont(mb.font, from_ascii(name)); - mb.font.setSize(oldsize); - if (string(name) != "lyxtex" - && ((isTextFont(oldname) && oldcolor != Color_foreground) - || (isMathFont(oldname) && oldcolor != Color_math))) - mb.font.setColor(oldcolor); - } + if (change.changed()) + return change.color(); + if (selected) + return Color_selectiontext; + return color; } -FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name, - bool really_change_font) - : Changer(mb), change_(really_change_font) +Changer MetricsBase::changeScript() { - if (change_) { - FontSize oldsize = save_.font.size(); - ColorCode oldcolor = save_.font.color(); - docstring const oldname = from_ascii(save_.fontname); - mb.fontname = to_utf8(name); - mb.font = sane_font; - augmentFont(mb.font, name); - mb.font.setSize(oldsize); - if (name != "lyxtex" - && ((isTextFont(oldname) && oldcolor != Color_foreground) - || (isMathFont(oldname) && oldcolor != Color_math))) - mb.font.setColor(oldcolor); + switch (font.style()) { + 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 Changer(); } + //remove Warning + return Changer(); } -FontSetChanger::~FontSetChanger() -{ - if (change_) - orig_ = save_; -} - - -///////////////////////////////////////////////////////////////////////// -// -// WidthChanger -// -///////////////////////////////////////////////////////////////////////// - -WidthChanger::WidthChanger(MetricsBase & mb, int w) - : Changer(mb) -{ - mb.textwidth = w; -} - - -WidthChanger::~WidthChanger() -{ - orig_ = save_; -} - - -///////////////////////////////////////////////////////////////////////// -// -// ColorChanger -// -///////////////////////////////////////////////////////////////////////// - -ColorChanger::ColorChanger(FontInfo & font, ColorCode color, - bool really_change_color) - : Changer(font, font.color()), change_(really_change_color) +Changer MetricsBase::changeFrac() { - if (change_) { - font.setColor(color); + switch (font.style()) { + 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 Changer(); } + //remove Warning + return Changer(); } -ColorChanger::~ColorChanger() +Changer MetricsBase::changeArray(bool small) { - if (change_) - orig_.setColor(save_); + if (small) + return font.changeStyle(SCRIPT_STYLE); + return (font.style() == DISPLAY_STYLE) ? font.changeStyle(TEXT_STYLE) + : Changer(); }