X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=9f247a55435ff951b38245dcb26b21e15843ee8e;hb=6fdb32958c6f0e7397455734c207790468c2da6c;hp=7ff4a8a22fe9be0cc57f6c4c541fc0edc2c7a119;hpb=439da7e82abb728d0edf7f47247df9437026b48f;p=lyx.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 7ff4a8a22f..9f247a5543 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -157,7 +157,7 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit,
 		pos_type pos, Font const & font)
 {
 	Inset * const inset = pars_[pit].getInset(pos);
-	LASSERT(inset && inset->resetFontEdit(), /**/);
+	LASSERT(inset && inset->resetFontEdit(), return);
 
 	CursorSlice::idx_type endidx = inset->nargs();
 	for (CursorSlice cs(*inset); cs.idx() != endidx; ++cs.idx()) {
@@ -173,29 +173,10 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit,
 }
 
 
-// return past-the-last paragraph influenced by a layout change on pit
-pit_type Text::undoSpan(pit_type pit)
-{
-	pit_type const end = paragraphs().size();
-	pit_type nextpit = pit + 1;
-	if (nextpit == end)
-		return nextpit;
-	//because of parindents
-	if (!pars_[pit].getDepth())
-		return boost::next(nextpit);
-	//because of depth constrains
-	for (; nextpit != end; ++pit, ++nextpit) {
-		if (!pars_[pit].getDepth())
-			break;
-	}
-	return nextpit;
-}
-
-
 void Text::setLayout(pit_type start, pit_type end,
 		     docstring const & layout)
 {
-	LASSERT(start != end, /**/);
+	LASSERT(start != end, return);
 
 	Buffer const & buffer = owner_->buffer();
 	BufferParams const & bp = buffer.params();
@@ -213,12 +194,11 @@ void Text::setLayout(pit_type start, pit_type end,
 // set layout over selection and make a total rebreak of those paragraphs
 void Text::setLayout(Cursor & cur, docstring const & layout)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	pit_type start = cur.selBegin().pit();
 	pit_type end = cur.selEnd().pit() + 1;
-	pit_type undopit = undoSpan(end - 1);
-	recUndo(cur, start, undopit - 1);
+	cur.recordUndoSelection();
 	setLayout(start, end, layout);
 	cur.forceBufferUpdate();
 }
@@ -227,8 +207,6 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 static bool changeDepthAllowed(Text::DEPTH_CHANGE type,
 			Paragraph const & par, int max_depth)
 {
-	if (par.layout().labeltype == LABEL_BIBLIO)
-		return false;
 	int const depth = par.params().depth();
 	if (type == Text::INC_DEPTH && depth < max_depth)
 		return true;
@@ -240,7 +218,7 @@ static bool changeDepthAllowed(Text::DEPTH_CHANGE type,
 
 bool Text::changeDepthAllowed(Cursor & cur, DEPTH_CHANGE type) const
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	// this happens when selecting several cells in tabular (bug 2630)
 	if (cur.selBegin().idx() != cur.selEnd().idx())
 		return false;
@@ -260,7 +238,7 @@ bool Text::changeDepthAllowed(Cursor & cur, DEPTH_CHANGE type) const
 
 void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	pit_type const beg = cur.selBegin().pit();
 	pit_type const end = cur.selEnd().pit() + 1;
 	cur.recordUndoSelection();
@@ -285,7 +263,7 @@ void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type)
 
 void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 {
-	LASSERT(this == cur.text(), /**/);
+	LASSERT(this == cur.text(), return);
 	// Set the current_font
 	// Determine basis font
 	FontInfo layoutfont;
@@ -340,7 +318,7 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 			newfi.setSeries(INHERIT_SERIES);
 	
 		FontShape newshp = newfi.shape();
-		if (newshp !=	INHERIT_SHAPE && newshp != IGNORE_SHAPE &&
+		if (newshp != INHERIT_SHAPE && newshp != IGNORE_SHAPE &&
 				newshp == oldfi.shape())
 			newfi.setShape(INHERIT_SHAPE);
 
@@ -405,21 +383,21 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin,
 
 bool Text::cursorTop(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	return setCursor(cur, 0, 0);
 }
 
 
 bool Text::cursorBottom(Cursor & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	return setCursor(cur, cur.lastpit(), boost::prior(paragraphs().end())->size());
 }
 
 
 void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	// If the mask is completely neutral, tell user
 	if (font.fontInfo() == ignore_font && font.language() == ignore_language) {
 		// Could only happen with user style
@@ -451,7 +429,7 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall)
 
 docstring Text::getStringToIndex(Cursor const & cur)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 
 	if (cur.selection())
 		return cur.selectionAsString(false);
@@ -473,87 +451,82 @@ docstring Text::getStringToIndex(Cursor const & cur)
 }
 
 
-void Text::setLabelWidthStringToSequence(pit_type const par_offset,
+void Text::setLabelWidthStringToSequence(Cursor const & cur,
 		docstring const & s)
 {
-	pit_type offset = par_offset;
+	Cursor c = cur;
 	// Find first of same layout in sequence
-	while (!isFirstInSequence(offset)) {
-		offset = depthHook(offset, pars_[offset].getDepth());
+	while (!isFirstInSequence(c.pit())) {
+		c.pit() = depthHook(c.pit(), c.paragraph().getDepth());
 	}
 
 	// now apply label width string to every par
 	// in sequence
-	pit_type const end = pars_.size();
-	depth_type const depth = pars_[offset].getDepth();
-	Layout const & layout = pars_[offset].layout();
-	for (pit_type pit = offset; pit != end; ++pit) {
-		while (pars_[pit].getDepth() > depth) {
-			++pit;
-			if (pit == end)
+	depth_type const depth = c.paragraph().getDepth();
+	Layout const & layout = c.paragraph().layout();
+	for ( ; c.pit() <= c.lastpit() ; ++c.pit()) {
+		while (c.paragraph().getDepth() > depth) {
+			++c.pit();
+			if (c.pit() > c.lastpit())
 				return;
 		}
-		if (pars_[pit].getDepth() < depth)
+		if (c.paragraph().getDepth() < depth)
 			return;
-		if (pars_[pit].layout() != layout)
+		if (c.paragraph().layout() != layout)
 			return;
-		pars_[pit].setLabelWidthString(s);
+		c.recordUndo();
+		c.paragraph().setLabelWidthString(s);
 	}
 }
 
 
-void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) 
+void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
 {
-	LASSERT(cur.text(), /**/);
-	// make sure that the depth behind the selection are restored, too
-	pit_type undopit = undoSpan(cur.selEnd().pit());
-	recUndo(cur, cur.selBegin().pit(), undopit - 1);
+	LBUFERR(cur.text());
 
 	//FIXME UNICODE
 	string const argument = to_utf8(arg);
 	depth_type priordepth = -1;
 	Layout priorlayout;
-	for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
-	     pit <= end; ++pit) {
-		Paragraph & par = pars_[pit];
+	Cursor c(cur.bv());
+	c.setCursor(cur.selectionBegin());
+	for ( ; c <= cur.selectionEnd() ; ++c.pit()) {
+		Paragraph & par = c.paragraph();
 		ParagraphParameters params = par.params();
 		params.read(argument, merge);
 		// Changes to label width string apply to all paragraphs
 		// with same layout in a sequence.
 		// Do this only once for a selected range of paragraphs
 		// of the same layout and depth.
-		if (par.getDepth() != priordepth || par.layout() != priorlayout)
-			setLabelWidthStringToSequence(pit, params.labelWidthString());
+		cur.recordUndo();
 		par.params().apply(params, par.layout());
+		if (par.getDepth() != priordepth || par.layout() != priorlayout)
+			setLabelWidthStringToSequence(c, params.labelWidthString());
 		priordepth = par.getDepth();
 		priorlayout = par.layout();
 	}
 }
 
 
-//FIXME This is a little redundant now, but it's probably worth keeping,
-//especially if we're going to go away from using serialization internally
-//quite so much.
-void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p) 
+void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
 {
-	LASSERT(cur.text(), /**/);
-	// make sure that the depth behind the selection are restored, too
-	pit_type undopit = undoSpan(cur.selEnd().pit());
-	recUndo(cur, cur.selBegin().pit(), undopit - 1);
+	LBUFERR(cur.text());
 
 	depth_type priordepth = -1;
 	Layout priorlayout;
-	for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
-	     pit <= end; ++pit) {
-		Paragraph & par = pars_[pit];
+	Cursor c(cur.bv());
+	c.setCursor(cur.selectionBegin());
+	for ( ; c < cur.selectionEnd() ; ++c.pit()) {
+		Paragraph & par = c.paragraph();
 		// Changes to label width string apply to all paragraphs
 		// with same layout in a sequence.
 		// Do this only once for a selected range of paragraphs
 		// of the same layout and depth.
+		cur.recordUndo();
+		par.params().apply(p, par.layout());
 		if (par.getDepth() != priordepth || par.layout() != priorlayout)
-			setLabelWidthStringToSequence(pit,
+			setLabelWidthStringToSequence(c,
 				par.params().labelWidthString());
-		par.params().apply(p, par.layout());
 		priordepth = par.getDepth();
 		priorlayout = par.layout();
 	}
@@ -563,10 +536,10 @@ void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
 // this really should just insert the inset and not move the cursor.
 void Text::insertInset(Cursor & cur, Inset * inset)
 {
-	LASSERT(this == cur.text(), /**/);
-	LASSERT(inset, /**/);
+	LBUFERR(this == cur.text());
+	LBUFERR(inset);
 	cur.paragraph().insertInset(cur.pos(), inset, cur.current_font,
-		Change(cur.buffer()->params().trackChanges
+		Change(cur.buffer()->params().track_changes
 		? Change::INSERTED : Change::UNCHANGED));
 }
 
@@ -578,16 +551,13 @@ bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos,
 	bool const update_needed = !tm.contains(par);
 	Cursor old = cur;
 	setCursorIntern(cur, par, pos, setfont, boundary);
-	// FIXME There is a chance that we'll miss a screen update here.
-	// If so, then do DEPM and then check if cur wants an update and
-	// go ahead and do it, if so.
 	return cur.bv().checkDepm(cur, old) || update_needed;
 }
 
 
 void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
 {
-	LASSERT(par != int(paragraphs().size()), /**/);
+	LASSERT(par != int(paragraphs().size()), return);
 	cur.pit() = par;
 	cur.pos() = pos;
 
@@ -596,15 +566,15 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
 
 	// None of these should happen, but we're scaredy-cats
 	if (pos < 0) {
-		lyxerr << "don't like -1" << endl;
-		LASSERT(false, /**/);
+		LYXERR0("Don't like -1!");
+		LATTEST(false);
 	}
 
 	if (pos > para.size()) {
-		lyxerr << "don't like 1, pos: " << pos
+		LYXERR0("Don't like 1, pos: " << pos
 		       << " size: " << para.size()
-		       << " par: " << par << endl;
-		LASSERT(false, /**/);
+		       << " par: " << par);
+		LATTEST(false);
 	}
 }
 
@@ -612,7 +582,7 @@ void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
 void Text::setCursorIntern(Cursor & cur,
 			      pit_type par, pos_type pos, bool setfont, bool boundary)
 {
-	LASSERT(this == cur.text(), /**/);
+	LBUFERR(this == cur.text());
 	cur.boundary(boundary);
 	setCursor(cur.top(), par, pos);
 	if (setfont)
@@ -622,8 +592,6 @@ void Text::setCursorIntern(Cursor & cur,
 
 bool Text::checkAndActivateInset(Cursor & cur, bool front)
 {
-	if (cur.selection())
-		return false;
 	if (front && cur.pos() == cur.lastpos())
 		return false;
 	if (!front && cur.pos() == 0)
@@ -631,6 +599,8 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
 	Inset * inset = front ? cur.nextInset() : cur.prevInset();
 	if (!inset || !inset->editable())
 		return false;
+	if (cur.selection() && cur.realAnchor().find(inset) == -1)
+		return false;
 	/*
 	 * Apparently, when entering an inset we are expected to be positioned
 	 * *before* it in the containing paragraph, regardless of the direction
@@ -647,8 +617,6 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
 
 bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft)
 {
-	if (cur.selection())
-		return false;
 	if (cur.pos() == -1)
 		return false;
 	if (cur.pos() == cur.lastpos())
@@ -657,6 +625,8 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo
 	Inset * inset = par.isInset(cur.pos()) ? par.getInset(cur.pos()) : 0;
 	if (!inset || !inset->editable())
 		return false;
+	if (cur.selection() && cur.realAnchor().find(inset) == -1)
+		return false;
 	inset->edit(cur, movingForward, 
 		movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT);
 	return true;
@@ -686,6 +656,7 @@ bool Text::cursorBackward(Cursor & cur)
 				cur.textRow().pos() == cur.pos() &&
 				!cur.paragraph().isLineSeparator(cur.pos() - 1) &&
 				!cur.paragraph().isNewline(cur.pos() - 1) &&
+				!cur.paragraph().isEnvSeparator(cur.pos() - 1) &&
 				!cur.paragraph().isSeparator(cur.pos() - 1)) {
 			return setCursor(cur, cur.pit(), cur.pos(), true, true);
 		}
@@ -699,8 +670,14 @@ bool Text::cursorBackward(Cursor & cur)
 	}
 
 	// move to the previous paragraph or do nothing
-	if (cur.pit() > 0)
-		return setCursor(cur, cur.pit() - 1, getPar(cur.pit() - 1).size(), true, false);
+	if (cur.pit() > 0) {
+		Paragraph & par = getPar(cur.pit() - 1);
+		pos_type lastpos = par.size();
+		if (lastpos > 0 && par.isEnvSeparator(lastpos - 1))
+			return setCursor(cur, cur.pit() - 1, lastpos - 1, true, false);
+		else
+			return setCursor(cur, cur.pit() - 1, lastpos, true, false);
+	}
 	return false;
 }
 
@@ -764,12 +741,19 @@ bool Text::cursorForward(Cursor & cur)
 			bool sep2 = cur.paragraph().isSeparator(cur.pos()+1);
 		}
 #endif
-		if (cur.textRow().endpos() == cur.pos() + 1 &&
-		    cur.textRow().endpos() != cur.lastpos() &&
-				!cur.paragraph().isNewline(cur.pos()) &&
-				!cur.paragraph().isLineSeparator(cur.pos()) &&
-				!cur.paragraph().isSeparator(cur.pos())) {
-			return setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
+		if (cur.textRow().endpos() == cur.pos() + 1) {
+			if (cur.paragraph().isEnvSeparator(cur.pos()) &&
+			    cur.pos() + 1 == cur.lastpos() &&
+			    cur.pit() != cur.lastpit()) {
+				// move to next paragraph
+				return setCursor(cur, cur.pit() + 1, 0, true, false);
+			} else if (cur.textRow().endpos() != cur.lastpos() &&
+				   !cur.paragraph().isNewline(cur.pos()) &&
+				   !cur.paragraph().isEnvSeparator(cur.pos()) &&
+				   !cur.paragraph().isLineSeparator(cur.pos()) &&
+				   !cur.paragraph().isSeparator(cur.pos())) {
+				return setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
+			}
 		}
 		
 		// in front of RTL boundary? Stay on this side of the boundary because:
@@ -803,7 +787,13 @@ bool Text::cursorDownParagraph(Cursor & cur)
 {
 	bool updated = false;
 	if (cur.pit() != cur.lastpit())
-		updated = setCursor(cur, cur.pit() + 1, 0);
+		if (lyxrc.mac_like_cursor_movement)
+			if (cur.pos() == cur.lastpos())
+				updated = setCursor(cur, cur.pit() + 1, getPar(cur.pit() + 1).size());
+			else
+				updated = setCursor(cur, cur.pit(), cur.lastpos());
+		else
+			updated = setCursor(cur, cur.pit() + 1, 0);
 	else
 		updated = setCursor(cur, cur.pit(), cur.lastpos());
 	return updated;
@@ -879,7 +869,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 		    && oldpar.isLineSeparator(old.pos() - 1)
 		    && !oldpar.isDeleted(old.pos() - 1)
 		    && !oldpar.isDeleted(old.pos())) {
-			oldpar.eraseChar(old.pos() - 1, cur.buffer()->params().trackChanges);
+			oldpar.eraseChar(old.pos() - 1, cur.buffer()->params().track_changes);
 // FIXME: This will not work anymore when we have multiple views of the same buffer
 // In this case, we will have to correct also the cursors held by
 // other bufferviews. It will probably be easier to do that in a more
@@ -934,7 +924,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 		return true;
 	}
 
-	if (oldpar.stripLeadingSpaces(cur.buffer()->params().trackChanges)) {
+	if (oldpar.stripLeadingSpaces(cur.buffer()->params().track_changes)) {
 		need_anchor_change = true;
 		// We return true here because the Paragraph contents changed and
 		// we need a redraw before further action is processed.
@@ -947,7 +937,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 
 void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges)
 {
-	LASSERT(first >= 0 && first <= last && last < (int) pars_.size(), /**/);
+	LASSERT(first >= 0 && first <= last && last < (int) pars_.size(), return);
 
 	for (pit_type pit = first; pit <= last; ++pit) {
 		Paragraph & par = pars_[pit];