Increase tex2lyx output format to 413 (LyX 2.0.x).

[lyx.git] / src / BufferList.cpp

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 15abbd830c5833c5c688f55f94e97101c26c0b99..e19c8aa63d3f86523e7da5f4609fef018c28cb82 100644 (file)
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -140,9 +140,12 @@ FileNameList const & BufferList::fileNames() const
 {
        static FileNameList nvec;
        nvec.clear();
-       transform(bstore.begin(), bstore.end(),
-                 back_inserter(nvec),
-                 bind(&Buffer::fileName, _1));
+       BufferStorage::const_iterator it = bstore.begin();
+       BufferStorage::const_iterator end = bstore.end();
+       for (; it != end; ++it) {
+               Buffer * buf = *it;
+               nvec.push_back(buf->fileName());
+       }
        return nvec;
 }
 
@@ -251,17 +254,33 @@ struct equivalent_to : public binary_function<FileName, FileName, bool>
 }
 
 
-Buffer * BufferList::getBuffer(support::FileName const & fname) const
+Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) const
 {
        // 1) cheap test, using string comparison of file names
        BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(),
                lyx::bind(equal_to<FileName>(), lyx::bind(&Buffer::fileName, _1), fname));
        if (it != bstore.end())
-                       return *it;
+               return *it;
        // 2) possibly expensive test, using equivalence test of file names
        it = find_if(bstore.begin(), bstore.end(),
                lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
-       return it != bstore.end() ? (*it) : 0;
+       if (it != bstore.end())
+               return *it;
+
+       if (internal) {
+               // 1) cheap test, using string comparison of file names
+               BufferStorage::const_iterator it = find_if(binternal.begin(), binternal.end(),
+                       lyx::bind(equal_to<FileName>(), lyx::bind(&Buffer::fileName, _1), fname));
+               if (it != binternal.end())
+                       return *it;
+               // 2) possibly expensive test, using equivalence test of file names
+               it = find_if(binternal.begin(), binternal.end(),
+                            lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
+               if (it != binternal.end())
+                       return *it;
+       }
+
+       return 0;
 }
 
 
@@ -276,7 +295,7 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
                        if (suffixIs(s, master_name))
                                return *it;
                        // if not, try with the children
-                       ListOfBuffers clist = (*it)->getChildren();
+                       ListOfBuffers clist = (*it)->getDescendents();
                        ListOfBuffers::const_iterator cit = clist.begin();
                        ListOfBuffers::const_iterator cend = clist.end();
                        for (; cit != cend; ++cit) {
@@ -292,12 +311,12 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
 }
 
 
-void BufferList::setCurrentAuthor(docstring const & name, docstring const & email)
+void BufferList::recordCurrentAuthor(Author const & author)
 {
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
        for (; it != end; ++it)
-               (*it)->params().authors().record(0, Author(name, email));
+               (*it)->params().authors().recordCurrentAuthor(author);
 }