* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
+#include "ColorSet.h"
+
#include "InsetMathColor.h"
+#include "LaTeXFeatures.h"
#include "MathData.h"
#include "MathStream.h"
#include "MathSupport.h"
-#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
+#include "support/gettext.h"
+#include "support/lstrings.h"
-#include "support/std_ostream.h"
+#include <ostream>
+using namespace lyx::support;
namespace lyx {
-InsetMathColor::InsetMathColor(bool oldstyle, Color_color const & color)
- : InsetMathNest(1), oldstyle_(oldstyle),
+InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle, ColorCode color)
+ : InsetMathNest(buf, 1), 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), oldstyle_(oldstyle), color_(color)
{}
void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
{
cell(0).metrics(mi, dim);
- metricsMarkers(dim);
- dim_ = dim;
}
void InsetMathColor::draw(PainterInfo & pi, int x, int y) const
{
- Color_color origcol = pi.base.font.color();
+ 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::write(WriteStream & os) const
{
- if (normalcolor(color_))
+ // We have to ensure correct spacing when the front and/or back
+ // atoms are not ordinary ones (bug 11827).
+ docstring const frontclass =
+ !cell(0).empty() ? class_to_string(cell(0).front()->mathClass())
+ : from_ascii("mathord");
+ docstring const backclass =
+ !cell(0).empty() ? class_to_string(cell(0).back()->mathClass())
+ : from_ascii("mathord");
+ bool adjchk = os.latex() && !os.inMathClass() && (normalcolor(color_) || oldstyle_);
+ bool adjust_front = frontclass != "mathord" && adjchk;
+ bool adjust_back = backclass != "mathord" && adjchk;
+ docstring const colswitch =
+ oldstyle_ ? from_ascii("{\\color{") + color_ + from_ascii("}")
+ : from_ascii("{\\normalcolor ");
+
+ if (adjust_front && adjust_back) {
+ os << '\\' << frontclass << colswitch << cell(0).front() << '}';
+ if (cell(0).size() > 2) {
+ os << colswitch;
+ for (size_t i = 1; i < cell(0).size() - 1; ++i)
+ os << cell(0)[i];
+ os << '}';
+ }
+ if (cell(0).size() > 1)
+ os << '\\' << backclass << colswitch << cell(0).back() << '}';
+ } else if (adjust_front) {
+ os << '\\' << frontclass << colswitch << cell(0).front() << '}';
+ if (cell(0).size() > 1) {
+ os << colswitch;
+ for (size_t i = 1; i < cell(0).size(); ++i)
+ os << cell(0)[i];
+ os << '}';
+ }
+ } else if (adjust_back) {
+ os << colswitch;
+ for (size_t i = 0; i < cell(0).size() - 1; ++i)
+ os << cell(0)[i];
+ os << '}' << '\\' << backclass << colswitch << cell(0).back()
+ << '}';
+ } else if (normalcolor(color_))
// reset to default color inside another color inset
os << "{\\normalcolor " << cell(0) << '}';
else if (oldstyle_)
void InsetMathColor::infoize(odocstream & os) const
{
- os << "Color: " << color_;
+ os << bformat(_("Color: %1$s"), color_);
}