VCS: allow displaying diff log

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index be7caa6519dda100609f249cf8e7af1e9f57481f..84dee28eee047b25fbc654a9a0f3248b7dd7397d 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -21,6 +21,7 @@
 #include "support/SignalSlot.h"
 
 #include <list>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -177,7 +178,7 @@ public:
        /// Write file. Returns \c false if unsuccesful.
        bool writeFile(support::FileName const &) const;
 
-       /// Loads LyX file \c filename into buffer, *  and \return success
+       /// Loads LyX file \c filename into buffer, *  and return success
        bool loadLyXFile(support::FileName const & s);
 
        /// Fill in the ErrorList with the TeXErrors
@@ -429,6 +430,10 @@ public:
        /// Return macro defined before the inclusion of the child
        MacroData const * getMacro(docstring const & name, Buffer const & child, bool global = true) const;
 
+       /// Collect user macro names at loading time
+       typedef std::set<docstring> UserMacroSet;
+       UserMacroSet usermacros;
+
        /// Replace the inset contents for insets which InsetCode is equal
        /// to the passed \p inset_code.
        void changeRefsIfUnique(docstring const & from, docstring const & to,
@@ -543,7 +548,8 @@ private:
        */
        void updateMacros(DocIterator & it,
                                     DocIterator & scope) const;
-
+       ///
+       void setLabel(ParIterator & it) const;
        ///
        void collectRelatives(BufferSet & bufs) const;