installer: further preparation

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

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index f56ccb62074a4c49e315a00116c26debf64c5762..61f82e9d947d270b399a947eb2a11febd30b6955 100644 (file)
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -17,11 +17,12 @@
 #include "MacroTable.h"
 #include "MathData.h"
 
-#include "support/types.h"
-
 
 namespace lyx {
 
+class OutputParams;
+class XHTMLStream;
+
 /// This class contains the macro definition.
 class MathMacroTemplate : public InsetMathNest {
 public:
@@ -50,10 +51,12 @@ public:
        /// Output LaTeX code, but assume that the macro is not definied yet
        /// if overwriteRedefinition is true
        int write(WriteStream & os, bool overwriteRedefinition) const;
+       /// 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;
@@ -99,7 +102,7 @@ public:
        ///
        void infoize(odocstream & os) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenuName() const;
 protected:
        ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);