X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.C;h=a43217cc055591222a2b62d954aecafec8812a6d;hb=2486c96b8d9086471299bf207b85b1ce848246aa;hp=05fe823984bf2a73e0fb63d54f7850029d3b6b04;hpb=b11b6f78b1153198dd8dba2bc7da4c56bfa20dab;p=lyx.git

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 05fe823984..a43217cc05 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -18,11 +18,12 @@
 #include "debug.h"
 #include "encoding.h"
 #include "gettext.h"
-#include "iterators.h"
 #include "language.h"
+#include "lyxrow.h"
 #include "lyxtext.h"
 #include "outputparams.h"
 #include "paragraph_pimpl.h"
+#include "pariterator.h"
 #include "sgml.h"
 #include "texrow.h"
 #include "vspace.h"
@@ -30,15 +31,14 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/std_sstream.h"
 
+#include <sstream>
 #include <vector>
 
 using lyx::pos_type;
-using lyx::par_type;
+using lyx::pit_type;
 
 using lyx::support::ascii_lowercase;
-using lyx::support::atoi;
 using lyx::support::bformat;
 using lyx::support::compare_ascii_no_case;
 using lyx::support::compare_no_case;
@@ -58,9 +58,14 @@ using std::pair;
 namespace {
 
 bool moveItem(Paragraph & from, Paragraph & to,
-	BufferParams const & params, pos_type i, pos_type j)
+	BufferParams const & params, pos_type i, pos_type j,
+	Change change = Change(Change::INSERTED));
+
+bool moveItem(Paragraph & from, Paragraph & to,
+	BufferParams const & params, pos_type i, pos_type j,
+	Change change)
 {
-	char const tmpchar = from.getChar(i);
+	Paragraph::value_type const tmpchar = from.getChar(i);
 	LyXFont tmpfont = from.getFontSettings(params, i);
 
 	if (tmpchar == Paragraph::META_INSET) {
@@ -68,15 +73,17 @@ bool moveItem(Paragraph & from, Paragraph & to,
 		if (from.getInset(i)) {
 			// the inset is not in a paragraph anymore
 			tmpinset = from.insetlist.release(i);
+			from.insetlist.erase(i);
 		}
 
-		if (!to.insetAllowed(tmpinset->lyxCode()))
+		if (!to.insetAllowed(tmpinset->lyxCode())) {
+			delete tmpinset;
 			return false;
-		to.insertInset(j, tmpinset, tmpfont);
+		}
+		if (tmpinset)
+			to.insertInset(j, tmpinset, tmpfont, change);
 	} else {
-		if (!to.checkInsertChar(tmpfont))
-			return false;
-		to.insertChar(j, tmpchar, tmpfont);
+		to.insertChar(j, tmpchar, tmpfont, change);
 	}
 	return true;
 }
@@ -85,17 +92,22 @@ bool moveItem(Paragraph & from, Paragraph & to,
 
 
 void breakParagraph(BufferParams const & bparams,
-	ParagraphList & pars, par_type par, pos_type pos, int flag)
+	ParagraphList & pars, pit_type par_offset, pos_type pos, int flag)
 {
 	// create a new paragraph, and insert into the list
 	ParagraphList::iterator tmp =
-		pars.insert(pars.begin() + par + 1, Paragraph());
+		pars.insert(pars.begin() + par_offset + 1, Paragraph());
+
+	Paragraph & par = pars[par_offset];
+
+	// we will invalidate the row cache
+	par.rows().clear();
 
 	// without doing that we get a crash when typing <Return> at the
 	// end of a paragraph
 	tmp->layout(bparams.getLyXTextClass().defaultLayout());
 	// remember to set the inset_owner
-	tmp->setInsetOwner(pars[par].inInset());
+	tmp->setInsetOwner(par.inInset());
 
 	if (bparams.tracking_changes)
 		tmp->trackChanges();
@@ -105,64 +117,71 @@ void breakParagraph(BufferParams const & bparams,
 
 	// layout stays the same with latex-environments
 	if (flag) {
-		tmp->layout(pars[par].layout());
-		tmp->setLabelWidthString(pars[par].params().labelWidthString());
+		tmp->layout(par.layout());
+		tmp->setLabelWidthString(par.params().labelWidthString());
 	}
 
-	bool const isempty = (pars[par].allowEmpty() && pars[par].empty());
+	bool const isempty = (par.allowEmpty() && par.empty());
 
-	if (!isempty && (pars[par].size() > pos || pars[par].empty() || flag == 2)) {
-		tmp->layout(pars[par].layout());
-		tmp->params().align(pars[par].params().align());
-		tmp->setLabelWidthString(pars[par].params().labelWidthString());
+	if (!isempty && (par.size() > pos || par.empty() || flag == 2)) {
+		tmp->layout(par.layout());
+		tmp->params().align(par.params().align());
+		tmp->setLabelWidthString(par.params().labelWidthString());
 
-		tmp->params().depth(pars[par].params().depth());
-		tmp->params().noindent(pars[par].params().noindent());
+		tmp->params().depth(par.params().depth());
+		tmp->params().noindent(par.params().noindent());
 
 		// copy everything behind the break-position
 		// to the new paragraph
 
-#ifdef WITH_WARNINGS
-#warning this seems wrong
-#endif
-		/* FIXME: if !keepempty, empty() == true, then we reach
-		 * here with size() == 0. So pos_end becomes - 1. Why
-		 * doesn't this cause problems ???
+		/* 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 = pars[par].size() - 1;
-		pos_type i = pos;
-		pos_type j = pos;
+		pos_type pos_end = par.size() - 1;
 
-		for (; i <= pos_end; ++i) {
-			Change::Type change = pars[par].lookupChange(i);
-			if (moveItem(pars[par], *tmp, bparams, i, j - pos)) {
+		for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
+			Change::Type change = par.lookupChange(i);
+			if (moveItem(par, *tmp, bparams, i, j - pos)) {
 				tmp->setChange(j - pos, change);
 				++j;
 			}
 		}
 
-		for (i = pos_end; i >= pos; --i)
-			pars[par].eraseIntern(i);
+		for (pos_type i = pos_end; i >= pos; --i)
+			par.eraseIntern(i);
 	}
 
-	if (pos)
-		return;
-
-	pars[par].params().clear();
+	if (pos) {
+		// Make sure that we keep the language when
+		// breaking paragrpah.
+		if (tmp->empty()) {
+			LyXFont changed = tmp->getFirstFontSettings();
+			LyXFont old = par.getFontSettings(bparams, par.size());
+			changed.setLanguage(old.language());
+			tmp->setFont(0, changed);
+		}
 
-	pars[par].layout(bparams.getLyXTextClass().defaultLayout());
+		return;
+	}
 
+        if (!isempty) {
+                par.params().clear();
+                par.layout(bparams.getLyXTextClass().defaultLayout());
+        }
+        
 	// layout stays the same with latex-environments
 	if (flag) {
-		pars[par].layout(tmp->layout());
-		pars[par].setLabelWidthString(tmp->params().labelWidthString());
-		pars[par].params().depth(tmp->params().depth());
+		par.layout(tmp->layout());
+		par.setLabelWidthString(tmp->params().labelWidthString());
+		par.params().depth(tmp->params().depth());
 	}
 
 	// subtle, but needed to get empty pars working right
 	if (bparams.tracking_changes) {
-		if (!pars[par].size()) {
-			pars[par].cleanChanges();
+		if (!par.size()) {
+			par.cleanChanges();
 		} else if (!tmp->size()) {
 			tmp->cleanChanges();
 		}
@@ -171,50 +190,64 @@ void breakParagraph(BufferParams const & bparams,
 
 
 void breakParagraphConservative(BufferParams const & bparams,
-	ParagraphList & pars, par_type par, pos_type pos)
+	ParagraphList & pars, pit_type par_offset, pos_type pos)
 {
 	// create a new paragraph
-	Paragraph & tmp = *pars.insert(pars.begin() + par + 1, Paragraph());
-	tmp.makeSameLayout(pars[par]);
+	Paragraph & tmp = *pars.insert(pars.begin() + par_offset + 1, Paragraph());
+	Paragraph & par = pars[par_offset];
+
+	if (bparams.tracking_changes)
+		tmp.trackChanges();
+
+	tmp.makeSameLayout(par);
 
 	// When can pos > size()?
 	// I guess pos == size() is possible.
-	if (pars[par].size() > pos) {
+	if (par.size() > pos) {
 		// copy everything behind the break-position to the new
 		// paragraph
-		pos_type pos_end = pars[par].size() - 1;
+		pos_type pos_end = par.size() - 1;
 
-		for (pos_type i = pos, j = pos; i <= pos_end; ++i)
-			if (moveItem(pars[par], tmp, bparams, i, j - pos))
+		for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
+			Change::Type change = par.lookupChange(i);
+			if (moveItem(par, tmp, bparams, i, j - pos, change))
 				++j;
-
-		for (pos_type k = pos_end; k >= pos; --k)
-			pars[par].erase(k);
+		}
+		// If tracking changes, set all the text that is to be
+		// erased to Type::INSERTED.
+		for (pos_type k = pos_end; k >= pos; --k) {
+			if (bparams.tracking_changes)
+				par.setChange(k, Change::INSERTED);
+			par.erase(k);
+		}
 	}
 }
 
 
 void mergeParagraph(BufferParams const & bparams,
-	ParagraphList & pars, par_type par)
+	ParagraphList & pars, pit_type par_offset)
 {
-	Paragraph & next = pars[par + 1];
+	Paragraph & next = pars[par_offset + 1];
+	Paragraph & par = pars[par_offset];
 
 	pos_type pos_end = next.size() - 1;
-	pos_type pos_insert = pars[par].size();
+	pos_type pos_insert = par.size();
 
 	// ok, now copy the paragraph
-	for (pos_type i = 0, j = 0; i <= pos_end; ++i)
-		if (moveItem(next, pars[par], bparams, i, pos_insert + j))
+	for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
+		Change::Type change = next.lookupChange(i);
+		if (moveItem(next, par, bparams, i, pos_insert + j, change))
 			++j;
+	}
 
-	pars.erase(pars.begin() + par + 1);
+	pars.erase(pars.begin() + par_offset + 1);
 }
 
 
-par_type depthHook(par_type pit,
+pit_type depthHook(pit_type pit,
 	ParagraphList const & pars, Paragraph::depth_type depth)
 {
-	par_type newpit = pit;
+	pit_type newpit = pit;
 
 	if (newpit != 0)
 		--newpit;
@@ -229,33 +262,40 @@ par_type depthHook(par_type pit,
 }
 
 
-par_type outerHook(par_type par, ParagraphList const & pars)
+pit_type outerHook(pit_type par_offset, ParagraphList const & pars)
 {
-	if (pars[par].getDepth() == 0)
+	Paragraph const & par = pars[par_offset];
+
+	if (par.getDepth() == 0)
 		return pars.size();
-	return depthHook(par, pars, Paragraph::depth_type(pars[par].getDepth() - 1));
+	return depthHook(par_offset, pars, Paragraph::depth_type(par.getDepth() - 1));
 }
 
 
-bool isFirstInSequence(par_type pit, ParagraphList const & pars)
+bool isFirstInSequence(pit_type par_offset, ParagraphList const & pars)
 {
-	par_type dhook = depthHook(pit, pars, pars[pit].getDepth());
-	return dhook == pit
-		|| pars[dhook].layout() != pars[pit].layout()
-		|| pars[dhook].getDepth() != pars[pit].getDepth();
+	Paragraph const & par = pars[par_offset];
+
+	pit_type dhook_offset = depthHook(par_offset, pars, par.getDepth());
+
+	Paragraph const & dhook = pars[dhook_offset];
+
+	return dhook_offset == par_offset
+		|| dhook.layout() != par.layout()
+		|| dhook.getDepth() != par.getDepth();
 }
 
 
-int getEndLabel(par_type p, ParagraphList const & pars)
+int getEndLabel(pit_type p, ParagraphList const & pars)
 {
-	par_type pit = p;
+	pit_type pit = p;
 	Paragraph::depth_type par_depth = pars[p].getDepth();
-	while (pit != par_type(pars.size())) {
+	while (pit != pit_type(pars.size())) {
 		LyXLayout_ptr const & layout = pars[pit].layout();
 		int const endlabeltype = layout->endlabeltype;
 
 		if (endlabeltype != END_LABEL_NO_LABEL) {
-			if (p + 1 == par_type(pars.size()))
+			if (p + 1 == pit_type(pars.size()))
 				return endlabeltype;
 
 			Paragraph::depth_type const next_depth =
@@ -268,26 +308,26 @@ int getEndLabel(par_type p, ParagraphList const & pars)
 		if (par_depth == 0)
 			break;
 		pit = outerHook(pit, pars);
-		if (pit != par_type(pars.size()))
+		if (pit != pit_type(pars.size()))
 			par_depth = pars[pit].getDepth();
 	}
 	return END_LABEL_NO_LABEL;
 }
 
 
-LyXFont const outerFont(par_type pit, ParagraphList const & pars)
+LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars)
 {
-	Paragraph::depth_type par_depth = pars[pit].getDepth();
+	Paragraph::depth_type par_depth = pars[par_offset].getDepth();
 	LyXFont tmpfont(LyXFont::ALL_INHERIT);
 
 	// Resolve against environment font information
-	while (pit != par_type(pars.size())
+	while (par_offset != pit_type(pars.size())
 	       && par_depth
 	       && !tmpfont.resolved()) {
-		pit = outerHook(pit, pars);
-		if (pit != par_type(pars.size())) {
-			tmpfont.realize(pars[pit].layout()->font);
-			par_depth = pars[pit].getDepth();
+		par_offset = outerHook(par_offset, pars);
+		if (par_offset != pit_type(pars.size())) {
+			tmpfont.realize(pars[par_offset].layout()->font);
+			par_depth = pars[par_offset].getDepth();
 		}
 	}
 
@@ -295,63 +335,16 @@ LyXFont const outerFont(par_type pit, ParagraphList const & pars)
 }
 
 
-par_type outerPar(Buffer const & buf, InsetBase const * inset)
+/// return the number of InsetOptArg in a paragraph
+int numberOfOptArgs(Paragraph const & par)
 {
-	ParIterator pit = const_cast<Buffer &>(buf).par_iterator_begin();
-	ParIterator end = const_cast<Buffer &>(buf).par_iterator_end();
-	for ( ; pit != end; ++pit) {
-		LyXText * text;
-		// the second '=' below is intentional
-		for (int i = 0; (text = inset->getText(i)); ++i)
-			if (&text->paragraphs() == &pit.plist())
-				return pit.outerPar();
-
-		InsetList::iterator ii = pit->insetlist.begin();
-		InsetList::iterator iend = pit->insetlist.end();
-		for ( ; ii != iend; ++ii)
-			if (ii->inset == inset)
-				return pit.outerPar();
-	}
-	lyxerr << "outerPar: should not happen" << endl;
-	BOOST_ASSERT(false);
-	return buf.paragraphs().size(); // shut up compiler
-}
+	int num = 0;
 
-
-Paragraph const & ownerPar(Buffer const & buf, InsetBase const * inset)
-{
-	ParConstIterator pit = buf.par_iterator_begin();
-	ParConstIterator end = buf.par_iterator_end();
-	for ( ; pit != end; ++pit) {
-		LyXText * text;
-		// the second '=' below is intentional
-		for (int i = 0; (text = inset->getText(i)); ++i)
-			if (&text->paragraphs() == &pit.plist())
-				return *pit;
-
-		InsetList::const_iterator ii = pit->insetlist.begin();
-		InsetList::const_iterator iend = pit->insetlist.end();
-		for ( ; ii != iend; ++ii)
-			if (ii->inset == inset)
-				return *pit;
+	InsetList::const_iterator it = par.insetlist.begin();
+	InsetList::const_iterator end = par.insetlist.end();
+	for (; it != end ; ++it) {
+		if (it->inset->lyxCode() == InsetBase::OPTARG_CODE)
+			++num;
 	}
-	lyxerr << "ownerPar: should not happen" << endl;
-	BOOST_ASSERT(false);
-	return buf.paragraphs().front(); // shut up compiler
-}
-
-
-/// return the range of pars [beg, end[ owning the range of y [ystart, yend] 
-void getParsInRange(ParagraphList & pars, int ystart, int yend,
-	par_type & beg, par_type & end)
-{
-	BOOST_ASSERT(!pars.empty());
-	par_type const endpar = pars.size();
-	par_type const begpar = 0;
-
-	for (beg = endpar - 1; beg != begpar && pars[beg].y > ystart; --beg)
-		;
-
-	for (end = beg ; end != endpar && pars[end].y <= yend; ++end)
-		;
+	return num;
 }