X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSession.cpp;h=eb0fc64829f6a1226e82491284060490c30174bb;hb=c8230ab0d0a919530c43c29395f4d9961498bf15;hp=310aa74c9b90760af8af76071c2cf5d471801c75;hpb=830eb234bebea1f58170a38e17610c2d57e63719;p=lyx.git

diff --git a/src/Session.cpp b/src/Session.cpp
index 310aa74c9b..eb0fc64829 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -35,8 +35,9 @@ 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 {
@@ -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 (...) {
@@ -337,7 +338,7 @@ LastCommandsSection::LastCommandsSection(unsigned int num) :
 	setNumberOfLastCommands(num);
 }
 
-	
+
 void LastCommandsSection::read(istream & is)
 {
 	string tmp;
@@ -422,6 +423,8 @@ void Session::readFile()
 			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);
@@ -442,6 +445,7 @@ void Session::writeFile() const
 		lastCommands().write(os);
 		bookmarks().write(os);
 		authFiles().write(os);
+		shellescapeFiles().write(os);
 	} else
 		LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "
 		       << session_file);
@@ -480,4 +484,96 @@ void AuthFilesSection::write(ostream & os) const
 }
 
 
+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);
+		if (s.empty() || s[0] == '#' || s[0] == ' ' || !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