Account for old versions of Pygments

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

diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index 8b9b38a436773e2ea941e76845646ac40cfcb006..bc445d43974fef7f7314160a5a8f1f43ad2d4dd3 100644 (file)
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -16,7 +16,6 @@
 #include "DocIterator.h"
 
 #include "support/docstring.h"
-#include "support/types.h"
 
 #include <map>
 #include <set>
@@ -28,13 +27,14 @@ class Buffer;
 class MathData;
 class MathMacroTemplate;
 class Paragraph;
+class latexkeys;
 
 enum MacroType {
        MacroTypeNewcommand,
        MacroTypeNewcommandx,
        MacroTypeDef
 };
-       
+
 ///
 class MacroData {
 public:
@@ -53,33 +53,40 @@ public:
        size_t numargs() const { updateData(); return numargs_; }
        /// replace #1,#2,... by given MathAtom 0,1,.., _including_ the possible
        /// optional argument
-       void expand(std::vector<MathData> const & from, MathData & to) const;
+       /// \return whether anything was expanded
+       bool expand(std::vector<MathData> const & from, MathData & to) const;
        /// number of optional arguments
        size_t optionals() const;
        ///
        std::vector<docstring> const & defaults() const;
        ///
-       std::string const & requires() const { updateData(); return requires_; }
+       std::string const requires() const;
+       ///
+       bool hidden() const;
+       ///
+       docstring const xmlname() const;
+       ///
+       char const * MathMLtype() const;
        ///
-       std::string & requires() { updateData(); return requires_; }
-       
+       latexkeys const * symbol() const { return sym_; }
+       ///
+       void setSymbol(latexkeys const * sym) { sym_ = sym; }
+       ///
+       DocIterator const & pos() { return pos_; }
+
        /// lock while being drawn to avoid recursions
        int lock() const { return ++lockCount_; }
        /// is it being drawn?
        bool locked() const { return lockCount_ != 0; }
        ///
        void unlock() const;
-       
-       ///
-       bool redefinition() const { return redefinition_; }
-       ///
-       void setRedefinition(bool redefined) { redefinition_ = redefined; }
 
        ///
-       MacroType type() const { return type_; }
+       bool redefinition() const { updateData(); return redefinition_; }
+
        ///
-       MacroType & type() { return type_; }
-       
+       MacroType type() const { updateData(); return type_; }
+
        /// output as TeX macro, only works for lazy MacroData!!!
        int write(odocstream & os, bool overwriteRedefinition) const;
 
@@ -87,10 +94,10 @@ public:
        bool operator==(MacroData const & x) const {
                updateData();
                x.updateData();
-               return definition_ == x.definition_ 
+               return definition_ == x.definition_
                        && numargs_ == x.numargs_
                        && display_ == x.display_
-                       && requires_ == x.requires_
+                       && sym_ == x.sym_
                        && optionals_ == x.optionals_
                        && defaults_ == x.defaults_;
        }
@@ -106,10 +113,10 @@ private:
        Buffer const * buffer_;
        /// The position of the definition in the buffer.
        /// There is no guarantee it stays valid if the buffer
-       /// changes. But it (normally) exists only until the 
+       /// changes. But it (normally) exists only until the
        /// next Buffer::updateMacros call where new MacroData
        /// objects are created for each macro definition.
-       /// In the worst case, it is invalidated and the MacroData 
+       /// In the worst case, it is invalidated and the MacroData
        /// returns its defaults values and the user sees unfolded
        /// macros.
        mutable DocIterator pos_;
@@ -122,7 +129,7 @@ private:
        ///
        mutable docstring display_;
        ///
-       mutable std::string requires_;
+       latexkeys const * sym_;
        ///
        mutable size_t optionals_;
        ///
@@ -141,7 +148,7 @@ class MacroNameSet : public std::set<docstring> {};
 ///
 class MacroSet : public std::set<MacroData const *> {};
 
-       
+
 /// A lookup table of macro definitions.
 /**
  * This contains a table of "global" macros that are always accessible,
@@ -153,7 +160,7 @@ class MacroTable : public std::map<docstring, MacroData>
 {
 public:
        /// Parse full "\\def..." or "\\newcommand..." or ...
-       iterator insert(Buffer * buf, docstring const & definition, std::string const &);
+       iterator insert(Buffer * buf, docstring const & definition);
        /// Insert pre-digested macro definition
        iterator insert(docstring const & name, MacroData const & data);
        ///
@@ -161,7 +168,7 @@ public:
        ///
        void dump();
        ///
-       void getMacroNames(std::set<docstring> & names) const;
+       void getMacroNames(std::set<docstring> & names, bool gethidden) const;
 
        /// the global list
        static MacroTable & globalMacros();
@@ -180,10 +187,10 @@ class MacroContext {
 public:
        /// construct context for the insets at pos
        MacroContext(Buffer const * buf, DocIterator const & pos);
-       
+
        /// Lookup macro
        MacroData const * get(docstring const & name) const;
-       
+
 private:
        ///
        Buffer const * buf_;