X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=b61011d63dee95245ae8dff328f6469f358753b7;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=05fc0658b1cc39e5ca35f78bc3e2bd8227f7d6db;hpb=c88eaf877ec9b9f7e41658af5b4b3b55e6078cd6;p=lyx.git diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp index 05fc0658b1..b61011d63d 100644 --- a/src/MetricsInfo.cpp +++ b/src/MetricsInfo.cpp @@ -12,6 +12,7 @@ #include "BufferView.h" #include "ColorSet.h" +#include "LyXRC.h" #include "MetricsInfo.h" #include "insets/Inset.h" @@ -22,6 +23,7 @@ #include "support/docstring.h" #include "support/lassert.h" +#include "support/RefChanger.h" using namespace std; @@ -34,16 +36,62 @@ 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); + 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(); +} ///////////////////////////////////////////////////////////////////////// @@ -52,8 +100,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) {} @@ -66,7 +114,7 @@ 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) + do_spellcheck(true), full_repaint(true), background_color(Color_background) { base.bv = bv; } @@ -107,204 +155,51 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const } -///////////////////////////////////////////////////////////////////////// -// -// 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)) -{} - - -///////////////////////////////////////////////////////////////////////// -// -// FracChanger -// -///////////////////////////////////////////////////////////////////////// - -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; - } -} - - -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) -{ - save_ = orig_.shape(); - orig_.setShape(shape); -} - - -ShapeChanger::~ShapeChanger() +Color PainterInfo::textColor(Color const & color) const { - orig_.setShape(save_); + if (change_.changed()) + return change_.color(); + if (selected) + return Color_selectiontext; + return color; } -///////////////////////////////////////////////////////////////////////// -// -// StyleChanger -// -///////////////////////////////////////////////////////////////////////// - -StyleChanger::StyleChanger(MetricsBase & mb, Styles style) - : Changer(mb) +Changer MetricsBase::changeScript() { - 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(); - mb.fontname = name; - mb.font = sane_font; - augmentFont(mb.font, from_ascii(name)); - mb.font.setSize(oldsize); - mb.font.setColor(oldcolor); + 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); } + //remove Warning + return Changer(); } -FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name, - bool really_change_font) - : Changer(mb), change_(really_change_font) +Changer MetricsBase::changeFrac() { - if (change_) { - save_ = mb; - FontSize oldsize = save_.font.size(); - ColorCode oldcolor = save_.font.color(); - mb.fontname = to_utf8(name); - mb.font = sane_font; - augmentFont(mb.font, name); - mb.font.setSize(oldsize); - mb.font.setColor(oldcolor); + 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); } + //remove Warning + return Changer(); } -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, string const & color) - : Changer(font) -{ - save_ = lcolor.getFromLyXName(color); - font.setColor(lcolor.getFromLyXName(color)); -} - - -ColorChanger::~ColorChanger() +Changer MetricsBase::changeArray() { - orig_.setColor(lcolor.getFromLyXName(save_)); + return (font.style() == LM_ST_DISPLAY) ? font.changeStyle(LM_ST_TEXT) + : Changer(); }