#include "BufferParams.h"
#include "Changes.h"
-#include "debug.h"
+#include "support/debug.h"
#include "InsetList.h"
#include "Layout.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
// 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));
}
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())
}
}
- return tmpfont;
+ return Font(tmpfont);
}