tex2lyx: support for \item with opt arg in itemize environment

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

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index be3b7ee5f2e17bd1943c019979d9b8c9051faf5b..0bb3d4db0be430b2be23042a2a58ccd205a7e09f 100644 (file)
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -17,8 +17,6 @@
 #include "MacroTable.h"
 #include "MathData.h"
 
-#include "support/types.h"
-
 
 namespace lyx {
 
@@ -56,9 +54,9 @@ public:
        /// Nothing happens. This is simply to suppress the default output.
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream &, OutputParams const &, size_t) const;
        ///
-       bool noFontChange() const { return true; }
+       bool inheritFont() const { return false; }
 
        ///
        docstring name() const;
@@ -89,7 +87,7 @@ public:
        virtual void validate(LaTeXFeatures &) const;
 
        /// decide whether its a redefinition
-       void updateToContext(MacroContext const & mc) const;
+       void updateToContext(MacroContext const & mc);
 
        ///
        void draw(PainterInfo & pi, int x, int y) const;
@@ -104,7 +102,7 @@ public:
        ///
        void infoize(odocstream & os) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
 protected:
        ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
@@ -166,7 +164,7 @@ private:
        /// (re)newcommand or def
        mutable MacroType type_;
        /// defined before already?
-       mutable bool redefinition_;
+       bool redefinition_;
        ///
        void createLook(int args) const;
        ///