2001-02-13 13:28:32 +00:00
|
|
|
// -*- C++ -*-
|
2003-08-19 13:00:56 +00:00
|
|
|
/**
|
2006-09-17 09:14:18 +00:00
|
|
|
* \file MathSupport.h
|
2003-08-19 13:00:56 +00:00
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
|
|
|
* \author Alejandro Aguilar Sierra
|
2008-11-14 15:58:50 +00:00
|
|
|
* \author André Pönitz
|
2003-08-19 13:00:56 +00:00
|
|
|
*
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
*/
|
2001-02-13 13:28:32 +00:00
|
|
|
|
|
|
|
#ifndef MATH_SUPPORT_H
|
|
|
|
#define MATH_SUPPORT_H
|
|
|
|
|
2008-10-18 12:25:03 +00:00
|
|
|
#include "MathParser_flags.h"
|
2007-11-27 20:51:20 +00:00
|
|
|
#include "support/strfwd.h"
|
2006-10-21 11:15:37 +00:00
|
|
|
#include <vector>
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
2003-03-21 14:20:48 +00:00
|
|
|
class PainterInfo;
|
2007-10-28 18:51:54 +00:00
|
|
|
class FontInfo;
|
2002-07-11 11:27:24 +00:00
|
|
|
class Dimension;
|
2007-04-26 16:05:57 +00:00
|
|
|
class MathData;
|
2004-01-07 18:28:50 +00:00
|
|
|
class MathAtom;
|
2006-09-16 18:11:38 +00:00
|
|
|
class InsetMath;
|
2004-01-07 18:28:50 +00:00
|
|
|
|
2001-02-13 13:28:32 +00:00
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
int mathed_char_width(FontInfo const &, char_type c);
|
2001-02-13 13:28:32 +00:00
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
int mathed_char_kerning(FontInfo const &, char_type c);
|
2007-03-21 17:21:59 +00:00
|
|
|
|
2003-03-21 14:20:48 +00:00
|
|
|
void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
|
2006-10-22 10:15:23 +00:00
|
|
|
docstring const & name);
|
2001-02-13 19:10:18 +00:00
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
void mathed_string_dim(FontInfo const & font,
|
2006-10-22 10:15:23 +00:00
|
|
|
docstring const & s,
|
2006-10-21 11:15:37 +00:00
|
|
|
Dimension & dim);
|
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
int mathed_string_width(FontInfo const &, docstring const & s);
|
2001-02-13 19:10:18 +00:00
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
void drawStrRed(PainterInfo & pi, int x, int y, docstring const & s);
|
|
|
|
void drawStrBlack(PainterInfo & pi, int x, int y, docstring const & s);
|
2001-07-13 09:10:59 +00:00
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
void math_font_max_dim(FontInfo const &, int & asc, int & desc);
|
2001-07-20 14:54:13 +00:00
|
|
|
|
2007-10-28 18:51:54 +00:00
|
|
|
void augmentFont(FontInfo & f, docstring const & cmd);
|
2002-05-30 07:09:54 +00:00
|
|
|
|
2006-10-22 10:15:23 +00:00
|
|
|
bool isFontName(docstring const & name);
|
2002-03-19 16:55:58 +00:00
|
|
|
|
2010-04-27 19:23:31 +00:00
|
|
|
bool isMathFont(docstring const & name);
|
|
|
|
|
Index: src/mathed/InsetMathHull.cpp
===================================================================
--- 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
2010-04-28 01:40:11 +00:00
|
|
|
bool isTextFont(docstring const & name);
|
|
|
|
|
2003-06-02 10:03:27 +00:00
|
|
|
// converts single cell to string
|
2007-04-26 16:05:57 +00:00
|
|
|
docstring asString(MathData const & ar);
|
2004-01-07 18:28:50 +00:00
|
|
|
// converts single inset to string
|
2006-10-22 10:15:23 +00:00
|
|
|
docstring asString(InsetMath const &);
|
|
|
|
docstring asString(MathAtom const &);
|
2003-06-02 10:03:27 +00:00
|
|
|
// converts string to single cell
|
2008-10-17 21:40:11 +00:00
|
|
|
void asArray(docstring const &, MathData &, Parse::flags f = Parse::NORMAL);
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
} // namespace lyx
|
2003-06-02 10:03:27 +00:00
|
|
|
|
2001-02-13 13:28:32 +00:00
|
|
|
#endif
|