#include "BufferParams.h"
#include "BufferView.h"
#include "Cursor.h"
-#include "support/debug.h"
#include "Dimension.h"
#include "DispatchResult.h"
#include "FloatList.h"
#include "FuncStatus.h"
-#include "support/gettext.h"
+#include "InsetLayout.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
+#include "support/debug.h"
#include "support/docstream.h"
+#include "support/gettext.h"
using namespace std;
InsetCollapsable::Geometry InsetCollapsable::geometry() const
{
switch (decoration()) {
- case Classic:
+ case Deco_Classic:
if (status() == Open) {
if (openinlined_)
return LeftButton;
} else
return ButtonOnly;
- case Minimalistic:
+ case Deco_Minimalistic:
return status() == Open ? NoButton : ButtonOnly ;
- case Conglomerate:
+ case Deco_Conglomerate:
return status() == Open ? SubLabel : Corners ;
+
+ case Deco_Default:
+ break; // this shouldn't happen
}
// dummy return value to shut down a warning,
setAutoBreakRows(true);
setDrawFrame(true);
setFrameColor(Color_collapsableframe);
+ paragraphs().back().layout(bp.getTextClass().emptyLayout());
}
docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
{
Dimension dim = dimensionCollapsed();
- if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+ if (geometry() == NoButton)
+ return layout_->labelstring();
+ else if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
return docstring();
switch (status_) {
textClass_ = tc;
if ( tc.get() != 0 ) {
layout_ = &tc->insetlayout(name());
- labelstring_ = layout_->labelstring;
+ labelstring_ = layout_->labelstring();
} else {
- layout_ = 0;
+ layout_ = &TextClass::emptyInsetLayout();
labelstring_ = _("UNDEFINED");
}
lex.pushToken(token);
}
}
- InsetText::read(buf, lex);
-
+ //this must be set before we enter InsetText::read()
setLayout(buf.params());
+ InsetText::read(buf, lex);
+
if (!token_found)
status_ = isOpen() ? Open : Collapsed;
{
BOOST_ASSERT(layout_);
Dimension dim;
- theFontMetrics(layout_->labelfont).buttonText(
+ theFontMetrics(layout_->labelfont()).buttonText(
labelstring_, dim.wid, dim.asc, dim.des);
return dim;
}
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()) {
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();
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
button_dim.y1 = y - dimc.asc;
button_dim.y2 = y + dimc.des;
- pi.pain.buttonText(x, y, labelstring_, layout_->labelfont,
+ pi.pain.buttonText(x, y, labelstring_, layout_->labelfont(),
mouse_hover_);
} else {
button_dim.x1 = 0;
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 (status_ == 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,
- layout_->labelfont.color());
+ layout_->labelfont().color());
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,
- layout_->labelfont.color());
+ layout_->labelfont().color());
// 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();
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,
- layout_->labelfont.color());
+ layout_->labelfont().color());
pi.pain.line(xx2 - 4, y, xx2, y,
- layout_->labelfont.color());
+ layout_->labelfont().color());
}
break;
}
}
-void InsetCollapsable::edit(Cursor & cur, bool left)
+void InsetCollapsable::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
//lyxerr << "InsetCollapsable: edit left/right" << endl;
cur.push(*this);
- InsetText::edit(cur, left);
+ InsetText::edit(cur, front, entry_from);
}
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3) {
// There is no button to right click:
- if (decoration() == Minimalistic ||
+ if (decoration() == Deco_Minimalistic ||
geometry() == Corners ||
geometry() == SubLabel ||
geometry() == NoButton
}
default:
- if (layout_ && layout_->forceltr) {
+ if (layout_ && layout_->isForceLtr()) {
// 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
{
- return layout_->multipar;
+ return layout_->isMultiPar();
}
{
Font font;
font.fontInfo() = inherit_font;
- if (layout_->forceltr)
+ if (layout_->isForceLtr())
font.setLanguage(latex_language);
- if (layout_->passthru) {
+ if (layout_->isPassThru()) {
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:
- if (layout_->passthru) {
+ if (layout_->isPassThru()) {
flag.enabled(false);
return true;
} else
return true;
case LFUN_LANGUAGE:
- flag.enabled(!layout_->forceltr);
+ flag.enabled(!layout_->isForceLtr());
return InsetText::getStatus(cur, cmd, flag);
case LFUN_BREAK_PARAGRAPH:
case LFUN_BREAK_PARAGRAPH_SKIP:
- flag.enabled(layout_->multipar);
+ flag.enabled(layout_->isMultiPar());
return true;
default:
}
-InsetCollapsable::Decoration InsetCollapsable::decoration() const
+InsetDecoration InsetCollapsable::decoration() const
{
- if (!layout_ || layout_->decoration == "classic")
- return Classic;
- if (layout_->decoration == "minimalistic")
- return Minimalistic;
- if (layout_->decoration == "conglomerate")
- return Conglomerate;
+ if (!layout_)
+ return Deco_Classic;
+ InsetDecoration const dec = layout_->decoration();
+ switch (dec) {
+ case Deco_Classic:
+ case Deco_Minimalistic:
+ case Deco_Conglomerate:
+ return dec;
+ case Deco_Default:
+ break;
+ }
if (lyxCode() == FLEX_CODE)
// FIXME: Is this really necessary?
- return Conglomerate;
- return Classic;
+ return Deco_Conglomerate;
+ return Deco_Classic;
}
// see InsetCollapsable::latex(...) below. In these case
// an environment is opened there
- if (!layout_->latexname.empty())
+ if (!layout_->latexname().empty())
return true;
return false;
// 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";
- 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());
os << '{';
- } 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;
- if (layout_->passthru)
+ if (layout_->isPassThru())
rp.verbatim = true;
- if (layout_->needprotect)
+ if (layout_->isNeedProtect())
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") {
os << "}";
- } 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";
i += 4;
}
}
return;
// Force inclusion of preamble snippet in layout file
- features.require(layout_->name);
+ features.require(to_utf8(layout_->name()));
InsetText::validate(features);
}
+bool InsetCollapsable::undefined() const
+{
+ docstring const & n = getLayout().name();
+ return n.empty() || n == TextClass::emptyInsetLayout().name();
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff