#include "BufferParams.h"
#include "BufferView.h"
#include "Cursor.h"
-#include "debug.h"
+#include "Dimension.h"
#include "DispatchResult.h"
#include "FloatList.h"
+#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "gettext.h"
+#include "InsetLayout.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
-#include "FuncRequest.h"
#include "MetricsInfo.h"
#include "ParagraphParameters.h"
+#include "TextClass.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
-namespace lyx {
+using namespace std;
-using std::endl;
-using std::max;
-using std::ostream;
-using std::string;
+namespace lyx {
InsetCollapsable::CollapseStatus InsetCollapsable::status() const
{
+ if (decoration() == InsetLayout::Conglomerate)
+ return status_;
return autoOpen_ ? Open : status_;
}
InsetCollapsable::Geometry InsetCollapsable::geometry() const
{
switch (decoration()) {
- case Classic:
- if (status() == Open) {
- if (openinlined_)
- return LeftButton;
- else
- return TopButton;
- } else
- return ButtonOnly;
+ case InsetLayout::Classic:
+ if (status() == Open)
+ return openinlined_ ? LeftButton : TopButton;
+ return ButtonOnly;
- case Minimalistic:
+ case InsetLayout::Minimalistic:
return status() == Open ? NoButton : ButtonOnly ;
- case Conglomerate:
+ case InsetLayout::Conglomerate:
return status() == Open ? SubLabel : Corners ;
+
+ case InsetLayout::Default:
+ break; // this shouldn't happen
}
// dummy return value to shut down a warning,
}
-InsetCollapsable::InsetCollapsable
- (BufferParams const & bp, CollapseStatus status)
- : InsetText(bp), status_(status),
+InsetCollapsable::InsetCollapsable(Buffer const & buf,
+ CollapseStatus status)
+ : InsetText(buf), status_(status),
openinlined_(false), autoOpen_(false), mouse_hover_(false)
{
+ DocumentClass const & dc = buf.params().documentClass();
+ setLayout(&dc);
setAutoBreakRows(true);
setDrawFrame(true);
setFrameColor(Color_collapsableframe);
- setButtonLabel();
- setLayout(bp);
+ paragraphs().back().setLayout(dc.emptyLayout());
}
InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
: InsetText(rhs),
- button_dim(rhs.button_dim),
- topx(rhs.topx),
- topbaseline(rhs.topbaseline),
layout_(rhs.layout_),
+ labelstring_(rhs.labelstring_),
+ button_dim(rhs.button_dim),
status_(rhs.status_),
openinlined_(rhs.openinlined_),
autoOpen_(rhs.autoOpen_),
}
-void InsetCollapsable::setLayout(BufferParams const & bp)
+docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
{
- // FIXME: put this in the InsetLayout parsing?
- // Fallback for lacking inset layout background
- layout_.bgcolor = Color_background;
+ Dimension dim = dimensionCollapsed();
+ if (geometry() == NoButton)
+ return translateIfPossible(layout_->labelstring());
+ if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+ return docstring();
- layout_ = getLayout(bp);
- if (layout_.labelfont != inherit_font)
- return;
+ docstring default_tip;
+ switch (status_) {
+ case Open:
+ default_tip = _("Left-click to collapse the inset");
+ break;
+ case Collapsed:
+ default_tip = _("Left-click to open the inset");
+ break;
+ }
+
+ OutputParams rp(&buffer().params().encoding());
+ odocstringstream ods;
+ InsetText::plaintext(ods, rp);
+ docstring content_tip = ods.str();
+ // shorten it if necessary
+ if (content_tip.size() > 200)
+ content_tip = content_tip.substr(0, 200) + "...";
+ if (!isOpen() && !content_tip.empty())
+ return content_tip + '\n' + default_tip;
+ return default_tip;
+}
+
+
+void InsetCollapsable::setLayout(BufferParams const & bp)
+{
+ setLayout(bp.documentClassPtr());
+}
+
+
+void InsetCollapsable::setLayout(DocumentClass const * const dc)
+{
+ if (dc) {
+ layout_ = &(dc->insetLayout(name()));
+ labelstring_ = translateIfPossible(layout_->labelstring());
+ } else {
+ layout_ = &DocumentClass::emptyInsetLayout();
+ labelstring_ = _("UNDEFINED");
+ }
- // FIXME: put this in the InsetLayout parsing?
- // Fallback for lacking inset layout labelfont.
- layout_.labelfont = sane_font;
- layout_.labelfont.decSize();
- layout_.labelfont.decSize();
- layout_.labelfont.setColor(Color_collapsable);
+ setButtonLabel();
}
-void InsetCollapsable::write(Buffer const & buf, ostream & os) const
+void InsetCollapsable::write(ostream & os) const
{
os << "status ";
switch (status_) {
break;
}
os << "\n";
- text_.write(buf, os);
+ text_.write(buffer(), os);
}
-void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
+void InsetCollapsable::read(Lexer & lex)
{
- bool token_found = false;
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token == "status") {
- lex.next();
- string const tmp_token = lex.getString();
-
- if (tmp_token == "collapsed") {
- status_ = Collapsed;
- token_found = true;
- } else if (tmp_token == "open") {
- status_ = Open;
- token_found = true;
- } else {
- lyxerr << "InsetCollapsable::read: Missing status!"
- << endl;
- // Take countermeasures
- lex.pushToken(token);
- }
- } else {
- lyxerr << "InsetCollapsable::read: Missing 'status'-tag!"
- << endl;
- // take countermeasures
- lex.pushToken(token);
- }
- }
- InsetText::read(buf, lex);
+ lex.setContext("InsetCollapsable::read");
+ string tmp_token;
+ status_ = Collapsed;
+ lex >> "status" >> tmp_token;
+ if (tmp_token == "open")
+ status_ = Open;
- if (!token_found)
- status_ = isOpen() ? Open : Collapsed;
+ // this must be set before we enter InsetText::read()
+ setLayout(buffer().params());
- setButtonLabel();
- setLayout(buf.params());
+ InsetText::read(lex);
// Force default font, if so requested
// This avoids paragraphs in buffer language that would have a
Dimension InsetCollapsable::dimensionCollapsed() const
{
+ LASSERT(layout_, /**/);
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);
return dim;
}
void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ LASSERT(layout_, /**/);
+
autoOpen_ = mi.base.bv->cursor().isInside(this);
FontInfo tmpfont = mi.base.font;
- getDrawFont(mi.base.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();
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;
}
case LeftButton:
case ButtonOnly:
dim = dimensionCollapsed();
- if (geometry() == TopButton
- || geometry() == LeftButton) {
+ if (geometry() == TopButton || geometry() == LeftButton) {
Dimension textdim;
InsetText::metrics(mi, textdim);
openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
{
+ LASSERT(layout_, /**/);
+
autoOpen_ = pi.base.bv->cursor().isInside(this);
ColorCode const old_color = pi.background_color;
pi.background_color = backgroundColor();
FontInfo tmpfont = pi.base.font;
- getDrawFont(pi.base.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, 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;
const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
pi.pain.line(xx1, y + desc - 4,
xx1, y + desc,
- layout_.labelfont.color());
- if (internalStatus() == Open)
+ 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());
+ pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3,
+ y + desc - 4, 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();
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,
- s, font, Color_none, Color_none);
+ labelstring_, font, Color_none, Color_none);
desc += d;
}
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;
}
{
if (geometry() == ButtonOnly)
status_ = Open;
- BOOST_ASSERT(geometry() != ButtonOnly);
+ LASSERT(geometry() != ButtonOnly, /**/);
InsetText::cursorPos(bv, sl, boundary, x, y);
Dimension const textdim = InsetText::dimension(bv);
docstring label;
pos_type const max_length = 15;
pos_type const p_siz = paragraphs().begin()->size();
- pos_type const n = std::min(max_length, p_siz);
+ pos_type const n = min(max_length, p_siz);
pos_type i = 0;
pos_type j = 0;
for (; i < n && j < p_siz; ++j) {
}
-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);
}
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
- if (cmd.button() == mouse_button::button1
- && hitButton(cmd)
- && geometry() != NoButton) {
- // reset selection if necessary (see bug 3060)
- if (cur.selection())
- cur.bv().cursor().clearSelection();
- else
- cur.noUpdate();
- cur.dispatched();
- break;
+ if (hitButton(cmd) && geometry() != NoButton) {
+ switch (cmd.button()) {
+ case mouse_button::button1:
+ // reset selection if necessary (see bug 3060)
+ if (cur.selection())
+ cur.bv().cursor().clearSelection();
+ else
+ cur.noUpdate();
+ cur.dispatched();
+ return;
+ case mouse_button::none:
+ case mouse_button::button2:
+ case mouse_button::button3:
+ case mouse_button::button4:
+ case mouse_button::button5:
+ // Nothing to do.
+ cur.undispatched();
+ return;
+ }
}
- if (geometry() == NoButton)
- InsetText::doDispatch(cur, cmd);
- else if (geometry() != ButtonOnly
- && !hitButton(cmd))
+ if (geometry() == NoButton
+ || (geometry() != ButtonOnly && !hitButton(cmd)))
InsetText::doDispatch(cur, cmd);
else
cur.undispatched();
break;
case LFUN_MOUSE_RELEASE:
- if (cmd.button() == mouse_button::button3) {
- // There is no button to right click:
- if (geometry() == Corners ||
- geometry() == SubLabel ||
- geometry() == NoButton) {
- if (internalStatus() == Open)
- setStatus(cur, Collapsed);
- else
- setStatus(cur, Open);
- break;
- } else {
- // Open the Inset
- // configuration dialog
- showInsetDialog(&cur.bv());
- break;
- }
- }
-
- if (geometry() == NoButton) {
+ if (geometry() == NoButton || !hitButton(cmd)) {
// The mouse click has to be within the inset!
InsetText::doDispatch(cur, cmd);
break;
}
-
- if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
- // if we are selecting, we do not want to
- // toggle the inset.
- if (cur.selection())
- break;
- // Left button is clicked, the user asks to
- // toggle the inset visual state.
+ if (cmd.button() != mouse_button::button1) {
cur.dispatched();
- cur.updateFlags(Update::Force | Update::FitCursor);
- if (geometry() == ButtonOnly) {
- setStatus(cur, Open);
- edit(cur, true);
- }
- else {
- setStatus(cur, Collapsed);
- }
- cur.bv().cursor() = cur;
break;
}
-
- // The mouse click is within the opened inset.
- if (geometry() == TopButton
- || geometry() == LeftButton)
- InsetText::doDispatch(cur, cmd);
+ // if we are selecting, we do not want to
+ // toggle the inset.
+ if (cur.selection())
+ break;
+ // Left button is clicked, the user asks to
+ // toggle the inset visual state.
+ cur.dispatched();
+ cur.updateFlags(Update::Force | Update::FitCursor);
+ if (geometry() == ButtonOnly) {
+ setStatus(cur, Open);
+ edit(cur, true);
+ }
+ else
+ setStatus(cur, Collapsed);
+ cur.bv().cursor() = cur;
break;
case LFUN_INSET_TOGGLE:
else if (cmd.argument() == "close")
setStatus(cur, Collapsed);
else if (cmd.argument() == "toggle" || cmd.argument().empty())
- if (internalStatus() == Open) {
+ if (status_ == Open) {
setStatus(cur, Collapsed);
if (geometry() == ButtonOnly)
cur.top().forwardPos();
}
default:
- if (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();
}
void InsetCollapsable::resetParagraphsFont()
{
Font font;
- font.fontInfo() = sane_font;
- if (layout_.forceltr)
+ font.fontInfo() = inherit_font;
+ 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) {
}
-void InsetCollapsable::getDrawFont(FontInfo & font) const
-{
- font = layout_.font;
-}
-
-
bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
case LFUN_ACCENT_HUNGARIAN_UMLAUT:
case LFUN_ACCENT_MACRON:
case LFUN_ACCENT_OGONEK:
- case LFUN_ACCENT_SPECIAL_CARON:
case LFUN_ACCENT_TIE:
case LFUN_ACCENT_TILDE:
case LFUN_ACCENT_UMLAUT:
case LFUN_ACCENT_UNDERBAR:
case LFUN_ACCENT_UNDERDOT:
case LFUN_APPENDIX:
- case LFUN_BIBITEM_INSERT:
case LFUN_BOX_INSERT:
case LFUN_BRANCH_INSERT:
- case LFUN_BREAK_LINE:
+ case LFUN_NEWLINE_INSERT:
case LFUN_CAPTION_INSERT:
- case LFUN_CLEARPAGE_INSERT:
- case LFUN_CLEARDOUBLEPAGE_INSERT:
case LFUN_DEPTH_DECREMENT:
case LFUN_DEPTH_INCREMENT:
- case LFUN_DOTS_INSERT:
- case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
- case LFUN_ENVIRONMENT_INSERT:
case LFUN_ERT_INSERT:
case LFUN_FILE_INSERT:
case LFUN_FLEX_INSERT:
case LFUN_FLOAT_INSERT:
- case LFUN_FLOAT_LIST:
+ case LFUN_FLOAT_LIST_INSERT:
case LFUN_FLOAT_WIDE_INSERT:
case LFUN_FONT_BOLD:
case LFUN_FONT_TYPEWRITER:
case LFUN_FONT_DEFAULT:
case LFUN_FONT_EMPH:
- case LFUN_FONT_FREE_APPLY:
- case LFUN_FONT_FREE_UPDATE:
+ case LFUN_TEXTSTYLE_APPLY:
+ case LFUN_TEXTSTYLE_UPDATE:
case LFUN_FONT_NOUN:
case LFUN_FONT_ROMAN:
case LFUN_FONT_SANS:
case LFUN_FONT_STATE:
case LFUN_FONT_UNDERLINE:
case LFUN_FOOTNOTE_INSERT:
- case LFUN_HFILL_INSERT:
case LFUN_HYPERLINK_INSERT:
- case LFUN_HYPHENATION_POINT_INSERT:
case LFUN_INDEX_INSERT:
case LFUN_INDEX_PRINT:
case LFUN_INSET_INSERT:
case LFUN_LABEL_GOTO:
case LFUN_LABEL_INSERT:
- case LFUN_LIGATURE_BREAK_INSERT:
case LFUN_LINE_INSERT:
- case LFUN_PAGEBREAK_INSERT:
+ case LFUN_NEWPAGE_INSERT:
case LFUN_LAYOUT:
case LFUN_LAYOUT_PARAGRAPH:
case LFUN_LAYOUT_TABULAR:
case LFUN_MATH_MATRIX:
case LFUN_MATH_MODE:
case LFUN_MENU_OPEN:
- case LFUN_MENU_SEPARATOR_INSERT:
case LFUN_NOACTION:
case LFUN_NOMENCL_INSERT:
case LFUN_NOMENCL_PRINT:
case LFUN_SERVER_NOTIFY:
case LFUN_SERVER_SET_XY:
case LFUN_SPACE_INSERT:
+ case LFUN_SPECIALCHAR_INSERT:
case LFUN_TABULAR_INSERT:
case LFUN_TOC_INSERT:
case LFUN_WRAP_INSERT:
- if (layout_.passthru) {
- flag.enabled(false);
- return true;
- } else
+ if (layout_->isPassThru()) {
+ flag.setEnabled(false);
+ return true;
+ }
return InsetText::getStatus(cur, cmd, flag);
case LFUN_INSET_TOGGLE:
- if (cmd.argument() == "open" || cmd.argument() == "close" ||
- cmd.argument() == "toggle")
- flag.enabled(true);
- else
- flag.enabled(false);
+ if (cmd.argument() == "open")
+ flag.setEnabled(status_ != Open);
+ else if (cmd.argument() == "close")
+ flag.setEnabled(status_ == Open);
+ else if (cmd.argument() == "toggle" || cmd.argument().empty()) {
+ flag.setEnabled(true);
+ flag.setOnOff(status_ == Open);
+ } else
+ flag.setEnabled(false);
return true;
case LFUN_LANGUAGE:
- flag.enabled(!layout_.forceltr);
+ flag.setEnabled(!layout_->isForceLtr());
return InsetText::getStatus(cur, cmd, flag);
case LFUN_BREAK_PARAGRAPH:
- case LFUN_BREAK_PARAGRAPH_SKIP:
- flag.enabled(layout_.multipar);
+ flag.setEnabled(layout_->isMultiPar());
return true;
default:
void InsetCollapsable::setLabel(docstring const & l)
{
- layout_.labelstring = l;
+ labelstring_ = l;
}
{
status_ = status;
setButtonLabel();
- if (status_ == Collapsed)
+ if (status_ == Collapsed) {
cur.leaveInset(*this);
+ mouse_hover_ = false;
+ }
}
-void InsetCollapsable::setLabelFont(FontInfo const & font)
-{
- layout_.labelfont = font;
-}
-
-
-void InsetCollapsable::setLabelColor(ColorCode code)
-{
- layout_.labelfont.setColor(code);
-}
-
-
-docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
+docstring InsetCollapsable::floatName(
+ string const & type, BufferParams const & bp) const
{
- FloatList const & floats = bp.getTextClass().floats();
+ FloatList const & floats = bp.documentClass().floats();
FloatList::const_iterator it = floats[type];
// FIXME UNICODE
return (it == floats.end()) ? from_ascii(type) : bp.B_(it->second.name());
}
-InsetCollapsable::Decoration InsetCollapsable::decoration() const
+InsetLayout::InsetDecoration InsetCollapsable::decoration() const
{
- if (layout_.decoration == "classic")
- return Classic;
- if (layout_.decoration == "minimalistic")
- return Minimalistic;
- if (layout_.decoration == "conglomerate")
- return Conglomerate;
- if (name() == from_ascii("Flex"))
- return Conglomerate;
- return Classic;
+ if (!layout_)
+ return InsetLayout::Classic;
+ InsetLayout::InsetDecoration const dec = layout_->decoration();
+ switch (dec) {
+ case InsetLayout::Classic:
+ case InsetLayout::Minimalistic:
+ case InsetLayout::Conglomerate:
+ return dec;
+ case InsetLayout::Default:
+ break;
+ }
+ if (lyxCode() == FLEX_CODE)
+ return InsetLayout::Conglomerate;
+ return InsetLayout::Classic;
}
-int InsetCollapsable::latex(Buffer const & buf, odocstream & os,
+int InsetCollapsable::latex(odocstream & os,
OutputParams const & runparams) const
{
+ // FIXME: What should we do layout_ is 0?
+ // 1) assert
+ // 2) through an error
+ if (!layout_)
+ return 0;
+
// This implements the standard way of handling the LaTeX output of
// 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") {
+ int i = InsetText::latex(os, rp);
+ 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;
}
}
void InsetCollapsable::validate(LaTeXFeatures & features) const
{
+ if (!layout_)
+ 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 == DocumentClass::emptyInsetLayout().name();
+}
+
+
+docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+ int y) const
+{
+ if (decoration() == InsetLayout::Conglomerate)
+ return from_ascii("context-conglomerate");
+
+ if (geometry() == NoButton)
+ return from_ascii("context-collapsable");
+
+ Dimension dim = dimensionCollapsed();
+ if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+ return from_ascii("context-collapsable");
+
+ return InsetText::contextMenu(bv, x, y);
+}
+
} // namespace lyx