\\subfloat captions are moving arguments

[lyx.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index 159ec9b9b0c1bd3b9a13b5e17fbf98130b4a2898..6cdf1f724842558011503954a8b084eba43299f5 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -40,7 +40,6 @@ string const sec_lastcommands = "[last commands]";
 
 namespace lyx {
 
-
 LastFilesSection::LastFilesSection(unsigned int num) :
        default_num_last_files(4),
        absolute_max_last_files(100)
@@ -57,11 +56,11 @@ void LastFilesSection::read(istream & is)
                if (c == '[')
                        break;
                getline(is, tmp);
-               FileName const file(tmp);
-               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute())
+               if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp))
                        continue;
 
                // read lastfiles
+               FileName const file(tmp);
                if (file.exists() && !file.isDirectory()
                    && lastfiles.size() < num_lastfiles)
                        lastfiles.push_back(file);
@@ -85,7 +84,7 @@ void LastFilesSection::add(FileName const & file)
        LastFiles::iterator it = find(lastfiles.begin(), lastfiles.end(), file);
        if (it != lastfiles.end())
                lastfiles.erase(it);
-       lastfiles.push_front(file);
+       lastfiles.insert(lastfiles.begin(), file);
        if (lastfiles.size() > num_lastfiles)
                lastfiles.pop_back();
 }
@@ -111,14 +110,31 @@ void LastOpenedSection::read(istream & is)
                if (c == '[')
                        break;
                getline(is, tmp);
-               FileName const file(tmp);
-               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute())
+               if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ')
                        continue;
 
-               if (file.exists() && !file.isDirectory())
-                       lastopened.push_back(file);
-               else
-                       LYXERR(Debug::INIT, "LyX: Warning: Ignore last opened file: " << tmp);
+               try {
+                       LastOpenedFile lof;
+                       istringstream itmp(tmp);
+                       itmp >> lof.active;
+                       itmp.ignore(2);  // ignore ", "
+                       string fname;
+                       getline(itmp, fname);
+                       if (!FileName::isAbsolute(fname))
+                               continue;
+
+                       FileName const file(fname);
+                       if (file.exists() && !file.isDirectory()) {
+                               lof.file_name = file;
+                               lastopened.push_back(lof);
+                       } else {
+                               LYXERR(Debug::INIT, 
+                                       "LyX: Warning: Ignore last opened file: " << tmp);
+                       }
+               } catch (...) {
+                       LYXERR(Debug::INIT,
+                               "LyX: Warning: unknown state of last opened file: " << tmp);
+               }
        } while (is.good());
 }
 
@@ -126,14 +142,15 @@ void LastOpenedSection::read(istream & is)
 void LastOpenedSection::write(ostream & os) const
 {
        os << '\n' << sec_lastopened << '\n';
-       copy(lastopened.begin(), lastopened.end(),
-            ostream_iterator<FileName>(os, "\n"));
+       for (size_t i = 0; i < lastopened.size(); ++i)
+               os << lastopened[i].active << ", " << lastopened[i].file_name << '\n';
 }
 
 
-void LastOpenedSection::add(FileName const & file)
+void LastOpenedSection::add(FileName const & file, bool active)
 {
-       lastopened.push_back(file);
+       LastOpenedFile lof(file, active);
+       lastopened.push_back(lof);
 }
 
 
@@ -165,9 +182,9 @@ void LastFilePosSection::read(istream & is)
                        itmp >> filepos.pos;
                        itmp.ignore(2);  // ignore ", "
                        getline(itmp, fname);
-                       FileName const file(fname);
-                       if (!file.isAbsolute())
+                       if (!FileName::isAbsolute(fname))
                                continue;
+                       FileName const file(fname);
                        if (file.exists() && !file.isDirectory()
                            && lastfilepos.size() < num_lastfilepos)
                                lastfilepos[file] = filepos;
@@ -242,9 +259,9 @@ void BookmarksSection::read(istream & is)
                        itmp >> pos;
                        itmp.ignore(2);  // ignore ", "
                        getline(itmp, fname);
-                       FileName const file(fname);
-                       if (!file.isAbsolute())
+                       if (!FileName::isAbsolute(fname))
                                continue;
+                       FileName const file(fname);
                        // only load valid bookmarks
                        if (file.exists() && !file.isDirectory() && idx <= max_bookmarks)
                                bookmarks[idx] = Bookmark(file, pit, pos, 0, 0);
@@ -260,7 +277,7 @@ void BookmarksSection::read(istream & is)
 void BookmarksSection::write(ostream & os) const
 {
        os << '\n' << sec_bookmarks << '\n';
-       for (size_t i = 1; i <= max_bookmarks; ++i) {
+       for (size_t i = 0; i <= max_bookmarks; ++i) {
                if (isValid(i))
                        os << i << ", "
                           << bookmarks[i].bottom_pit << ", "
@@ -363,7 +380,7 @@ Session::Session(unsigned int num_last_files, unsigned int num_last_commands) :
 {
        // locate the session file
        // note that the session file name 'session' is hard-coded
-       session_file = FileName(addName(package().user_support().absFilename(), "session"));
+       session_file = FileName(addName(package().user_support().absFileName(), "session"));
        //
        readFile();
 }