X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.cpp;h=2f87daf5b59d553417418371384dfc34fcdc7750;hb=1acedf11da79f509da706bc8d6d2f491c9676087;hp=7514a1a436dfa971411d2d29013da0cff17f62a7;hpb=fad47c0fe0a45da4ac4a395817a0ad73425ef275;p=lyx.git

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 7514a1a436..2f87daf5b5 100644
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -13,39 +13,38 @@
 #include "paragraph_funcs.h"
 
 #include "BufferParams.h"
-#include "debug.h"
+#include "Changes.h"
+#include "support/debug.h"
+#include "InsetList.h"
 #include "Layout.h"
-#include "Text.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
+#include "Text.h"
+#include "TextClass.h"
 
 #include <boost/next_prior.hpp>
 
+using namespace std;
 
 namespace lyx {
 
-using std::endl;
-
-
 static bool moveItem(Paragraph & fromPar, pos_type fromPos,
 	Paragraph & toPar, pos_type toPos, BufferParams const & params)
 {
 	// Note: moveItem() does not honour change tracking!
 	// Therefore, it should only be used for breaking and merging paragraphs
 
-	Paragraph::value_type const tmpChar = fromPar.getChar(fromPos);
+	char_type const tmpChar = fromPar.getChar(fromPos);
 	Font const tmpFont = fromPar.getFontSettings(params, fromPos);
 	Change const tmpChange = fromPar.lookupChange(fromPos);
 
-	if (tmpChar == Paragraph::META_INSET) {
+	if (fromPar.isInset(fromPos)) {
 		Inset * tmpInset = 0;
 		if (fromPar.getInset(fromPos)) {
 			// the inset is not in the paragraph any more
-			tmpInset = fromPar.insetlist.release(fromPos);
+			tmpInset = fromPar.releaseInset(fromPos);
 		}
 
-		fromPar.eraseChar(fromPos, false);
-
 		if (!toPar.insetAllowed(tmpInset->lyxCode())) {
 			delete tmpInset;
 			return false;
@@ -62,7 +61,8 @@ static bool moveItem(Paragraph & fromPar, pos_type fromPos,
 
 
 void breakParagraph(BufferParams const & bparams,
-	ParagraphList & pars, pit_type par_offset, pos_type pos, int flag)
+		    ParagraphList & pars, pit_type par_offset, pos_type pos, 
+		    bool keep_layout)
 {
 	// create a new paragraph, and insert into the list
 	ParagraphList::iterator tmp =
@@ -78,7 +78,7 @@ void breakParagraph(BufferParams const & bparams,
 	tmp->setInsetOwner(par.inInset());
 
 	// layout stays the same with latex-environments
-	if (flag) {
+	if (keep_layout) {
 		tmp->layout(par.layout());
 		tmp->setLabelWidthString(par.params().labelWidthString());
 		tmp->params().depth(par.params().depth());
@@ -92,7 +92,7 @@ void breakParagraph(BufferParams const & bparams,
 
 	bool const isempty = (par.allowEmpty() && par.empty());
 
-	if (!isempty && (par.size() > pos || par.empty() || flag == 2)) {
+	if (!isempty && (par.size() > pos || par.empty())) {
 		tmp->layout(par.layout());
 		tmp->params().align(par.params().align());
 		tmp->setLabelWidthString(par.params().labelWidthString());
@@ -144,7 +144,7 @@ void breakParagraph(BufferParams const & bparams,
 	}
 
 	// layout stays the same with latex-environments
-	if (flag) {
+	if (keep_layout) {
 		par.layout(tmp->layout());
 		par.setLabelWidthString(tmp->params().labelWidthString());
 		par.params().depth(tmp->params().depth());
@@ -194,8 +194,8 @@ void mergeParagraph(BufferParams const & bparams,
 	// marked as unmodified. Otherwise, its change is adopted by the first
 	// character of the next paragraph.
 	if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
-		LYXERR(Debug::CHANGES) <<
-		   "merging par with inserted/deleted end-of-par character" << endl;
+		LYXERR(Debug::CHANGES,
+		   "merging par with inserted/deleted end-of-par character");
 		par.setChange(par.size(), Change(Change::UNCHANGED));
 	}
 
@@ -290,7 +290,7 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
 Font const outerFont(pit_type par_offset, ParagraphList const & pars)
 {
 	depth_type par_depth = pars[par_offset].getDepth();
-	Font tmpfont(Font::ALL_INHERIT);
+	FontInfo tmpfont = inherit_font;
 
 	// Resolve against environment font information
 	while (par_offset != pit_type(pars.size())
@@ -303,22 +303,7 @@ Font const outerFont(pit_type par_offset, ParagraphList const & pars)
 		}
 	}
 
-	return tmpfont;
-}
-
-
-/// return the number of InsetOptArg in a paragraph
-int numberOfOptArgs(Paragraph const & par)
-{
-	int num = 0;
-
-	InsetList::const_iterator it = par.insetlist.begin();
-	InsetList::const_iterator end = par.insetlist.end();
-	for (; it != end ; ++it) {
-		if (it->inset->lyxCode() == Inset::OPTARG_CODE)
-			++num;
-	}
-	return num;
+	return Font(tmpfont);
 }