Merge remote-tracking branch 'features/properpaint' into 2.3.2-staging

[lyx.git] / src / mathed / InsetMathColor.cpp

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index f237eb9c4fceb05a4eb28434fa17eba6c8be7698..6cb996013b13d10682c788733f0edba5d66ad9f7 100644 (file)
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -3,63 +3,61 @@
  * 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/std_ostream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
+#include <ostream>
 
-namespace lyx {
+using namespace lyx::support;
 
-using std::auto_ptr;
-using std::string;
+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), 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)
 {}
 
 
-auto_ptr<InsetBase> InsetMathColor::doClone() const
+Inset * InsetMathColor::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathColor(*this));
+       return new InsetMathColor(*this);
 }
 
 
-bool InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
-       metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
 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);
 }
 
 
@@ -73,8 +71,26 @@ static bool normalcolor(docstring const & color)
 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;
+               }
+       }
 }
 
 
@@ -98,7 +114,7 @@ void InsetMathColor::normalize(NormalStream & os) const
 
 void InsetMathColor::infoize(odocstream & os) const
 {
-       os << "Color: " << color_;
+       os << bformat(_("Color: %1$s"), color_);
 }