#include "paragraph_funcs.h"
#include "BufferParams.h"
+#include "Changes.h"
#include "debug.h"
+#include "InsetList.h"
#include "Layout.h"
-#include "Text.h"
#include "Paragraph.h"
#include "ParagraphParameters.h"
+#include "Text.h"
+
+#include <boost/next_prior.hpp>
namespace lyx {
-using std::string;
using std::endl;
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;
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 =
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());
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());
}
// 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());
{
int num = 0;
- InsetList::const_iterator it = par.insetlist.begin();
- InsetList::const_iterator end = par.insetlist.end();
+ 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)
+ if (it->inset->lyxCode() == OPTARG_CODE)
++num;
}
return num;