X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSession.cpp;h=9ec18f1d0141852646217929a47bd1563abb2f62;hb=a4d9315bc49445e4419b3b59fd238a13c5f7be31;hp=cfb256538aae9163e24c8a398f95b64897fea317;hpb=9c37cb47594a5a6d57b77a313b5ddce03cf01aa1;p=lyx.git

diff --git a/src/Session.cpp b/src/Session.cpp
index cfb256538a..9ec18f1d01 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -31,11 +31,12 @@ string const sec_lastfiles = "[recent files]";
 string const sec_lastfilepos = "[cursor positions]";
 string const sec_lastopened = "[last opened files]";
 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]";
+// currently unused:
+//string const sec_session = "[session info]";
+//string const sec_toolbars = "[toolbars]";
 
 } // namespace
 
@@ -325,7 +326,7 @@ bool BookmarksSection::isValid(unsigned int i) const
 
 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;
 	}
@@ -339,6 +340,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)
@@ -385,6 +409,11 @@ void LastCommandsSection::setNumberOfLastCommands(unsigned int no)
 
 void LastCommandsSection::add(std::string const & command)
 {
+	// 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);
 }