Use of div for labels causes validation errors. See #8843.

[lyx.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index 4f835e34ee34e4629a82aea27302072377f74205..009bf39cf1ed2bdbae82bbc76903cfa3665a6335 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -34,13 +34,14 @@ string const sec_bookmarks = "[bookmarks]";
 string const sec_session = "[session info]";
 string const sec_toolbars = "[toolbars]";
 string const sec_lastcommands = "[last commands]";
+string const sec_authfiles = "[auth files]";
+string const sec_shellescape = "[shell escape files]";
 
-} // anon namespace
+} // namespace
 
 
 namespace lyx {
 
-
 LastFilesSection::LastFilesSection(unsigned int num) :
        default_num_last_files(4),
        absolute_max_last_files(100)
@@ -85,7 +86,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();
 }
@@ -129,7 +130,7 @@ void LastOpenedSection::read(istream & is)
                                lof.file_name = file;
                                lastopened.push_back(lof);
                        } else {
-                               LYXERR(Debug::INIT, 
+                               LYXERR(Debug::INIT,
                                        "LyX: Warning: Ignore last opened file: " << tmp);
                        }
                } catch (...) {
@@ -151,6 +152,16 @@ void LastOpenedSection::write(ostream & os) const
 void LastOpenedSection::add(FileName const & file, bool active)
 {
        LastOpenedFile lof(file, active);
+       // check if file is already recorded (this can happen
+       // with multiple buffer views). We do only record each
+       // file once, since we cannot restore multiple views
+       // currently, we even crash in some cases (see #9483).
+       // FIXME: Add session support for multiple views of
+       //        the same buffer (split-view etc.).
+       for (size_t i = 0; i < lastopened.size(); ++i) {
+               if (lastopened[i].file_name == file)
+                       return;
+       }
        lastopened.push_back(lof);
 }
 
@@ -278,7 +289,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 << ", "
@@ -327,7 +338,7 @@ LastCommandsSection::LastCommandsSection(unsigned int num) :
        setNumberOfLastCommands(num);
 }
 
-       
+
 void LastCommandsSection::read(istream & is)
 {
        string tmp;
@@ -410,6 +421,10 @@ void Session::readFile()
                        bookmarks().read(is);
                else if (tmp == sec_lastcommands)
                        lastCommands().read(is);
+               else if (tmp == sec_authfiles)
+                       authFiles().read(is);
+               else if (tmp == sec_shellescape)
+                       shellescapeFiles().read(is);
 
                else
                        LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
@@ -429,9 +444,137 @@ void Session::writeFile() const
                lastFilePos().write(os);
                lastCommands().write(os);
                bookmarks().write(os);
+               authFiles().write(os);
+               shellescapeFiles().write(os);
        } else
                LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "
                       << session_file);
 }
 
+
+AuthFilesSection::AuthFilesSection() {  }
+
+
+void AuthFilesSection::read(istream & is)
+{
+       string tmp;
+       do {
+               char c = is.peek();
+               if (c == '[')
+                       break;
+               getline(is, tmp);
+               if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp))
+                       continue;
+
+               // read lastfiles
+               FileName const file(tmp);
+               if (file.exists() && !file.isDirectory())
+                       auth_files_.insert(tmp);
+               else
+                       LYXERR(Debug::INIT, "LyX: Warning: Ignore auth file: " << tmp);
+       } while (is.good());
+}
+
+
+void AuthFilesSection::write(ostream & os) const
+{
+       os << '\n' << sec_authfiles << '\n';
+       copy(auth_files_.begin(), auth_files_.end(),
+            ostream_iterator<std::string>(os, "\n"));
+}
+
+
+bool AuthFilesSection::find(string const & name) const
+{
+       if (auth_files_.find(name) != auth_files_.end())
+               return true;
+
+       return false;
+}
+
+
+void AuthFilesSection::insert(string const & name)
+{
+       auth_files_.insert(name);
+}
+
+
+void ShellEscapeSection::read(istream & is)
+{
+       string s;
+       do {
+               char c = is.peek();
+               if (c == '[')
+                       break;
+               getline(is, s);
+               c = s[0];
+               if (c == 0 || c == '#' || c == ' ' || !FileName::isAbsolute(s))
+                       continue;
+
+               // read shellescape files
+               FileName const file(s.substr(0, s.length() - 2));
+               if (file.exists() && !file.isDirectory())
+                       shellescape_files_.insert(s);
+               else
+                       LYXERR(Debug::INIT, "LyX: Warning: Ignore shellescape file: " << file);
+       } while (is.good());
+}
+
+
+void ShellEscapeSection::write(ostream & os) const
+{
+       os << '\n' << sec_shellescape << '\n';
+       copy(shellescape_files_.begin(), shellescape_files_.end(),
+            ostream_iterator<std::string>(os, "\n"));
+}
+
+
+bool ShellEscapeSection::find(string const & name) const
+{
+       if (shellescape_files_.find(name + ",0") != shellescape_files_.end())
+               return true;
+
+       return findAuth(name);
+}
+
+
+bool ShellEscapeSection::findAuth(string const & name) const
+{
+       if (shellescape_files_.find(name + ",1") != shellescape_files_.end())
+               return true;
+
+       return false;
+}
+
+
+void ShellEscapeSection::insert(string const & name, bool auth)
+{
+       set<string>::iterator it;
+       string const name0 = name + ",0";
+       string const name1 = name + ",1";
+
+       if (auth) {
+               it = shellescape_files_.find(name0);
+               if (it != shellescape_files_.end())
+                       shellescape_files_.erase(it);
+               shellescape_files_.insert(name1);
+       } else {
+               it = shellescape_files_.find(name1);
+               if (it != shellescape_files_.end())
+                       shellescape_files_.erase(it);
+               shellescape_files_.insert(name0);
+       }
 }
+
+
+void ShellEscapeSection::remove(string const & name)
+{
+       set<string>::iterator it = shellescape_files_.find(name + ",0");
+       if (it == shellescape_files_.end())
+               it = shellescape_files_.find(name + ",1");
+       if (it != shellescape_files_.end())
+               shellescape_files_.erase(it);
+}
+
+
+} // namespace lyx