#include <config.h>
-#include "Color.h"
+#include "ColorSet.h"
#include "InsetMathColor.h"
#include "LaTeXFeatures.h"
#include "MathSupport.h"
#include "MetricsInfo.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
#include <ostream>
+using namespace lyx::support;
namespace lyx {
-InsetMathColor::InsetMathColor(bool oldstyle, ColorCode color)
- : InsetMathNest(1), oldstyle_(oldstyle),
+InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle, ColorCode color)
+ : InsetMathNest(buf, 1), w_(0), oldstyle_(oldstyle),
color_(from_utf8(lcolor.getLaTeXName(color)))
{}
-InsetMathColor::InsetMathColor(bool oldstyle, docstring const & color)
- : InsetMathNest(1), oldstyle_(oldstyle), color_(color)
+InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle,
+ docstring const & color)
+ : InsetMathNest(buf, 1), w_(0), oldstyle_(oldstyle), color_(color)
{}
void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
{
cell(0).metrics(mi, dim);
- metricsMarkers(dim);
}
{
ColorCode origcol = pi.base.font.color();
pi.base.font.setColor(lcolor.getFromLaTeXName(to_utf8(color_)));
- cell(0).draw(pi, x + 1, y);
+ cell(0).draw(pi, x, y);
pi.base.font.setColor(origcol);
- drawMarkers(pi, x, y);
- setPosCache(pi, x, y);
}
void InsetMathColor::validate(LaTeXFeatures & features) const
{
InsetMathNest::validate(features);
- if (!normalcolor(color_))
- features.require("color");
+ if (!normalcolor(color_)) {
+ switch (lcolor.getFromLaTeXName(to_utf8(color_))) {
+ case Color_brown:
+ case Color_darkgray:
+ case Color_gray:
+ case Color_lightgray:
+ case Color_lime:
+ case Color_olive:
+ case Color_orange:
+ case Color_pink:
+ case Color_purple:
+ case Color_teal:
+ case Color_violet:
+ features.require("xcolor");
+ break;
+ default:
+ features.require("color");
+ break;
+ }
+ }
}
void InsetMathColor::infoize(odocstream & os) const
{
- os << "Color: " << color_;
+ os << bformat(_("Color: %1$s"), color_);
}