X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=d8436b2ddc7eed3cfa789a052477a5ef8401ac01;hb=19bec6e8bc13c00c528392cb77826dc7de3f68e8;hp=91b8a5f02a456ad58c5df78fd1736cfc0c0e8030;hpb=4706961841c7b324e72412d9d62cc9e515dc615f;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 91b8a5f02a..d8436b2ddc 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -34,12 +34,14 @@
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "factory.h"
+#include "InsetList.h"
 #include "Language.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"
@@ -59,7 +61,6 @@
 #include "insets/InsetSpecialChar.h"
 #include "insets/InsetTabular.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
@@ -79,12 +80,202 @@ namespace lyx {
 using cap::cutSelection;
 using cap::pasteParagraphList;
 
-namespace {
+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(boost::next(pars.begin(), par_offset + 1),
+				       Paragraph());
+	Paragraph & par = pars[par_offset];
+
+	tmp.setInsetOwner(&par.inInset());
+	tmp.makeSameLayout(par);
+
+	LASSERT(pos <= par.size(), /**/);
+
+	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.trackChanges ?
+					   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(boost::next(pars.begin(), par_offset + 1));
+}
+
+
+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();
+}
+
+
+Font const Text::outerFont(pit_type par_offset) const
+{
+	depth_type par_depth = pars_[par_offset].getDepth();
+	FontInfo tmpfont = inherit_font;
+
+	// Resolve against environment font information
+	while (par_offset != pit_type(pars_.size())
+	       && par_depth
+	       && !tmpfont.resolved()) {
+		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);
+}
+
+
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+	pit_type pars_size = static_cast<pit_type>(pars.size());
+
+	// first, accept changes within each individual paragraph
+	// (do not consider end-of-par)
+	for (pit_type pit = 0; pit < pars_size; ++pit) {
+		if (!pars[pit].empty())   // prevent assertion failure
+			pars[pit].acceptChanges(0, pars[pit].size());
+	}
+
+	// next, accept imaginary end-of-par characters
+	for (pit_type pit = 0; pit < pars_size; ++pit) {
+		pos_type pos = pars[pit].size();
+
+		if (pars[pit].isInserted(pos)) {
+			pars[pit].setChange(pos, Change(Change::UNCHANGED));
+		} else if (pars[pit].isDeleted(pos)) {
+			if (pit == pars_size - 1) {
+				// we cannot remove a par break at the end of the last
+				// paragraph; instead, we mark it unchanged
+				pars[pit].setChange(pos, Change(Change::UNCHANGED));
+			} else {
+				mergeParagraph(bparams, pars, pit);
+				--pit;
+				--pars_size;
+			}
+		}
+	}
+}
+
+InsetText const & Text::inset() const
+{
+	return *owner_;
+}
+
 
-void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
+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 const & bp = buf->params();
 
 	if (token[0] != '\\') {
 		docstring dstr = lex.getDocString();
@@ -102,7 +293,7 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 		if (layoutname.empty())
 			layoutname = tclass.defaultLayoutName();
 
-		if (par.forcePlainLayout()) {
+		if (owner_->forcePlainLayout()) {
 			// in this case only the empty layout is allowed
 			layoutname = tclass.plainLayoutName();
 		} else if (par.usePlainLayout()) {
@@ -170,10 +361,10 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 		}
 	} else if (token == "\\numeric") {
 		lex.next();
-		font.fontInfo().setNumber(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setNumber(setLyXMisc(lex.getString()));
 	} else if (token == "\\emph") {
 		lex.next();
-		font.fontInfo().setEmph(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setEmph(setLyXMisc(lex.getString()));
 	} else if (token == "\\bar") {
 		lex.next();
 		string const tok = lex.getString();
@@ -187,54 +378,58 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 		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.fontInfo().setNoun(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setNoun(setLyXMisc(lex.getString()));
 	} else if (token == "\\color") {
 		lex.next();
 		setLyXColor(lex.getString(), font.fontInfo());
 	} else if (token == "\\SpecialChar") {
-			auto_ptr<Inset> inset;
-			inset.reset(new InsetSpecialChar);
-			inset->read(lex);
-			par.insertInset(par.size(), inset.release(),
-					font, change);
+		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 == "\\backslash") {
 		par.appendChar('\\', font, change);
 	} else if (token == "\\LyXTable") {
-		auto_ptr<Inset> inset(new InsetTabular(const_cast<Buffer &>(buf)));
+		auto_ptr<Inset> inset(new InsetTabular(buf));
 		inset->read(lex);
 		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\lyxline") {
-		par.insertInset(par.size(), new InsetLine, font, change);
+		auto_ptr<Inset> inset;
+		inset.reset(new InsetLine);
+		inset->setBuffer(*buf);
+		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\change_unchanged") {
 		change = Change(Change::UNCHANGED);
-	} else if (token == "\\change_inserted") {
+	} else if (token == "\\change_inserted" || token == "\\change_deleted") {
 		lex.eatLine();
 		istringstream is(lex.getString());
 		unsigned int aid;
 		time_t ct;
 		is >> aid >> ct;
-		if (aid >= bp.author_map.size()) {
+		map<unsigned int, int> const & am = bp.author_map;
+		if (am.find(aid) == am.end()) {
 			errorList.push_back(ErrorItem(_("Change tracking error"),
-					    bformat(_("Unknown author index for insertion: %1$d\n"), aid),
+					    bformat(_("Unknown author index for change: %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") {
-		lex.eatLine();
-		istringstream is(lex.getString());
-		unsigned 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);
+		} else {
+			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"),
@@ -245,7 +440,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();
@@ -254,7 +449,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();
@@ -286,8 +481,6 @@ void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
 }
 
 
-} // namespace anon
-
 class TextCompletionList : public CompletionList
 {
 public:
@@ -327,14 +520,114 @@ bool Text::empty() const
 }
 
 
-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(boost::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());
+
+	// layout stays the same with latex-environments
+	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.trackChanges ?
+					   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());
+	}
+
+	// layout stays the same with latex-environments
+	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)
 {
 	LASSERT(this == cur.text(), /**/);
@@ -371,8 +664,7 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 	// 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!
 
@@ -410,6 +702,85 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 }
 
 
+// needed to insert the selection
+void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
+		Font const & font)
+{
+	BufferParams const & bparams = owner_->buffer().params();
+	pit_type pit = dit.pit();
+	pos_type pos = dit.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 (autoBreakRows_ && (!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.trackChanges);
+				++pos;
+				space_inserted = true;
+			} else {
+				par.insertChar(pos, *cit, font, bparams.trackChanges);
+				++pos;
+				space_inserted = true;
+			}
+		} else if (!isPrintable(*cit)) {
+			// Ignore unprintables
+			continue;
+		} else {
+			// just insert the character
+			par.insertChar(pos, *cit, font, bparams.trackChanges);
+			++pos;
+			space_inserted = (*cit == ' ');
+		}
+	}
+}
+
+
+// turn double CR to single CR, others are converted into one
+// blank. Then insertStringAsLines is called
+void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+		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(dit, 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)
@@ -452,12 +823,12 @@ void Text::insertChar(Cursor & cur, char_type c)
 				     || par.isSeparator(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.displayFont(pit, cur.pos() - 2).fontInfo().number() == FONT_ON) {
-					setCharFont(buffer, pit, cur.pos() - 1, cur.current_font,
+					setCharFont(pit, cur.pos() - 1, cur.current_font,
 						tm.font_);
 				}
 			}
@@ -544,7 +915,9 @@ void Text::insertChar(Cursor & cur, char_type c)
 	cur.checkBufferStructure();
 
 //		cur.updateFlags(Update::Force);
-	setCursor(cur.top(), cur.pit(), cur.pos() + 1);
+	bool boundary = cur.boundary()
+		|| tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
+	setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary);
 	charInserted(cur);
 }
 
@@ -555,21 +928,20 @@ 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;
+	if (undo_counter_ < 20) {
+		++undo_counter_;
 	} else {
 		cur.finishUndo();
-		counter = 0;
+		undo_counter_ = 0;
 	}
 
 	// register word if a non-letter was entered
 	if (cur.pos() > 1
-	    && par.isLetter(cur.pos() - 2)
-	    && !par.isLetter(cur.pos() - 1)) {
+	    && !par.isWordSeparator(cur.pos() - 2)
+	    && par.isWordSeparator(cur.pos() - 1)) {
 		// get the word in front of cursor
 		LASSERT(this == cur.text(), /**/);
-		cur.paragraph().updateWords(cur.top());
+		cur.paragraph().updateWords();
 	}
 }
 
@@ -600,14 +972,14 @@ bool Text::cursorForwardOneWord(Cursor & cur)
                         ++pos;
 
 		// Skip over either a non-char inset or a full word
-		if (pos != lastpos && !par.isLetter(pos))
+		if (pos != lastpos && par.isWordSeparator(pos))
 			++pos;
-		else while (pos != lastpos && par.isLetter(pos))
+		else while (pos != lastpos && !par.isWordSeparator(pos))
 			     ++pos;
 	} else {
 		LASSERT(pos < lastpos, /**/); // see above
-		if (par.isLetter(pos))
-			while (pos != lastpos && par.isLetter(pos))
+		if (!par.isWordSeparator(pos))
+			while (pos != lastpos && !par.isWordSeparator(pos))
 				++pos;
 		else if (par.isChar(pos))
 			while (pos != lastpos && par.isChar(pos))
@@ -642,17 +1014,17 @@ bool Text::cursorBackwardOneWord(Cursor & cur)
 			--pos;
 
 		// Skip over either a non-char inset or a full word
-		if (pos != 0 && !par.isLetter(pos - 1) && !par.isChar(pos - 1))
+		if (pos != 0 && par.isWordSeparator(pos - 1) && !par.isChar(pos - 1))
 			--pos;
-		else while (pos != 0 && par.isLetter(pos - 1))
+		else while (pos != 0 && !par.isWordSeparator(pos - 1))
 			     --pos;
 	} else {
 		// Skip over white space
 		while (pos != 0 && par.isSpace(pos - 1))
 			     --pos;
 
-		if (pos != 0 && par.isLetter(pos - 1))
-			while (pos != 0 && par.isLetter(pos - 1))
+		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))
@@ -680,9 +1052,9 @@ bool Text::cursorVisLeftOneWord(Cursor & cur)
 		// collect some information about current cursor position
 		temp_cur.getSurroundingPos(left_pos, right_pos);
 		left_is_letter = 
-			(left_pos > -1 ? temp_cur.paragraph().isLetter(left_pos) : false);
+			(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
 		right_is_letter = 
-			(right_pos > -1 ? temp_cur.paragraph().isLetter(right_pos) : false);
+			(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)
@@ -717,9 +1089,9 @@ bool Text::cursorVisRightOneWord(Cursor & cur)
 		// collect some information about current cursor position
 		temp_cur.getSurroundingPos(left_pos, right_pos);
 		left_is_letter = 
-			(left_pos > -1 ? temp_cur.paragraph().isLetter(left_pos) : false);
+			(left_pos > -1 ? !temp_cur.paragraph().isWordSeparator(left_pos) : false);
 		right_is_letter = 
-			(right_pos > -1 ? temp_cur.paragraph().isLetter(right_pos) : false);
+			(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)
@@ -792,8 +1164,11 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 {
 	LASSERT(this == cur.text(), /**/);
 
-	if (!cur.selection())
-		return;
+	if (!cur.selection()) {
+		bool const changed = cur.paragraph().isChanged(cur.pos());
+		if (!(changed && findNextChange(&cur.bv())))
+			return;
+	}
 
 	cur.recordUndoSelection();
 
@@ -828,9 +1203,9 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 		pos_type right = (pit == endPit ? endPos : parSize);
 
 		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);
 		}
 	}
 
@@ -892,22 +1267,24 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 }
 
 
-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);
 }
 
 
-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
@@ -1203,7 +1580,7 @@ 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();
@@ -1236,7 +1613,13 @@ bool Text::dissolveInset(Cursor & cur)
 		// restore position
 		cur.pit() = min(cur.lastpit(), spit);
 		cur.pos() = min(cur.lastpos(), spos);
-	}
+	} else
+		// this is the least that needs to be done (bug 6003)
+		// in the above case, pasteParagraphList handles this
+		cur.buffer()->updateLabels();
+
+	// Ensure the current language is set correctly (bug 6292)
+	cur.text()->setCursor(cur, cur.pit(), cur.pos());
 	cur.clearSelection();
 	cur.resetAnchor();
 	return true;
@@ -1246,44 +1629,14 @@ bool Text::dissolveInset(Cursor & cur)
 void Text::getWord(CursorSlice & from, CursorSlice & to,
 	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:
-		LYXERR0("Text::getWord: NEXT_WORD not implemented yet");
-		break;
-	case PARTIAL_WORD:
-		// no need to move the 'from' cursor
-		break;
-	}
 	to = from;
-	Paragraph const & 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, 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;
@@ -1296,9 +1649,10 @@ void Text::write(Buffer const & buf, ostream & os) const
 }
 
 
-bool Text::read(Buffer const & buf, Lexer & lex, 
+bool Text::read(Lexer & lex, 
 		ErrorList & errorList, InsetText * insetPtr)
 {
+	Buffer const & buf = owner_->buffer();
 	depth_type depth = 0;
 	bool res = true;
 
@@ -1331,15 +1685,10 @@ bool Text::read(Buffer const & buf, Lexer & lex,
 			par.params().depth(depth);
 			par.setFont(0, Font(inherit_font, buf.params().language));
 			pars_.push_back(par);
-
-			// FIXME: goddamn InsetTabular makes us pass a Buffer
-			// not BufferParams
-			lyx::readParagraph(buf, pars_.back(), lex, errorList);
+			readParagraph(pars_.back(), lex, errorList);
 
 			// register the words in the global word list
-			CursorSlice sl = CursorSlice(*insetPtr);
-			sl.pit() = pars_.size() - 1;
-			pars_.back().updateWords(sl);
+			pars_.back().updateWords();
 		} else if (token == "\\begin_deeper") {
 			++depth;
 		} else if (token == "\\end_deeper") {
@@ -1379,7 +1728,7 @@ docstring Text::currentState(Cursor const & cur) const
 
 	Change change = par.lookupChange(cur.pos());
 
-	if (change.type != Change::UNCHANGED) {
+	if (change.changed()) {
 		Author const & a = buf.params().authors().get(change.author);
 		os << _("Change: ") << a.name();
 		if (!a.email().empty())
@@ -1630,8 +1979,8 @@ bool Text::completionSupported(Cursor const & cur) const
 {
 	Paragraph const & par = cur.paragraph();
 	return cur.pos() > 0
-		&& (cur.pos() >= par.size() || !par.isLetter(cur.pos()))
-		&& par.isLetter(cur.pos() - 1);
+		&& (cur.pos() >= par.size() || par.isWordSeparator(cur.pos()))
+		&& !par.isWordSeparator(cur.pos() - 1);
 }