X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=3cf1de49043f8fbb213201231caf6f3ded573af6;hb=94f0968e9212f24997cfee0d17c6f060210edbc6;hp=6c899a95e8f7f65d86210de687f785cd7dfa85ce;hpb=f3c472e76928a2217050d90f399c3da38f63fdd9;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 6c899a95e8..3cf1de4904 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -46,7 +46,6 @@
 #include "ParIterator.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
-#include "VSpace.h"
 #include "WordLangTuple.h"
 #include "WordList.h"
 
@@ -356,7 +355,13 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 		// of this document. For example, when you apply class article to a beamer document,
 		// all unknown layouts such as frame will be added to document class article so that
 		// these layouts can keep their original names.
-		tclass.addLayoutIfNeeded(layoutname);
+		bool const added_one = tclass.addLayoutIfNeeded(layoutname);
+		if (added_one) {
+			// Warn the user.
+			docstring const s = bformat(_("Layout `%1$s' was not found."), layoutname);
+			errorList.push_back(
+				ErrorItem(_("Layout Not Found"), s, par.id(), 0, par.size()));
+		}
 
 		par.setLayout(bp.documentClass()[layoutname]);
 
@@ -749,12 +754,12 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 
 
 // needed to insert the selection
-void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
+void Text::insertStringAsLines(Cursor & cur, docstring const & str,
 		Font const & font)
 {
 	BufferParams const & bparams = owner_->buffer().params();
-	pit_type pit = dit.pit();
-	pos_type pos = dit.pos();
+	pit_type pit = cur.pit();
+	pos_type pos = cur.pos();
 
 	// insert the string, don't insert doublespace
 	bool space_inserted = true;
@@ -796,12 +801,13 @@ void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
 			space_inserted = (*cit == ' ');
 		}
 	}
+	setCursor(cur, pit, pos);
 }
 
 
 // turn double CR to single CR, others are converted into one
 // blank. Then insertStringAsLines is called
-void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str,
 		Font const & font)
 {
 	docstring linestr = str;
@@ -823,7 +829,7 @@ void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & s
 			newline_inserted = false;
 		}
 	}
-	insertStringAsLines(dit, linestr, font);
+	insertStringAsLines(cur, linestr, font);
 }
 
 
@@ -1243,7 +1249,11 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 
 		pos_type left  = (pit == begPit ? begPos : 0);
 		pos_type right = (pit == endPit ? endPos : parSize);
-
+		
+		if (left == right)
+			// there is no change here
+			continue;
+		
 		if (op == ACCEPT) {
 			pars_[pit].acceptChanges(left, right);
 		} else {
@@ -1641,7 +1651,17 @@ bool Text::dissolveInset(Cursor & cur)
 	spit += cur.pit();
 	Buffer & b = *cur.buffer();
 	cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+
 	if (!plist.empty()) {
+		// see bug 7319
+		// we clear the cache so that we won't get conflicts with labels
+		// that get pasted into the buffer. we should update this before
+		// its being empty matters. if not (i.e., if we encounter bugs),
+		// then this should instead be:
+		//	  cur.buffer().updateBuffer();
+		// but we'll try the cheaper solution here.
+		cur.buffer()->clearReferenceCache();
+
 		// ERT paragraphs have the Language latex_language.
 		// This is invalid outside of ERT, so we need to
 		// change it to the buffer language.
@@ -1655,8 +1675,9 @@ bool Text::dissolveInset(Cursor & cur)
 		// restore position
 		cur.pit() = min(cur.lastpit(), spit);
 		cur.pos() = min(cur.lastpos(), spos);
-	} else
-		cur.forceBufferUpdate();
+	}
+
+	cur.forceBufferUpdate();
 
 	// Ensure the current language is set correctly (bug 6292)
 	cur.text()->setCursor(cur, cur.pit(), cur.pos());