X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=4e593ddf23ca619f1bcf8d3a12cadd74abbca8da;hb=3628ceec480c3d8fa9673f80f781eb1153fb9e1f;hp=2c72eefdffa19c4066779b30e3ef4d4fd9087236;hpb=ce1ec3edd2f7ebd17050acdfc5be1f4798c80f45;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 2c72eefdff..4e593ddf23 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1,17 +1,17 @@
 /**
- * \file src/text.cpp
+ * \file src/Text.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Dov Feldstern
  * \author Jean-Marc Lasgouttes
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Stefan Schimanski
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -26,80 +26,342 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
+#include "CompletionList.h"
 #include "Cursor.h"
-#include "ParIterator.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "factory.h"
-#include "FontIterator.h"
-#include "gettext.h"
+#include "InsetList.h"
 #include "Language.h"
-#include "Color.h"
+#include "Layout.h"
 #include "Length.h"
 #include "Lexer.h"
+#include "lyxfind.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
-#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
+#include "ParIterator.h"
+#include "TextClass.h"
 #include "TextMetrics.h"
-#include "VSpace.h"
 #include "WordLangTuple.h"
-
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
+#include "WordList.h"
 
 #include "insets/InsetText.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
-#include "insets/InsetHFill.h"
-#include "insets/InsetLine.h"
 #include "insets/InsetNewline.h"
-#include "insets/InsetPagebreak.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetNewpage.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/lyxtime.h"
 #include "support/textutils.h"
-#include "support/convert.h"
-
-#include <boost/current_function.hpp>
-#include <boost/next_prior.hpp>
 
 #include <sstream>
 
-using std::auto_ptr;
-using std::advance;
-using std::distance;
-using std::max;
-using std::min;
-using std::endl;
-using std::string;
 
-namespace lyx {
+// TODO: replace if in Text::readParToken() with compile time switch
+#if 0
 
-using support::bformat;
-using support::contains;
-using support::lowercase;
-using support::split;
-using support::uppercase;
+#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;
+
+namespace lyx {
 
 using cap::cutSelection;
 using cap::pasteParagraphList;
 
-using frontend::FontMetrics;
+static bool moveItem(Paragraph & fromPar, pos_type fromPos,
+	Paragraph & toPar, pos_type toPos, BufferParams const & params)
+{
+	// Note: moveItem() does not honour change tracking!
+	// Therefore, it should only be used for breaking and merging paragraphs
+
+	// We need a copy here because the character at fromPos is going to be erased.
+	Font const tmpFont = fromPar.getFontSettings(params, fromPos);
+	Change const tmpChange = fromPar.lookupChange(fromPos);
+
+	if (Inset * tmpInset = fromPar.getInset(fromPos)) {
+		fromPar.releaseInset(fromPos);
+		// The inset is not in fromPar any more.
+		if (!toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange)) {
+			delete tmpInset;
+			return false;
+		}
+		return true;
+	}
+
+	char_type const tmpChar = fromPar.getChar(fromPos);
+	fromPar.eraseChar(fromPos, false);
+	toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
+	return true;
+}
+
+
+void breakParagraphConservative(BufferParams const & bparams,
+	ParagraphList & pars, pit_type par_offset, pos_type pos)
+{
+	// create a new paragraph
+	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(), return);
+
+	if (pos < par.size()) {
+		// move everything behind the break position to the new paragraph
+		pos_type pos_end = par.size() - 1;
+
+		for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+			if (moveItem(par, pos, tmp, j, bparams)) {
+				++j;
+			}
+		}
+		// Move over the end-of-par change information
+		tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+		par.setChange(par.size(), Change(bparams.track_changes ?
+					   Change::INSERTED : Change::UNCHANGED));
+	}
+}
+
+
+void mergeParagraph(BufferParams const & bparams,
+	ParagraphList & pars, pit_type par_offset)
+{
+	Paragraph & next = pars[par_offset + 1];
+	Paragraph & par = pars[par_offset];
+
+	pos_type pos_end = next.size() - 1;
+	pos_type pos_insert = par.size();
+
+	// the imaginary end-of-paragraph character (at par.size()) has to be
+	// marked as unmodified. Otherwise, its change is adopted by the first
+	// character of the next paragraph.
+	if (par.isChanged(par.size())) {
+		LYXERR(Debug::CHANGES,
+		   "merging par with inserted/deleted end-of-par character");
+		par.setChange(par.size(), Change(Change::UNCHANGED));
+	}
+
+	Change change = next.lookupChange(next.size());
+
+	// move the content of the second paragraph to the end of the first one
+	for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
+		if (moveItem(next, 0, par, j, bparams)) {
+			++j;
+		}
+	}
+
+	// move the change of the end-of-paragraph character
+	par.setChange(par.size(), change);
+
+	pars.erase(lyx::next(pars.begin(), par_offset + 1));
+}
+
+
+Text::Text(InsetText * owner, bool use_default_layout)
+	: owner_(owner)
+{
+	pars_.push_back(Paragraph());
+	Paragraph & par = pars_.back();
+	par.setInsetOwner(owner);
+	DocumentClass const & dc = owner->buffer().params().documentClass();
+	if (use_default_layout)
+		par.setDefaultLayout(dc);
+	else
+		par.setPlainLayout(dc);
+}
+
+
+Text::Text(InsetText * owner, Text const & text)
+	: owner_(owner)
+{
+	pars_ = text.pars_;
+	ParagraphList::iterator const end = pars_.end();
+	ParagraphList::iterator it = pars_.begin();
+	for (; it != end; ++it)
+		it->setInsetOwner(owner);
+}
+
+
+pit_type Text::depthHook(pit_type pit, depth_type depth) const
+{
+	pit_type newpit = pit;
+
+	if (newpit != 0)
+		--newpit;
+
+	while (newpit != 0 && pars_[newpit].getDepth() > depth)
+		--newpit;
+
+	if (pars_[newpit].getDepth() > depth)
+		return pit;
+
+	return newpit;
+}
+
+
+pit_type Text::outerHook(pit_type par_offset) const
+{
+	Paragraph const & par = pars_[par_offset];
+
+	if (par.getDepth() == 0)
+		return pars_.size();
+	return depthHook(par_offset, depth_type(par.getDepth() - 1));
+}
+
+
+bool Text::isFirstInSequence(pit_type par_offset) const
+{
+	Paragraph const & par = pars_[par_offset];
+
+	pit_type dhook_offset = depthHook(par_offset, par.getDepth());
+
+	if (dhook_offset == par_offset)
+		return true;
+
+	Paragraph const & dhook = pars_[dhook_offset];
+
+	return dhook.layout() != par.layout()
+		|| dhook.getDepth() != par.getDepth();
+}
+
+
+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;
+}
 
-namespace {
 
-void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
+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);
+			par_depth = pars_[par_offset].getDepth();
+		}
+	}
+
+	return Font(tmpfont);
+}
+
+
+static void acceptOrRejectChanges(ParagraphList & pars,
+	BufferParams const & bparams, Text::ChangeOp op)
+{
+	pit_type pars_size = static_cast<pit_type>(pars.size());
+
+	// first, accept or reject changes within each individual
+	// paragraph (do not consider end-of-par)
+	for (pit_type pit = 0; pit < pars_size; ++pit) {
+		// 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 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].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 {
+				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)
 {
-	BufferParams const & bp = buf.params();
+	Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
+	BufferParams & bp = buf->params();
 
 	if (token[0] != '\\') {
 		docstring dstr = lex.getDocString();
@@ -109,43 +371,54 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 		lex.eatLine();
 		docstring layoutname = lex.getDocString();
 
-		font = Font(Font::ALL_INHERIT, bp.language);
+		font = Font(inherit_font, bp.language);
 		change = Change(Change::UNCHANGED);
 
-		TextClass const & tclass = bp.getTextClass();
+		DocumentClass const & tclass = bp.documentClass();
 
-		if (layoutname.empty()) {
+		if (layoutname.empty())
 			layoutname = tclass.defaultLayoutName();
-		}
 
-		bool hasLayout = tclass.hasLayout(layoutname);
+		if (owner_->forcePlainLayout()) {
+			// 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
+			if (layoutname == tclass.defaultLayoutName())
+				layoutname = tclass.plainLayoutName();
+		} else {
+			// otherwise, the empty layout maps to the default
+			if (layoutname == tclass.plainLayoutName())
+				layoutname = tclass.defaultLayoutName();
+		}
 
-		if (!hasLayout) {
-			errorList.push_back(ErrorItem(_("Unknown layout"),
-			bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"),
-			layoutname, from_utf8(tclass.name())), par.id(), 0, par.size()));
-			layoutname = tclass.defaultLayoutName();
+		// When we apply an unknown layout to a document, we add this layout to the textclass
+		// 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.
+		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.layout(bp.getTextClass()[layoutname]);
+		par.setLayout(bp.documentClass()[layoutname]);
 
 		// Test whether the layout is obsolete.
-		LayoutPtr const & layout = par.layout();
-		if (!layout->obsoleted_by().empty())
-			par.layout(bp.getTextClass()[layout->obsoleted_by()]);
+		Layout const & layout = par.layout();
+		if (!layout.obsoleted_by().empty())
+			par.setLayout(bp.documentClass()[layout.obsoleted_by()]);
 
 		par.params().read(lex);
 
 	} else if (token == "\\end_layout") {
-		lyxerr << BOOST_CURRENT_FUNCTION
-		       << ": Solitary \\end_layout in line "
-		       << lex.getLineNo() << "\n"
-		       << "Missing \\begin_layout?.\n";
+		LYXERR0("Solitary \\end_layout in line " << lex.lineNumber() << "\n"
+		       << "Missing \\begin_layout ?");
 	} else if (token == "\\end_inset") {
-		lyxerr << BOOST_CURRENT_FUNCTION
-		       << ": Solitary \\end_inset in line "
-		       << lex.getLineNo() << "\n"
-		       << "Missing \\begin_inset?.\n";
+		LYXERR0("Solitary \\end_inset in line " << lex.lineNumber() << "\n"
+		       << "Missing \\begin_inset ?");
 	} else if (token == "\\begin_inset") {
 		Inset * inset = readInset(lex, buf);
 		if (inset)
@@ -158,16 +431,16 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 		}
 	} else if (token == "\\family") {
 		lex.next();
-		font.setLyXFamily(lex.getString());
+		setLyXFamily(lex.getString(), font.fontInfo());
 	} else if (token == "\\series") {
 		lex.next();
-		font.setLyXSeries(lex.getString());
+		setLyXSeries(lex.getString(), font.fontInfo());
 	} else if (token == "\\shape") {
 		lex.next();
-		font.setLyXShape(lex.getString());
+		setLyXShape(lex.getString(), font.fontInfo());
 	} else if (token == "\\size") {
 		lex.next();
-		font.setLyXSize(lex.getString());
+		setLyXSize(lex.getString(), font.fontInfo());
 	} else if (token == "\\lang") {
 		lex.next();
 		string const tok = lex.getString();
@@ -180,104 +453,107 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 		}
 	} else if (token == "\\numeric") {
 		lex.next();
-		font.setNumber(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setNumber(setLyXMisc(lex.getString()));
 	} else if (token == "\\emph") {
 		lex.next();
-		font.setEmph(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setEmph(setLyXMisc(lex.getString()));
 	} else if (token == "\\bar") {
 		lex.next();
 		string const tok = lex.getString();
 
 		if (tok == "under")
-			font.setUnderbar(Font::ON);
+			font.fontInfo().setUnderbar(FONT_ON);
 		else if (tok == "no")
-			font.setUnderbar(Font::OFF);
+			font.fontInfo().setUnderbar(FONT_OFF);
 		else if (tok == "default")
-			font.setUnderbar(Font::INHERIT);
+			font.fontInfo().setUnderbar(FONT_INHERIT);
 		else
 			lex.printError("Unknown bar font flag "
 				       "`$$Token'");
+	} else if (token == "\\strikeout") {
+		lex.next();
+		font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
+	} else if (token == "\\uuline") {
+		lex.next();
+		font.fontInfo().setUuline(setLyXMisc(lex.getString()));
+	} else if (token == "\\uwave") {
+		lex.next();
+		font.fontInfo().setUwave(setLyXMisc(lex.getString()));
 	} else if (token == "\\noun") {
 		lex.next();
-		font.setNoun(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setNoun(setLyXMisc(lex.getString()));
 	} else if (token == "\\color") {
 		lex.next();
-		font.setLyXColor(lex.getString());
-	} else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
-
-		// Insets don't make sense in a free-spacing context! ---Kayvan
-		if (par.isFreeSpacing()) {
-			if (token == "\\InsetSpace")
-				par.appendChar(' ', font, change);
-			else if (lex.isOK()) {
-				lex.next();
-				string const next_token = lex.getString();
-				if (next_token == "\\-")
-					par.appendChar('-', font, change);
-				else {
-					lex.printError("Token `$$Token' "
-						       "is in free space "
-						       "paragraph layout!");
-				}
-			}
+		setLyXColor(lex.getString(), font.fontInfo());
+	} 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 {
-			auto_ptr<Inset> inset;
-			if (token == "\\SpecialChar" )
-				inset.reset(new InsetSpecialChar);
+			if (token == "\\twohyphens")
+				par.insertChar(par.size(), 0x2013, font, change);
 			else
-				inset.reset(new InsetSpace);
-			inset->read(buf, lex);
-			par.insertInset(par.size(), inset.release(),
-					font, change);
+				par.insertChar(par.size(), 0x2014, font, change);
 		}
 	} else if (token == "\\backslash") {
 		par.appendChar('\\', font, change);
-	} else if (token == "\\newline") {
-		auto_ptr<Inset> inset(new InsetNewline);
-		inset->read(buf, lex);
-		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\LyXTable") {
 		auto_ptr<Inset> inset(new InsetTabular(buf));
-		inset->read(buf, lex);
+		inset->read(lex);
 		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\hfill") {
-		par.insertInset(par.size(), new InsetHFill, font, change);
-	} else if (token == "\\lyxline") {
-		par.insertInset(par.size(), new InsetLine, font, change);
-	} else if (token == "\\newpage") {
-		par.insertInset(par.size(), new InsetPagebreak, font, change);
-	} else if (token == "\\clearpage") {
-		par.insertInset(par.size(), new InsetClearPage, font, change);
-	} else if (token == "\\cleardoublepage") {
-		par.insertInset(par.size(), new InsetClearDoublePage, font, change);
 	} else if (token == "\\change_unchanged") {
 		change = Change(Change::UNCHANGED);
-	} else if (token == "\\change_inserted") {
-		lex.eatLine();
-		std::istringstream is(lex.getString());
-		unsigned int aid;
-		time_type ct;
-		is >> aid >> ct;
-		if (aid >= bp.author_map.size()) {
-			errorList.push_back(ErrorItem(_("Change tracking error"),
-					    bformat(_("Unknown author index for insertion: %1$d\n"), aid),
-					    par.id(), 0, par.size()));
-			change = Change(Change::UNCHANGED);
-		} else
-			change = Change(Change::INSERTED, bp.author_map[aid], ct);
-	} else if (token == "\\change_deleted") {
+	} else if (token == "\\change_inserted" || token == "\\change_deleted") {
 		lex.eatLine();
-		std::istringstream is(lex.getString());
-		unsigned int aid;
-		time_type ct;
+		istringstream is(lex.getString());
+		int aid;
+		time_t ct;
 		is >> aid >> ct;
-		if (aid >= bp.author_map.size()) {
-			errorList.push_back(ErrorItem(_("Change tracking error"),
-					    bformat(_("Unknown author index for deletion: %1$d\n"), aid),
-					    par.id(), 0, par.size()));
-			change = Change(Change::UNCHANGED);
-		} else
-			change = Change(Change::DELETED, bp.author_map[aid], ct);
+		BufferParams::AuthorMap const & am = bp.author_map_;
+		if (am.find(aid) == am.end()) {
+			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"),
@@ -288,7 +564,7 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 }
 
 
-void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
+void Text::readParagraph(Paragraph & par, Lexer & lex,
 	ErrorList & errorList)
 {
 	lex.nextToken();
@@ -297,7 +573,7 @@ void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
 	Change change(Change::UNCHANGED);
 
 	while (lex.isOK()) {
-		readParToken(buf, par, lex, token, font, change, errorList);
+		readParToken(par, lex, token, font, change, errorList);
 
 		lex.nextToken();
 		token = lex.getString();
@@ -310,14 +586,13 @@ void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
 			break;
 		}
 
-		LYXERR(Debug::PARSER) << "Handling paragraph token: `"
-				      << token << '\'' << endl;
+		LYXERR(Debug::PARSER, "Handling paragraph token: `" << token << '\'');
 		if (token == "\\begin_layout" || token == "\\end_document"
 		    || token == "\\end_inset" || token == "\\begin_deeper"
 		    || token == "\\end_deeper") {
 			lex.pushToken(token);
 			lyxerr << "Paragraph ended in line "
-			       << lex.getLineNo() << "\n"
+			       << lex.lineNumber() << "\n"
 			       << "Missing \\end_layout.\n";
 			break;
 		}
@@ -327,67 +602,204 @@ void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
 
 	// Initialize begin_of_body_ on load; redoParagraph maintains
 	par.setBeginOfBody();
+
+	// mark paragraph for spell checking on load
+	// par.requestSpellCheck();
 }
 
 
-} // namespace anon
+class TextCompletionList : public CompletionList
+{
+public:
+	///
+	TextCompletionList(Cursor const & cur, WordList const * list)
+		: buffer_(cur.buffer()), list_(list)
+	{}
+	///
+	virtual ~TextCompletionList() {}
+
+	///
+	virtual bool sorted() const { return true; }
+	///
+	virtual size_t size() const
+	{
+		return list_->size();
+	}
+	///
+	virtual docstring const & data(size_t idx) const
+	{
+		return list_->word(idx);
+	}
+
+private:
+	///
+	Buffer const * buffer_;
+	///
+	WordList const * list_;
+};
 
 
 bool Text::empty() const
 {
 	return pars_.empty() || (pars_.size() == 1 && pars_[0].empty()
-		// FIXME: Should we consider the labeled type as empty too? 
-		&& pars_[0].layout()->labeltype == LABEL_NO_LABEL);
+		// FIXME: Should we consider the labeled type as empty too?
+		&& pars_[0].layout().labeltype == LABEL_NO_LABEL);
 }
 
 
-double Text::spacing(Buffer const & buffer,
-		Paragraph const & par) const
+double Text::spacing(Paragraph const & par) const
 {
 	if (par.params().spacing().isDefault())
-		return buffer.params().spacing().getValue();
+		return owner_->buffer().params().spacing().getValue();
 	return par.params().spacing().getValue();
 }
 
 
+/**
+ * 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 current depth and layout when keep_layout == true
+ */
+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(lyx::next(pars.begin(), par_offset + 1),
+			    Paragraph());
+
+	Paragraph & par = pars[par_offset];
+
+	// remember to set the inset_owner
+	tmp->setInsetOwner(&par.inInset());
+	// without doing that we get a crash when typing <Return> at the
+	// end of a paragraph
+	tmp->setPlainOrDefaultLayout(bparams.documentClass());
+
+	if (keep_layout) {
+		tmp->setLayout(par.layout());
+		tmp->setLabelWidthString(par.params().labelWidthString());
+		tmp->params().depth(par.params().depth());
+	} else if (par.params().depth() > 0) {
+		Paragraph const & hook = pars[text.outerHook(par_offset)];
+		tmp->setLayout(hook.layout());
+		// not sure the line below is useful
+		tmp->setLabelWidthString(par.params().labelWidthString());
+		tmp->params().depth(hook.params().depth());
+	}
+
+	bool const isempty = (par.allowEmpty() && par.empty());
+
+	if (!isempty && (par.size() > pos || par.empty())) {
+		tmp->setLayout(par.layout());
+		tmp->params().align(par.params().align());
+		tmp->setLabelWidthString(par.params().labelWidthString());
+
+		tmp->params().depth(par.params().depth());
+		tmp->params().noindent(par.params().noindent());
+
+		// move everything behind the break position
+		// to the new paragraph
+
+		/* Note: if !keepempty, empty() == true, then we reach
+		 * here with size() == 0. So pos_end becomes - 1. This
+		 * doesn't cause problems because both loops below
+		 * enforce pos <= pos_end and 0 <= pos
+		 */
+		pos_type pos_end = par.size() - 1;
+
+		for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+			if (moveItem(par, pos, *tmp, j, bparams)) {
+				++j;
+			}
+		}
+	}
+
+	// Move over the end-of-par change information
+	tmp->setChange(tmp->size(), par.lookupChange(par.size()));
+	par.setChange(par.size(), Change(bparams.track_changes ?
+					   Change::INSERTED : Change::UNCHANGED));
+
+	if (pos) {
+		// Make sure that we keep the language when
+		// breaking paragraph.
+		if (tmp->empty()) {
+			Font changed = tmp->getFirstFontSettings(bparams);
+			Font const & old = par.getFontSettings(bparams, par.size());
+			changed.setLanguage(old.language());
+			tmp->setFont(0, changed);
+		}
+
+		return;
+	}
+
+	if (!isempty) {
+		bool const soa = par.params().startOfAppendix();
+		par.params().clear();
+		// do not lose start of appendix marker (bug 4212)
+		par.params().startOfAppendix(soa);
+		par.setPlainOrDefaultLayout(bparams.documentClass());
+	}
+
+	if (keep_layout) {
+		par.setLayout(tmp->layout());
+		par.setLabelWidthString(tmp->params().labelWidthString());
+		par.params().depth(tmp->params().depth());
+	}
+}
+
+
 void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 
 	Paragraph & cpar = cur.paragraph();
 	pit_type cpit = cur.pit();
 
-	TextClass const & tclass = cur.buffer().params().getTextClass();
-	LayoutPtr const & layout = cpar.layout();
+	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);
+			pit_type const prev = depthHook(cpit, cpar.getDepth());
+			docstring const & lay = pars_[prev].layout().name();
+			if (lay != layout.name())
+				setLayout(cur, lay);
+		} else {
+			docstring const & lay = cur.paragraph().usePlainLayout()
+			    ? tclass.plainLayoutName() : tclass.defaultLayoutName();
+			if (lay != layout.name())
+				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
-	bool sensitive = layout->labeltype == LABEL_SENSITIVE;
+	bool sensitive = layout.labeltype == LABEL_SENSITIVE;
 
 	// we need to set this before we insert the paragraph.
 	bool const isempty = cpar.allowEmpty() && cpar.empty();
 
-	lyx::breakParagraph(cur.buffer().params(), paragraphs(), cpit,
-			 cur.pos(), keep_layout);
+	lyx::breakParagraph(*this, cpit, cur.pos(), keep_layout);
 
 	// After this, neither paragraph contains any rows!
 
@@ -398,21 +810,22 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 	if (sensitive) {
 		if (cur.pos() == 0)
 			// set to standard-layout
+		//FIXME Check if this should be plainLayout() in some cases
 			pars_[cpit].applyLayout(tclass.defaultLayout());
 		else
 			// set to standard-layout
+			//FIXME Check if this should be plainLayout() in some cases
 			pars_[next_par].applyLayout(tclass.defaultLayout());
 	}
 
 	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
 	}
 
-	updateLabels(cur.buffer());
-
 	// 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!
@@ -423,21 +836,101 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 }
 
 
+// needed to insert the selection
+void Text::insertStringAsLines(Cursor & cur, docstring const & str,
+		Font const & font)
+{
+	BufferParams const & bparams = owner_->buffer().params();
+	pit_type pit = cur.pit();
+	pos_type pos = cur.pos();
+
+	// insert the string, don't insert doublespace
+	bool space_inserted = true;
+	for (docstring::const_iterator cit = str.begin();
+	    cit != str.end(); ++cit) {
+		Paragraph & par = pars_[pit];
+		if (*cit == '\n') {
+			if (inset().allowMultiPar() && (!par.empty() || par.allowEmpty())) {
+				lyx::breakParagraph(*this, pit, pos,
+					par.layout().isEnvironment());
+				++pit;
+				pos = 0;
+				space_inserted = true;
+			} else {
+				continue;
+			}
+		// 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.track_changes);
+				++pos;
+				space_inserted = true;
+			} else {
+				par.insertChar(pos, *cit, font, bparams.track_changes);
+				++pos;
+				space_inserted = true;
+			}
+		} else if (!isPrintable(*cit)) {
+			// Ignore unprintables
+			continue;
+		} else {
+			// just insert the character
+			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(Cursor & cur, docstring const & str,
+		Font const & font)
+{
+	docstring linestr = str;
+	bool newline_inserted = false;
+
+	for (string::size_type i = 0, siz = linestr.size(); i < siz; ++i) {
+		if (linestr[i] == '\n') {
+			if (newline_inserted) {
+				// we know that \r will be ignored by
+				// insertStringAsLines. Of course, it is a dirty
+				// trick, but it works...
+				linestr[i - 1] = '\r';
+				linestr[i] = '\n';
+			} else {
+				linestr[i] = ' ';
+				newline_inserted = true;
+			}
+		} else if (isPrintable(linestr[i])) {
+			newline_inserted = false;
+		}
+	}
+	insertStringAsLines(cur, linestr, font);
+}
+
+
 // insert a character, moves all the following breaks in the
 // same Paragraph one to the right and make a rebreak
 void Text::insertChar(Cursor & cur, char_type c)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 
 	cur.recordUndo(INSERT_UNDO);
 
 	TextMetrics const & tm = cur.bv().textMetrics(this);
-	Buffer const & buffer = cur.buffer();
+	Buffer const & buffer = *cur.buffer();
 	Paragraph & par = cur.paragraph();
 	// try to remove this
 	pit_type const pit = cur.pit();
 
-	bool const freeSpacing = par.layout()->free_spacing ||
+	bool const freeSpacing = par.layout().free_spacing ||
 		par.isFreeSpacing();
 
 	if (lyxrc.auto_number) {
@@ -445,16 +938,16 @@ void Text::insertChar(Cursor & cur, char_type c)
 		static docstring const number_unary_operators = from_ascii("+-");
 		static docstring const number_seperators = from_ascii(".,:");
 
-		if (cur.current_font.number() == Font::ON) {
-			if (!isDigit(c) && !contains(number_operators, c) &&
+		if (cur.current_font.fontInfo().number() == FONT_ON) {
+			if (!isDigitASCII(c) && !contains(number_operators, c) &&
 			    !(contains(number_seperators, c) &&
 			      cur.pos() != 0 &&
 			      cur.pos() != cur.lastpos() &&
-			      tm.getDisplayFont(pit, cur.pos()).number() == Font::ON &&
-			      tm.getDisplayFont(pit, cur.pos() - 1).number() == Font::ON)
+			      tm.displayFont(pit, cur.pos()).fontInfo().number() == FONT_ON &&
+			      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
 
@@ -463,14 +956,15 @@ 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(buffer, pit, cur.pos() - 1, cur.current_font,
+					setCharFont(pit, cur.pos() - 1, cur.current_font,
 						tm.font_);
 				} else if (contains(number_seperators, c)
 				     && cur.pos() >= 2
-				     && tm.getDisplayFont(pit, cur.pos() - 2).number() == Font::ON) {
-					setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+				     && tm.displayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) {
+					setCharFont(pit, cur.pos() - 1, cur.current_font,
 						tm.font_);
 				}
 			}
@@ -478,49 +972,49 @@ 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.getDisplayFont(cur.pit(), cur.pos() - 2);
+		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();
 
-			Font space_font = tm.getDisplayFont(cur.pit(), cur.pos() - 1);
+			Font space_font = tm.displayFont(cur.pit(), cur.pos() - 1);
 			space_font.setLanguage(lang);
 			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
@@ -531,46 +1025,75 @@ 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;
 		}
-		BOOST_ASSERT(cur.pos() > 0);
+		// 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);
-	checkBufferStructure(cur.buffer(), cur);
+	// 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.real_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--;
+		}
+	}
+
+	par.insertChar(pos, c, cur.current_font,
+		cur.buffer()->params().track_changes);
+	cur.checkBufferStructure();
 
-//		cur.updateFlags(Update::Force);
-	setCursor(cur.top(), cur.pit(), cur.pos() + 1);
+//		cur.screenUpdateFlags(Update::Force);
+	bool boundary = cur.boundary()
+		|| tm.isRTLBoundary(cur.pit(), pos + 1);
+	setCursor(cur, cur.pit(), pos + 1, false, boundary);
 	charInserted(cur);
 }
 
 
 void Text::charInserted(Cursor & cur)
 {
-	// Here we call finishUndo for every 20 characters inserted.
-	// This is from my experience how emacs does it. (Lgb)
-	static unsigned int counter;
-	if (counter < 20) {
-		++counter;
-	} else {
-		cur.finishUndo();
-		counter = 0;
+	Paragraph & par = cur.paragraph();
+
+	// 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
+		LBUFERR(this == cur.text());
+		cur.paragraph().updateWords();
 	}
 }
 
@@ -578,61 +1101,212 @@ void Text::charInserted(Cursor & cur)
 // the cursor set functions have a special mechanism. When they
 // realize, that you left an empty paragraph, they will delete it.
 
-bool Text::cursorRightOneWord(Cursor & cur)
+bool Text::cursorForwardOneWord(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
+
+	pos_type const lastpos = cur.lastpos();
+	pit_type pit = cur.pit();
+	pos_type pos = cur.pos();
+	Paragraph const & par = cur.paragraph();
+
+	// Paragraph boundary is a word boundary
+	if (pos == lastpos || (pos + 1 == lastpos && par.isEnvSeparator(pos))) {
+		if (pit != cur.lastpit())
+			return setCursor(cur, pit + 1, 0);
+		else
+			return false;
+	}
 
-	Cursor old = cur;
+	if (lyxrc.mac_like_cursor_movement) {
+		// Skip through trailing punctuation and spaces.
+		while (pos != lastpos && (par.isChar(pos) || par.isSpace(pos)))
+			++pos;
 
-	if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) {
-		++old.pit();
-		old.pos() = 0;
+		// Skip over either a non-char inset or a full word
+		if (pos != lastpos && par.isWordSeparator(pos))
+			++pos;
+		else while (pos != lastpos && !par.isWordSeparator(pos))
+			     ++pos;
 	} else {
-		// Advance through word.
-		while (old.pos() != old.lastpos() && old.paragraph().isLetter(old.pos()))
-			++old.pos();
-		// Skip through trailing nonword stuff.
-		while (old.pos() != old.lastpos() && !old.paragraph().isLetter(old.pos()))
-			++old.pos();
+		LASSERT(pos < lastpos, return false); // see above
+		if (!par.isWordSeparator(pos))
+			while (pos != lastpos && !par.isWordSeparator(pos))
+				++pos;
+		else if (par.isChar(pos))
+			while (pos != lastpos && par.isChar(pos))
+				++pos;
+		else if (!par.isSpace(pos)) // non-char inset
+			++pos;
+
+		// Skip over white space
+		while (pos != lastpos && par.isSpace(pos))
+			     ++pos;
 	}
-	return setCursor(cur, old.pit(), old.pos());
+
+	// Don't skip a separator inset at the end of a paragraph
+	if (pos == lastpos && pos && par.isEnvSeparator(pos - 1))
+		--pos;
+
+	return setCursor(cur, pit, pos);
 }
 
 
-bool Text::cursorLeftOneWord(Cursor & cur)
+bool Text::cursorBackwardOneWord(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 
-	Cursor old = cur;
+	pit_type pit = cur.pit();
+	pos_type pos = cur.pos();
+	Paragraph & par = cur.paragraph();
 
-	if (old.pos() == 0 && old.pit() != 0) {
-		--old.pit();
-		old.pos() = old.lastpos();
+	// Paragraph boundary is a word boundary
+	if (pos == 0 && pit != 0) {
+		Paragraph & prevpar = getPar(pit - 1);
+		pos = prevpar.size();
+		// Don't stop after an environment separator
+		if (pos && prevpar.isEnvSeparator(pos - 1))
+			--pos;
+		return setCursor(cur, pit - 1, pos);
+	}
+
+	if (lyxrc.mac_like_cursor_movement) {
+		// Skip through punctuation and spaces.
+		while (pos != 0 && (par.isChar(pos - 1) || par.isSpace(pos - 1)))
+			--pos;
+
+		// Skip over either a non-char inset or a full word
+		if (pos != 0 && par.isWordSeparator(pos - 1) && !par.isChar(pos - 1))
+			--pos;
+		else while (pos != 0 && !par.isWordSeparator(pos - 1))
+			     --pos;
 	} else {
-		// Skip through initial nonword stuff.
-		while (old.pos() != 0 && !old.paragraph().isLetter(old.pos() - 1))
-			--old.pos();
-		// Advance through word.
-		while (old.pos() != 0 && old.paragraph().isLetter(old.pos() - 1))
-			--old.pos();
+		// Skip over white space
+		while (pos != 0 && par.isSpace(pos - 1))
+			     --pos;
+
+		if (pos != 0 && !par.isWordSeparator(pos - 1))
+			while (pos != 0 && !par.isWordSeparator(pos - 1))
+				--pos;
+		else if (pos != 0 && par.isChar(pos - 1))
+			while (pos != 0 && par.isChar(pos - 1))
+				--pos;
+		else if (pos != 0 && !par.isSpace(pos - 1)) // non-char inset
+			--pos;
+	}
+
+	return setCursor(cur, pit, pos);
+}
+
+
+bool Text::cursorVisLeftOneWord(Cursor & cur)
+{
+	LBUFERR(this == cur.text());
+
+	pos_type left_pos, right_pos;
+
+	Cursor temp_cur = cur;
+
+	// always try to move at least once...
+	while (temp_cur.posVisLeft(true /* skip_inset */)) {
+
+		// collect some information about current cursor position
+		temp_cur.getSurroundingPos(left_pos, right_pos);
+		bool left_is_letter =
+			(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
+		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
+		if (left_is_letter == right_is_letter)
+			continue;
+
+		// 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(), left_pos).isRightToLeft())
+			|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
+				temp_cur.buffer()->params(), right_pos).isRightToLeft()))
+			break;
 	}
-	return setCursor(cur, old.pit(), old.pos());
+
+	return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
+					 true, temp_cur.boundary());
+}
+
+
+bool Text::cursorVisRightOneWord(Cursor & cur)
+{
+	LBUFERR(this == cur.text());
+
+	pos_type left_pos, right_pos;
+
+	Cursor temp_cur = cur;
+
+	// always try to move at least once...
+	while (temp_cur.posVisRight(true /* skip_inset */)) {
+
+		// collect some information about current cursor position
+		temp_cur.getSurroundingPos(left_pos, right_pos);
+		bool left_is_letter =
+			(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
+		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
+		if (left_is_letter == right_is_letter)
+			continue;
+
+		// 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(),
+				left_pos).isRightToLeft())
+			|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
+				temp_cur.buffer()->params(),
+				right_pos).isRightToLeft()))
+			break;
+	}
+
+	return setCursor(cur, temp_cur.pit(), temp_cur.pos(),
+					 true, temp_cur.boundary());
 }
 
 
 void Text::selectWord(Cursor & cur, word_location loc)
 {
-	BOOST_ASSERT(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());
 	if (to == from)
 		return;
-	cur.resetAnchor();
+	if (!cur.selection())
+		cur.resetAnchor();
 	setCursor(cur, to.pit(), to.pos());
 	cur.setSelection();
+	cur.setWordSelection(true);
+}
+
+
+void Text::selectAll(Cursor & cur)
+{
+	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);
+	} else {
+		setCursor(cur, 0, 0);
+		cur.resetAnchor();
+		setCursor(cur, cur.lastpit(), getPar(cur.lastpit()).size());
+	}
+	cur.setSelection();
 }
 
 
@@ -640,7 +1314,7 @@ void Text::selectWord(Cursor & cur, word_location loc)
 // selection is currently set
 bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 	if (cur.selection())
 		return false;
 	selectWord(cur, loc);
@@ -650,10 +1324,12 @@ bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
 
 void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 
-	if (!cur.selection())
-		return;
+	if (!cur.selection()) {
+		if (!selectChange(cur))
+			return;
+	}
 
 	cur.recordUndoSelection();
 
@@ -667,7 +1343,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();
 
@@ -687,10 +1362,14 @@ 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(cur.buffer().params(), left, right);
+			pars_[pit].acceptChanges(left, right);
 		} else {
-			pars_[pit].rejectChanges(cur.buffer().params(), left, right);
+			pars_[pit].rejectChanges(left, right);
 		}
 	}
 
@@ -717,7 +1396,7 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 					// instead, we mark it unchanged
 					pars_[pit].setChange(pos, Change(Change::UNCHANGED));
 				} else {
-					mergeParagraph(cur.buffer().params(), pars_, pit);
+					mergeParagraph(cur.buffer()->params(), pars_, pit);
 					--endPit;
 					--pit;
 				}
@@ -730,7 +1409,7 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 					// we mark the par break at the end of the last paragraph unchanged
 					pars_[pit].setChange(pos, Change(Change::UNCHANGED));
 				} else {
-					mergeParagraph(cur.buffer().params(), pars_, pit);
+					mergeParagraph(cur.buffer()->params(), pars_, pit);
 					--endPit;
 					--pit;
 				}
@@ -739,35 +1418,34 @@ 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);
-	updateLabels(cur.buffer());
+	cur.screenUpdateFlags(Update::Force);
+	cur.forceBufferUpdate();
 }
 
 
-void Text::acceptChanges(BufferParams const & bparams)
+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);
 }
 
 
-void Text::rejectChanges(BufferParams const & bparams)
+void Text::rejectChanges()
 {
+	BufferParams const & bparams = owner_->buffer().params();
 	pit_type pars_size = static_cast<pit_type>(pars_.size());
 
 	// first, 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].rejectChanges(bparams, 0, pars_[pit].size());
+			pars_[pit].rejectChanges(0, pars_[pit].size());
 	}
 
 	// next, reject imaginary end-of-par characters
@@ -790,56 +1468,57 @@ void Text::rejectChanges(BufferParams const & bparams)
 	}
 
 	// finally, invoke the DEPM
-	deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.trackChanges);
+	deleteEmptyParagraphMechanism(0, pars_size - 1, bparams.track_changes);
 }
 
 
 void Text::deleteWordForward(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 	if (cur.lastpos() == 0)
 		cursorForward(cur);
 	else {
 		cur.resetAnchor();
-		cur.selection() = true;
-		cursorRightOneWord(cur);
+		cur.setSelection(true);
+		cursorForwardOneWord(cur);
 		cur.setSelection();
 		cutSelection(cur, true, false);
-		checkBufferStructure(cur.buffer(), cur);
+		cur.checkBufferStructure();
 	}
 }
 
 
 void Text::deleteWordBackward(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 	if (cur.lastpos() == 0)
 		cursorBackward(cur);
 	else {
 		cur.resetAnchor();
-		cur.selection() = true;
-		cursorLeftOneWord(cur);
+		cur.setSelection(true);
+		cursorBackwardOneWord(cur);
 		cur.setSelection();
 		cutSelection(cur, true, false);
-		checkBufferStructure(cur.buffer(), cur);
+		cur.checkBufferStructure();
 	}
 }
 
 
 // Kill to end of line.
-void Text::changeCase(Cursor & cur, Text::TextCase action)
+void Text::changeCase(Cursor & cur, TextCase action, bool partial)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 	CursorSlice from;
 	CursorSlice to;
 
-	if (cur.selection()) {
+	bool const gotsel = cur.selection();
+	if (gotsel) {
 		from = cur.selBegin();
 		to = cur.selEnd();
 	} else {
 		from = cur.top();
-		getWord(from, to, PARTIAL_WORD);
-		cursorRightOneWord(cur);
+		getWord(from, to, partial ? PARTIAL_WORD : WHOLE_WORD);
+		cursorForwardOneWord(cur);
 	}
 
 	cur.recordUndoSelection();
@@ -850,120 +1529,66 @@ void Text::changeCase(Cursor & cur, Text::TextCase action)
 	pos_type begPos = from.pos();
 	pos_type endPos = to.pos();
 
-	bool const trackChanges = cur.buffer().params().trackChanges;
-
 	pos_type right = 0; // needed after the for loop
 
 	for (pit_type pit = begPit; pit <= endPit; ++pit) {
 		Paragraph & par = pars_[pit];
-		pos_type parSize = par.size();
-
-		pos_type pos = (pit == begPit ? begPos : 0);
-		right = (pit == endPit ? endPos : parSize);
-
-		// process sequences of modified characters; in change
-		// tracking mode, this approach results in much better
-		// usability than changing case on a char-by-char basis
-		docstring changes;
-
-		bool capitalize = true;
-
-		for (; pos < right; ++pos) {
-			char_type oldChar = par.getChar(pos);
-			char_type newChar = oldChar;
-
-			// ignore insets and don't play with deleted text!
-			if (par.isInset(pos) && !par.isDeleted(pos)) {
-				switch (action) {
-				case text_lowercase:
-					newChar = lowercase(oldChar);
-					break;
-				case text_capitalization:
-					if (capitalize) {
-						newChar = uppercase(oldChar);
-						capitalize = false;
-					}
-					break;
-				case text_uppercase:
-					newChar = uppercase(oldChar);
-					break;
-				}
-			}
-
-			if (!par.isLetter(pos) || par.isDeleted(pos)) {
-				capitalize = true; // permit capitalization again
-			}
-
-			if (oldChar != newChar) {
-				changes += newChar;
-			}
-
-			if (oldChar == newChar || pos == right - 1) {
-				if (oldChar != newChar) {
-					pos++; // step behind the changing area
-				}
-				int erasePos = pos - changes.size();
-				for (size_t i = 0; i < changes.size(); i++) {
-					par.insertChar(pos, changes[i],
-						par.getFontSettings(cur.buffer().params(),
-								erasePos),
-						trackChanges);
-					if (!par.eraseChar(erasePos, trackChanges)) {
-						++erasePos;
-						++pos; // advance
-						++right; // expand selection
-					}
-				}
-				changes.clear();
-			}
-		}
+		pos_type const pos = (pit == begPit ? begPos : 0);
+		right = (pit == endPit ? endPos : par.size());
+		par.changeCase(cur.buffer()->params(), pos, right, action);
 	}
 
 	// the selection may have changed due to logically-only deleted chars
-	setCursor(cur, begPit, begPos);
-	cur.resetAnchor();
-	setCursor(cur, endPit, right);
-	cur.setSelection();
+	if (gotsel) {
+		setCursor(cur, begPit, begPos);
+		cur.resetAnchor();
+		setCursor(cur, endPit, right);
+		cur.setSelection();
+	} else
+		setCursor(cur, endPit, right);
 
-	checkBufferStructure(cur.buffer(), cur);
+	cur.checkBufferStructure();
 }
 
 
 bool Text::handleBibitems(Cursor & cur)
 {
-	if (cur.paragraph().layout()->labeltype != LABEL_BIBLIO)
+	if (cur.paragraph().layout().labeltype != LABEL_BIBLIO)
+		return false;
+
+	if (cur.pos() != 0)
 		return false;
+
+	BufferParams const & bufparams = cur.buffer()->params();
+	Paragraph const & par = cur.paragraph();
+	Cursor prevcur = cur;
+	if (cur.pit() > 0) {
+		--prevcur.pit();
+		prevcur.pos() = prevcur.lastpos();
+	}
+	Paragraph const & prevpar = prevcur.paragraph();
+
 	// if a bibitem is deleted, merge with previous paragraph
 	// if this is a bibliography item as well
-	if (cur.pos() == 0) {
-		BufferParams const & bufparams = cur.buffer().params();
-		Paragraph const & par = cur.paragraph();
-		Cursor prevcur = cur;
-		if (cur.pit() > 0) {
-			--prevcur.pit();
-			prevcur.pos() = prevcur.lastpos();
-		}
-		Paragraph const & prevpar = prevcur.paragraph();
-		if (cur.pit() > 0 && par.layout() == prevpar.layout()) {
-			cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
-			mergeParagraph(bufparams, cur.text()->paragraphs(),
-				       prevcur.pit());
-			updateLabels(cur.buffer());
-			setCursorIntern(cur, prevcur.pit(), prevcur.pos());
-			cur.updateFlags(Update::Force);
-		// if not, reset the paragraph to default
-		} else
-			cur.paragraph().layout(
-				bufparams.getTextClass().defaultLayout());
+	if (cur.pit() > 0 && par.layout() == prevpar.layout()) {
+		cur.recordUndo(prevcur.pit());
+		mergeParagraph(bufparams, cur.text()->paragraphs(),
+							prevcur.pit());
+		cur.forceBufferUpdate();
+		setCursorIntern(cur, prevcur.pit(), prevcur.pos());
+		cur.screenUpdateFlags(Update::Force);
 		return true;
 	}
-	return false;
+
+	// otherwise reset to default
+	cur.paragraph().setPlainOrDefaultLayout(bufparams.documentClass());
+	return true;
 }
 
 
 bool Text::erase(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), return false);
 	bool needsUpdate = false;
 	Paragraph & par = cur.paragraph();
 
@@ -971,17 +1596,22 @@ bool Text::erase(Cursor & cur)
 		// this is the code for a normal delete, not pasting
 		// any paragraphs
 		cur.recordUndo(DELETE_UNDO);
-		if(!par.eraseChar(cur.pos(), cur.buffer().params().trackChanges)) {
+		bool const was_inset = cur.paragraph().isInset(cur.pos());
+		if(!par.eraseChar(cur.pos(), cur.buffer()->params().track_changes))
 			// the character has been logically deleted only => skip it
 			cur.top().forwardPos();
-		}
-		checkBufferStructure(cur.buffer(), cur);
+
+		if (was_inset)
+			cur.forceBufferUpdate();
+		else
+			cur.checkBufferStructure();
 		needsUpdate = true;
 	} else {
 		if (cur.pit() == cur.lastpit())
 			return dissolveInset(cur);
 
-		if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
+		if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
+			cur.recordUndo(DELETE_UNDO);
 			par.setChange(cur.pos(), Change(Change::DELETED));
 			cur.forwardPos();
 			needsUpdate = true;
@@ -997,7 +1627,7 @@ bool Text::erase(Cursor & cur)
 		// Make sure the cursor is correct. Is this really needed?
 		// No, not really... at least not here!
 		cur.text()->setCursor(cur.top(), cur.pit(), cur.pos());
-		checkBufferStructure(cur.buffer(), cur);
+		cur.checkBufferStructure();
 	}
 
 	return needsUpdate;
@@ -1006,14 +1636,14 @@ bool Text::erase(Cursor & cur)
 
 bool Text::backspacePos0(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 	if (cur.pit() == 0)
 		return false;
 
 	bool needsUpdate = false;
 
-	BufferParams const & bufparams = cur.buffer().params();
-	TextClass const & tclass = bufparams.getTextClass();
+	BufferParams const & bufparams = cur.buffer()->params();
+	DocumentClass const & tclass = bufparams.documentClass();
 	ParagraphList & plist = cur.text()->paragraphs();
 	Paragraph const & par = cur.paragraph();
 	Cursor prevcur = cur;
@@ -1024,30 +1654,32 @@ 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
 	// layouts. I think it is a real bug of all other
 	// word processors to allow it. It confuses the user.
 	// Correction: Pasting is always allowed with standard-layout
+	// or the empty layout.
 	else if (par.layout() == prevpar.layout()
-		 || par.layout() == tclass.defaultLayout()) {
-		cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
+		 || tclass.isDefaultLayout(par.layout())
+		 || tclass.isPlainLayout(par.layout())) {
+		cur.recordUndo(prevcur.pit());
 		mergeParagraph(bufparams, plist, prevcur.pit());
 		needsUpdate = true;
 	}
 
 	if (needsUpdate) {
-		updateLabels(cur.buffer());
+		cur.forceBufferUpdate();
 		setCursorIntern(cur, prevcur.pit(), prevcur.pos());
 	}
 
@@ -1057,17 +1689,19 @@ bool Text::backspacePos0(Cursor & cur)
 
 bool Text::backspace(Cursor & cur)
 {
-	BOOST_ASSERT(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
@@ -1084,8 +1718,12 @@ bool Text::backspace(Cursor & cur)
 		// without the dreaded mechanism. (JMarc)
 		setCursorIntern(cur, cur.pit(), cur.pos() - 1,
 				false, cur.boundary());
-		cur.paragraph().eraseChar(cur.pos(), cur.buffer().params().trackChanges);
-		checkBufferStructure(cur.buffer(), cur);
+		bool const was_inset = cur.paragraph().isInset(cur.pos());
+		cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().track_changes);
+		if (was_inset)
+			cur.forceBufferUpdate();
+		else
+			cur.checkBufferStructure();
 	}
 
 	if (cur.pos() == cur.lastpos())
@@ -1094,20 +1732,22 @@ 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;
 }
 
 
-bool Text::dissolveInset(Cursor & cur) {
-	BOOST_ASSERT(this == cur.text());
+bool Text::dissolveInset(Cursor & cur)
+{
+	LASSERT(this == cur.text(), return false);
 
-	if (isMainText(cur.bv().buffer()) || cur.inset().nargs() != 1)
+	if (isMainText() || cur.inset().nargs() != 1)
 		return false;
 
 	cur.recordUndoInset();
+	cur.setMark(false);
 	cur.selHandle(false);
 	// save position
 	pos_type spos = cur.pos();
@@ -1115,28 +1755,43 @@ bool Text::dissolveInset(Cursor & cur) {
 	ParagraphList plist;
 	if (cur.lastpit() != 0 || cur.lastpos() != 0)
 		plist = paragraphs();
-	cur.popLeft();
+	cur.popBackward();
 	// store cursor offset
 	if (spit == 0)
 		spos += cur.pos();
 	spit += cur.pit();
-	Buffer & b = cur.buffer();
-	cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+	Buffer & b = *cur.buffer();
+	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().getTextClassPtr(),
+		pasteParagraphList(cur, plist, b.params().documentClassPtr(),
 				   b.errorList("Paste"));
 		// restore position
-		cur.pit() = std::min(cur.lastpit(), spit);
-		cur.pos() = std::min(cur.lastpos(), spos);
+		cur.pit() = min(cur.lastpit(), spit);
+		cur.pos() = min(cur.lastpos(), spos);
 	}
+
+	cur.forceBufferUpdate();
+
+	// Ensure the current language is set correctly (bug 6292)
+	cur.text()->setCursor(cur, cur.pit(), cur.pos());
 	cur.clearSelection();
 	cur.resetAnchor();
 	return true;
@@ -1144,52 +1799,21 @@ bool Text::dissolveInset(Cursor & cur) {
 
 
 void Text::getWord(CursorSlice & from, CursorSlice & to,
-	word_location const loc)
+	word_location const loc) const
 {
-	Paragraph const & from_par = pars_[from.pit()];
-	switch (loc) {
-	case WHOLE_WORD_STRICT:
-		if (from.pos() == 0 || from.pos() == from_par.size()
-		    || !from_par.isLetter(from.pos())
-		    || !from_par.isLetter(from.pos() - 1)) {
-			to = from;
-			return;
-		}
-		// no break here, we go to the next
-
-	case WHOLE_WORD:
-		// If we are already at the beginning of a word, do nothing
-		if (!from.pos() || !from_par.isLetter(from.pos() - 1))
-			break;
-		// no break here, we go to the next
-
-	case PREVIOUS_WORD:
-		// always move the cursor to the beginning of previous word
-		while (from.pos() && from_par.isLetter(from.pos() - 1))
-			--from.pos();
-		break;
-	case NEXT_WORD:
-		lyxerr << "Text::getWord: NEXT_WORD not implemented yet"
-		       << endl;
-		break;
-	case PARTIAL_WORD:
-		// no need to move the 'from' cursor
-		break;
-	}
 	to = from;
-	Paragraph & to_par = pars_[to.pit()];
-	while (to.pos() < to_par.size() && to_par.isLetter(to.pos()))
-		++to.pos();
+	pars_[to.pit()].locateWord(from.pos(), to.pos(), loc);
 }
 
 
-void Text::write(Buffer const & buf, std::ostream & os) const
+void Text::write(ostream & os) const
 {
+	Buffer const & buf = owner_->buffer();
 	ParagraphList::const_iterator pit = paragraphs().begin();
 	ParagraphList::const_iterator end = paragraphs().end();
 	depth_type dth = 0;
 	for (; pit != end; ++pit)
-		pit->write(buf, os, buf.params(), dth);
+		pit->write(os, buf.params(), dth);
 
 	// Close begin_deeper
 	for(; dth > 0; --dth)
@@ -1197,9 +1821,12 @@ void Text::write(Buffer const & buf, std::ostream & os) const
 }
 
 
-bool Text::read(Buffer const & buf, Lexer & lex, ErrorList & errorList)
+bool Text::read(Lexer & lex,
+		ErrorList & errorList, InsetText * insetPtr)
 {
+	Buffer const & buf = owner_->buffer();
 	depth_type depth = 0;
+	bool res = true;
 
 	while (lex.isOK()) {
 		lex.nextToken();
@@ -1217,65 +1844,76 @@ bool Text::read(Buffer const & buf, Lexer & lex, ErrorList & errorList)
 		if (token == "\\begin_body")
 			continue;
 
-		if (token == "\\end_document")
-			return false;
+		if (token == "\\end_document") {
+			res = false;
+			break;
+		}
 
 		if (token == "\\begin_layout") {
 			lex.pushToken(token);
 
 			Paragraph par;
+			par.setInsetOwner(insetPtr);
 			par.params().depth(depth);
-			par.setFont(0, Font(Font::ALL_INHERIT, buf.params().language));
+			par.setFont(0, Font(inherit_font, buf.params().language));
 			pars_.push_back(par);
+			readParagraph(pars_.back(), lex, errorList);
 
-			// FIXME: goddamn InsetTabular makes us pass a Buffer
-			// not BufferParams
-			lyx::readParagraph(buf, pars_.back(), lex, errorList);
-
+			// register the words in the global word list
+			pars_.back().updateWords();
 		} else if (token == "\\begin_deeper") {
 			++depth;
 		} else if (token == "\\end_deeper") {
-			if (!depth) {
+			if (!depth)
 				lex.printError("\\end_deeper: " "depth is already null");
-			} else {
+			else
 				--depth;
-			}
 		} else {
-			lyxerr << "Handling unknown body token: `"
-			       << token << '\'' << endl;
+			LYXERR0("Handling unknown body token: `" << token << '\'');
 		}
 	}
-	return true;
+
+	// avoid a crash on weird documents (bug 4859)
+	if (pars_.empty()) {
+		Paragraph par;
+		par.setInsetOwner(insetPtr);
+		par.params().depth(depth);
+		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 & cur)
+docstring Text::currentState(Cursor const & cur) const
 {
-	BOOST_ASSERT(this == cur.text());
-	Buffer & buf = cur.buffer();
+	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());
 
-	if (change.type != Change::UNCHANGED) {
-		Author const & a = buf.params().authors().get(change.author);
-		os << _("Change: ") << a.name();
-		if (!a.email().empty())
-			os << " (" << a.email() << ")";
-		// FIXME ctime is english, we should translate that
-		os << _(" at ") << ctime(&change.changetime);
-		os << " : ";
+	if (change.changed()) {
+		docstring const author =
+			buf.params().authors().get(change.author).nameAndEmail();
+		docstring const date = formatted_datetime(change.changetime);
+		os << bformat(_("Changed by %1$s[[author]] on %2$s[[date]]. "),
+		              author, date);
 	}
 
 	// I think we should only show changes from the default
 	// font. (Asger)
 	// No, from the document font (MV)
 	Font font = cur.real_current_font;
-	font.reduce(buf.params().getFont());
+	font.fontInfo().reduce(buf.params().getFont().fontInfo());
 
 	os << bformat(_("Font: %1$s"), font.stateText(&buf.params()));
 
@@ -1318,7 +1956,7 @@ docstring Text::currentState(Cursor & cur)
 	if (!par.empty() && cur.pos() < par.size()) {
 		// Force output of code point, not character
 		size_t const c = par.getChar(cur.pos());
-		os << _(", Char: 0x") << std::hex << c;
+		os << _(", Char: 0x") << hex << c;
 	}
 	os << _(", Boundary: ") << cur.boundary();
 //	Row & row = cur.textRow();
@@ -1328,15 +1966,19 @@ docstring Text::currentState(Cursor & cur)
 }
 
 
-docstring Text::getPossibleLabel(Cursor & cur) const
+docstring Text::getPossibleLabel(Cursor const & cur) const
 {
 	pit_type pit = cur.pit();
 
-	LayoutPtr layout = pars_[pit].layout();
+	Layout const * layout = &(pars_[pit].layout());
 
 	docstring text;
-	docstring par_text = pars_[pit].asString(cur.buffer(), false);
-	for (int i = 0; i < lyxrc.label_init_length; ++i) {
+	docstring par_text = pars_[pit].asString();
+
+	// The return string of math matrices might contain linebreaks
+	par_text = subst(par_text, '\n', '-');
+	int const numwords = 3;
+	for (int i = 0; i < numwords; ++i) {
 		if (par_text.empty())
 			break;
 		docstring head;
@@ -1347,64 +1989,102 @@ docstring Text::getPossibleLabel(Cursor & 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...
 	if (layout->latextype == LATEX_PARAGRAPH && pit != 0) {
-		LayoutPtr const & layout2 = pars_[pit - 1].layout();
+		Layout const * layout2 = &(pars_[pit - 1].layout());
 		if (layout2->latextype != LATEX_PARAGRAPH) {
 			--pit;
 			layout = layout2;
 		}
 	}
 	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 (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));
+	}
 
-	// If none of the above worked, we'll see if we're inside various
-	// types of insets and take our abbreviation from them.
+	// If none of the above worked, see if the inset knows.
 	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;
-			}
+		InsetLayout const & il = cur.inset().getLayout();
+		name = il.refprefix();
+	}
+
+	if (!name.empty())
+		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 label;
+}
+
+
+docstring Text::asString(int options) const
+{
+	return asString(0, pars_.size(), options);
+}
+
+
+docstring Text::asString(pit_type beg, pit_type end, int options) const
+{
+	size_t i = size_t(beg);
+	docstring str = pars_[i].asString(options);
+	for (++i; i != size_t(end); ++i) {
+		str += '\n';
+		str += pars_[i].asString(options);
 	}
+	return str;
+}
 
-	// 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 (!name.empty())
-		text = name.substr(0, 3) + ':' + text;
+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' ';	
+}
+
 
-	return text;
+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)
 {
-	BOOST_ASSERT(this == cur.text());
+	LBUFERR(this == cur.text());
 
 	pos_type pos = cur.pos();
 
@@ -1434,17 +2114,17 @@ void Text::charsTranspose(Cursor & cur)
 		return;
 
 	// Store the characters to be transposed (including font information).
-	char_type char1 = par.getChar(pos1);
+	char_type const char1 = par.getChar(pos1);
 	Font const font1 =
-		par.getFontSettings(cur.buffer().params(), pos1);
+		par.getFontSettings(cur.buffer()->params(), pos1);
 
-	char_type char2 = par.getChar(pos2);
+	char_type const char2 = par.getChar(pos2);
 	Font const font2 =
-		par.getFontSettings(cur.buffer().params(), pos2);
+		par.getFontSettings(cur.buffer()->params(), pos2);
 
 	// 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();
 
@@ -1453,7 +2133,7 @@ void Text::charsTranspose(Cursor & cur)
 	par.insertChar(pos1, char2, font2, trackChanges);
 	par.insertChar(pos2, char1, font1, trackChanges);
 
-	checkBufferStructure(cur.buffer(), cur);
+	cur.checkBufferStructure();
 
 	// After the transposition, move cursor to after the transposition.
 	setCursor(cur, cur.pit(), pos2);
@@ -1461,4 +2141,61 @@ void Text::charsTranspose(Cursor & cur)
 }
 
 
+DocIterator Text::macrocontextPosition() const
+{
+	return macrocontext_position_;
+}
+
+
+void Text::setMacrocontextPosition(DocIterator const & pos)
+{
+	macrocontext_position_ = pos;
+}
+
+
+docstring Text::previousWord(CursorSlice const & sl) const
+{
+	CursorSlice from = sl;
+	CursorSlice to = sl;
+	getWord(from, to, PREVIOUS_WORD);
+	if (sl == from || to == from)
+		return docstring();
+
+	Paragraph const & par = sl.paragraph();
+	return par.asString(from.pos(), to.pos());
+}
+
+
+bool Text::completionSupported(Cursor const & cur) const
+{
+	Paragraph const & par = cur.paragraph();
+	return cur.pos() > 0
+		&& (cur.pos() >= par.size() || par.isWordSeparator(cur.pos()))
+		&& !par.isWordSeparator(cur.pos() - 1);
+}
+
+
+CompletionList const * Text::createCompletionList(Cursor const & cur) const
+{
+	WordList const * list = theWordList(cur.getFont().language()->lang());
+	return new TextCompletionList(cur, list);
+}
+
+
+bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/)
+{
+	LBUFERR(cur.bv().cursor() == cur);
+	cur.insert(s);
+	cur.bv().cursor() = cur;
+	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());
+}
+
 } // namespace lyx