#include "BufferParams.h"
#include "BufferView.h"
#include "Cursor.h"
-#include "debug.h"
+#include "Dimension.h"
#include "DispatchResult.h"
#include "FloatList.h"
#include "FuncStatus.h"
-#include "gettext.h"
-#include "Color.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"
-namespace lyx {
+using namespace std;
-using std::endl;
-using std::string;
-using std::ostream;
+namespace lyx {
InsetCollapsable::CollapseStatus InsetCollapsable::status() const
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,
}
-InsetCollapsable::InsetCollapsable
- (BufferParams const & bp, CollapseStatus status)
+InsetCollapsable::InsetCollapsable(BufferParams const & bp,
+ CollapseStatus status, TextClassPtr tc)
: InsetText(bp), status_(status),
openinlined_(false), autoOpen_(false), mouse_hover_(false)
{
+ setLayout(tc);
setAutoBreakRows(true);
setDrawFrame(true);
- setFrameColor(Color::collapsableframe);
- setButtonLabel();
- // Fallback for lacking inset layout item
- layout_.bgcolor = Color::background;
+ setFrameColor(Color_collapsableframe);
+ paragraphs().back().layout(bp.getTextClass().emptyLayout());
}
InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
: InsetText(rhs),
- button_dim(rhs.button_dim),
- topx(rhs.topx),
- topbaseline(rhs.topbaseline),
+ textClass_(rhs.textClass_),
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
{
- layout_ = getLayout(bp);
+ Dimension dim = dimensionCollapsed();
+ if (geometry() == NoButton)
+ return layout_->labelstring();
+ else if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+ return docstring();
+
+ switch (status_) {
+ case Open:
+ return _("Left-click to collapse the inset");
+ case Collapsed:
+ return _("Left-click to open the inset");
+ }
+ return docstring();
+}
+
+
+void InsetCollapsable::setLayout(BufferParams const & bp)
+{
+ setLayout(bp.getTextClassPtr());
+}
+
+
+void InsetCollapsable::setLayout(TextClassPtr tc)
+{
+ textClass_ = tc;
+ if ( tc.get() != 0 ) {
+ layout_ = &tc->insetlayout(name());
+ labelstring_ = layout_->labelstring();
+ } else {
+ layout_ = &TextClass::emptyInsetLayout();
+ labelstring_ = _("UNDEFINED");
+ }
+
+ setButtonLabel();
}
lex.pushToken(token);
}
} else {
- lyxerr << "InsetCollapsable::read: Missing 'status'-tag!"
- << endl;
+ LYXERR0("InsetCollapsable::read: Missing 'status'-tag!");
// take countermeasures
lex.pushToken(token);
}
}
+ //this must be set before we enter InsetText::read()
+ setLayout(buf.params());
+
InsetText::read(buf, lex);
if (!token_found)
status_ = isOpen() ? Open : Collapsed;
- setButtonLabel();
+ // 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();
}
Dimension InsetCollapsable::dimensionCollapsed() const
{
+ BOOST_ASSERT(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;
}
-bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
{
- using std::max;
+ BOOST_ASSERT(layout_);
autoOpen_ = mi.base.bv->cursor().isInside(this);
- mi.base.textwidth -= int(1.5 * TEXT_TO_INSET_OFFSET);
+
+ FontInfo tmpfont = mi.base.font;
+ mi.base.font = layout_->font();
+ mi.base.font.realize(tmpfont);
switch (geometry()) {
case NoButton:
case Corners:
InsetText::metrics(mi, dim);
dim.des -= 3;
- dim.asc -= 3;
+ dim.asc -= 1;
break;
case SubLabel: {
InsetText::metrics(mi, dim);
// consider width of the inset label
- Font font(layout_.labelfont);
- font.realize(Font(Font::ALL_SANE));
+ 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);
- dim.wid = max(dim.wid, w);
- dim.des += ascent();
+ theFontMetrics(font).rectText(labelstring_, w, a, d);
+ dim.des += a + d;
break;
}
case TopButton:
dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
dim.asc = textdim.asc;
} else {
- dim.des += textdim.height() + TEXT_TO_BOTTOM_OFFSET;
+ dim.des += textdim.height() + TEXT_TO_INSET_OFFSET;
dim.wid = max(dim.wid, textdim.wid);
- if (hasFixedWidth())
- dim.wid = max(dim.wid, mi.base.textwidth);
}
}
break;
}
- dim.asc += TEXT_TO_INSET_OFFSET;
- dim.des += TEXT_TO_INSET_OFFSET;
- dim.wid += int(1.5 * TEXT_TO_INSET_OFFSET);
- mi.base.textwidth += int(1.5 * TEXT_TO_INSET_OFFSET);
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
+
+ mi.base.font = tmpfont;
}
void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
{
+ BOOST_ASSERT(layout_);
+
autoOpen_ = pi.base.bv->cursor().isInside(this);
- int const old_color = pi.background_color;
+ ColorCode const old_color = pi.background_color;
pi.background_color = backgroundColor();
- int const xx = x + TEXT_TO_INSET_OFFSET;
+
+ FontInfo tmpfont = pi.base.font;
+ pi.base.font = layout_->font();
+ pi.base.font.realize(tmpfont);
// Draw button first -- top, left or only
Dimension dimc = dimensionCollapsed();
- TextMetrics const & tm = pi.base.bv->textMetrics(&text_);
- int const top = y - tm.ascent();
if (geometry() == TopButton ||
geometry() == LeftButton ||
geometry() == ButtonOnly) {
- button_dim.x1 = xx + 0;
- button_dim.x2 = xx + dimc.width();
- button_dim.y1 = top;
- button_dim.y2 = top + dimc.height();
+ 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(xx, top + dimc.asc, 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;
button_dim.y2 = 0;
}
+ Dimension const textdim = InsetText::dimension(*pi.base.bv);
+ int const baseline = y;
int textx, texty;
switch (geometry()) {
case LeftButton:
- textx = xx + dimc.width();
- texty = top;
+ textx = x + dimc.width();
+ texty = baseline;
InsetText::draw(pi, textx, texty);
break;
case TopButton:
- textx = xx;
- texty = top + dimc.height();
+ textx = x;
+ texty = baseline + dimc.des + textdim.asc;
InsetText::draw(pi, textx, texty);
break;
case ButtonOnly:
break;
case NoButton:
- textx = xx;
- texty = top;
+ textx = x;
+ texty = baseline;
InsetText::draw(pi, textx, texty);
break;
case SubLabel:
case Corners:
- textx = xx;
- texty = y;
+ textx = x;
+ texty = baseline;
const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
InsetText::draw(pi, textx, texty);
const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
- int desc = InsetText::descent();
- if (geometry() == SubLabel)
- desc -= ascent();
- else
+ int desc = textdim.descent();
+ if (geometry() == Corners)
desc -= 3;
- const int xx1 = xx + border_ - 1;
- const int xx2 = x + dim_.wid - border_
- - TEXT_TO_INSET_OFFSET + 1;
+ 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());
- 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 + dim_.wid - 3, y + desc, x + dim_.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) {
- Font font(layout_.labelfont);
- font.realize(Font(Font::ALL_SANE));
+ FontInfo font(layout_->labelfont());
+ font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
- // FIXME UNICODE
- docstring s = layout_.labelstring;
- theFontMetrics(font).rectText(s, w, a, d);
- pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
- s, font, Color::none, Color::none);
+ theFontMetrics(font).rectText(labelstring_, 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);
+ desc += d;
}
- // a visual clue when the cursor is inside the inset
+ // a visual cue when the cursor is inside the inset
Cursor & cur = pi.base.bv->cursor();
if (cur.isInside(this)) {
- y -= ascent();
+ 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(xx2, y + 4, x + dim_.wid - 3, 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());
pi.pain.line(xx2 - 4, y, xx2, y,
- layout_.labelfont.color());
+ layout_->labelfont().color());
}
break;
}
- setPosCache(pi, x, y);
pi.background_color = old_color;
-}
-
-void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
-{
- x += TEXT_TO_INSET_OFFSET;
- switch (geometry()) {
- case LeftButton:
- x += dimensionCollapsed().wid;
- InsetText::drawSelection(pi, x, y);
- break;
- case TopButton:
- y += dimensionCollapsed().des;
- InsetText::drawSelection(pi, x, y);
- break;
- case ButtonOnly:
- break;
- case NoButton:
- case SubLabel:
- case Corners:
- InsetText::drawSelection(pi, x, y);
- break;
- }
+ pi.base.font = tmpfont;
}
void InsetCollapsable::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
+ if (geometry() == ButtonOnly)
+ status_ = Open;
BOOST_ASSERT(geometry() != ButtonOnly);
InsetText::cursorPos(bv, sl, boundary, x, y);
+ Dimension const textdim = InsetText::dimension(bv);
switch (geometry()) {
case LeftButton:
x += dimensionCollapsed().wid;
break;
case TopButton: {
- TextMetrics const & tm = bv.textMetrics(&text_);
- y += dimensionCollapsed().height() - ascent()
- + TEXT_TO_INSET_OFFSET + tm.ascent();
+ y += dimensionCollapsed().des + textdim.asc;
break;
}
case NoButton:
// Cannot get here
break;
}
- x += TEXT_TO_INSET_OFFSET;
}
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);
}
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3) {
// There is no button to right click:
- if (geometry() == Corners ||
+ if (decoration() == Deco_Minimalistic ||
+ geometry() == Corners ||
geometry() == SubLabel ||
- geometry() == NoButton) {
- if (internalStatus() == Open)
+ geometry() == NoButton
+ ) {
+ if (status_ == Open)
setStatus(cur, Collapsed);
else
setStatus(cur, Open);
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();
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_NEW_LINE:
+ case LFUN_CAPTION_INSERT:
+ case LFUN_CLEARPAGE_INSERT:
+ case LFUN_CLEARDOUBLEPAGE_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_HFILL_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_PAGEBREAK_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;
+ } else
+ return InsetText::getStatus(cur, cmd, flag);
case LFUN_INSET_TOGGLE:
if (cmd.argument() == "open" || cmd.argument() == "close" ||
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());
+ return true;
+
default:
return InsetText::getStatus(cur, cmd, flag);
}
void InsetCollapsable::setLabel(docstring const & l)
{
- layout_.labelstring = l;
+ labelstring_ = l;
}
}
-void InsetCollapsable::setLabelFont(Font const & font)
-{
- layout_.labelfont = font;
-}
-
docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
{
FloatList const & floats = bp.getTextClass().floats();
}
-InsetCollapsable::Decoration InsetCollapsable::decoration() const
+InsetDecoration InsetCollapsable::decoration() const
+{
+ 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 Deco_Conglomerate;
+ return Deco_Classic;
+}
+
+
+bool InsetCollapsable::isMacroScope(Buffer const &) 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;
+ // layout_ == 0 leads to no latex output, so ignore
+ // the macros outside
+ if (!layout_)
+ return true;
+
+ // see InsetCollapsable::latex(...) below. In these case
+ // an environment is opened there
+ if (!layout_->latexname().empty())
+ return true;
+
+ return false;
}
int InsetCollapsable::latex(Buffer const & buf, 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
- os << '\\' << from_utf8(layout_.latexname);
- if (!layout_.latexparam.empty())
- os << from_utf8(layout_.latexparam);
+ 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);
+ } else if (layout_->latextype() == "environment") {
+ os << "%\n\\begin{" << from_utf8(layout_->latexname()) << "}\n";
+ if (!layout_->latexparam().empty())
+ os << from_utf8(layout_->latexparam());
}
}
- int i = InsetText::latex(buf, os, runparams);
- if (!layout_.latexname.empty())
- if (layout_.latextype == "command") {
+ OutputParams rp = runparams;
+ if (layout_->isPassThru())
+ rp.verbatim = true;
+ if (layout_->isNeedProtect())
+ rp.moving_arg = true;
+ int i = InsetText::latex(buf, 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;
}
+ }
return i;
}
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 == TextClass::emptyInsetLayout().name();
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff