* Licence details can be found in the file COPYING.
*
* \author Alejandro Aguilar Sierra
- * \author Jürgen Vigna
- * \author Lars Gullik Bjønnes
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS.
*/
#include "BufferView.h"
#include "Cursor.h"
#include "Dimension.h"
-#include "DispatchResult.h"
#include "FloatList.h"
+#include "FuncRequest.h"
#include "FuncStatus.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 "OutputParams.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
-#include "support/assert.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
+#include "support/lassert.h"
+#include "support/lstrings.h"
using namespace std;
namespace lyx {
-InsetCollapsable::CollapseStatus InsetCollapsable::status() const
+InsetCollapsable::InsetCollapsable(Buffer * buf, InsetText::UsePlain ltype)
+ : InsetText(buf, ltype), status_(Open),
+ openinlined_(false), mouse_hover_(false)
+{
+ setAutoBreakRows(true);
+ setDrawFrame(true);
+ setFrameColor(Color_collapsableframe);
+}
+
+
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
+ : InsetText(rhs),
+ status_(rhs.status_),
+ labelstring_(rhs.labelstring_),
+ button_dim(rhs.button_dim),
+ openinlined_(rhs.openinlined_),
+ auto_open_(rhs.auto_open_),
+ // the sole purpose of this copy constructor
+ mouse_hover_(false)
+{
+}
+
+
+InsetCollapsable::CollapseStatus InsetCollapsable::status(BufferView const & bv) const
{
- if (decoration() == InsetLayout::Conglomerate)
+ if (decoration() == InsetLayout::CONGLOMERATE)
return status_;
- return autoOpen_ ? Open : status_;
+ return auto_open_[&bv] ? Open : status_;
}
-InsetCollapsable::Geometry InsetCollapsable::geometry() const
+InsetCollapsable::Geometry InsetCollapsable::geometry(BufferView const & bv) const
{
switch (decoration()) {
- case InsetLayout::Classic:
- if (status() == Open)
+ case InsetLayout::CLASSIC:
+ if (status(bv) == Open)
return openinlined_ ? LeftButton : TopButton;
return ButtonOnly;
- case InsetLayout::Minimalistic:
- return status() == Open ? NoButton : ButtonOnly ;
+ case InsetLayout::MINIMALISTIC:
+ return status(bv) == Open ? NoButton : ButtonOnly ;
- case InsetLayout::Conglomerate:
- return status() == Open ? SubLabel : Corners ;
+ case InsetLayout::CONGLOMERATE:
+ return status(bv) == Open ? SubLabel : Corners ;
- case InsetLayout::Default:
+ case InsetLayout::DEFAULT:
break; // this shouldn't happen
}
}
-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);
- paragraphs().back().setLayout(dc.emptyLayout());
-}
-
-
-InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
- : InsetText(rhs),
- layout_(rhs.layout_),
- labelstring_(rhs.labelstring_),
- button_dim(rhs.button_dim),
- status_(rhs.status_),
- openinlined_(rhs.openinlined_),
- autoOpen_(rhs.autoOpen_),
- // the sole purpose of this copy constructor
- mouse_hover_(false)
+InsetCollapsable::Geometry InsetCollapsable::geometry() const
{
-}
+ switch (decoration()) {
+ case InsetLayout::CLASSIC:
+ if (status_ == Open)
+ return openinlined_ ? LeftButton : TopButton;
+ return ButtonOnly;
+ case InsetLayout::MINIMALISTIC:
+ return status_ == Open ? NoButton : ButtonOnly ;
-docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
-{
- Dimension dim = dimensionCollapsed();
- if (geometry() == NoButton)
- return translateIfPossible(layout_->labelstring());
- if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
- return docstring();
+ case InsetLayout::CONGLOMERATE:
+ return status_ == Open ? SubLabel : Corners ;
- switch (status_) {
- case Open:
- return _("Left-click to collapse the inset");
- case Collapsed:
- return _("Left-click to open the inset");
+ case InsetLayout::DEFAULT:
+ break; // this shouldn't happen
}
- return docstring();
-}
-
-void InsetCollapsable::setLayout(BufferParams const & bp)
-{
- setLayout(bp.documentClassPtr());
+ // dummy return value to shut down a warning,
+ // this is dead code.
+ return NoButton;
}
-void InsetCollapsable::setLayout(DocumentClass const * const dc)
+docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
{
- if (dc) {
- layout_ = &(dc->insetLayout(name()));
- labelstring_ = translateIfPossible(layout_->labelstring());
- } else {
- layout_ = &DocumentClass::emptyInsetLayout();
- labelstring_ = _("UNDEFINED");
- }
+ Dimension dim = dimensionCollapsed(bv);
+ if (geometry(bv) == NoButton)
+ return translateIfPossible(getLayout().labelstring());
+ if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des || isOpen(bv))
+ return docstring();
- setButtonLabel();
+ OutputParams rp(&buffer().params().encoding());
+ odocstringstream ods;
+ InsetText::plaintext(ods, rp);
+ docstring const content_tip = ods.str();
+ return support::wrapParas(content_tip, 4);
}
break;
}
os << "\n";
- text_.write(buffer(), os);
+ text().write(os);
}
if (tmp_token == "open")
status_ = Open;
- // this must be set before we enter InsetText::read()
- setLayout(buffer().params());
-
InsetText::read(lex);
-
- // Force default font, if so requested
- // This avoids paragraphs in buffer language that would have a
- // foreign language after a document language change, and it ensures
- // that all new text in ERT and similar gets the "latex" language,
- // since new text inherits the language from the last position of the
- // existing text. As a side effect this makes us also robust against
- // bugs in LyX that might lead to font changes in ERT in .lyx files.
- resetParagraphsFont();
+ setButtonLabel();
}
-Dimension InsetCollapsable::dimensionCollapsed() const
+Dimension InsetCollapsable::dimensionCollapsed(BufferView const & bv) const
{
- LASSERT(layout_, /**/);
Dimension dim;
- theFontMetrics(layout_->labelfont()).buttonText(
- labelstring_, dim.wid, dim.asc, dim.des);
+ theFontMetrics(getLayout().labelfont()).buttonText(
+ buttonLabel(bv), 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);
+ auto_open_[mi.base.bv] = mi.base.bv->cursor().isInside(this);
FontInfo tmpfont = mi.base.font;
- mi.base.font = layout_->font();
+ mi.base.font = getLayout().font();
mi.base.font.realize(tmpfont);
- switch (geometry()) {
+ BufferView const & bv = *mi.base.bv;
+
+ switch (geometry(bv)) {
case NoButton:
InsetText::metrics(mi, dim);
break;
case SubLabel: {
InsetText::metrics(mi, dim);
// consider width of the inset label
- FontInfo font(layout_->labelfont());
+ FontInfo font(getLayout().labelfont());
font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
- theFontMetrics(font).rectText(labelstring_, w, a, d);
+ theFontMetrics(font).rectText(buttonLabel(bv), w, a, d);
dim.des += a + d;
break;
}
case TopButton:
case LeftButton:
case ButtonOnly:
- dim = dimensionCollapsed();
- if (geometry() == TopButton || geometry() == LeftButton) {
+ dim = dimensionCollapsed(bv);
+ if (geometry(bv) == TopButton
+ || geometry(bv) == 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_, /**/);
+ BufferView const & bv = *pi.base.bv;
- autoOpen_ = pi.base.bv->cursor().isInside(this);
- ColorCode const old_color = pi.background_color;
- pi.background_color = backgroundColor();
+ auto_open_[&bv] = bv.cursor().isInside(this);
FontInfo tmpfont = pi.base.font;
- pi.base.font = layout_->font();
+ pi.base.font = getLayout().font();
pi.base.font.realize(tmpfont);
// Draw button first -- top, left or only
- Dimension dimc = dimensionCollapsed();
+ Dimension dimc = dimensionCollapsed(bv);
- if (geometry() == TopButton ||
- geometry() == LeftButton ||
- geometry() == ButtonOnly) {
+ if (geometry(bv) == TopButton ||
+ geometry(bv) == LeftButton ||
+ geometry(bv) == ButtonOnly) {
button_dim.x1 = x + 0;
button_dim.x2 = x + dimc.width();
button_dim.y1 = y - dimc.asc;
button_dim.y2 = y + dimc.des;
- pi.pain.buttonText(x, y, labelstring_, layout_->labelfont(),
+ FontInfo labelfont = getLayout().labelfont();
+ labelfont.setColor(labelColor());
+ pi.pain.buttonText(x, y, buttonLabel(bv), labelfont,
mouse_hover_);
} else {
button_dim.x1 = 0;
button_dim.y2 = 0;
}
- Dimension const textdim = InsetText::dimension(*pi.base.bv);
+ Dimension const textdim = InsetText::dimension(bv);
int const baseline = y;
int textx, texty;
- switch (geometry()) {
+ switch (geometry(bv)) {
case LeftButton:
textx = x + dimc.width();
texty = baseline;
const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
int desc = textdim.descent();
- if (geometry() == Corners)
+ if (geometry(bv) == Corners)
desc -= 3;
const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
pi.pain.line(xx1, y + desc - 4,
xx1, y + desc,
- layout_->labelfont().color());
+ labelColor());
if (status_ == Open)
pi.pain.line(xx1, y + desc,
xx2, y + desc,
- layout_->labelfont().color());
+ labelColor());
else {
// Make status_ value visible:
pi.pain.line(xx1, y + desc,
xx1 + 4, y + desc,
- layout_->labelfont().color());
+ labelColor());
pi.pain.line(xx2 - 4, y + desc,
xx2, y + desc,
- layout_->labelfont().color());
+ labelColor());
}
pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3,
- y + desc - 4, layout_->labelfont().color());
+ y + desc - 4, labelColor());
// the label below the text. Can be toggled.
- if (geometry() == SubLabel) {
- FontInfo font(layout_->labelfont());
+ if (geometry(bv) == SubLabel) {
+ FontInfo font(getLayout().labelfont());
font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
- theFontMetrics(font).rectText(labelstring_, w, a, d);
+ theFontMetrics(font).rectText(buttonLabel(bv), w, a, d);
int const ww = max(textdim.wid, w);
pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
- labelstring_, font, Color_none, Color_none);
+ buttonLabel(bv), font, Color_none, Color_none);
desc += d;
}
// a visual cue when the cursor is inside the inset
- Cursor & cur = pi.base.bv->cursor();
+ Cursor const & cur = bv.cursor();
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, labelColor());
+ pi.pain.line(xx1 + 4, y, xx1, y, labelColor());
pi.pain.line(xx2, y + 4, xx2, y,
- layout_->labelfont().color());
+ labelColor());
pi.pain.line(xx2 - 4, y, xx2, y,
- layout_->labelfont().color());
+ labelColor());
}
break;
}
- pi.background_color = old_color;
pi.base.font = tmpfont;
}
void InsetCollapsable::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
- if (geometry() == ButtonOnly)
+ if (geometry(bv) == ButtonOnly)
status_ = Open;
- LASSERT(geometry() != ButtonOnly, /**/);
InsetText::cursorPos(bv, sl, boundary, x, y);
Dimension const textdim = InsetText::dimension(bv);
- switch (geometry()) {
+ switch (geometry(bv)) {
case LeftButton:
- x += dimensionCollapsed().wid;
+ x += dimensionCollapsed(bv).wid;
break;
case TopButton: {
- y += dimensionCollapsed().des + textdim.asc;
+ y += dimensionCollapsed(bv).des + textdim.asc;
break;
}
case NoButton:
}
-Inset::EDITABLE InsetCollapsable::editable() const
+bool InsetCollapsable::editable() const
{
- return geometry() != ButtonOnly? HIGHLY_EDITABLE : IS_EDITABLE;
+ return geometry() != ButtonOnly;
}
-bool InsetCollapsable::descendable() const
+bool InsetCollapsable::descendable(BufferView const & bv) const
{
- return geometry() != ButtonOnly;
+ return geometry(bv) != ButtonOnly;
}
Inset * InsetCollapsable::editXY(Cursor & cur, int x, int y)
{
//lyxerr << "InsetCollapsable: edit xy" << endl;
- if (geometry() == ButtonOnly
+ if (geometry(cur.bv()) == ButtonOnly
|| (button_dim.contains(x, y)
- && geometry() != NoButton))
+ && geometry(cur.bv()) != NoButton))
return this;
cur.push(*this);
return InsetText::editXY(cur, x, y);
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
- if (hitButton(cmd) && geometry() != NoButton) {
+ if (hitButton(cmd)) {
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::button3:
+ // Pass the command to the enclosing InsetText,
+ // so that the cursor gets set.
+ cur.undispatched();
+ break;
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;
+ cur.noUpdate();
+ break;
}
- }
- if (geometry() == NoButton
- || (geometry() != ButtonOnly && !hitButton(cmd)))
+ } else if (geometry(cur.bv()) != ButtonOnly)
InsetText::doDispatch(cur, cmd);
else
cur.undispatched();
case LFUN_MOUSE_MOTION:
case LFUN_MOUSE_DOUBLE:
case LFUN_MOUSE_TRIPLE:
- if (geometry() == NoButton)
- InsetText::doDispatch(cur, cmd);
- else if (geometry() != ButtonOnly
- && !hitButton(cmd))
+ if (hitButton(cmd))
+ cur.noUpdate();
+ else if (geometry(cur.bv()) != ButtonOnly)
InsetText::doDispatch(cur, cmd);
else
cur.undispatched();
break;
case LFUN_MOUSE_RELEASE:
- if (geometry() == NoButton || !hitButton(cmd)) {
+ if (!hitButton(cmd)) {
// The mouse click has to be within the inset!
- InsetText::doDispatch(cur, cmd);
+ if (geometry(cur.bv()) != ButtonOnly)
+ InsetText::doDispatch(cur, cmd);
+ else
+ cur.undispatched();
break;
}
if (cmd.button() != mouse_button::button1) {
- cur.dispatched();
+ // Nothing to do.
+ cur.noUpdate();
break;
}
// if we are selecting, we do not want to
// toggle the inset visual state.
cur.dispatched();
cur.updateFlags(Update::Force | Update::FitCursor);
- if (geometry() == ButtonOnly) {
+ if (geometry(cur.bv()) == ButtonOnly) {
setStatus(cur, Open);
edit(cur, true);
}
else if (cmd.argument() == "toggle" || cmd.argument().empty())
if (status_ == Open) {
setStatus(cur, Collapsed);
- if (geometry() == ButtonOnly)
+ if (geometry(cur.bv()) == ButtonOnly)
cur.top().forwardPos();
} else
setStatus(cur, Open);
cur.dispatched();
break;
- case LFUN_PASTE:
- case LFUN_CLIPBOARD_PASTE:
- case LFUN_PRIMARY_SELECTION_PASTE: {
- InsetText::doDispatch(cur, cmd);
- // Since we can only store plain text, we must reset all
- // attributes.
- // FIXME: Change only the pasted paragraphs
-
- resetParagraphsFont();
- break;
- }
-
default:
- 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
- // start of an existing paragraph get the buffer language
- // and not latex_language, so we take this brute force
- // approach.
- cur.current_font.setLanguage(latex_language);
- cur.real_current_font.setLanguage(latex_language);
- }
InsetText::doDispatch(cur, cmd);
break;
}
}
-bool InsetCollapsable::allowMultiPar() const
-{
- return layout_->isMultiPar();
-}
-
-
-void InsetCollapsable::resetParagraphsFont()
-{
- Font font;
- font.fontInfo() = inherit_font;
- if (layout_->isForceLtr())
- font.setLanguage(latex_language);
- if (layout_->isPassThru()) {
- ParagraphList::iterator par = paragraphs().begin();
- ParagraphList::iterator const end = paragraphs().end();
- while (par != end) {
- par->resetFonts(font);
- par->params().clear();
- ++par;
- }
- }
-}
-
-
bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
switch (cmd.action) {
- // suppress these
- case LFUN_ACCENT_ACUTE:
- case LFUN_ACCENT_BREVE:
- case LFUN_ACCENT_CARON:
- case LFUN_ACCENT_CEDILLA:
- case LFUN_ACCENT_CIRCLE:
- case LFUN_ACCENT_CIRCUMFLEX:
- case LFUN_ACCENT_DOT:
- case LFUN_ACCENT_GRAVE:
- 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_NEWLINE_INSERT:
- case LFUN_CAPTION_INSERT:
- case LFUN_DEPTH_DECREMENT:
- case LFUN_DEPTH_INCREMENT:
- 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_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_FONT_NOUN:
- case LFUN_FONT_ROMAN:
- case LFUN_FONT_SANS:
- case LFUN_FONT_FRAK:
- case LFUN_FONT_ITAL:
- case LFUN_FONT_SIZE:
- case LFUN_FONT_STATE:
- case LFUN_FONT_UNDERLINE:
- case LFUN_FOOTNOTE_INSERT:
- case LFUN_HYPERLINK_INSERT:
- case LFUN_INDEX_INSERT:
- case LFUN_INDEX_PRINT:
- case LFUN_INSET_INSERT:
- case LFUN_LABEL_GOTO:
- case LFUN_LABEL_INSERT:
- case LFUN_LINE_INSERT:
- case LFUN_NEWPAGE_INSERT:
- case LFUN_LAYOUT:
- case LFUN_LAYOUT_PARAGRAPH:
- case LFUN_LAYOUT_TABULAR:
- case LFUN_MARGINALNOTE_INSERT:
- case LFUN_MATH_DISPLAY:
- case LFUN_MATH_INSERT:
- case LFUN_MATH_MATRIX:
- case LFUN_MATH_MODE:
- case LFUN_MENU_OPEN:
- case LFUN_NOACTION:
- case LFUN_NOMENCL_INSERT:
- case LFUN_NOMENCL_PRINT:
- case LFUN_NOTE_INSERT:
- case LFUN_NOTE_NEXT:
- case LFUN_OPTIONAL_INSERT:
- case LFUN_PARAGRAPH_PARAMS:
- case LFUN_PARAGRAPH_PARAMS_APPLY:
- case LFUN_PARAGRAPH_SPACING:
- case LFUN_PARAGRAPH_UPDATE:
- case LFUN_REFERENCE_NEXT:
- case LFUN_SERVER_GOTO_FILE_ROW:
- 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_->isPassThru()) {
- flag.enabled(false);
- return true;
- }
- return InsetText::getStatus(cur, cmd, flag);
-
case LFUN_INSET_TOGGLE:
if (cmd.argument() == "open")
- flag.enabled(status_ != Open);
+ flag.setEnabled(status_ != Open);
else if (cmd.argument() == "close")
- flag.enabled(status_ == Open);
+ flag.setEnabled(status_ == Open);
else if (cmd.argument() == "toggle" || cmd.argument().empty()) {
- flag.enabled(true);
+ flag.setEnabled(true);
flag.setOnOff(status_ == Open);
} else
- flag.enabled(false);
- return true;
-
- case LFUN_LANGUAGE:
- flag.enabled(!layout_->isForceLtr());
- return InsetText::getStatus(cur, cmd, flag);
-
- case LFUN_BREAK_PARAGRAPH:
- case LFUN_BREAK_PARAGRAPH_SKIP:
- flag.enabled(layout_->isMultiPar());
+ flag.setEnabled(false);
return true;
default:
}
+docstring const InsetCollapsable::buttonLabel(BufferView const &) const
+{
+ return labelstring_.empty() ?
+ translateIfPossible(getLayout().labelstring()) : labelstring_;
+}
+
+
void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
{
status_ = status;
setButtonLabel();
- if (status_ == Collapsed)
+ if (status_ == Collapsed) {
cur.leaveInset(*this);
+ mouse_hover_ = false;
+ }
}
-docstring InsetCollapsable::floatName(
- string const & type, BufferParams const & bp) const
+docstring InsetCollapsable::floatName(string const & type) const
{
+ BufferParams const & bp = buffer().params();
FloatList const & floats = bp.documentClass().floats();
FloatList::const_iterator it = floats[type];
// FIXME UNICODE
InsetLayout::InsetDecoration InsetCollapsable::decoration() const
{
- 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(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") {
- // FIXME UNICODE
- if (runparams.moving_arg)
- os << "\\protect";
- 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());
- }
- }
- OutputParams rp = runparams;
- if (layout_->isPassThru())
- rp.verbatim = true;
- if (layout_->isNeedProtect())
- rp.moving_arg = true;
- 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";
- i += 4;
- }
- }
- return i;
-}
-
-
-void InsetCollapsable::validate(LaTeXFeatures & features) const
-{
- if (!layout_)
- return;
-
- // Force inclusion of preamble snippet in layout file
- 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();
+ InsetLayout::InsetDecoration const dec = getLayout().decoration();
+ return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec;
}
docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
int y) const
{
- if (decoration() == InsetLayout::Conglomerate)
+ if (decoration() == InsetLayout::CONGLOMERATE)
return from_ascii("context-conglomerate");
- if (geometry() == NoButton)
+ if (geometry(bv) == NoButton)
return from_ascii("context-collapsable");
- Dimension dim = dimensionCollapsed();
+ Dimension dim = dimensionCollapsed(bv);
if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
return from_ascii("context-collapsable");
projects / lyx.git / blobdiff