- Getting rid of some unneeded init() methods.
- InsetCollapsable::layout_ is now a const pointer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21396
a592a061-630c-0410-9148-
cb99ea01b6c8
12 files changed:
InsetFlex & inset =
static_cast<InsetFlex &>(*it);
string const name = inset.params().name;
InsetFlex & inset =
static_cast<InsetFlex &>(*it);
string const name = inset.params().name;
+ InsetLayout const & il =
tclass2.insetlayout(from_utf8(name));
inset.setLayout(il);
if (il.labelstring == from_utf8("UNDEFINED")) {
tclass2.insetlayout(from_utf8(name));
inset.setLayout(il);
if (il.labelstring == from_utf8("UNDEFINED")) {
break;
case IL_LABELFONT:
labelfont = lyxRead(lexrc, inherit_font);
break;
case IL_LABELFONT:
labelfont = lyxRead(lexrc, inherit_font);
+ // The label font is generally used as-is without
+ // any realization against a given context.
+ labelfont.realize(sane_font);
break;
case IL_FORCELTR:
lexrc.next();
break;
case IL_FORCELTR:
lexrc.next();
case LFUN_FLEX_INSERT: {
string s = cmd.getArg(0);
case LFUN_FLEX_INSERT: {
string s = cmd.getArg(0);
- TextClass tclass = params.getTextClass();
- InsetLayout il = tclass.insetlayout(from_utf8(s));
+ TextClass const & tclass = params.getTextClass();
+ InsetLayout const & il = tclass.insetlayout(from_utf8(s));
return new InsetFlex(params, il);
}
return new InsetFlex(params, il);
}
- TextClass tclass = buf.params().getTextClass();
+ TextClass const & tclass = buf.params().getTextClass();
lex.next();
string tmptok = lex.getString();
lex.next();
string tmptok = lex.getString();
} else if (tmptok == "Flex") {
lex.next();
string s = lex.getString();
} else if (tmptok == "Flex") {
lex.next();
string s = lex.getString();
- InsetLayout il = tclass.insetlayout(from_utf8(s));
+ InsetLayout const & il = tclass.insetlayout(from_utf8(s));
inset.reset(new InsetFlex(buf.params(), il));
} else if (tmptok == "Branch") {
inset.reset(new InsetBranch(buf.params(),
inset.reset(new InsetFlex(buf.params(), il));
} else if (tmptok == "Branch") {
inset.reset(new InsetBranch(buf.params(),
-void InsetBox::init()
-{
- setButtonLabel();
-}
-
-
InsetBox::InsetBox(BufferParams const & bp, string const & label)
: InsetCollapsable(bp), params_(label)
InsetBox::InsetBox(BufferParams const & bp, string const & label)
: InsetCollapsable(bp), params_(label)
InsetBox::InsetBox(InsetBox const & in)
: InsetCollapsable(in), params_(in.params_)
InsetBox::InsetBox(InsetBox const & in)
: InsetCollapsable(in), params_(in.params_)
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
InsetBranch::InsetBranch(BufferParams const & bp,
InsetBranchParams const & params)
: InsetCollapsable(bp), params_(params)
InsetBranch::InsetBranch(BufferParams const & bp,
InsetBranchParams const & params)
: InsetCollapsable(bp), params_(params)
-{
- setButtonLabel();
-}
InsetBranch::InsetBranch(InsetBranch const & in)
: InsetCollapsable(in), params_(in.params_)
InsetBranch::InsetBranch(InsetBranch const & in)
: InsetCollapsable(in), params_(in.params_)
-{
- setButtonLabel();
-}
InsetBranch::~InsetBranch()
InsetBranch::~InsetBranch()
void InsetCollapsable::setLayout(BufferParams const & bp)
{
void InsetCollapsable::setLayout(BufferParams const & bp)
{
- // FIXME: put this in the InsetLayout parsing?
- // Fallback for lacking inset layout background
- layout_.bgcolor = Color_background;
-
- layout_ = getLayout(bp);
-
- // FIXME: put this in the InsetLayout parsing?
- layout_.labelfont.realize(sane_font);
+ layout_ = &getLayout(bp);
+ labelstring_ = layout_->labelstring;
Dimension InsetCollapsable::dimensionCollapsed() const
{
Dimension dim;
Dimension InsetCollapsable::dimensionCollapsed() const
{
Dimension dim;
- theFontMetrics(layout_.labelfont).buttonText(
- layout_.labelstring, dim.wid, dim.asc, dim.des);
+ theFontMetrics(layout_->labelfont).buttonText(
+ labelstring_, dim.wid, dim.asc, dim.des);
autoOpen_ = mi.base.bv->cursor().isInside(this);
FontInfo tmpfont = mi.base.font;
autoOpen_ = mi.base.bv->cursor().isInside(this);
FontInfo tmpfont = mi.base.font;
- mi.base.font = layout_.font;
+ mi.base.font = layout_->font;
mi.base.font.realize(tmpfont);
switch (geometry()) {
mi.base.font.realize(tmpfont);
switch (geometry()) {
case SubLabel: {
InsetText::metrics(mi, dim);
// consider width of the inset label
case SubLabel: {
InsetText::metrics(mi, dim);
// consider width of the inset label
- FontInfo font(layout_.labelfont);
+ FontInfo font(layout_->labelfont);
font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
- docstring s = layout_.labelstring;
- theFontMetrics(font).rectText(s, w, a, d);
+ theFontMetrics(font).rectText(labelstring_, w, a, d);
dim.des += a + d;
break;
}
dim.des += a + d;
break;
}
pi.background_color = backgroundColor();
FontInfo tmpfont = pi.base.font;
pi.background_color = backgroundColor();
FontInfo tmpfont = pi.base.font;
- pi.base.font = layout_.font;
+ pi.base.font = layout_->font;
pi.base.font.realize(tmpfont);
// Draw button first -- top, left or only
pi.base.font.realize(tmpfont);
// Draw button first -- top, left or only
button_dim.y1 = y - dimc.asc;
button_dim.y2 = y + dimc.des;
button_dim.y1 = y - dimc.asc;
button_dim.y2 = y + dimc.des;
- pi.pain.buttonText(x, y, layout_.labelstring, layout_.labelfont, mouse_hover_);
+ pi.pain.buttonText(x, y, labelstring_, layout_->labelfont,
+ mouse_hover_);
} else {
button_dim.x1 = 0;
button_dim.y1 = 0;
} else {
button_dim.x1 = 0;
button_dim.y1 = 0;
const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
pi.pain.line(xx1, y + desc - 4,
xx1, y + desc,
const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
pi.pain.line(xx1, y + desc - 4,
xx1, y + desc,
- layout_.labelfont.color());
+ layout_->labelfont.color());
if (internalStatus() == Open)
pi.pain.line(xx1, y + desc,
xx2, y + desc,
if (internalStatus() == Open)
pi.pain.line(xx1, y + desc,
xx2, y + desc,
- layout_.labelfont.color());
+ layout_->labelfont.color());
else {
// Make status_ value visible:
pi.pain.line(xx1, y + desc,
xx1 + 4, y + desc,
else {
// Make status_ value visible:
pi.pain.line(xx1, y + desc,
xx1 + 4, y + desc,
- layout_.labelfont.color());
+ layout_->labelfont.color());
pi.pain.line(xx2 - 4, y + desc,
xx2, y + desc,
pi.pain.line(xx2 - 4, y + desc,
xx2, y + desc,
- layout_.labelfont.color());
+ layout_->labelfont.color());
}
pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, y + desc - 4,
}
pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, y + desc - 4,
- layout_.labelfont.color());
+ layout_->labelfont.color());
// the label below the text. Can be toggled.
if (geometry() == SubLabel) {
// the label below the text. Can be toggled.
if (geometry() == SubLabel) {
- FontInfo font(layout_.labelfont);
+ FontInfo font(layout_->labelfont);
font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
- docstring s = layout_.labelstring;
- theFontMetrics(font).rectText(s, w, a, d);
+ theFontMetrics(font).rectText(labelstring_, w, a, d);
int const ww = max(textdim.wid, w);
pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
int const ww = max(textdim.wid, w);
pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
- s, font, Color_none, Color_none);
+ labelstring_, font, Color_none, Color_none);
if (cur.isInside(this)) {
y -= textdim.asc;
y += 3;
if (cur.isInside(this)) {
y -= textdim.asc;
y += 3;
- pi.pain.line(xx1, y + 4, xx1, y, layout_.labelfont.color());
- pi.pain.line(xx1 + 4, y, xx1, y, layout_.labelfont.color());
+ pi.pain.line(xx1, y + 4, xx1, y, layout_->labelfont.color());
+ pi.pain.line(xx1 + 4, y, xx1, y, layout_->labelfont.color());
pi.pain.line(xx2, y + 4, xx2, y,
pi.pain.line(xx2, y + 4, xx2, y,
- layout_.labelfont.color());
+ layout_->labelfont.color());
pi.pain.line(xx2 - 4, y, xx2, y,
pi.pain.line(xx2 - 4, y, xx2, y,
- layout_.labelfont.color());
+ layout_->labelfont.color());
- if (layout_.forceltr) {
+ if (layout_->forceltr) {
// Force any new text to latex_language
// FIXME: This should only be necessary in constructor, but
// new paragraphs that are created by pressing enter at the
// Force any new text to latex_language
// FIXME: This should only be necessary in constructor, but
// new paragraphs that are created by pressing enter at the
bool InsetCollapsable::allowMultiPar() const
{
bool InsetCollapsable::allowMultiPar() const
{
- return layout_.multipar;
+ return layout_->multipar;
{
Font font;
font.fontInfo() = sane_font;
{
Font font;
font.fontInfo() = sane_font;
font.setLanguage(latex_language);
font.setLanguage(latex_language);
- if (layout_.passthru) {
+ if (layout_->passthru) {
ParagraphList::iterator par = paragraphs().begin();
ParagraphList::iterator const end = paragraphs().end();
while (par != end) {
ParagraphList::iterator par = paragraphs().begin();
ParagraphList::iterator const end = paragraphs().end();
while (par != end) {
case LFUN_TABULAR_INSERT:
case LFUN_TOC_INSERT:
case LFUN_WRAP_INSERT:
case LFUN_TABULAR_INSERT:
case LFUN_TOC_INSERT:
case LFUN_WRAP_INSERT:
- if (layout_.passthru) {
+ if (layout_->passthru) {
flag.enabled(false);
return true;
} else
flag.enabled(false);
return true;
} else
return true;
case LFUN_LANGUAGE:
return true;
case LFUN_LANGUAGE:
- flag.enabled(!layout_.forceltr);
+ flag.enabled(!layout_->forceltr);
return InsetText::getStatus(cur, cmd, flag);
case LFUN_BREAK_PARAGRAPH:
case LFUN_BREAK_PARAGRAPH_SKIP:
return InsetText::getStatus(cur, cmd, flag);
case LFUN_BREAK_PARAGRAPH:
case LFUN_BREAK_PARAGRAPH_SKIP:
- flag.enabled(layout_.multipar);
+ flag.enabled(layout_->multipar);
void InsetCollapsable::setLabel(docstring const & l)
{
void InsetCollapsable::setLabel(docstring const & l)
{
- layout_.labelstring = l;
InsetCollapsable::Decoration InsetCollapsable::decoration() const
{
InsetCollapsable::Decoration InsetCollapsable::decoration() const
{
- if (layout_.decoration == "classic")
+ if (layout_->decoration == "classic")
- if (layout_.decoration == "minimalistic")
+ if (layout_->decoration == "minimalistic")
- if (layout_.decoration == "conglomerate")
+ if (layout_->decoration == "conglomerate")
return Conglomerate;
if (name() == from_ascii("Flex"))
return Conglomerate;
return Conglomerate;
if (name() == from_ascii("Flex"))
return Conglomerate;
// a collapsable inset, either a command or an environment. Standard
// collapsable insets should not redefine this, non-standard ones may
// call this.
// a collapsable inset, either a command or an environment. Standard
// collapsable insets should not redefine this, non-standard ones may
// call this.
- if (!layout_.latexname.empty()) {
- if (layout_.latextype == "command") {
+ if (!layout_->latexname.empty()) {
+ if (layout_->latextype == "command") {
// FIXME UNICODE
if (runparams.moving_arg)
os << "\\protect";
// FIXME UNICODE
if (runparams.moving_arg)
os << "\\protect";
- os << '\\' << from_utf8(layout_.latexname);
- if (!layout_.latexparam.empty())
- os << from_utf8(layout_.latexparam);
+ os << '\\' << from_utf8(layout_->latexname);
+ if (!layout_->latexparam.empty())
+ os << from_utf8(layout_->latexparam);
- } else if (layout_.latextype == "environment") {
- os << "%\n\\begin{" << from_utf8(layout_.latexname) << "}\n";
- if (!layout_.latexparam.empty())
- os << from_utf8(layout_.latexparam);
+ } else if (layout_->latextype == "environment") {
+ os << "%\n\\begin{" << from_utf8(layout_->latexname) << "}\n";
+ if (!layout_->latexparam.empty())
+ os << from_utf8(layout_->latexparam);
}
}
OutputParams rp = runparams;
}
}
OutputParams rp = runparams;
- if (layout_.needprotect)
+ if (layout_->needprotect)
rp.moving_arg = true;
int i = InsetText::latex(buf, os, rp);
rp.moving_arg = true;
int i = InsetText::latex(buf, os, rp);
- if (!layout_.latexname.empty()) {
- if (layout_.latextype == "command") {
+ if (!layout_->latexname.empty()) {
+ if (layout_->latextype == "command") {
- } else if (layout_.latextype == "environment") {
- os << "\n\\end{" << from_utf8(layout_.latexname) << "}\n";
+ } else if (layout_->latextype == "environment") {
+ os << "\n\\end{" << from_utf8(layout_->latexname) << "}\n";
void InsetCollapsable::validate(LaTeXFeatures & features) const
{
// Force inclusion of preamble snippet in layout file
void InsetCollapsable::validate(LaTeXFeatures & features) const
{
// Force inclusion of preamble snippet in layout file
- features.require(layout_.name);
+ features.require(layout_->name);
InsetText::validate(features);
}
InsetText::validate(features);
}
///
bool setMouseHover(bool mouse_hover);
///
///
bool setMouseHover(bool mouse_hover);
///
- virtual ColorCode backgroundColor() const {return layout_.bgcolor; }
+ virtual ColorCode backgroundColor() const {return layout_->bgcolor; }
int latex(Buffer const &, odocstream &,
OutputParams const &) const;
int latex(Buffer const &, odocstream &,
OutputParams const &) const;
virtual InsetCode lyxCode() const { return COLLAPSABLE_CODE; }
/// Allow multiple blanks
virtual InsetCode lyxCode() const { return COLLAPSABLE_CODE; }
/// Allow multiple blanks
- virtual bool isFreeSpacing() const { return layout_.freespacing; }
+ virtual bool isFreeSpacing() const { return layout_->freespacing; }
/// Don't eliminate empty paragraphs
/// Don't eliminate empty paragraphs
- virtual bool allowEmpty() const { return layout_.keepempty; }
+ virtual bool allowEmpty() const { return layout_->keepempty; }
///
mutable int topbaseline;
///
///
mutable int topbaseline;
///
- mutable InsetLayout layout_;
+ InsetLayout const * layout_;
///
CollapseStatus internalStatus() const { return status_; }
private:
///
CollapseStatus internalStatus() const { return status_; }
private:
+ ///
+ docstring labelstring_;
///
mutable CollapseStatus status_;
/// a substatus of the Open status, determined automatically in metrics
///
mutable CollapseStatus status_;
/// a substatus of the Open status, determined automatically in metrics
-void InsetERT::init()
-{
- setButtonLabel();
- // FIXME: what to do with those?
- //text_.current_font.setLanguage(latex_language);
- //text_.real_current_font.setLanguage(latex_language);
-}
-
-
InsetERT::InsetERT(BufferParams const & bp, CollapseStatus status)
: InsetCollapsable(bp, status)
InsetERT::InsetERT(BufferParams const & bp, CollapseStatus status)
: InsetCollapsable(bp, status)
InsetERT::InsetERT(InsetERT const & in)
: InsetCollapsable(in)
InsetERT::InsetERT(InsetERT const & in)
: InsetCollapsable(in)
Inset * InsetERT::clone() const
Inset * InsetERT::clone() const
-#if 0
-InsetERT::InsetERT(BufferParams const & bp,
- Language const *, string const & contents, CollapseStatus status)
- : InsetCollapsable(bp, status)
-{
- Font font(FONT_INHERIT, latex_language);
- paragraphs().begin()->insert(0, contents, font);
-
- // the init has to be after the initialization of the paragraph
- // because of the label settings (draw_label for ert insets).
- init();
-}
-#endif
-
-
InsetERT::~InsetERT()
{
InsetERTMailer(*this).hideDialog();
InsetERT::~InsetERT()
{
InsetERTMailer(*this).hideDialog();
}
default:
// Force any new text to latex_language
}
default:
// Force any new text to latex_language
- // FIXME: This should only be necessary in init(), but
+ // FIXME: This should not be necessary but
// new paragraphs that are created by pressing enter at the
// start of an existing paragraph get the buffer language
// and not latex_language, so we take this brute force
// new paragraphs that are created by pressing enter at the
// start of an existing paragraph get the buffer language
// and not latex_language, so we take this brute force
private:
virtual Inset * clone() const;
///
private:
virtual Inset * clone() const;
///
void setButtonLabel();
///
bool allowSpellCheck() const { return false; }
void setButtonLabel();
///
bool allowSpellCheck() const { return false; }
InsetFlex::InsetFlex(BufferParams const & bp,
InsetFlex::InsetFlex(BufferParams const & bp,
+ InsetLayout const & il)
: InsetCollapsable(bp, Collapsed)
{
params_.name = il.name;
: InsetCollapsable(bp, Collapsed)
{
params_.name = il.name;
InsetFlex::InsetFlex(InsetFlex const & in)
: InsetCollapsable(in), params_(in.params_)
InsetFlex::InsetFlex(InsetFlex const & in)
: InsetCollapsable(in), params_(in.params_)
+{
+ setLayout(*in.layout_);
+}
Inset * InsetFlex::clone() const
Inset * InsetFlex::clone() const
bool InsetFlex::undefined() const
{
bool InsetFlex::undefined() const
{
- return layout_.labelstring == from_utf8("UNDEFINED");
+ return layout_->labelstring == from_utf8("UNDEFINED");
-void InsetFlex::setLayout(InsetLayout il)
+void InsetFlex::setLayout(InsetLayout const & il)
if (!undefined())
// FIXME UNICODE
if (!undefined())
// FIXME UNICODE
- sgml::openTag(os, layout_.latexname,
- par->getID(buf, runparams) + layout_.latexparam);
+ sgml::openTag(os, layout_->latexname,
+ par->getID(buf, runparams) + layout_->latexparam);
for (; par != end; ++par) {
par->simpleDocBookOnePar(buf, os, runparams,
for (; par != end; ++par) {
par->simpleDocBookOnePar(buf, os, runparams,
- sgml::closeTag(os, layout_.latexname);
+ sgml::closeTag(os, layout_->latexname);
class InsetFlex : public InsetCollapsable {
public:
///
class InsetFlex : public InsetCollapsable {
public:
///
- InsetFlex(BufferParams const &, InsetLayout);
+ InsetFlex(BufferParams const &, InsetLayout const &);
///
docstring name() const { return from_ascii("Flex"); }
///
///
docstring name() const { return from_ascii("Flex"); }
///
- InsetLayout const & getLayout(BufferParams const &) const { return layout_; }
+ InsetLayout const & getLayout(BufferParams const &) const
+ { return *layout_; }
/// Is this character style defined in the document's textclass?
/// May be wrong after textclass change or paste from another document
bool undefined() const;
/// (Re-)set the character style parameters from \p il
/// Is this character style defined in the document's textclass?
/// May be wrong after textclass change or paste from another document
bool undefined() const;
/// (Re-)set the character style parameters from \p il
- void setLayout(InsetLayout il);
+ void setLayout(InsetLayout const & il);
///
virtual docstring const editMessage() const;
///
///
virtual docstring const editMessage() const;
///
: InsetCollapsable(bp)
{
params_.type = notetranslator().find(label);
: InsetCollapsable(bp)
{
params_.type = notetranslator().find(label);
}
InsetNote::InsetNote(InsetNote const & in)
: InsetCollapsable(in), params_(in.params_)
}
InsetNote::InsetNote(InsetNote const & in)
: InsetCollapsable(in), params_(in.params_)
-{
- setButtonLabel();
-}