revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index 5fa88cee2b2e43eb996126af9d803f8b4aabe3fc..d1b455b03a390026cb0b741ba4a082e13a9ed6f3 100644 (file)
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -19,6 +19,7 @@
 #include "support/types.h"
 
 #include <map>
+#include <set>
 #include <vector>
 
 namespace lyx {
@@ -28,13 +29,12 @@ class MathData;
 class MathMacroTemplate;
 class Paragraph;
 
-
 enum MacroType {
        MacroTypeNewcommand,
+       MacroTypeNewcommandx,
        MacroTypeDef
 };
-
-
+       
 ///
 class MacroData {
 public:
@@ -135,6 +135,12 @@ private:
        mutable MacroType type_;
 };
 
+
+///
+class MacroNameSet : public std::set<docstring> {};
+///
+class MacroSet : public std::set<MacroData const *> {};
+
        
 /// A lookup table of macro definitions.
 /**
@@ -154,6 +160,8 @@ public:
        MacroData const * get(docstring const & name) const;
        ///
        void dump();
+       ///
+       void getMacroNames(std::set<docstring> & names) const;
 
        /// the global list
        static MacroTable & globalMacros();