X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=3dae072cecfa9e9132d396c16764f7f053f9dd08;hb=3c488c22e1d86da021750e04b0c8e85a8d8630ab;hp=4959a3fc814d259b34366b3e0854e31c1ba3f27f;hpb=939d25561d5345d367309b7994eaefa355072456;p=features.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 4959a3fc81..3dae072cec 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -162,6 +162,7 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit,
 void Text::setLayout(pit_type start, pit_type end,
 		     docstring const & layout)
 {
+	// FIXME: make this work in multicell selection case
 	LASSERT(start != end, return);
 
 	Buffer const & buffer = owner_->buffer();
@@ -426,6 +427,11 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
 		cur.top() = resetCursor;
 		cur.resetAnchor();
 	}
+
+	// if there was no selection at all, the point was to change cursor font.
+	// Otherwise, we want to reset it to local text font.
+	if (cur.selection() || implicitSelection)
+		cur.setCurrentFont();
 }
 
 
@@ -933,6 +939,15 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 
 
 void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges)
+{
+	pos_type last_pos = pars_[last].size() - 1;
+	deleteEmptyParagraphMechanism(first, last, 0, last_pos, trackChanges);
+}
+
+
+void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last,
+					 pos_type first_pos, pos_type last_pos,
+					 bool trackChanges)
 {
 	LASSERT(first >= 0 && first <= last && last < (int) pars_.size(), return);
 
@@ -943,8 +958,9 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra
 		 * (1) Delete consecutive spaces
 		 */
 		if (!par.isFreeSpacing()) {
-			pos_type from = 0;
-			while (from < par.size()) {
+			pos_type from = (pit == first) ? first_pos : 0;
+			pos_type to_pos = (pit == last) ? last_pos + 1 : par.size();
+			while (from < to_pos) {
 				// skip non-spaces
 				while (from < par.size()
 					   && (!par.isLineSeparator(from) || par.isDeleted(from)))