#include "TextMetrics.h"
#include "VSpace.h"
-#include "insets/InsetEnvironment.h"
+#include "insets/InsetCollapsable.h"
#include "mathed/InsetMathHull.h"
}
+// Note that this is supposed to return a fully realized font.
FontInfo Text::layoutFont(Buffer const & buffer, pit_type const pit) const
{
Layout const & layout = pars_[pit].layout();
// In case the default family has been customized
if (layout.font.family() == INHERIT_FAMILY)
lf.setFamily(buffer.params().getFont().fontInfo().family());
- return lf;
+ // FIXME
+ // It ought to be possible here just to use Inset::getLayout() and skip
+ // the asInsetCollapsable() bit. Unfortunatley, that doesn't work right
+ // now, because Inset::getLayout() will return a default-constructed
+ // InsetLayout, and that e.g. sets the foreground color to red. So we
+ // need to do some work to make that possible.
+ InsetCollapsable const * icp = pars_[pit].inInset().asInsetCollapsable();
+ if (!icp)
+ return lf;
+ FontInfo icf = icp->getLayout().font();
+ icf.realize(lf);
+ return icf;
}
FontInfo font = layout.font;
}
+// Note that this is supposed to return a fully realized font.
FontInfo Text::labelFont(Buffer const & buffer, Paragraph const & par) const
{
Layout const & layout = par.layout();
// In case the default family has been customized
if (layout.labelfont.family() == INHERIT_FAMILY)
lf.setFamily(buffer.params().getFont().fontInfo().family());
- return lf;
+ // FIXME As above....
+ InsetCollapsable const * icp = par.inInset().asInsetCollapsable();
+ if (!icp)
+ return lf;
+ FontInfo icf = icp->getLayout().labelfont();
+ icf.realize(lf);
+ return icf;
}
FontInfo font = layout.labelfont;
void Text::setLayout(Cursor & cur, docstring const & layout)
{
LASSERT(this == cur.text(), /**/);
- // special handling of new environment insets
- BufferView & bv = cur.bv();
- BufferParams const & params = bv.buffer().params();
- Layout 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(bv.buffer(), layout);
- insertInset(cur, inset);
- //inset->edit(cur, true);
- //lyx::dispatch(FuncRequest(LFUN_PASTE));
- return;
- }
pit_type start = cur.selBegin().pit();
pit_type end = cur.selEnd().pit() + 1;
{
LASSERT(this == cur.text(), /**/);
// If the mask is completely neutral, tell user
- if (font.fontInfo() == ignore_font &&
- (font.language() == 0 || font.language() == ignore_language)) {
+ if (font.fontInfo() == ignore_font && font.language() == ignore_language) {
// Could only happen with user style
cur.message(_("No font change defined."));
return;