Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/mathed/InsetMathColor.h b/src/mathed/InsetMathColor.h
index 513f4443bae5b8eb3745b72b11f92f8e7790a0ae..7c69dac8b70cae2148dd81b9122c515c4e672248 100644 (file)
--- a/src/mathed/InsetMathColor.h
+++ b/src/mathed/InsetMathColor.h
@@ -4,7 +4,7 @@
  * 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.
  */
@@ -12,10 +12,9 @@
 #ifndef MATH_COLORINSET_H
 #define MATH_COLORINSET_H
 
-#include "Color.h"
-
 #include "InsetMathNest.h"
 
+#include "support/docstream.h"
 
 namespace lyx {
 
@@ -24,12 +23,11 @@ namespace lyx {
 class InsetMathColor : public InsetMathNest {
 public:
        /// Create a color inset from LyX color number
-       explicit InsetMathColor(bool oldstyle,
-               Color_color const & color = Color::none);
+       InsetMathColor(Buffer * buf, bool oldstyle, ColorCode color = Color_none);
        /// Create a color inset from LaTeX color name
-       explicit InsetMathColor(bool oldstyle, docstring const & color);
+       InsetMathColor(Buffer * buf, bool oldstyle, docstring const & color);
        ///
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        /// we write extra braces in any case...
        /// FIXME Why? Are they necessary if oldstyle_ == false?
        bool extraBraces() const { return true; }
@@ -39,10 +37,17 @@ public:
        void validate(LaTeXFeatures & features) const;
        ///
        void write(WriteStream & os) const;
+       /// FIXME XHTML For now, we do nothing with color.
+       void mathmlize(MathStream &) const {}
+       /// FIXME XHTML For now, we do nothing with color.
+       void htmlize(HtmlStream &) const {}
+       ///
        /// write normalized content
        void normalize(NormalStream & ns) const;
        ///
        void infoize(odocstream & os) const;
+       ///
+       InsetCode lyxCode() const { return MATH_COLOR_CODE; }
 private:
        virtual Inset * clone() const;
        /// width of '[' in current font