rename assert.h to lassert.h

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 33d019b3de1746d886ec1d16ef227b9181261f8d..95d1386866874f118628f1d95f768a6b93072600 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -24,8 +24,8 @@
 
 namespace lyx {
 
+class BiblioInfo;
 class BufferParams;
-class EmbeddedFileList;
 class DocIterator;
 class ErrorItem;
 class ErrorList;
@@ -43,6 +43,7 @@ class LaTeXFeatures;
 class Language;
 class MacroData;
 class MacroNameSet;
+class MacroSet;
 class OutputParams;
 class Paragraph;
 class ParConstIterator;
@@ -60,6 +61,7 @@ class WorkAreaManager;
 
 namespace support {
 class FileName;
+class FileNameList;
 }
 
 /** The buffer object.
@@ -306,7 +308,12 @@ public:
        void updateBibfilesCache() const;
        /// Return the cache with all bibfiles in use (including bibfiles
        /// of loaded child documents).
-       EmbeddedFileList const & getBibfilesCache() const;
+       support::FileNameList const & getBibfilesCache() const;
+       /// \return the bibliography information for this buffer's master,
+       /// or just for it, if it isn't a child.
+       BiblioInfo const & masterBibInfo() const;
+       /// \return the bibliography information for this buffer ONLY.
+       BiblioInfo const & localBibInfo() const;
        ///
        void getLabelList(std::vector<docstring> &) const;
 
@@ -368,12 +375,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;
@@ -404,15 +409,10 @@ public:
        /// method is const because modifying this backend does not touch
        /// the document contents.
        TocBackend & tocBackend() const;
-       
-       //@{
-       EmbeddedFileList & embeddedFiles();
-       EmbeddedFileList const & embeddedFiles() const;
-       bool embedded() const;
-       //@}
 
+       ///
        Undo & undo();
-       
+
        /// This function is called when the buffer is changed.
        void changed() const;
        /// This function is called when the buffer structure is changed.
@@ -462,25 +462,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);