Allow using \binom without amsmath and add support for \brace and \brack

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index edfdadcf894d4e44ac9e7a2f64a1c632ec903458..68f80cc82eea33a491394aada325fec6e39692fa 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -43,6 +43,7 @@ class LaTeXFeatures;
 class Language;
 class MacroData;
 class MacroNameSet;
+class MacroSet;
 class OutputParams;
 class Paragraph;
 class ParConstIterator;
@@ -368,12 +369,10 @@ public:
        /// Iterate through the whole buffer and try to resolve macros
        void updateMacroInstances() const;
 
-       /// List macro names of this buffer. the parent and the children
+       /// List macro names of this buffer, the parent and the children
        void listMacroNames(MacroNameSet & macros) const;
-       /// Write out all macros somewhere defined in the parent,
-       /// its parents and its children, which are visible at the beginning 
-       /// of this buffer
-       void writeParentMacros(odocstream & os) const;
+       /// Collect macros of the parent and its children in front of this buffer.
+       void listParentMacros(MacroSet & macros, LaTeXFeatures & features) const;
 
        /// Return macro defined before pos (or in the master buffer)
        MacroData const * getMacro(docstring const & name, DocIterator const & pos, bool global = true) const;
@@ -434,8 +433,6 @@ public:
 
        ///
        void autoSave() const;
-       ///
-       void resetChildDocuments(bool close_them) const;
 
        /// return the format of the buffer on a string
        std::string bufferFormat() const;
@@ -464,25 +461,11 @@ private:
        /// search for macro in local (buffer) table or in children
        MacroData const * getBufferMacro(docstring const & name,
                                         DocIterator const & pos) const;
-       /** Update macro table in the whole text inset
-           \param it at the start of the text inset)
-       */
-       void updateInsetMacros(DocIterator & it, 
-                              DocIterator & scope) const;
-       /** Update macro table for paragraphs until \c lastpit
+       /** Update macro table starting with position of it
            \param it in some text inset
-           \param lastpit last processed paragraph
        */
-       void updateEnvironmentMacros(DocIterator & it, 
-                                    pit_type lastpit, 
+       void updateMacros(DocIterator & it,
                                     DocIterator & scope) const;
-       /** Update macro table for one paragraph block with 
-           same layout and depth, until \c lastpit
-           \param it in some text inset
-           \param lastpit last processed paragraph
-       */
-       void updateBlockMacros(DocIterator & it, 
-                              DocIterator & scope) const;
 
        /// 
        bool readFileHelper(support::FileName const & s);