X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=8ac87d31c2d2060cfa08f56d30d417a110c02023;hb=7a000652c02f98dcff4d3c611b22af244409df73;hp=f0e6741d0ca1ea5a04bfede945e146415adae85e;hpb=6273c1f66d9b920053119d59a8ecf07dcf02bcc1;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index f0e6741d0c..8ac87d31c2 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -37,6 +37,7 @@
 #include "output_xhtml.h"
 #include "output_docbook.h"
 #include "ParagraphParameters.h"
+#include "Session.h"
 #include "SpellChecker.h"
 #include "texstream.h"
 #include "TexRow.h"
@@ -307,7 +308,7 @@ public:
 	/// \return the number of characters written.
 	int latexSurrogatePair(BufferParams const &, otexstream & os,
 			       char_type c, char_type next,
-			       OutputParams const &);
+			       OutputParams const &) const;
 
 	/// Output a space in appropriate formatting (or a surrogate pair
 	/// if the next character is a combining character).
@@ -318,7 +319,7 @@ public:
 			     pos_type i,
 			     unsigned int & column,
 			     Font const & font,
-			     Layout const & style);
+			     Layout const & style) const;
 
 	/// This could go to ParagraphParameters if we want to.
 	int startTeXParParams(BufferParams const &, otexstream &,
@@ -342,7 +343,7 @@ public:
 				   unsigned int & column,
 				   bool const fontswitch_inset,
 				   bool const closeLanguage,
-				   bool const lang_switched_at_inset);
+				   bool const lang_switched_at_inset) const;
 
 	///
 	void latexSpecialChar(
@@ -354,7 +355,7 @@ public:
 				   Layout const & style,
 				   pos_type & i,
 				   pos_type end_pos,
-				   unsigned int & column);
+				   unsigned int & column) const;
 
 	///
 	bool latexSpecialT1(
@@ -401,7 +402,7 @@ public:
 		return speller_change_number > speller_state_.currentChangeNumber();
 	}
 
-	bool ignoreWord(docstring const & word) const ;
+	bool ignoreWord(docstring const & word) const;
 
 	void setMisspelled(pos_type from, pos_type to, SpellChecker::Result state)
 	{
@@ -832,6 +833,10 @@ void Paragraph::Private::insertChar(pos_type pos, char_type c,
 
 	// Update list of misspelled positions
 	speller_state_.increasePosAfterPos(pos);
+
+	// Update bookmarks
+	theSession().bookmarks().adjustPosAfterPos(inset_owner_->buffer().fileName(),
+	                                           id_, pos, 1);
 }
 
 
@@ -916,6 +921,10 @@ bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
 	d->speller_state_.decreasePosAfterPos(pos);
 	d->speller_state_.refreshLast(size());
 
+	// Update bookmarks
+	theSession().bookmarks().adjustPosAfterPos(d->inset_owner_->buffer().fileName(),
+	                                           d->id_, pos, -1);
+
 	return true;
 }
 
@@ -937,7 +946,7 @@ int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
 // Handle combining characters
 int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
 		otexstream & os, char_type c, char_type next,
-		OutputParams const & runparams)
+		OutputParams const & runparams) const
 {
 	// Writing next here may circumvent a possible font change between
 	// c and next. Since next is only output if it forms a surrogate pair
@@ -974,7 +983,7 @@ bool Paragraph::Private::simpleTeXBlanks(BufferParams const & bparams,
 				       pos_type i,
 				       unsigned int & column,
 				       Font const & font,
-				       Layout const & style)
+				       Layout const & style) const
 {
 	if (style.pass_thru || runparams.pass_thru)
 		return false;
@@ -1027,7 +1036,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
 				    unsigned int & column,
 				    bool const fontswitch_inset,
 				    bool const closeLanguage,
-				    bool const lang_switched_at_inset)
+				    bool const lang_switched_at_inset) const
 {
 	Inset * inset = owner_->getInset(i);
 	LBUFERR(inset);
@@ -1193,7 +1202,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
 					  Layout const & style,
 					  pos_type & i,
 					  pos_type end_pos,
-					  unsigned int & column)
+					  unsigned int & column) const
 {
 	char_type const c = owner_->getUChar(bparams, runparams, i);