X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=89196f3fb3be765fd000b1a18ace026a16054f47;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=6d701c75ac1354c15cb0eafaac86d5aced3d1f00;hpb=6c33aa2e5bdc298c9cd314bdf7bcc11b792aa2b8;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index 6d701c75ac..89196f3fb3 100644 --- a/src/MetricsInfo.cpp +++ b/src/MetricsInfo.cpp @@ -10,19 +10,17 @@ #include -#include "BufferView.h" -#include "ColorSet.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" - using namespace std; @@ -34,16 +32,87 @@ 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(std::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 == "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 + /** 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::changeEnsureMath(Inset::mode_type mode) +{ + switch (mode) { + case Inset::UNDECIDED_MODE: + return noChange(); + case Inset::TEXT_MODE: + return isMathFont(fontname) ? changeFontSet("textnormal") : noChange(); + case Inset::MATH_MODE: + // FIXME: + // \textit{\ensuremath{\text{a}}} + // should appear in italics + return isTextFont(fontname) ? changeFontSet("mathnormal"): noChange(); + } + return noChange(); +} + + +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,9 +121,9 @@ MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w) // ///////////////////////////////////////////////////////////////////////// -MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, - MacroContext const & mc) - : base(bv, font, textwidth), macrocontext(mc) +MetricsInfo::MetricsInfo(BufferView * bv, FontInfo font, int textwidth, + MacroContext const & mc, bool vm, bool tight) + : base(bv, font, textwidth), macrocontext(mc), vmode(vm), tight_insets(tight) {} @@ -65,8 +134,10 @@ 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), selected_left(false), selected_right(false), + do_spellcheck(true), full_repaint(true), background_color(Color_background), + leftx(0), rightx(0) { base.bv = bv; } @@ -86,237 +157,84 @@ void PainterInfo::draw(int x, int y, docstring const & str) 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; -///////////////////////////////////////////////////////////////////////// -// -// 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; - } + // This inset has no own color, but inherits a color + return background_color; } -ScriptChanger::ScriptChanger(MetricsBase & mb) - : StyleChanger(mb, smallerScriptStyle(mb.style)) -{} - - -///////////////////////////////////////////////////////////////////////// -// -// FracChanger -// -///////////////////////////////////////////////////////////////////////// - -Styles smallerFracStyle(Styles st) +Color PainterInfo::textColor(Color const & color) const { - 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; - } + if (change.changed()) + return change.color(); + if (selected) + return Color_selectiontext; + return 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) +Changer MetricsBase::changeScript() { - save_ = orig_.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 } }; - save_ = mb; - 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) -{ - if (change_) { - save_ = mb; - 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); - } -} - - -FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name, - bool really_change_font) - : Changer(mb), change_(really_change_font) -{ - if (change_) { - save_ = mb; - 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 noChange(); } + //remove Warning + return noChange(); } -FontSetChanger::~FontSetChanger() -{ - if (change_) - orig_ = save_; -} - - -///////////////////////////////////////////////////////////////////////// -// -// WidthChanger -// -///////////////////////////////////////////////////////////////////////// - -WidthChanger::WidthChanger(MetricsBase & mb, int w) - : Changer(mb) -{ - save_ = mb; - mb.textwidth = w; -} - - -WidthChanger::~WidthChanger() -{ - orig_ = save_; -} - - -///////////////////////////////////////////////////////////////////////// -// -// ColorChanger -// -///////////////////////////////////////////////////////////////////////// - -ColorChanger::ColorChanger(FontInfo & font, docstring const & color, - bool really_change_color) - : Changer(font), change_(really_change_color) +Changer MetricsBase::changeFrac() { - if (change_) { - save_ = font.color(); - font.setColor(lcolor.getFromLyXName(to_utf8(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 noChange(); } + //remove Warning + return noChange(); } -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) + : noChange(); }