X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=187e3872312f2ff66f3edb5705906c85703f5cfe;hb=f1a388584fb2c043d17127d7db49c36cb8427cfa;hp=66c6090aa22c9abb40d8d9561fcdf82ddb7cbcb2;hpb=744ee152faeb376a142d26c09784d1a7e9dd303d;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 66c6090aa2..187e387231 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -46,32 +46,56 @@
 #include "ParIterator.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
-#include "VSpace.h"
 #include "WordLangTuple.h"
 #include "WordList.h"
 
 #include "insets/InsetText.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
-#include "insets/InsetLine.h"
 #include "insets/InsetNewline.h"
 #include "insets/InsetNewpage.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
+#include "insets/InsetIPAMacro.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetSpecialChar.h"
 #include "insets/InsetTabular.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
 #include "support/textutils.h"
 
-#include <boost/next_prior.hpp>
-
 #include <sstream>
 
+
+// TODO: replace if in Text::readParToken() with compile time switch
+#if 0
+
+#include "support/metahash.h"
+
+typedef boost::mpl::string<'\\end','_lay','out'> end_layout;
+typedef boost::mpl::string<'\\end','in','set'>   end_inset;
+
+void foo()
+{
+	std::string token = "\\end_layout";
+
+	switch (boost::hash_value(token)) {
+		case lyx::support::hash_string<end_layout>::value:
+			return;
+		case lyx::support::hash_string<end_inset>::value:
+			return;
+		default: ;
+	};
+
+}
+#endif
+
+
 using namespace std;
 using namespace lyx::support;
 
@@ -111,14 +135,14 @@ void breakParagraphConservative(BufferParams const & bparams,
 	ParagraphList & pars, pit_type par_offset, pos_type pos)
 {
 	// create a new paragraph
-	Paragraph & tmp = *pars.insert(boost::next(pars.begin(), par_offset + 1),
+	Paragraph & tmp = *pars.insert(lyx::next(pars.begin(), par_offset + 1),
 				       Paragraph());
 	Paragraph & par = pars[par_offset];
 
 	tmp.setInsetOwner(&par.inInset());
 	tmp.makeSameLayout(par);
 
-	LASSERT(pos <= par.size(), /**/);
+	LASSERT(pos <= par.size(), return);
 
 	if (pos < par.size()) {
 		// move everything behind the break position to the new paragraph
@@ -131,7 +155,7 @@ void breakParagraphConservative(BufferParams const & bparams,
 		}
 		// Move over the end-of-par change information
 		tmp.setChange(tmp.size(), par.lookupChange(par.size()));
-		par.setChange(par.size(), Change(bparams.trackChanges ?
+		par.setChange(par.size(), Change(bparams.track_changes ?
 					   Change::INSERTED : Change::UNCHANGED));
 	}
 }
@@ -167,22 +191,15 @@ void mergeParagraph(BufferParams const & bparams,
 	// move the change of the end-of-paragraph character
 	par.setChange(par.size(), change);
 
-	pars.erase(boost::next(pars.begin(), par_offset + 1));
+	pars.erase(lyx::next(pars.begin(), par_offset + 1));
 }
 
-// Initialization of the counter for the paragraph id's,
-//
-// FIXME: There should be a more intelligent way to generate and use the
-// paragraph ids per buffer instead a global static counter for all InsetText
-// in the running program.
-static int paragraph_id = -1;
 
 Text::Text(InsetText * owner, bool use_default_layout)
-	: owner_(owner), autoBreakRows_(false), undo_counter_(0)
+	: owner_(owner)
 {
 	pars_.push_back(Paragraph());
 	Paragraph & par = pars_.back();
-	par.setId(++paragraph_id);
 	par.setInsetOwner(owner);
 	DocumentClass const & dc = owner->buffer().params().documentClass();
 	if (use_default_layout)
@@ -193,15 +210,13 @@ Text::Text(InsetText * owner, bool use_default_layout)
 
 
 Text::Text(InsetText * owner, Text const & text)
-	: owner_(owner), autoBreakRows_(text.autoBreakRows_), undo_counter_(0)
+	: owner_(owner)
 {
 	pars_ = text.pars_;
 	ParagraphList::iterator const end = pars_.end();
 	ParagraphList::iterator it = pars_.begin();
-	for (; it != end; ++it) {
-		it->setId(++paragraph_id);
+	for (; it != end; ++it)
 		it->setInsetOwner(owner);
-	}
 }
 
 
@@ -248,15 +263,28 @@ bool Text::isFirstInSequence(pit_type par_offset) const
 }
 
 
+int Text::getTocLevel(pit_type par_offset) const
+{
+	Paragraph const & par = pars_[par_offset];
+
+	if (par.layout().isEnvironment() && !isFirstInSequence(par_offset))
+		return Layout::NOT_IN_TOC;
+
+	return par.layout().toclevel;
+}
+
+
 Font const Text::outerFont(pit_type par_offset) const
 {
 	depth_type par_depth = pars_[par_offset].getDepth();
 	FontInfo tmpfont = inherit_font;
-
+	depth_type prev_par_depth = 0;
 	// Resolve against environment font information
 	while (par_offset != pit_type(pars_.size())
+	       && par_depth != prev_par_depth
 	       && par_depth
 	       && !tmpfont.resolved()) {
+		prev_par_depth = par_depth;
 		par_offset = outerHook(par_offset);
 		if (par_offset != pit_type(pars_.size())) {
 			tmpfont.realize(pars_[par_offset].layout().font);
@@ -268,48 +296,71 @@ Font const Text::outerFont(pit_type par_offset) const
 }
 
 
-void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+static void acceptOrRejectChanges(ParagraphList & pars,
+	BufferParams const & bparams, Text::ChangeOp op)
 {
 	pit_type pars_size = static_cast<pit_type>(pars.size());
 
-	// first, accept changes within each individual paragraph
-	// (do not consider end-of-par)
+	// first, accept or reject changes within each individual
+	// paragraph (do not consider end-of-par)
 	for (pit_type pit = 0; pit < pars_size; ++pit) {
-		if (!pars[pit].empty())   // prevent assertion failure
-			pars[pit].acceptChanges(0, pars[pit].size());
+		// prevent assertion failure
+		if (!pars[pit].empty()) {
+			if (op == Text::ACCEPT)
+				pars[pit].acceptChanges(0, pars[pit].size());
+			else
+				pars[pit].rejectChanges(0, pars[pit].size());
+		}
 	}
 
-	// next, accept imaginary end-of-par characters
+	// next, accept or reject imaginary end-of-par characters
 	for (pit_type pit = 0; pit < pars_size; ++pit) {
 		pos_type pos = pars[pit].size();
-
-		if (pars[pit].isInserted(pos)) {
-			pars[pit].setChange(pos, Change(Change::UNCHANGED));
-		} else if (pars[pit].isDeleted(pos)) {
-			if (pit == pars_size - 1) {
-				// we cannot remove a par break at the end of the last
-				// paragraph; instead, we mark it unchanged
+		if (pars[pit].isChanged(pos)) {
+			// keep the end-of-par char if it is inserted and accepted
+			// or when it is deleted and rejected.
+			if (pars[pit].isInserted(pos) == (op == Text::ACCEPT)) {
 				pars[pit].setChange(pos, Change(Change::UNCHANGED));
 			} else {
-				mergeParagraph(bparams, pars, pit);
-				--pit;
-				--pars_size;
+				if (pit == pars_size - 1) {
+					// we cannot remove a par break at the end of the last
+					// paragraph; instead, we mark it unchanged
+					pars[pit].setChange(pos, Change(Change::UNCHANGED));
+				} else {
+					mergeParagraph(bparams, pars, pit);
+					--pit;
+					--pars_size;
+				}
 			}
 		}
 	}
 }
 
+
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+	acceptOrRejectChanges(pars, bparams, Text::ACCEPT);
+}
+
+
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+	acceptOrRejectChanges(pars, bparams, Text::REJECT);
+}
+
+
 InsetText const & Text::inset() const
 {
 	return *owner_;
 }
 
 
+
 void Text::readParToken(Paragraph & par, Lexer & lex,
 	string const & token, Font & font, Change & change, ErrorList & errorList)
 {
 	Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
-	BufferParams const & bp = buf->params();
+	BufferParams & bp = buf->params();
 
 	if (token[0] != '\\') {
 		docstring dstr = lex.getDocString();
@@ -331,10 +382,10 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 			// in this case only the empty layout is allowed
 			layoutname = tclass.plainLayoutName();
 		} else if (par.usePlainLayout()) {
-			// in this case, default layout maps to empty layout 
+			// in this case, default layout maps to empty layout
 			if (layoutname == tclass.defaultLayoutName())
 				layoutname = tclass.plainLayoutName();
-		} else { 
+		} else {
 			// otherwise, the empty layout maps to the default
 			if (layoutname == tclass.plainLayoutName())
 				layoutname = tclass.defaultLayoutName();
@@ -344,7 +395,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]);
 
@@ -427,43 +484,75 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 	} else if (token == "\\color") {
 		lex.next();
 		setLyXColor(lex.getString(), font.fontInfo());
-	} else if (token == "\\SpecialChar") {
+	} else if (token == "\\SpecialChar" ||
+	           (token == "\\SpecialCharNoPassThru" &&
+	            !par.layout().pass_thru && !inset().isPassThru())) {
 		auto_ptr<Inset> inset;
 		inset.reset(new InsetSpecialChar);
 		inset->read(lex);
 		inset->setBuffer(*buf);
 		par.insertInset(par.size(), inset.release(), font, change);
+	} else if (token == "\\SpecialCharNoPassThru") {
+		lex.next();
+		docstring const s = ltrim(lex.getDocString(), "\\");
+		par.insert(par.size(), s, font, change);
+	} else if (token == "\\IPAChar") {
+		auto_ptr<Inset> inset;
+		inset.reset(new InsetIPAChar);
+		inset->read(lex);
+		inset->setBuffer(*buf);
+		par.insertInset(par.size(), inset.release(), font, change);
+	} else if (token == "\\twohyphens" || token == "\\threehyphens") {
+		// Ideally, this should be done by lyx2lyx, but lyx2lyx does not know the
+		// running font and does not know anything about layouts (and CopyStyle).
+		Layout const & layout(par.layout());
+		FontInfo info = font.fontInfo();
+		info.realize(layout.resfont);
+		if (layout.pass_thru || inset().isPassThru() ||
+		    info.family() == TYPEWRITER_FAMILY) {
+			if (token == "\\twohyphens")
+				par.insert(par.size(), from_ascii("--"), font, change);
+			else
+				par.insert(par.size(), from_ascii("---"), font, change);
+		} else {
+			if (token == "\\twohyphens")
+				par.insertChar(par.size(), 0x2013, font, change);
+			else
+				par.insertChar(par.size(), 0x2014, font, change);
+		}
 	} else if (token == "\\backslash") {
 		par.appendChar('\\', font, change);
 	} else if (token == "\\LyXTable") {
 		auto_ptr<Inset> inset(new InsetTabular(buf));
 		inset->read(lex);
 		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\lyxline") {
-		auto_ptr<Inset> inset;
-		inset.reset(new InsetLine);
-		inset->setBuffer(*buf);
-		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\change_unchanged") {
 		change = Change(Change::UNCHANGED);
 	} else if (token == "\\change_inserted" || token == "\\change_deleted") {
 		lex.eatLine();
 		istringstream is(lex.getString());
-		unsigned int aid;
+		int aid;
 		time_t ct;
 		is >> aid >> ct;
-		map<unsigned int, int> const & am = bp.author_map;
+		BufferParams::AuthorMap const & am = bp.author_map_;
 		if (am.find(aid) == am.end()) {
-			errorList.push_back(ErrorItem(_("Change tracking error"),
-					    bformat(_("Unknown author index for change: %1$d\n"), aid),
-					    par.id(), 0, par.size()));
-			change = Change(Change::UNCHANGED);
-		} else {
-			if (token == "\\change_inserted")
-				change = Change(Change::INSERTED, am.find(aid)->second, ct);
-			else
-				change = Change(Change::DELETED, am.find(aid)->second, ct);
+			errorList.push_back(ErrorItem(
+				_("Change tracking author index missing"),
+				bformat(_("A change tracking author information for index "
+				          "%1$d is missing. This can happen after a wrong "
+				          "merge by a version control system. In this case, "
+				          "either fix the merge, or have this information "
+				          "missing until the corresponding tracked changes "
+				          "are merged or this user edits the file again.\n"),
+				        aid),
+				par.id(), par.size(), par.size() + 1
+				));
+			bp.addAuthor(Author(aid));
 		}
+		if (token == "\\change_inserted")
+			change = Change(Change::INSERTED, am.find(aid)->second, ct);
+		else
+			change = Change(Change::DELETED, am.find(aid)->second, ct);
 	} else {
 		lex.eatLine();
 		errorList.push_back(ErrorItem(_("Unknown token"),
@@ -512,6 +601,9 @@ void Text::readParagraph(Paragraph & par, Lexer & lex,
 
 	// Initialize begin_of_body_ on load; redoParagraph maintains
 	par.setBeginOfBody();
+
+	// mark paragraph for spell checking on load
+	// par.requestSpellCheck();
 }
 
 
@@ -520,11 +612,11 @@ class TextCompletionList : public CompletionList
 public:
 	///
 	TextCompletionList(Cursor const & cur, WordList const * list)
-		: buffer_(cur.buffer()), pos_(0), list_(list)
+		: buffer_(cur.buffer()), list_(list)
 	{}
 	///
 	virtual ~TextCompletionList() {}
-	
+
 	///
 	virtual bool sorted() const { return true; }
 	///
@@ -537,13 +629,11 @@ public:
 	{
 		return list_->word(idx);
 	}
-	
+
 private:
 	///
 	Buffer const * buffer_;
 	///
-	size_t pos_;
-	///
 	WordList const * list_;
 };
 
@@ -551,7 +641,7 @@ private:
 bool Text::empty() const
 {
 	return pars_.empty() || (pars_.size() == 1 && pars_[0].empty()
-		// FIXME: Should we consider the labeled type as empty too? 
+		// FIXME: Should we consider the labeled type as empty too?
 		&& pars_[0].layout().labeltype == LABEL_NO_LABEL);
 }
 
@@ -568,17 +658,17 @@ double Text::spacing(Paragraph const & par) const
  * This breaks a paragraph at the specified position.
  * The new paragraph will:
  * - Decrease depth by one (or change layout to default layout) when
- *    keep_layout == false  
+ *    keep_layout == false
  * - keep current depth and layout when keep_layout == true
  */
-static void breakParagraph(Text & text, pit_type par_offset, pos_type pos, 
+static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
 		    bool keep_layout)
 {
 	BufferParams const & bparams = text.inset().buffer().params();
 	ParagraphList & pars = text.paragraphs();
 	// create a new paragraph, and insert into the list
 	ParagraphList::iterator tmp =
-		pars.insert(boost::next(pars.begin(), par_offset + 1),
+		pars.insert(lyx::next(pars.begin(), par_offset + 1),
 			    Paragraph());
 
 	Paragraph & par = pars[par_offset];
@@ -589,7 +679,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
 	// end of a paragraph
 	tmp->setPlainOrDefaultLayout(bparams.documentClass());
 
-	// layout stays the same with latex-environments
 	if (keep_layout) {
 		tmp->setLayout(par.layout());
 		tmp->setLabelWidthString(par.params().labelWidthString());
@@ -631,7 +720,7 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
 
 	// Move over the end-of-par change information
 	tmp->setChange(tmp->size(), par.lookupChange(par.size()));
-	par.setChange(par.size(), Change(bparams.trackChanges ?
+	par.setChange(par.size(), Change(bparams.track_changes ?
 					   Change::INSERTED : Change::UNCHANGED));
 
 	if (pos) {
@@ -655,7 +744,6 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
 		par.setPlainOrDefaultLayout(bparams.documentClass());
 	}
 
-	// layout stays the same with latex-environments
 	if (keep_layout) {
 		par.setLayout(tmp->layout());
 		par.setLabelWidthString(tmp->params().labelWidthString());
@@ -666,7 +754,7 @@ static void breakParagraph(Text & text, pit_type par_offset, pos_type pos,
 
 void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	Paragraph & cpar = cur.paragraph();
 	pit_type cpit = cur.pit();
@@ -674,24 +762,29 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 	DocumentClass const & tclass = cur.buffer()->params().documentClass();
 	Layout const & layout = cpar.layout();
 
-	// this is only allowed, if the current paragraph is not empty
-	// or caption and if it has not the keepempty flag active
-	if (cur.lastpos() == 0 && !cpar.allowEmpty() &&
-	    layout.labeltype != LABEL_SENSITIVE)
+	if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
+		if (changeDepthAllowed(cur, DEC_DEPTH))
+			changeDepth(cur, DEC_DEPTH);
+		else {
+			docstring const & lay = cur.paragraph().usePlainLayout()
+			    ? tclass.plainLayoutName() : tclass.defaultLayoutName();
+			setLayout(cur, lay);
+		}
 		return;
+	}
 
-	// a layout change may affect also the following paragraph
-	recUndo(cur, cur.pit(), undoSpan(cur.pit()) - 1);
+	cur.recordUndo();
 
 	// Always break behind a space
 	// It is better to erase the space (Dekel)
 	if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos()))
-		cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
+		cpar.eraseChar(cur.pos(), cur.buffer()->params().track_changes);
 
 	// What should the layout for the new paragraph be?
-	bool keep_layout = inverse_logic ? 
-		!layout.isEnvironment() 
-		: layout.isEnvironment();
+	bool keep_layout = layout.isEnvironment()
+		|| (layout.isParagraph() && layout.parbreak_is_newline);
+	if (inverse_logic)
+		keep_layout = !keep_layout;
 
 	// We need to remember this before we break the paragraph, because
 	// that invalidates the layout variable
@@ -720,14 +813,13 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 	}
 
 	while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) {
-		if (!pars_[next_par].eraseChar(0, cur.buffer()->params().trackChanges))
+		if (!pars_[next_par].eraseChar(0, cur.buffer()->params().track_changes))
 			break; // the character couldn't be deleted physically due to change tracking
 	}
 
-	cur.buffer()->updateLabels();
-
 	// A singlePar update is not enough in this case.
-	cur.updateFlags(Update::Force);
+	cur.screenUpdateFlags(Update::Force);
+	cur.forceBufferUpdate();
 
 	// This check is necessary. Otherwise the new empty paragraph will
 	// be deleted automatically. And it is more friendly for the user!
@@ -739,12 +831,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;
@@ -752,7 +844,7 @@ void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
 	    cit != str.end(); ++cit) {
 		Paragraph & par = pars_[pit];
 		if (*cit == '\n') {
-			if (autoBreakRows_ && (!par.empty() || par.allowEmpty())) {
+			if (inset().allowMultiPar() && (!par.empty() || par.allowEmpty())) {
 				lyx::breakParagraph(*this, pit, pos,
 					par.layout().isEnvironment());
 				++pit;
@@ -761,18 +853,18 @@ void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
 			} else {
 				continue;
 			}
-			// do not insert consecutive spaces if !free_spacing
+		// do not insert consecutive spaces if !free_spacing
 		} else if ((*cit == ' ' || *cit == '\t') &&
 			   space_inserted && !par.isFreeSpacing()) {
 			continue;
 		} else if (*cit == '\t') {
 			if (!par.isFreeSpacing()) {
 				// tabs are like spaces here
-				par.insertChar(pos, ' ', font, bparams.trackChanges);
+				par.insertChar(pos, ' ', font, bparams.track_changes);
 				++pos;
 				space_inserted = true;
 			} else {
-				par.insertChar(pos, *cit, font, bparams.trackChanges);
+				par.insertChar(pos, *cit, font, bparams.track_changes);
 				++pos;
 				space_inserted = true;
 			}
@@ -781,17 +873,18 @@ void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
 			continue;
 		} else {
 			// just insert the character
-			par.insertChar(pos, *cit, font, bparams.trackChanges);
+			par.insertChar(pos, *cit, font, bparams.track_changes);
 			++pos;
 			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;
@@ -813,7 +906,7 @@ void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & s
 			newline_inserted = false;
 		}
 	}
-	insertStringAsLines(dit, linestr, font);
+	insertStringAsLines(cur, linestr, font);
 }
 
 
@@ -821,7 +914,7 @@ void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & s
 // same Paragraph one to the right and make a rebreak
 void Text::insertChar(Cursor & cur, char_type c)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	cur.recordUndo(INSERT_UNDO);
 
@@ -840,7 +933,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 		static docstring const number_seperators = from_ascii(".,:");
 
 		if (cur.current_font.fontInfo().number() == FONT_ON) {
-			if (!isDigit(c) && !contains(number_operators, c) &&
+			if (!isDigitASCII(c) && !contains(number_operators, c) &&
 			    !(contains(number_seperators, c) &&
 			      cur.pos() != 0 &&
 			      cur.pos() != cur.lastpos() &&
@@ -848,7 +941,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 			      tm.displayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
 			   )
 				number(cur); // Set current_font.number to OFF
-		} else if (isDigit(c) &&
+		} else if (isDigitASCII(c) &&
 			   cur.real_current_font.isVisibleRightToLeft()) {
 			number(cur); // Set current_font.number to ON
 
@@ -857,6 +950,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 				if (contains(number_unary_operators, c) &&
 				    (cur.pos() == 1
 				     || par.isSeparator(cur.pos() - 2)
+				     || par.isEnvSeparator(cur.pos() - 2)
 				     || par.isNewline(cur.pos() - 2))
 				  ) {
 					setCharFont(pit, cur.pos() - 1, cur.current_font,
@@ -872,40 +966,40 @@ void Text::insertChar(Cursor & cur, char_type c)
 	}
 
 	// In Bidi text, we want spaces to be treated in a special way: spaces
-	// which are between words in different languages should get the 
-	// paragraph's language; otherwise, spaces should keep the language 
+	// which are between words in different languages should get the
+	// paragraph's language; otherwise, spaces should keep the language
 	// they were originally typed in. This is only in effect while typing;
 	// after the text is already typed in, the user can always go back and
 	// explicitly set the language of a space as desired. But 99.9% of the
 	// time, what we're doing here is what the user actually meant.
-	// 
+	//
 	// The following cases are the ones in which the language of the space
 	// should be changed to match that of the containing paragraph. In the
-	// depictions, lowercase is LTR, uppercase is RTL, underscore (_) 
+	// depictions, lowercase is LTR, uppercase is RTL, underscore (_)
 	// represents a space, pipe (|) represents the cursor position (so the
 	// character before it is the one just typed in). The different cases
 	// are depicted logically (not visually), from left to right:
-	// 
+	//
 	// 1. A_a|
 	// 2. a_A|
 	//
 	// Theoretically, there are other situations that we should, perhaps, deal
-	// with (e.g.: a|_A, A|_a). In practice, though, there really isn't any 
+	// with (e.g.: a|_A, A|_a). In practice, though, there really isn't any
 	// point (to understand why, just try to create this situation...).
 
 	if ((cur.pos() >= 2) && (par.isLineSeparator(cur.pos() - 1))) {
-		// get font in front and behind the space in question. But do NOT 
+		// get font in front and behind the space in question. But do NOT
 		// use getFont(cur.pos()) because the character c is not inserted yet
 		Font const pre_space_font  = tm.displayFont(cur.pit(), cur.pos() - 2);
 		Font const & post_space_font = cur.real_current_font;
 		bool pre_space_rtl  = pre_space_font.isVisibleRightToLeft();
 		bool post_space_rtl = post_space_font.isVisibleRightToLeft();
-		
+
 		if (pre_space_rtl != post_space_rtl) {
-			// Set the space's language to match the language of the 
+			// Set the space's language to match the language of the
 			// adjacent character whose direction is the paragraph's
 			// direction; don't touch other properties of the font
-			Language const * lang = 
+			Language const * lang =
 				(pre_space_rtl == par.isRTL(buffer.params())) ?
 				pre_space_font.language() : post_space_font.language();
 
@@ -914,7 +1008,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 			par.setFont(cur.pos() - 1, space_font);
 		}
 	}
-	
+
 	// Next check, if there will be two blanks together or a blank at
 	// the beginning of a paragraph.
 	// I decided to handle blanks like normal characters, the main
@@ -925,35 +1019,65 @@ void Text::insertChar(Cursor & cur, char_type c)
 	// disable the double-space checking
 	if (!freeSpacing && isLineSeparatorChar(c)) {
 		if (cur.pos() == 0) {
-			static bool sent_space_message = false;
-			if (!sent_space_message) {
-				cur.message(_("You cannot insert a space at the "
-							   "beginning of a paragraph. Please read the Tutorial."));
-				sent_space_message = true;
-			}
+			cur.message(_(
+					"You cannot insert a space at the "
+					"beginning of a paragraph. Please read the Tutorial."));
 			return;
 		}
+		// LASSERT: Is it safe to continue here?
 		LASSERT(cur.pos() > 0, /**/);
 		if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
-		    && !par.isDeleted(cur.pos() - 1)) {
-			static bool sent_space_message = false;
-			if (!sent_space_message) {
-				cur.message(_("You cannot type two spaces this way. "
-							   "Please read the Tutorial."));
-				sent_space_message = true;
-			}
+				&& !par.isDeleted(cur.pos() - 1)) {
+			cur.message(_(
+					"You cannot type two spaces this way. "
+					"Please read the Tutorial."));
 			return;
 		}
 	}
 
-	par.insertChar(cur.pos(), c, cur.current_font,
-		cur.buffer()->params().trackChanges);
+	// Prevent to insert uncodable characters in verbatim and ERT
+	// (workaround for bug 9012)
+	// Don't do it for listings inset, since InsetListings::latex() tries
+	// to switch to a usable encoding which works in many cases (bug 9102).
+	if (cur.paragraph().isPassThru() && owner_->lyxCode() != LISTINGS_CODE &&
+	    cur.current_font.language()) {
+		Encoding const * e = cur.current_font.language()->encoding();
+		if (!e->encodable(c)) {
+			cur.message(_("Character is uncodable in verbatim paragraphs."));
+			return;
+		}
+	}
+
+	pos_type pos = cur.pos();
+	if (!cur.paragraph().isPassThru() && owner_->lyxCode() != IPA_CODE &&
+	    cur.current_font.fontInfo().family() != TYPEWRITER_FAMILY &&
+	    c == '-' && pos > 0) {
+		if (par.getChar(pos - 1) == '-') {
+			// convert "--" to endash
+			par.eraseChar(pos - 1, cur.buffer()->params().track_changes);
+			c = 0x2013;
+			pos--;
+		} else if (par.getChar(pos - 1) == 0x2013) {
+			// convert "---" to emdash
+			par.eraseChar(pos - 1, cur.buffer()->params().track_changes);
+			c = 0x2014;
+			pos--;
+		} else if (par.getChar(pos - 1) == 0x2014) {
+			// convert "----" to "-"
+			par.eraseChar(pos - 1, cur.buffer()->params().track_changes);
+			c = '-';
+			pos--;
+		}
+	}
+
+	par.insertChar(pos, c, cur.current_font,
+		cur.buffer()->params().track_changes);
 	cur.checkBufferStructure();
 
-//		cur.updateFlags(Update::Force);
+//		cur.screenUpdateFlags(Update::Force);
 	bool boundary = cur.boundary()
-		|| tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
-	setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary);
+		|| tm.isRTLBoundary(cur.pit(), pos + 1);
+	setCursor(cur, cur.pit(), pos + 1, false, boundary);
 	charInserted(cur);
 }
 
@@ -962,21 +1086,12 @@ void Text::charInserted(Cursor & cur)
 {
 	Paragraph & par = cur.paragraph();
 
-	// Here we call finishUndo for every 20 characters inserted.
-	// This is from my experience how emacs does it. (Lgb)
-	if (undo_counter_ < 20) {
-		++undo_counter_;
-	} else {
-		cur.finishUndo();
-		undo_counter_ = 0;
-	}
-
 	// register word if a non-letter was entered
 	if (cur.pos() > 1
 	    && !par.isWordSeparator(cur.pos() - 2)
 	    && par.isWordSeparator(cur.pos() - 1)) {
 		// get the word in front of cursor
-		LASSERT(this == cur.text(), /**/);
+		LBUFERR(this == cur.text());
 		cur.paragraph().updateWords();
 	}
 }
@@ -987,7 +1102,7 @@ void Text::charInserted(Cursor & cur)
 
 bool Text::cursorForwardOneWord(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pos_type const lastpos = cur.lastpos();
 	pit_type pit = cur.pit();
@@ -1002,10 +1117,10 @@ bool Text::cursorForwardOneWord(Cursor & cur)
 			return false;
 	}
 
-	if (lyxrc.mac_like_word_movement) {
+	if (lyxrc.mac_like_cursor_movement) {
 		// Skip through trailing punctuation and spaces.
 		while (pos != lastpos && (par.isChar(pos) || par.isSpace(pos)))
-                        ++pos;
+			++pos;
 
 		// Skip over either a non-char inset or a full word
 		if (pos != lastpos && par.isWordSeparator(pos))
@@ -1013,7 +1128,7 @@ bool Text::cursorForwardOneWord(Cursor & cur)
 		else while (pos != lastpos && !par.isWordSeparator(pos))
 			     ++pos;
 	} else {
-		LASSERT(pos < lastpos, /**/); // see above
+		LASSERT(pos < lastpos, return false); // see above
 		if (!par.isWordSeparator(pos))
 			while (pos != lastpos && !par.isWordSeparator(pos))
 				++pos;
@@ -1025,7 +1140,7 @@ bool Text::cursorForwardOneWord(Cursor & cur)
 
 		// Skip over white space
 		while (pos != lastpos && par.isSpace(pos))
-			     ++pos;		
+			     ++pos;
 	}
 
 	return setCursor(cur, pit, pos);
@@ -1034,7 +1149,7 @@ bool Text::cursorForwardOneWord(Cursor & cur)
 
 bool Text::cursorBackwardOneWord(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pit_type pit = cur.pit();
 	pos_type pos = cur.pos();
@@ -1044,7 +1159,7 @@ bool Text::cursorBackwardOneWord(Cursor & cur)
 	if (pos == 0 && pit != 0)
 		return setCursor(cur, pit - 1, getPar(pit - 1).size());
 
-	if (lyxrc.mac_like_word_movement) {
+	if (lyxrc.mac_like_cursor_movement) {
 		// Skip through punctuation and spaces.
 		while (pos != 0 && (par.isChar(pos - 1) || par.isSpace(pos - 1)))
 			--pos;
@@ -1075,10 +1190,9 @@ bool Text::cursorBackwardOneWord(Cursor & cur)
 
 bool Text::cursorVisLeftOneWord(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pos_type left_pos, right_pos;
-	bool left_is_letter, right_is_letter;
 
 	Cursor temp_cur = cur;
 
@@ -1087,9 +1201,9 @@ bool Text::cursorVisLeftOneWord(Cursor & cur)
 
 		// collect some information about current cursor position
 		temp_cur.getSurroundingPos(left_pos, right_pos);
-		left_is_letter = 
+		bool left_is_letter =
 			(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
-		right_is_letter = 
+		bool right_is_letter =
 			(right_pos > -1 ? !temp_cur.paragraph().isWordSeparator(right_pos) : false);
 
 		// if we're not at a letter/non-letter boundary, continue moving
@@ -1105,17 +1219,16 @@ bool Text::cursorVisLeftOneWord(Cursor & cur)
 			break;
 	}
 
-	return setCursor(cur, temp_cur.pit(), temp_cur.pos(), 
+	return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
 					 true, temp_cur.boundary());
 }
 
 
 bool Text::cursorVisRightOneWord(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pos_type left_pos, right_pos;
-	bool left_is_letter, right_is_letter;
 
 	Cursor temp_cur = cur;
 
@@ -1124,9 +1237,9 @@ bool Text::cursorVisRightOneWord(Cursor & cur)
 
 		// collect some information about current cursor position
 		temp_cur.getSurroundingPos(left_pos, right_pos);
-		left_is_letter = 
+		bool left_is_letter =
 			(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
-		right_is_letter = 
+		bool right_is_letter =
 			(right_pos > -1 ? !temp_cur.paragraph().isWordSeparator(right_pos) : false);
 
 		// if we're not at a letter/non-letter boundary, continue moving
@@ -1136,24 +1249,24 @@ bool Text::cursorVisRightOneWord(Cursor & cur)
 		// we should stop when we have an LTR word on our right or an RTL word
 		// on our left
 		if ((left_is_letter && temp_cur.paragraph().getFontSettings(
-				temp_cur.buffer()->params(), 
+				temp_cur.buffer()->params(),
 				left_pos).isRightToLeft())
 			|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
-				temp_cur.buffer()->params(), 
+				temp_cur.buffer()->params(),
 				right_pos).isRightToLeft()))
 			break;
 	}
 
-	return setCursor(cur, temp_cur.pit(), temp_cur.pos(), 
+	return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
 					 true, temp_cur.boundary());
 }
 
 
 void Text::selectWord(Cursor & cur, word_location loc)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	CursorSlice from = cur.top();
-	CursorSlice to = cur.top();
+	CursorSlice to;
 	getWord(from, to, loc);
 	if (cur.top() != from)
 		setCursor(cur, from.pit(), from.pos());
@@ -1169,14 +1282,14 @@ void Text::selectWord(Cursor & cur, word_location loc)
 
 void Text::selectAll(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	if (cur.lastpos() == 0 && cur.lastpit() == 0)
 		return;
 	// If the cursor is at the beginning, make sure the cursor ends there
 	if (cur.pit() == 0 && cur.pos() == 0) {
 		setCursor(cur, cur.lastpit(), getPar(cur.lastpit()).size());
 		cur.resetAnchor();
-		setCursor(cur, 0, 0);		
+		setCursor(cur, 0, 0);
 	} else {
 		setCursor(cur, 0, 0);
 		cur.resetAnchor();
@@ -1190,7 +1303,7 @@ void Text::selectAll(Cursor & cur)
 // selection is currently set
 bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	if (cur.selection())
 		return false;
 	selectWord(cur, loc);
@@ -1200,11 +1313,10 @@ bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
 
 void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	if (!cur.selection()) {
-		bool const changed = cur.paragraph().isChanged(cur.pos());
-		if (!(changed && findNextChange(&cur.bv())))
+		if (!selectChange(cur))
 			return;
 	}
 
@@ -1220,7 +1332,6 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 	bool endsBeforeEndOfPar = (endPos < pars_[endPit].size());
 
 	// first, accept/reject changes within each individual paragraph (do not consider end-of-par)
-
 	for (pit_type pit = begPit; pit <= endPit; ++pit) {
 		pos_type parSize = pars_[pit].size();
 
@@ -1240,6 +1351,10 @@ 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 {
@@ -1292,16 +1407,13 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 	}
 
 	// finally, invoke the DEPM
-
-	deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().trackChanges);
-
-	//
+	deleteEmptyParagraphMechanism(begPit, endPit, cur.buffer()->params().track_changes);
 
 	cur.finishUndo();
 	cur.clearSelection();
 	setCursorIntern(cur, begPit, begPos);
-	cur.updateFlags(Update::Force);
-	cur.buffer()->updateLabels();
+	cur.screenUpdateFlags(Update::Force);
+	cur.forceBufferUpdate();
 }
 
 
@@ -1309,7 +1421,7 @@ void Text::acceptChanges()
 {
 	BufferParams const & bparams = owner_->buffer().params();
 	lyx::acceptChanges(pars_, bparams);
-	deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.trackChanges);
+	deleteEmptyParagraphMechanism(0, pars_.size() - 1, bparams.track_changes);
 }
 
 
@@ -1345,13 +1457,13 @@ void Text::rejectChanges()
 	}
 
 	// finally, invoke the DEPM
-	deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.trackChanges);
+	deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.track_changes);
 }
 
 
 void Text::deleteWordForward(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	if (cur.lastpos() == 0)
 		cursorForward(cur);
 	else {
@@ -1367,7 +1479,7 @@ void Text::deleteWordForward(Cursor & cur)
 
 void Text::deleteWordBackward(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	if (cur.lastpos() == 0)
 		cursorBackward(cur);
 	else {
@@ -1382,20 +1494,19 @@ void Text::deleteWordBackward(Cursor & cur)
 
 
 // Kill to end of line.
-void Text::changeCase(Cursor & cur, TextCase action)
+void Text::changeCase(Cursor & cur, TextCase action, bool partial)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	CursorSlice from;
 	CursorSlice to;
 
-	bool gotsel = false;
-	if (cur.selection()) {
+	bool const gotsel = cur.selection();
+	if (gotsel) {
 		from = cur.selBegin();
 		to = cur.selEnd();
-		gotsel = true;
 	} else {
 		from = cur.top();
-		getWord(from, to, PARTIAL_WORD);
+		getWord(from, to, partial ? PARTIAL_WORD : WHOLE_WORD);
 		cursorForwardOneWord(cur);
 	}
 
@@ -1449,14 +1560,14 @@ bool Text::handleBibitems(Cursor & cur)
 	// if a bibitem is deleted, merge with previous paragraph
 	// if this is a bibliography item as well
 	if (cur.pit() > 0 && par.layout() == prevpar.layout()) {
-		cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
+		cur.recordUndo(prevcur.pit());
 		mergeParagraph(bufparams, cur.text()->paragraphs(),
 							prevcur.pit());
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		setCursorIntern(cur, prevcur.pit(), prevcur.pos());
-		cur.updateFlags(Update::Force);
+		cur.screenUpdateFlags(Update::Force);
 		return true;
-	} 
+	}
 
 	// otherwise reset to default
 	cur.paragraph().setPlainOrDefaultLayout(bufparams.documentClass());
@@ -1475,12 +1586,12 @@ bool Text::erase(Cursor & cur)
 		// any paragraphs
 		cur.recordUndo(DELETE_UNDO);
 		bool const was_inset = cur.paragraph().isInset(cur.pos());
-		if(!par.eraseChar(cur.pos(), cur.buffer()->params().trackChanges))
+		if(!par.eraseChar(cur.pos(), cur.buffer()->params().track_changes))
 			// the character has been logically deleted only => skip it
 			cur.top().forwardPos();
 
 		if (was_inset)
-			cur.buffer()->updateLabels();
+			cur.forceBufferUpdate();
 		else
 			cur.checkBufferStructure();
 		needsUpdate = true;
@@ -1488,7 +1599,7 @@ bool Text::erase(Cursor & cur)
 		if (cur.pit() == cur.lastpit())
 			return dissolveInset(cur);
 
-		if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
+		if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
 			par.setChange(cur.pos(), Change(Change::DELETED));
 			cur.forwardPos();
 			needsUpdate = true;
@@ -1513,7 +1624,7 @@ bool Text::erase(Cursor & cur)
 
 bool Text::backspacePos0(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	if (cur.pit() == 0)
 		return false;
 
@@ -1531,15 +1642,15 @@ bool Text::backspacePos0(Cursor & cur)
 	// is it an empty paragraph?
 	if (cur.lastpos() == 0
 	    || (cur.lastpos() == 1 && par.isSeparator(0))) {
-		cur.recordUndo(ATOMIC_UNDO, prevcur.pit(), cur.pit());
-		plist.erase(boost::next(plist.begin(), cur.pit()));
+		cur.recordUndo(prevcur.pit());
+		plist.erase(lyx::next(plist.begin(), cur.pit()));
 		needsUpdate = true;
 	}
 	// is previous par empty?
 	else if (prevcur.lastpos() == 0
 		 || (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) {
-		cur.recordUndo(ATOMIC_UNDO, prevcur.pit(), cur.pit());
-		plist.erase(boost::next(plist.begin(), prevcur.pit()));
+		cur.recordUndo(prevcur.pit());
+		plist.erase(lyx::next(plist.begin(), prevcur.pit()));
 		needsUpdate = true;
 	}
 	// Pasting is not allowed, if the paragraphs have different
@@ -1550,13 +1661,13 @@ bool Text::backspacePos0(Cursor & cur)
 	else if (par.layout() == prevpar.layout()
 		 || tclass.isDefaultLayout(par.layout())
 		 || tclass.isPlainLayout(par.layout())) {
-		cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
+		cur.recordUndo(prevcur.pit());
 		mergeParagraph(bufparams, plist, prevcur.pit());
 		needsUpdate = true;
 	}
 
 	if (needsUpdate) {
-		cur.buffer()->updateLabels();
+		cur.forceBufferUpdate();
 		setCursorIntern(cur, prevcur.pit(), prevcur.pos());
 	}
 
@@ -1566,17 +1677,19 @@ bool Text::backspacePos0(Cursor & cur)
 
 bool Text::backspace(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	bool needsUpdate = false;
 	if (cur.pos() == 0) {
 		if (cur.pit() == 0)
 			return dissolveInset(cur);
 
-		Paragraph & prev_par = pars_[cur.pit() - 1];
+		Cursor prev_cur = cur;
+		--prev_cur.pit();
 
-		if (!prev_par.isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
-			prev_par.setChange(prev_par.size(), Change(Change::DELETED));
-			setCursorIntern(cur, cur.pit() - 1, prev_par.size());
+		if (!prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
+			cur.recordUndo(prev_cur.pit(), prev_cur.pit());
+			prev_cur.paragraph().setChange(prev_cur.lastpos(), Change(Change::DELETED));
+			setCursorIntern(cur, prev_cur.pit(), prev_cur.lastpos());
 			return true;
 		}
 		// The cursor is at the beginning of a paragraph, so
@@ -1594,9 +1707,9 @@ bool Text::backspace(Cursor & cur)
 		setCursorIntern(cur, cur.pit(), cur.pos() - 1,
 				false, cur.boundary());
 		bool const was_inset = cur.paragraph().isInset(cur.pos());
-		cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
+		cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().track_changes);
 		if (was_inset)
-			cur.buffer()->updateLabels();
+			cur.forceBufferUpdate();
 		else
 			cur.checkBufferStructure();
 	}
@@ -1607,7 +1720,7 @@ bool Text::backspace(Cursor & cur)
 	needsUpdate |= handleBibitems(cur);
 
 	// A singlePar update is not enough in this case.
-//		cur.updateFlags(Update::Force);
+//		cur.screenUpdateFlags(Update::Force);
 	setCursor(cur.top(), cur.pit(), cur.pos());
 
 	return needsUpdate;
@@ -1636,14 +1749,24 @@ bool Text::dissolveInset(Cursor & cur)
 		spos += cur.pos();
 	spit += cur.pit();
 	Buffer & b = *cur.buffer();
-	cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+	cur.paragraph().eraseChar(cur.pos(), b.params().track_changes);
+
 	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.
 		ParagraphList::iterator it = plist.begin();
 		ParagraphList::iterator it_end = plist.end();
-		for (; it != it_end; it++)
+		for (; it != it_end; ++it)
 			it->changeLanguage(b.params(), latex_language, b.language());
 
 		pasteParagraphList(cur, plist, b.params().documentClassPtr(),
@@ -1651,10 +1774,9 @@ bool Text::dissolveInset(Cursor & cur)
 		// restore position
 		cur.pit() = min(cur.lastpit(), spit);
 		cur.pos() = min(cur.lastpos(), spos);
-	} else
-		// this is the least that needs to be done (bug 6003)
-		// in the above case, pasteParagraphList handles this
-		cur.buffer()->updateLabels();
+	}
+
+	cur.forceBufferUpdate();
 
 	// Ensure the current language is set correctly (bug 6292)
 	cur.text()->setCursor(cur, cur.pit(), cur.pos());
@@ -1687,7 +1809,7 @@ void Text::write(ostream & os) const
 }
 
 
-bool Text::read(Lexer & lex, 
+bool Text::read(Lexer & lex,
 		ErrorList & errorList, InsetText * insetPtr)
 {
 	Buffer const & buf = owner_->buffer();
@@ -1744,24 +1866,25 @@ bool Text::read(Lexer & lex,
 		Paragraph par;
 		par.setInsetOwner(insetPtr);
 		par.params().depth(depth);
-		par.setFont(0, Font(inherit_font, 
+		par.setFont(0, Font(inherit_font,
 				    buf.params().language));
 		par.setPlainOrDefaultLayout(buf.params().documentClass());
 		pars_.push_back(par);
 	}
-	
+
 	return res;
 }
 
+
 // Returns the current font and depth as a message.
 docstring Text::currentState(Cursor const & cur) const
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	Buffer & buf = *cur.buffer();
 	Paragraph const & par = cur.paragraph();
 	odocstringstream os;
 
-	if (buf.params().trackChanges)
+	if (buf.params().track_changes)
 		os << _("[Change Tracking] ");
 
 	Change change = par.lookupChange(cur.pos());
@@ -1841,10 +1964,11 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 
 	docstring text;
 	docstring par_text = pars_[pit].asString();
-	string piece;
-	// the return string of math matrices might contain linebreaks
+
+	// The return string of math matrices might contain linebreaks
 	par_text = subst(par_text, '\n', '-');
-	for (int i = 0; i < lyxrc.label_init_length; ++i) {
+	int const numwords = 3;
+	for (int i = 0; i < numwords; ++i) {
 		if (par_text.empty())
 			break;
 		docstring head;
@@ -1855,11 +1979,12 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 		text += head;
 	}
 
-	// No need for a prefix if the user said so.
-	if (lyxrc.label_init_length <= 0)
-		return text;
+	// Make sure it isn't too long
+	unsigned int const max_label_length = 32;
+	if (text.size() > max_label_length)
+		text.resize(max_label_length);
 
-	// Will contain the label type.
+	// Will contain the label prefix.
 	docstring name;
 
 	// For section, subsection, etc...
@@ -1871,42 +1996,39 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 		}
 	}
 	if (layout->latextype != LATEX_PARAGRAPH)
-		name = from_ascii(layout->latexname());
+		name = layout->refprefix;
 
-	// for captions, we just take the caption type
+	// For captions, we just take the caption type
 	Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
-	if (caption_inset)
-		name = from_ascii(static_cast<InsetCaption *>(caption_inset)->type());
-
-	// If none of the above worked, we'll see if we're inside various
-	// types of insets and take our abbreviation from them.
-	if (name.empty()) {
-		InsetCode const codes[] = {
-			FLOAT_CODE,
-			WRAP_CODE,
-			FOOT_CODE
-		};
-		for (unsigned int i = 0; i < (sizeof codes / sizeof codes[0]); ++i) {
-			Inset * float_inset = cur.innerInsetOfType(codes[i]);
-			if (float_inset) {
-				name = float_inset->name();
-				break;
-			}
+	if (caption_inset) {
+		string const & ftype = static_cast<InsetCaption *>(caption_inset)->floattype();
+		FloatList const & fl = cur.buffer()->params().documentClass().floats();
+		if (fl.typeExist(ftype)) {
+			Floating const & flt = fl.getType(ftype);
+			name = from_utf8(flt.refPrefix());
 		}
+		if (name.empty())
+			name = from_utf8(ftype.substr(0,3));
 	}
 
-	// Create a correct prefix for prettyref
-	if (name == "theorem")
-		name = from_ascii("thm");
-	else if (name == "Foot")
-		name = from_ascii("fn");
-	else if (name == "listing")
-		name = from_ascii("lst");
+	// If none of the above worked, see if the inset knows.
+	if (name.empty()) {
+		InsetLayout const & il = cur.inset().getLayout();
+		name = il.refprefix();
+	}
 
 	if (!name.empty())
-		text = name.substr(0, 3) + ':' + text;
+		text = name + ':' + text;
+
+	// We need a unique label
+	docstring label = text;
+	int i = 1;
+	while (cur.buffer()->insetLabel(label)) {
+			label = text + '-' + convert<docstring>(i);
+			++i;
+		}
 
-	return text;
+	return label;
 }
 
 
@@ -1928,10 +2050,31 @@ docstring Text::asString(pit_type beg, pit_type end, int options) const
 }
 
 
+void Text::shortenForOutliner(docstring & str, size_t const maxlen)
+{
+	support::truncateWithEllipsis(str, maxlen);
+	docstring::iterator it = str.begin();
+	docstring::iterator end = str.end();
+	for (; it != end; ++it)
+		if ((*it) == L'\n' || (*it) == L'\t')
+			(*it) = L' ';	
+}
+
+
+void Text::forOutliner(docstring & os, size_t const maxlen,
+					   bool const shorten) const
+{
+	size_t tmplen = shorten ? maxlen + 1 : maxlen;
+	for (size_t i = 0; i != pars_.size() && os.length() < tmplen; ++i)
+		pars_[i].forOutliner(os, tmplen, false);
+	if (shorten)
+		shortenForOutliner(os, maxlen);
+}
+
 
 void Text::charsTranspose(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pos_type pos = cur.pos();
 
@@ -1971,7 +2114,7 @@ void Text::charsTranspose(Cursor & cur)
 
 	// And finally, we are ready to perform the transposition.
 	// Track the changes if Change Tracking is enabled.
-	bool const trackChanges = cur.buffer()->params().trackChanges;
+	bool const trackChanges = cur.buffer()->params().track_changes;
 
 	cur.recordUndo();
 
@@ -2007,7 +2150,7 @@ docstring Text::previousWord(CursorSlice const & sl) const
 	getWord(from, to, PREVIOUS_WORD);
 	if (sl == from || to == from)
 		return docstring();
-	
+
 	Paragraph const & par = sl.paragraph();
 	return par.asString(from.pos(), to.pos());
 }
@@ -2024,22 +2167,22 @@ bool Text::completionSupported(Cursor const & cur) const
 
 CompletionList const * Text::createCompletionList(Cursor const & cur) const
 {
-	WordList const * list = theWordList(*cur.getFont().language());
+	WordList const * list = theWordList(cur.getFont().language()->lang());
 	return new TextCompletionList(cur, list);
 }
 
 
 bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/)
-{	
-	LASSERT(cur.bv().cursor() == cur, /**/);
+{
+	LBUFERR(cur.bv().cursor() == cur);
 	cur.insert(s);
 	cur.bv().cursor() = cur;
-	if (!(cur.disp_.update() & Update::Force))
-		cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+	if (!(cur.result().screenUpdate() & Update::Force))
+		cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
 	return true;
 }
-	
-	
+
+
 docstring Text::completionPrefix(Cursor const & cur) const
 {
 	return previousWord(cur.top());