X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSession.cpp;h=d79a5a09a94a8874c699e312d89321e0f5acf156;hb=7261fa94482916cb9bf2ba0d21c4df390ea58320;hp=009bf39cf1ed2bdbae82bbc76903cfa3665a6335;hpb=f11bfe1697492f79f8cc02d4021305005cf539ef;p=lyx.git

diff --git a/src/Session.cpp b/src/Session.cpp
index 009bf39cf1..d79a5a09a9 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -144,8 +144,8 @@ void LastOpenedSection::read(istream & is)
 void LastOpenedSection::write(ostream & os) const
 {
 	os << '\n' << sec_lastopened << '\n';
-	for (size_t i = 0; i < lastopened.size(); ++i)
-		os << lastopened[i].active << ", " << lastopened[i].file_name << '\n';
+	for (auto const & last : lastopened)
+		os << last.active << ", " << last.file_name << '\n';
 }
 
 
@@ -158,8 +158,8 @@ void LastOpenedSection::add(FileName const & file, bool active)
 	// 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)
+	for (auto const & last : lastopened) {
+		if (last.file_name == file)
 			return;
 	}
 	lastopened.push_back(lof);
@@ -196,10 +196,10 @@ void LastFilePosSection::read(istream & is)
 			getline(itmp, fname);
 			if (!FileName::isAbsolute(fname))
 				continue;
-			FileName const file(fname);
-			if (file.exists() && !file.isDirectory()
+			filepos.file = FileName(fname);
+			if (filepos.file.exists() && !filepos.file.isDirectory()
 			    && lastfilepos.size() < num_lastfilepos)
-				lastfilepos[file] = filepos;
+				lastfilepos.push_back(filepos);
 			else
 				LYXERR(Debug::INIT, "LyX: Warning: Ignore pos of last file: " << fname);
 		} catch (...) {
@@ -212,26 +212,34 @@ void LastFilePosSection::read(istream & is)
 void LastFilePosSection::write(ostream & os) const
 {
 	os << '\n' << sec_lastfilepos << '\n';
-	for (FilePosMap::const_iterator file = lastfilepos.begin();
-		file != lastfilepos.end(); ++file) {
-		os << file->second.pit << ", " << file->second.pos << ", "
-		   << file->first << '\n';
-	}
+	for (auto const & file_p : lastfilepos)
+		os << file_p.pit << ", " << file_p.pos << ", " << file_p.file << '\n';
 }
 
 
-void LastFilePosSection::save(FileName const & fname, FilePos const & pos)
+void LastFilePosSection::save(FilePos const & pos)
 {
-	lastfilepos[fname] = pos;
+	// Remove element if it was already present. Iterating should
+	// not be a problem since the list is small (<100 elements).
+	for (FilePosList::iterator it = lastfilepos.begin();
+	     it != lastfilepos.end(); ++it)
+		if (it->file == pos.file) {
+			lastfilepos.erase(it);
+			break;
+		}
+
+	// insert new element at front.
+	lastfilepos.push_front(pos);
 }
 
 
 LastFilePosSection::FilePos LastFilePosSection::load(FileName const & fname) const
 {
-	FilePosMap::const_iterator entry = lastfilepos.find(fname);
-	// Has position information, return it.
-	if (entry != lastfilepos.end())
-		return entry->second;
+	for (auto const & fp : lastfilepos)
+		if (fp.file == fname)
+			// Has position information, return it.
+			return fp;
+
 	// Not found, return the first paragraph
 	return FilePos();
 }
@@ -275,7 +283,7 @@ void BookmarksSection::read(istream & is)
 				continue;
 			FileName const file(fname);
 			// only load valid bookmarks
-			if (file.exists() && !file.isDirectory() && idx <= max_bookmarks)
+			if (file.exists() && !file.isDirectory() && idx < bookmarks.size())
 				bookmarks[idx] = Bookmark(file, pit, pos, 0, 0);
 			else
 				LYXERR(Debug::INIT, "LyX: Warning: Ignore bookmark of file: " << fname);
@@ -289,7 +297,7 @@ void BookmarksSection::read(istream & is)
 void BookmarksSection::write(ostream & os) const
 {
 	os << '\n' << sec_bookmarks << '\n';
-	for (size_t i = 0; i <= max_bookmarks; ++i) {
+	for (size_t i = 0; i < bookmarks.size(); ++i) {
 		if (isValid(i))
 			os << i << ", "
 			   << bookmarks[i].bottom_pit << ", "
@@ -304,20 +312,20 @@ void BookmarksSection::save(FileName const & fname,
 	int top_id, pos_type top_pos, unsigned int idx)
 {
 	// silently ignore bookmarks when idx is out of range
-	if (idx <= max_bookmarks)
+	if (idx < bookmarks.size())
 		bookmarks[idx] = Bookmark(fname, bottom_pit, bottom_pos, top_id, top_pos);
 }
 
 
 bool BookmarksSection::isValid(unsigned int i) const
 {
-	return i <= max_bookmarks && !bookmarks[i].filename.empty();
+	return i < bookmarks.size() && !bookmarks[i].filename.empty();
 }
 
 
 bool BookmarksSection::hasValid() const
 {
-	for (size_t i = 1; i <= size(); ++i) {
+	for (size_t i = 1; i < bookmarks.size(); ++i) {
 		if (isValid(i))
 			return true;
 	}
@@ -331,6 +339,29 @@ BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) co
 }
 
 
+BookmarksSection::BookmarkPosList
+BookmarksSection::bookmarksInPar(FileName const & fn, int const par_id) const
+{
+	// FIXME: we do not consider the case of bottom_pit.
+	// This is probably not a problem.
+	BookmarksSection::BookmarkPosList bip;
+	for (size_t i = 1; i < bookmarks.size(); ++i)
+		if (bookmarks[i].filename == fn && bookmarks[i].top_id == par_id)
+			bip.push_back({i, bookmarks[i].top_pos});
+
+	return bip;
+}
+
+
+void BookmarksSection::adjustPosAfterPos(FileName const & fn,
+	int const par_id, pos_type pos, int offset)
+{
+	for (Bookmark & bkm : bookmarks)
+		if (bkm.filename == fn && bkm.top_id == par_id && bkm.top_pos > pos)
+			bkm.top_pos += offset;
+}
+
+
 LastCommandsSection::LastCommandsSection(unsigned int num) :
 	default_num_last_commands(30),
 	absolute_max_last_commands(100)
@@ -375,9 +406,14 @@ void LastCommandsSection::setNumberOfLastCommands(unsigned int no)
 }
 
 
-void LastCommandsSection::add(std::string const & string)
+void LastCommandsSection::add(std::string const & command)
 {
-	lastcommands.push_back(string);
+	// remove traces of 'command' in history using the erase-remove idiom
+	//   https://en.wikipedia.org/wiki/Erase%E2%80%93remove_idiom
+	lastcommands.erase(remove(lastcommands.begin(), lastcommands.end(), command),
+	                   lastcommands.end());
+	// add it at the end of the list.
+	lastcommands.push_back(command);
 }
 
 
@@ -486,10 +522,7 @@ 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;
+	return auth_files_.find(name) != auth_files_.end();
 }
 
 
@@ -507,8 +540,7 @@ void ShellEscapeSection::read(istream & is)
 		if (c == '[')
 			break;
 		getline(is, s);
-		c = s[0];
-		if (c == 0 || c == '#' || c == ' ' || !FileName::isAbsolute(s))
+		if (s.empty() || s[0] == '#' || s[0] == ' ' || !FileName::isAbsolute(s))
 			continue;
 
 		// read shellescape files
@@ -540,10 +572,7 @@ bool ShellEscapeSection::find(string const & name) const
 
 bool ShellEscapeSection::findAuth(string const & name) const
 {
-	if (shellescape_files_.find(name + ",1") != shellescape_files_.end())
-		return true;
-
-	return false;
+	return shellescape_files_.find(name + ",1") != shellescape_files_.end();
 }