}
-FontInfo Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
+FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
{
LayoutPtr const & layout = pars_[pit].layout();
}
-FontInfo Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
+FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
{
LayoutPtr const & layout = par.layout();
BOOST_ASSERT(start != end);
BufferParams const & bufparams = buffer.params();
- LayoutPtr const & lyxlayout = bufparams.textClass()[layout];
+ LayoutPtr const & lyxlayout = bufparams.documentClass()[layout];
for (pit_type pit = start; pit != end; ++pit) {
Paragraph & par = pars_[pit];
// special handling of new environment insets
BufferView & bv = cur.bv();
BufferParams const & params = bv.buffer().params();
- LayoutPtr const & lyxlayout = params.textClass()[layout];
+ LayoutPtr const & lyxlayout = params.documentClass()[layout];
if (lyxlayout->is_environment) {
// move everything in a new environment inset
LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout));
lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN));
lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT));
lyx::dispatch(FuncRequest(LFUN_CUT));
- Inset * inset = new InsetEnvironment(params, layout);
+ Inset * inset = new InsetEnvironment(bv.buffer(), layout);
insertInset(cur, inset);
//inset->edit(cur, true);
//lyx::dispatch(FuncRequest(LFUN_PASTE));
FontInfo layoutfont;
pit_type pit = cur.pit();
if (cur.pos() < pars_[pit].beginOfBody())
- layoutfont = getLabelFont(cur.buffer(), pars_[pit]);
+ layoutfont = labelFont(cur.buffer(), pars_[pit]);
else
- layoutfont = getLayoutFont(cur.buffer(), pit);
+ layoutfont = layoutFont(cur.buffer(), pit);
// Update current font
cur.real_current_font.update(font,
setInsetFont(bv, pit, pos, font, toggleall);
}
TextMetrics const & tm = bv.textMetrics(this);
- Font f = tm.getDisplayFont(pit, pos);
+ Font f = tm.displayFont(pit, pos);
f.update(font, language, toggleall);
setCharFont(buffer, pit, pos, f, tm.font_);
}
bool setfont, bool boundary)
{
TextMetrics const & tm = cur.bv().textMetrics(this);
- bool const update_needed = !tm.has(par);
+ bool const update_needed = !tm.contains(par);
Cursor old = cur;
setCursorIntern(cur, par, pos, setfont, boundary);
return cur.bv().checkDepm(cur, old) || update_needed;