X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText.cpp;h=c5d1501417853a8f00df2b75b9138147f5af731a;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=cb9531d19dcd64e1c252cbf86c345c42a8eb3112;hpb=f733221747bbdadc82a412d77565a76961c015b4;p=lyx.git

diff --git a/src/Text.cpp b/src/Text.cpp
index cb9531d19d..c5d1501417 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -171,6 +171,31 @@ void mergeParagraph(BufferParams const & bparams,
 }
 
 
+Text::Text(InsetText * owner, bool use_default_layout)
+	: owner_(owner), autoBreakRows_(false), undo_counter_(0)
+{
+	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), autoBreakRows_(text.autoBreakRows_), undo_counter_(0)
+{
+	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;
@@ -274,8 +299,8 @@ InsetText const & Text::inset() const
 void Text::readParToken(Paragraph & par, Lexer & lex,
 	string const & token, Font & font, Change & change, ErrorList & errorList)
 {
-	Buffer const & buf = owner_->buffer();
-	BufferParams const & bp = buf.params();
+	Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
+	BufferParams const & bp = buf->params();
 
 	if (token[0] != '\\') {
 		docstring dstr = lex.getDocString();
@@ -361,10 +386,10 @@ void Text::readParToken(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();
@@ -380,16 +405,16 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 				       "`$$Token'");
 	} else if (token == "\\strikeout") {
 		lex.next();
-		font.fontInfo().setStrikeout(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
 	} else if (token == "\\uuline") {
 		lex.next();
-		font.fontInfo().setUuline(font.setLyXMisc(lex.getString()));
+		font.fontInfo().setUuline(setLyXMisc(lex.getString()));
 	} else if (token == "\\uwave") {
 		lex.next();
-		font.fontInfo().setUwave(font.setLyXMisc(lex.getString()));
+		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());
@@ -397,18 +422,18 @@ void Text::readParToken(Paragraph & par, Lexer & lex,
 		auto_ptr<Inset> inset;
 		inset.reset(new InsetSpecialChar);
 		inset->read(lex);
-		inset->setBuffer(const_cast<Buffer &>(buf));
+		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") {
 		auto_ptr<Inset> inset;
 		inset.reset(new InsetLine);
-		inset->setBuffer(const_cast<Buffer &>(buf));
+		inset->setBuffer(*buf);
 		par.insertInset(par.size(), inset.release(), font, change);
 	} else if (token == "\\change_unchanged") {
 		change = Change(Change::UNCHANGED);
@@ -485,8 +510,8 @@ class TextCompletionList : public CompletionList
 {
 public:
 	///
-	TextCompletionList(Cursor const & cur)
-		: buffer_(cur.buffer()), pos_(0)
+	TextCompletionList(Cursor const & cur, WordList const * list)
+		: buffer_(cur.buffer()), pos_(0), list_(list)
 	{}
 	///
 	virtual ~TextCompletionList() {}
@@ -496,12 +521,12 @@ public:
 	///
 	virtual size_t size() const
 	{
-		return theWordList().size();
+		return list_->size();
 	}
 	///
 	virtual docstring const & data(size_t idx) const
 	{
-		return theWordList().word(idx);
+		return list_->word(idx);
 	}
 	
 private:
@@ -509,6 +534,8 @@ private:
 	Buffer const * buffer_;
 	///
 	size_t pos_;
+	///
+	WordList const * list_;
 };
 
 
@@ -915,7 +942,8 @@ void Text::insertChar(Cursor & cur, char_type c)
 	cur.checkBufferStructure();
 
 //		cur.updateFlags(Update::Force);
-	bool boundary = tm.isRTLBoundary(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);
 }
@@ -927,12 +955,11 @@ 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
@@ -1123,9 +1150,11 @@ void Text::selectWord(Cursor & cur, word_location loc)
 		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);
 }
 
 
@@ -1617,6 +1646,9 @@ bool Text::dissolveInset(Cursor & cur)
 		// 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;
@@ -1983,7 +2015,8 @@ bool Text::completionSupported(Cursor const & cur) const
 
 CompletionList const * Text::createCompletionList(Cursor const & cur) const
 {
-	return new TextCompletionList(cur);
+	WordList const * list = theWordList(*cur.getFont().language());
+	return new TextCompletionList(cur, list);
 }