#include <config.h>
#include "BufferView.h"
-#include "LColor.h"
+#include "Color.h"
#include "MetricsInfo.h"
#include "mathed/MathSupport.h"
{}
-MetricsBase::MetricsBase(BufferView * b, LyXFont const & f, int w)
+MetricsBase::MetricsBase(BufferView * b, Font const & f, int w)
: bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"),
textwidth(w)
{}
{}
-MetricsInfo::MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth)
+MetricsInfo::MetricsInfo(BufferView * bv, Font const & font, int textwidth)
: base(bv, font, textwidth)
{}
-ShapeChanger::ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape)
- : Changer<LyXFont, LyXFont::FONT_SHAPE>(font)
+ShapeChanger::ShapeChanger(Font & font, Font::FONT_SHAPE shape)
+ : Changer<Font, Font::FONT_SHAPE>(font)
{
save_ = orig_.shape();
orig_.setShape(shape);
: Changer<MetricsBase>(mb)
{
save_ = mb;
- LyXFont::FONT_SIZE oldsize = save_.font.size();
+ Font::FONT_SIZE oldsize = save_.font.size();
mb.fontname = name;
- mb.font = LyXFont();
+ mb.font = Font();
augmentFont(mb.font, from_ascii(name));
mb.font.setSize(oldsize);
}
: Changer<MetricsBase>(mb)
{
save_ = mb;
- LyXFont::FONT_SIZE oldsize = save_.font.size();
+ Font::FONT_SIZE oldsize = save_.font.size();
mb.fontname = to_utf8(name);
- mb.font = LyXFont();
+ mb.font = Font();
augmentFont(mb.font, name);
mb.font.setSize(oldsize);
}
-ColorChanger::ColorChanger(LyXFont & font, string const & color)
- : Changer<LyXFont, string>(font)
+ColorChanger::ColorChanger(Font & font, string const & color)
+ : Changer<Font, string>(font)
{
save_ = lcolor.getFromLyXName(color);
font.setColor(lcolor.getFromLyXName(color));