X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=483f945e039e7eb145b5d1660a42753e011f8405;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=86fd90360e10d033ae32311c45cfe3ababe7bc68;hpb=a6325095c4ab830a8ebb3b176313b200ebde1dab;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 86fd90360e..483f945e03 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -30,6 +30,7 @@
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
+#include "Encoding.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "factory.h"
@@ -65,38 +66,14 @@
 #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/unique_ptr.h"
 
-#include <boost/next_prior.hpp>
-
-#include <limits>
 #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;
 
@@ -133,17 +110,17 @@ static bool moveItem(Paragraph & fromPar, pos_type fromPos,
 
 
 void breakParagraphConservative(BufferParams const & bparams,
-	ParagraphList & pars, pit_type par_offset, pos_type pos)
+	ParagraphList & pars, pit_type pit, 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(), pit + 1),
 				       Paragraph());
-	Paragraph & par = pars[par_offset];
+	Paragraph & par = pars[pit];
 
 	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
@@ -156,7 +133,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));
 	}
 }
@@ -192,12 +169,12 @@ 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));
 }
 
 
 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();
@@ -211,9 +188,8 @@ 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_)
 {
-	pars_ = text.pars_;
 	ParagraphList::iterator const end = pars_.end();
 	ParagraphList::iterator it = pars_.begin();
 	for (; it != end; ++it)
@@ -264,6 +240,21 @@ bool Text::isFirstInSequence(pit_type par_offset) const
 }
 
 
+pit_type Text::lastInSequence(pit_type pit) const
+{
+	depth_type const depth = pars_[pit].getDepth();
+	pit_type newpit = pit;
+
+	while (size_t(newpit + 1) < pars_.size() &&
+	       (pars_[newpit + 1].getDepth() > depth ||
+	        (pars_[newpit + 1].getDepth() == depth &&
+	         pars_[newpit + 1].layout() == pars_[pit].layout())))
+		++newpit;
+
+	return newpit;
+}
+
+
 int Text::getTocLevel(pit_type par_offset) const
 {
 	Paragraph const & par = pars_[par_offset];
@@ -361,7 +352,7 @@ 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();
@@ -383,10 +374,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();
@@ -400,8 +391,8 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 		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()));
+			errorList.push_back(ErrorItem(_("Layout Not Found"), s,
+			                              {par.id(), 0}, {par.id(), -1}));
 		}
 
 		par.setLayout(bp.documentClass()[layoutname]);
@@ -427,7 +418,7 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 			lex.eatLine();
 			docstring line = lex.getDocString();
 			errorList.push_back(ErrorItem(_("Unknown Inset"), line,
-					    par.id(), 0, par.size()));
+			                              {par.id(), 0}, {par.id(), -1}));
 		}
 	} else if (token == "\\family") {
 		lex.next();
@@ -473,6 +464,9 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 	} else if (token == "\\strikeout") {
 		lex.next();
 		font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
+	} else if (token == "\\xout") {
+		lex.next();
+		font.fontInfo().setXout(setLyXMisc(lex.getString()));
 	} else if (token == "\\uuline") {
 		lex.next();
 		font.fontInfo().setUuline(setLyXMisc(lex.getString()));
@@ -485,22 +479,44 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 	} else if (token == "\\color") {
 		lex.next();
 		setLyXColor(lex.getString(), font.fontInfo());
-	} else if (token == "\\SpecialChar") {
-		auto_ptr<Inset> inset;
-		inset.reset(new InsetSpecialChar);
+	} else if (token == "\\SpecialChar" ||
+	           (token == "\\SpecialCharNoPassThru" &&
+	            !par.layout().pass_thru && !inset().isPassThru())) {
+		auto inset = make_unique<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);
+		auto inset = make_unique<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));
+		auto inset = make_unique<InsetTabular>(buf);
 		inset->read(lex);
 		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\change_unchanged") {
@@ -511,24 +527,31 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 		int aid;
 		time_t ct;
 		is >> aid >> ct;
-		BufferParams::AuthorMap 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.id(), 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"),
-			bformat(_("Unknown token: %1$s %2$s\n"), from_utf8(token),
-			lex.getDocString()),
-			par.id(), 0, par.size()));
+		                              bformat(_("Unknown token: %1$s %2$s\n"),
+		                                      from_utf8(token),
+		                                      lex.getDocString()),
+		                              {par.id(), 0}, {par.id(), -1}));
 	}
 }
 
@@ -571,7 +594,7 @@ 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();
 }
@@ -581,39 +604,37 @@ class TextCompletionList : public CompletionList
 {
 public:
 	///
-	TextCompletionList(Cursor const & cur, WordList const * list)
-		: buffer_(cur.buffer()), pos_(0), list_(list)
+	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();
+		return list_.size();
 	}
 	///
 	virtual docstring const & data(size_t idx) const
 	{
-		return list_->word(idx);
+		return list_.word(idx);
 	}
-	
+
 private:
 	///
 	Buffer const * buffer_;
 	///
-	size_t pos_;
-	///
-	WordList const * list_;
+	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? 
+		// FIXME: Should we consider the labeled type as empty too?
 		&& pars_[0].layout().labeltype == LABEL_NO_LABEL);
 }
 
@@ -630,17 +651,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];
@@ -692,7 +713,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) {
@@ -726,7 +747,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();
@@ -735,10 +756,18 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 	Layout const & layout = cpar.layout();
 
 	if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
-		if (changeDepthAllowed(cur, DEC_DEPTH))
+		if (changeDepthAllowed(cur, DEC_DEPTH)) {
 			changeDepth(cur, DEC_DEPTH);
-		else 
-			setLayout(cur, tclass.defaultLayoutName());
+			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;
 	}
 
@@ -747,10 +776,10 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 	// 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 = layout.isEnvironment() 
+	bool keep_layout = layout.isEnvironment()
 		|| (layout.isParagraph() && layout.parbreak_is_newline);
 	if (inverse_logic)
 		keep_layout = !keep_layout;
@@ -782,7 +811,7 @@ 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
 	}
 
@@ -813,7 +842,7 @@ void Text::insertStringAsLines(Cursor & cur, 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;
@@ -822,18 +851,18 @@ void Text::insertStringAsLines(Cursor & cur, 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;
 			}
@@ -842,7 +871,7 @@ void Text::insertStringAsLines(Cursor & cur, 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 == ' ');
 		}
@@ -883,7 +912,7 @@ void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str,
 // 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);
 
@@ -899,11 +928,11 @@ void Text::insertChar(Cursor & cur, char_type c)
 	if (lyxrc.auto_number) {
 		static docstring const number_operators = from_ascii("+-/*");
 		static docstring const number_unary_operators = from_ascii("+-");
-		static docstring const number_seperators = from_ascii(".,:");
+		static docstring const number_separators = from_ascii(".,:");
 
 		if (cur.current_font.fontInfo().number() == FONT_ON) {
 			if (!isDigitASCII(c) && !contains(number_operators, c) &&
-			    !(contains(number_seperators, c) &&
+			    !(contains(number_separators, c) &&
 			      cur.pos() != 0 &&
 			      cur.pos() != cur.lastpos() &&
 			      tm.displayFont(pit, cur.pos()).fontInfo().number() == FONT_ON &&
@@ -919,11 +948,12 @@ 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,
 						tm.font_);
-				} else if (contains(number_seperators, c)
+				} else if (contains(number_separators, c)
 				     && cur.pos() >= 2
 				     && tm.displayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) {
 					setCharFont(pit, cur.pos() - 1, cur.current_font,
@@ -934,40 +964,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();
 
@@ -976,7 +1006,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
@@ -992,6 +1022,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 					"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)) {
@@ -1002,14 +1033,44 @@ void Text::insertChar(Cursor & cur, char_type c)
 		}
 	}
 
-	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.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.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);
 }
 
@@ -1018,21 +1079,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();
 	}
 }
@@ -1043,7 +1095,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();
@@ -1051,17 +1103,17 @@ bool Text::cursorForwardOneWord(Cursor & cur)
 	Paragraph const & par = cur.paragraph();
 
 	// Paragraph boundary is a word boundary
-	if (pos == lastpos) {
+	if (pos == lastpos || (pos + 1 == lastpos && par.isEnvSeparator(pos))) {
 		if (pit != cur.lastpit())
 			return setCursor(cur, pit + 1, 0);
 		else
 			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))
@@ -1069,7 +1121,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;
@@ -1081,26 +1133,36 @@ bool Text::cursorForwardOneWord(Cursor & cur)
 
 		// Skip over white space
 		while (pos != lastpos && par.isSpace(pos))
-			     ++pos;		
+			     ++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::cursorBackwardOneWord(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pit_type pit = cur.pit();
 	pos_type pos = cur.pos();
 	Paragraph & par = cur.paragraph();
 
 	// Paragraph boundary is a word boundary
-	if (pos == 0 && pit != 0)
-		return setCursor(cur, pit - 1, getPar(pit - 1).size());
+	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_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;
@@ -1131,10 +1193,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;
 
@@ -1143,9 +1204,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
@@ -1161,17 +1222,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;
 
@@ -1180,9 +1240,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
@@ -1192,24 +1252,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());
@@ -1225,14 +1285,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();
@@ -1246,7 +1306,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);
@@ -1256,11 +1316,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;
 	}
 
@@ -1276,7 +1335,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();
 
@@ -1295,11 +1353,11 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 
 		pos_type left  = (pit == begPit ? begPos : 0);
 		pos_type right = (pit == endPit ? endPos : parSize);
-		
+
 		if (left == right)
 			// there is no change here
 			continue;
-		
+
 		if (op == ACCEPT) {
 			pars_[pit].acceptChanges(left, right);
 		} else {
@@ -1352,10 +1410,7 @@ 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();
@@ -1369,7 +1424,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);
 }
 
 
@@ -1405,57 +1460,60 @@ 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)
+void Text::deleteWordForward(Cursor & cur, bool const force)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	if (cur.lastpos() == 0)
 		cursorForward(cur);
 	else {
 		cur.resetAnchor();
-		cur.setSelection(true);
+		cur.selection(true);
 		cursorForwardOneWord(cur);
 		cur.setSelection();
-		cutSelection(cur, true, false);
-		cur.checkBufferStructure();
+		if (force || !cur.confirmDeletion()) {
+			cutSelection(cur, true, false);
+			cur.checkBufferStructure();
+		}
 	}
 }
 
 
-void Text::deleteWordBackward(Cursor & cur)
+void Text::deleteWordBackward(Cursor & cur, bool const force)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	if (cur.lastpos() == 0)
 		cursorBackward(cur);
 	else {
 		cur.resetAnchor();
-		cur.setSelection(true);
+		cur.selection(true);
 		cursorBackwardOneWord(cur);
 		cur.setSelection();
-		cutSelection(cur, true, false);
-		cur.checkBufferStructure();
+		if (force || !cur.confirmDeletion()) {
+			cutSelection(cur, true, false);
+			cur.checkBufferStructure();
+		}
 	}
 }
 
 
 // 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);
 	}
 
@@ -1509,14 +1567,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.forceBufferUpdate();
 		setCursorIntern(cur, prevcur.pit(), prevcur.pos());
 		cur.screenUpdateFlags(Update::Force);
 		return true;
-	} 
+	}
 
 	// otherwise reset to default
 	cur.paragraph().setPlainOrDefaultLayout(bufparams.documentClass());
@@ -1535,7 +1593,7 @@ 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();
 
@@ -1548,7 +1606,8 @@ 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)) {
+			cur.recordUndo(DELETE_UNDO);
 			par.setChange(cur.pos(), Change(Change::DELETED));
 			cur.forwardPos();
 			needsUpdate = true;
@@ -1563,7 +1622,7 @@ bool Text::erase(Cursor & cur)
 	if (needsUpdate) {
 		// 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());
+		cur.top().setPitPos(cur.pit(), cur.pos());
 		cur.checkBufferStructure();
 	}
 
@@ -1573,7 +1632,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;
 
@@ -1591,15 +1650,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
@@ -1610,7 +1669,7 @@ 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;
 	}
@@ -1626,7 +1685,7 @@ 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)
@@ -1635,8 +1694,8 @@ bool Text::backspace(Cursor & cur)
 		Cursor prev_cur = cur;
 		--prev_cur.pit();
 
-		if (!prev_cur.paragraph().isMergedOnEndOfParDeletion(cur.buffer()->params().trackChanges)) {
-			cur.recordUndo(ATOMIC_UNDO, prev_cur.pit(), prev_cur.pit());
+		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;
@@ -1656,7 +1715,7 @@ 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.forceBufferUpdate();
 		else
@@ -1670,7 +1729,7 @@ bool Text::backspace(Cursor & cur)
 
 	// A singlePar update is not enough in this case.
 //		cur.screenUpdateFlags(Update::Force);
-	setCursor(cur.top(), cur.pit(), cur.pos());
+	cur.top().setPitPos(cur.pit(), cur.pos());
 
 	return needsUpdate;
 }
@@ -1686,20 +1745,24 @@ bool Text::dissolveInset(Cursor & cur)
 	cur.recordUndoInset();
 	cur.setMark(false);
 	cur.selHandle(false);
-	// save position
+	// save position inside inset
 	pos_type spos = cur.pos();
 	pit_type spit = cur.pit();
 	ParagraphList plist;
 	if (cur.lastpit() != 0 || cur.lastpos() != 0)
 		plist = paragraphs();
 	cur.popBackward();
-	// store cursor offset
+	// update cursor offset
 	if (spit == 0)
 		spos += cur.pos();
 	spit += cur.pit();
-	Buffer & b = *cur.buffer();
-	cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+	// remember position outside inset to delete inset later
+	// we do not do it now to avoid memory reuse issues (see #10667).
+	DocIterator inset_it = cur;
+	// jump over inset
+	++cur.pos();
 
+	Buffer & b = *cur.buffer();
 	if (!plist.empty()) {
 		// see bug 7319
 		// we clear the cache so that we won't get conflicts with labels
@@ -1720,17 +1783,20 @@ bool Text::dissolveInset(Cursor & cur)
 
 		pasteParagraphList(cur, plist, b.params().documentClassPtr(),
 				   b.errorList("Paste"));
-		// restore position
-		cur.pit() = min(cur.lastpit(), spit);
-		cur.pos() = min(cur.lastpos(), spos);
 	}
 
-	cur.forceBufferUpdate();
+	// delete the inset now
+	inset_it.paragraph().eraseChar(inset_it.pos(), b.params().track_changes);
 
+	// restore position
+	cur.pit() = min(cur.lastpit(), spit);
+	cur.pos() = min(cur.lastpos(), spos);
 	// Ensure the current language is set correctly (bug 6292)
 	cur.text()->setCursor(cur, cur.pit(), cur.pos());
 	cur.clearSelection();
 	cur.resetAnchor();
+	cur.forceBufferUpdate();
+
 	return true;
 }
 
@@ -1758,7 +1824,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();
@@ -1815,12 +1881,12 @@ 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;
 }
 
@@ -1828,24 +1894,22 @@ bool Text::read(Lexer & lex,
 // 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());
 
 	if (change.changed()) {
-		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 << " : ";
+		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
@@ -1927,7 +1991,7 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
 			text += '-';
 		text += head;
 	}
-	
+
 	// Make sure it isn't too long
 	unsigned int const max_label_length = 32;
 	if (text.size() > max_label_length)
@@ -1999,22 +2063,47 @@ docstring Text::asString(pit_type beg, pit_type end, int options) const
 }
 
 
-void Text::forToc(docstring & os, size_t maxlen, bool shorten) const
+void Text::shortenForOutliner(docstring & str, size_t const maxlen)
 {
-	if (maxlen == 0)
-		maxlen = std::numeric_limits<std::size_t>::max();
-	else
-		LASSERT(maxlen >= 8, maxlen = TOC_ENTRY_LENGTH);
-	for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i)
-		pars_[i].forToc(os, maxlen);
-	if (shorten && os.length() >= maxlen)
-		os = os.substr(0, maxlen - 3) + from_ascii("...");
+	support::truncateWithEllipsis(str, maxlen);
+	for (char_type & c : str)
+		if (c == L'\n' || c == L'\t')
+			c = L' ';
+}
+
+
+void Text::forOutliner(docstring & os, size_t const maxlen,
+                       bool const shorten) const
+{
+	pit_type end = pars_.size() - 1;
+	if (0 <= end && !pars_[0].labelString().empty())
+		os += pars_[0].labelString() + ' ';
+	forOutliner(os, maxlen, 0, end, shorten);
+}
+
+
+void Text::forOutliner(docstring & os, size_t const maxlen,
+                       pit_type pit_start, pit_type pit_end,
+                       bool const shorten) const
+{
+	size_t tmplen = shorten ? maxlen + 1 : maxlen;
+	pit_type end = min(size_t(pit_end), pars_.size() - 1);
+	bool first = true;
+	for (pit_type i = pit_start; i <= end && os.length() < tmplen; ++i) {
+		if (!first)
+			os += ' ';
+		// This function lets the first label be treated separately
+		pars_[i].forOutliner(os, tmplen, false, !first);
+		first = false;
+	}
+	if (shorten)
+		shortenForOutliner(os, maxlen);
 }
 
 
 void Text::charsTranspose(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pos_type pos = cur.pos();
 
@@ -2054,7 +2143,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();
 
@@ -2090,7 +2179,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());
 }
@@ -2107,22 +2196,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.result().screenUpdate() & Update::Force))
 		cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
 	return true;
 }
-	
-	
+
+
 docstring Text::completionPrefix(Cursor const & cur) const
 {
 	return previousWord(cur.top());