int column = 0;
for (pos_type i = 0; i <= size(); ++i) {
- Change change = pimpl_->lookupChangeFull(i);
+ Change change = pimpl_->lookupChange(i);
Changes::lyxMarkChange(os, column, curtime, running_change, change);
running_change = change;
LyXFont font = getFontSettings(bparams, pos);
font.realize(layoutfont);
font.realize(outerfont);
- font.realize(bparams.getLyXTextClass().defaultfont());
+ font.realize(bparams.getFont());
return font;
}
LyXFont tmpfont = layout()->labelfont;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ tmpfont.realize(bparams.getFont());
return tmpfont;
}
LyXFont tmpfont = layout()->font;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ tmpfont.realize(bparams.getFont());
return tmpfont;
}
int i = 0;
while (!empty() && (isNewline(0) || isLineSeparator(0))
- && (lookupChange(0) != Change::DELETED)) {
+ && (lookupChange(0).type != Change::DELETED)) {
erase(0);
++i;
}
open_font = true;
}
- Change::Type change = pimpl_->lookupChange(i);
+ Change::Type change = pimpl_->lookupChange(i).type;
column += Changes::latexMarkChange(os, running_change,
change, output);
}
-Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
+Change const Paragraph::lookupChange(lyx::pos_type pos) const
{
BOOST_ASSERT(pos <= size());
return pimpl_->lookupChange(pos);
}
-Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
-{
- BOOST_ASSERT(pos <= size());
- return pimpl_->lookupChangeFull(pos);
-}
-
-
bool Paragraph::isChanged(pos_type start, pos_type end) const
{
return pimpl_->isChanged(start, end);
}
-void Paragraph::setChange(lyx::pos_type pos, Change::Type type)
+void Paragraph::setChangeType(lyx::pos_type pos, Change::Type type)
{
- pimpl_->setChange(pos, type);
+ pimpl_->setChangeType(pos, type);
}
-void Paragraph::setChangeFull(lyx::pos_type pos, Change change)
+void Paragraph::setChange(lyx::pos_type pos, Change change)
{
- pimpl_->setChangeFull(pos, change);
+ pimpl_->setChange(pos, change);
}