X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=c9bb7e3b563c5e0af33fdfab50455511c0b455ab;hb=cfbe5dd9e1da55cba9499bee0220c2fdab65c3c0;hp=675ab8f768e9d252a6e15fdedef277a868d3de21;hpb=cdbebdf0933d5acb9880b5fafa6584e4fcb7cfbb;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index 675ab8f768..c9bb7e3b56 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -34,7 +34,6 @@
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "factory.h"
-#include "FontIterator.h"
 #include "Language.h"
 #include "Length.h"
 #include "Lexer.h"
@@ -52,7 +51,6 @@
 #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/InsetNewpage.h"
@@ -61,6 +59,7 @@
 #include "insets/InsetSpecialChar.h"
 #include "insets/InsetTabular.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -137,10 +136,10 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 		par.params().read(lex);
 
 	} else if (token == "\\end_layout") {
-		LYXERR0("Solitary \\end_layout in line " << lex.getLineNo() << "\n"
+		LYXERR0("Solitary \\end_layout in line " << lex.lineNumber() << "\n"
 		       << "Missing \\begin_layout ?");
 	} else if (token == "\\end_inset") {
-		LYXERR0("Solitary \\end_inset in line " << lex.getLineNo() << "\n"
+		LYXERR0("Solitary \\end_inset in line " << lex.lineNumber() << "\n"
 		       << "Missing \\begin_inset ?");
 	} else if (token == "\\begin_inset") {
 		Inset * inset = readInset(lex, buf);
@@ -199,59 +198,20 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 	} else if (token == "\\color") {
 		lex.next();
 		setLyXColor(lex.getString(), font.fontInfo());
-	} 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!");
-				}
-			}
-		} else {
+	} else if (token == "\\SpecialChar") {
 			auto_ptr<Inset> inset;
-			if (token == "\\SpecialChar" )
-				inset.reset(new InsetSpecialChar);
-			else
-				inset.reset(new InsetSpace);
+			inset.reset(new InsetSpecialChar);
 			inset->read(lex);
 			par.insertInset(par.size(), inset.release(),
 					font, change);
-		}
 	} else if (token == "\\backslash") {
 		par.appendChar('\\', font, change);
-	} else if (token == "\\linebreak") {
-		auto_ptr<Inset> inset(new InsetLinebreak);
-		inset->read(lex);
-		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\newline") {
-		auto_ptr<Inset> inset(new InsetNewline);
-		inset->read(lex);
-		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\LyXTable") {
 		auto_ptr<Inset> inset(new InsetTabular(buf));
 		inset->read(lex);
 		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\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 InsetNewpage, font, change);
-	} else if (token == "\\pagebreak") {
-		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") {
@@ -318,7 +278,7 @@ void readParagraph(Buffer const & buf, Paragraph & par, Lexer & lex,
 		    || token == "\\end_deeper") {
 			lex.pushToken(token);
 			lyxerr << "Paragraph ended in line "
-			       << lex.getLineNo() << "\n"
+			       << lex.lineNumber() << "\n"
 			       << "Missing \\end_layout.\n";
 			break;
 		}
@@ -381,7 +341,7 @@ double Text::spacing(Buffer const & buffer, Paragraph const & par) const
 
 void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 
 	Paragraph & cpar = cur.paragraph();
 	pit_type cpit = cur.pit();
@@ -458,7 +418,7 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
 // same Paragraph one to the right and make a rebreak
 void Text::insertChar(Cursor & cur, char_type c)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 
 	cur.recordUndo(INSERT_UNDO);
 
@@ -570,7 +530,7 @@ void Text::insertChar(Cursor & cur, char_type c)
 			}
 			return;
 		}
-		BOOST_ASSERT(cur.pos() > 0);
+		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;
@@ -611,7 +571,7 @@ void Text::charInserted(Cursor & cur)
 	    && par.isLetter(cur.pos() - 2)
 	    && !par.isLetter(cur.pos() - 1)) {
 		// get the word in front of cursor
-		BOOST_ASSERT(this == cur.text());
+		LASSERT(this == cur.text(), /**/);
 		cur.paragraph().updateWords(cur.top());
 	}
 }
@@ -622,49 +582,140 @@ void Text::charInserted(Cursor & cur)
 
 bool Text::cursorForwardOneWord(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 
-	Cursor old = cur;
+	pos_type const lastpos = cur.lastpos();
+	pit_type pit = cur.pit();
+	pos_type pos = cur.pos();
+	Paragraph const & par = cur.paragraph();
 
-	if (old.pos() == old.lastpos() && old.pit() != old.lastpit()) {
-		++old.pit();
-		old.pos() = 0;
-	} 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();
+	// Skip over either a non-char inset or a full word
+	if (pos != lastpos && !par.isLetter(pos) && !par.isChar(pos))
+		++pos;
+	else while (pos != lastpos && par.isLetter(pos))
+			++pos;
+
+	// Skip through trailing punctuation and spaces.
+	while (pos != lastpos && par.isChar(pos))
+		++pos;
+
+	if (pos == lastpos && pit != cur.lastpit()) {
+		++pit;
+		pos = 0;
 	}
-	return setCursor(cur, old.pit(), old.pos());
+
+	return setCursor(cur, pit, pos);
 }
 
 
 bool Text::cursorBackwardOneWord(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(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();
-	} 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 through puctuation and spaces.
+	while (pos != 0 && par.isChar(pos - 1))
+		--pos;
+
+	// Skip over either a non-char inset or a full word
+	if (pos != 0 && !par.isLetter(pos) && !par.isChar(pos - 1))
+		--pos;
+	else while (pos != 0 && par.isLetter(pos - 1))
+			--pos;
+
+	if (pos == 0 && pit != 0) {
+		--pit;
+		pos = getPar(cur.pit() - 1).size();
 	}
-	return setCursor(cur, old.pit(), old.pos());
+
+	return setCursor(cur, pit, pos);
+}
+
+
+bool Text::cursorVisLeftOneWord(Cursor & cur)
+{
+	LASSERT(this == cur.text(), /**/);
+
+	pos_type left_pos, right_pos;
+	bool left_is_letter, right_is_letter;
+
+	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);
+		left_is_letter = 
+			(left_pos > -1 ? temp_cur.paragraph().isLetter(left_pos) : false);
+		right_is_letter = 
+			(right_pos > -1 ? temp_cur.paragraph().isLetter(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.bv().buffer().params(), 
+				left_pos).isRightToLeft())
+			|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
+				temp_cur.bv().buffer().params(), 
+				right_pos).isRightToLeft()))
+			break;
+	}
+
+	return setCursor(cur, temp_cur.pit(), temp_cur.pos(), 
+					 true, temp_cur.boundary());
+}
+
+
+bool Text::cursorVisRightOneWord(Cursor & cur)
+{
+	LASSERT(this == cur.text(), /**/);
+
+	pos_type left_pos, right_pos;
+	bool left_is_letter, right_is_letter;
+
+	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);
+		left_is_letter = 
+			(left_pos > -1 ? temp_cur.paragraph().isLetter(left_pos) : false);
+		right_is_letter = 
+			(right_pos > -1 ? temp_cur.paragraph().isLetter(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.bv().buffer().params(), 
+				left_pos).isRightToLeft())
+			|| (right_is_letter && !temp_cur.paragraph().getFontSettings(
+				temp_cur.bv().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());
+	LASSERT(this == cur.text(), /**/);
 	CursorSlice from = cur.top();
 	CursorSlice to = cur.top();
 	getWord(from, to, loc);
@@ -682,7 +733,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());
+	LASSERT(this == cur.text(), /**/);
 	if (cur.selection())
 		return false;
 	selectWord(cur, loc);
@@ -692,7 +743,7 @@ bool Text::selectWordWhenUnderCursor(Cursor & cur, word_location loc)
 
 void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 
 	if (!cur.selection())
 		return;
@@ -838,7 +889,7 @@ void Text::rejectChanges(BufferParams const & bparams)
 
 void Text::deleteWordForward(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 	if (cur.lastpos() == 0)
 		cursorForward(cur);
 	else {
@@ -854,7 +905,7 @@ void Text::deleteWordForward(Cursor & cur)
 
 void Text::deleteWordBackward(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 	if (cur.lastpos() == 0)
 		cursorBackward(cur);
 	else {
@@ -871,7 +922,7 @@ void Text::deleteWordBackward(Cursor & cur)
 // Kill to end of line.
 void Text::changeCase(Cursor & cur, TextCase action)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 	CursorSlice from;
 	CursorSlice to;
 
@@ -953,7 +1004,7 @@ bool Text::handleBibitems(Cursor & cur)
 
 bool Text::erase(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 	bool needsUpdate = false;
 	Paragraph & par = cur.paragraph();
 
@@ -1000,7 +1051,7 @@ bool Text::erase(Cursor & cur)
 
 bool Text::backspacePos0(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 	if (cur.pit() == 0)
 		return false;
 
@@ -1053,7 +1104,7 @@ bool Text::backspacePos0(Cursor & cur)
 
 bool Text::backspace(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 	bool needsUpdate = false;
 	if (cur.pos() == 0) {
 		if (cur.pit() == 0)
@@ -1102,7 +1153,7 @@ bool Text::backspace(Cursor & cur)
 
 
 bool Text::dissolveInset(Cursor & cur) {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 
 	if (isMainText(cur.bv().buffer()) || cur.inset().nargs() != 1)
 		return false;
@@ -1255,7 +1306,7 @@ bool Text::read(Buffer const & buf, Lexer & lex,
 // Returns the current font and depth as a message.
 docstring Text::currentState(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 	Buffer & buf = cur.buffer();
 	Paragraph const & par = cur.paragraph();
 	odocstringstream os;
@@ -1339,7 +1390,7 @@ docstring Text::getPossibleLabel(Cursor & cur) const
 	Layout const * layout = &(pars_[pit].layout());
 
 	docstring text;
-	docstring par_text = pars_[pit].asString(false);
+	docstring par_text = pars_[pit].asString();
 	string piece;
 	// the return string of math matrices might contain linebreaks
 	par_text = subst(par_text, '\n', '-');
@@ -1411,7 +1462,7 @@ docstring Text::getPossibleLabel(Cursor & cur) const
 
 void Text::charsTranspose(Cursor & cur)
 {
-	BOOST_ASSERT(this == cur.text());
+	LASSERT(this == cur.text(), /**/);
 
 	pos_type pos = cur.pos();
 
@@ -1489,7 +1540,7 @@ docstring Text::previousWord(CursorSlice const & sl) const
 		return docstring();
 	
 	Paragraph const & par = sl.paragraph();
-	return par.asString(from.pos(), to.pos(), false);
+	return par.asString(from.pos(), to.pos());
 }
 
 
@@ -1510,7 +1561,7 @@ CompletionList const * Text::createCompletionList(Cursor const & cur) const
 
 bool Text::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/)
 {	
-	BOOST_ASSERT(cur.bv().cursor() == cur);
+	LASSERT(cur.bv().cursor() == cur, /**/);
 	cur.insert(s);
 	cur.bv().cursor() = cur;
 	if (!(cur.disp_.update() & Update::Force))