mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-11 13:46:43 +00:00
6c33aa2e5b
=================================================================== --- src/mathed/InsetMathHull.cpp (revisione 34304) +++ src/mathed/InsetMathHull.cpp (copia locale) @@ -328,6 +328,23 @@ docstring InsetMathHull::standardFont() } +docstring InsetMathHull::standardColor() const +{ + docstring color; + switch (type_) { + case hullRegexp: + color = from_ascii("foreground"); + break; + case hullNone: + color = from_ascii("foreground"); + break; + default: + color = from_ascii("math"); + } + return color; +} + + bool InsetMathHull::previewState(BufferView * bv) const { if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) { @@ -417,8 +434,11 @@ void InsetMathHull::draw(PainterInfo & p return; } + bool const really_change_color = pi.base.font.color() == Color_none; + ColorChanger dummy0(pi.base.font, standardColor(), really_change_color); FontSetChanger dummy1(pi.base, standardFont()); StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT); + InsetMathGrid::draw(pi, x + 1, y); if (numberedType()) { Index: src/mathed/MathSupport.cpp =================================================================== --- src/mathed/MathSupport.cpp (revisione 34311) +++ src/mathed/MathSupport.cpp (copia locale) @@ -653,6 +653,13 @@ bool isMathFont(docstring const & name) } +bool isTextFont(docstring const & name) +{ + fontinfo * f = lookupFont(name); + return f && f->color_ == Color_foreground; +} + + FontInfo getFont(docstring const & name) { FontInfo font; Index: src/mathed/MathSupport.h =================================================================== --- src/mathed/MathSupport.h (revisione 34311) +++ src/mathed/MathSupport.h (copia locale) @@ -51,6 +51,8 @@ bool isFontName(docstring const & name); bool isMathFont(docstring const & name); +bool isTextFont(docstring const & name); + // converts single cell to string docstring asString(MathData const & ar); // converts single inset to string Index: src/mathed/InsetMathHull.h =================================================================== --- src/mathed/InsetMathHull.h (revisione 34304) +++ src/mathed/InsetMathHull.h (copia locale) @@ -197,6 +197,8 @@ private: void changeCols(col_type); /// docstring standardFont() const; + /// + docstring standardColor() const; /// consistency check void check() const; /// can this change its number of rows? Index: src/MetricsInfo.cpp =================================================================== --- src/MetricsInfo.cpp (revisione 34312) +++ src/MetricsInfo.cpp (copia locale) @@ -235,11 +235,15 @@ FontSetChanger::FontSetChanger(MetricsBa 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); - mb.font.setColor(oldcolor); + if (string(name) != "lyxtex" + && ((isTextFont(oldname) && oldcolor != Color_foreground) + || (isMathFont(oldname) && oldcolor != Color_math))) + mb.font.setColor(oldcolor); } } @@ -252,11 +256,15 @@ FontSetChanger::FontSetChanger(MetricsBa 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); - mb.font.setColor(oldcolor); + if (name != "lyxtex" + && ((isTextFont(oldname) && oldcolor != Color_foreground) + || (isMathFont(oldname) && oldcolor != Color_math))) + mb.font.setColor(oldcolor); } } @@ -294,17 +302,21 @@ WidthChanger::~WidthChanger() // ///////////////////////////////////////////////////////////////////////// -ColorChanger::ColorChanger(FontInfo & font, string const & color) - : Changer<FontInfo, string>(font) +ColorChanger::ColorChanger(FontInfo & font, docstring const & color, + bool really_change_color) + : Changer<FontInfo, ColorCode>(font), change_(really_change_color) { - save_ = lcolor.getFromLyXName(color); - font.setColor(lcolor.getFromLyXName(color)); + if (change_) { + save_ = font.color(); + font.setColor(lcolor.getFromLyXName(to_utf8(color))); + } } ColorChanger::~ColorChanger() { - orig_.setColor(lcolor.getFromLyXName(save_)); + if (change_) + orig_.setColor(save_); } Index: src/MetricsInfo.h =================================================================== --- src/MetricsInfo.h (revisione 34312) +++ src/MetricsInfo.h (copia locale) @@ -222,12 +222,16 @@ public: // temporarily change the used color -class ColorChanger : public Changer<FontInfo, std::string> { +class ColorChanger : public Changer<FontInfo, ColorCode> { public: /// - ColorChanger(FontInfo & font, std::string const & color); + ColorChanger(FontInfo & font, docstring const & color, + bool really_change_color = true); /// ~ColorChanger(); +private: + /// + bool change_; }; } // namespace lyx git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34320 a592a061-630c-0410-9148-cb99ea01b6c8
324 lines
6.9 KiB
C++
324 lines
6.9 KiB
C++
/**
|
|
* \file MetricsInfo.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author André Pönitz
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "BufferView.h"
|
|
#include "ColorSet.h"
|
|
#include "MetricsInfo.h"
|
|
|
|
#include "insets/Inset.h"
|
|
|
|
#include "mathed/MathSupport.h"
|
|
|
|
#include "frontends/Painter.h"
|
|
|
|
#include "support/docstring.h"
|
|
#include "support/lassert.h"
|
|
|
|
using namespace std;
|
|
|
|
|
|
namespace lyx {
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// MetricsBase
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
MetricsBase::MetricsBase()
|
|
: bv(0), font(), style(LM_ST_TEXT), fontname("mathnormal"),
|
|
textwidth(0)
|
|
{}
|
|
|
|
|
|
MetricsBase::MetricsBase(BufferView * b, FontInfo const & f, int w)
|
|
: bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"),
|
|
textwidth(w)
|
|
{}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// MetricsInfo
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth,
|
|
MacroContext const & mc)
|
|
: base(bv, font, textwidth), macrocontext(mc)
|
|
{}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// PainterInfo
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
|
|
: pain(painter), ltr_pos(false), change_(), selected(false),
|
|
full_repaint(true), background_color(Color_background)
|
|
{
|
|
base.bv = bv;
|
|
}
|
|
|
|
|
|
void PainterInfo::draw(int x, int y, char_type c)
|
|
{
|
|
pain.text(x, y, c, base.font);
|
|
}
|
|
|
|
|
|
void PainterInfo::draw(int x, int y, docstring const & str)
|
|
{
|
|
pain.text(x, y, str, base.font);
|
|
}
|
|
|
|
|
|
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 {
|
|
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;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// 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<FontInfo, FontShape>(font)
|
|
{
|
|
save_ = orig_.shape();
|
|
orig_.setShape(shape);
|
|
}
|
|
|
|
|
|
ShapeChanger::~ShapeChanger()
|
|
{
|
|
orig_.setShape(save_);
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// StyleChanger
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
StyleChanger::StyleChanger(MetricsBase & mb, Styles style)
|
|
: Changer<MetricsBase>(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<MetricsBase>(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<MetricsBase>(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);
|
|
}
|
|
}
|
|
|
|
|
|
FontSetChanger::~FontSetChanger()
|
|
{
|
|
if (change_)
|
|
orig_ = save_;
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// WidthChanger
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
WidthChanger::WidthChanger(MetricsBase & mb, int w)
|
|
: Changer<MetricsBase>(mb)
|
|
{
|
|
save_ = mb;
|
|
mb.textwidth = w;
|
|
}
|
|
|
|
|
|
WidthChanger::~WidthChanger()
|
|
{
|
|
orig_ = save_;
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// ColorChanger
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
ColorChanger::ColorChanger(FontInfo & font, docstring const & color,
|
|
bool really_change_color)
|
|
: Changer<FontInfo, ColorCode>(font), change_(really_change_color)
|
|
{
|
|
if (change_) {
|
|
save_ = font.color();
|
|
font.setColor(lcolor.getFromLyXName(to_utf8(color)));
|
|
}
|
|
}
|
|
|
|
|
|
ColorChanger::~ColorChanger()
|
|
{
|
|
if (change_)
|
|
orig_.setColor(save_);
|
|
}
|
|
|
|
|
|
} // namespace lyx
|