* 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 "Dimension.h"
#include "DispatchResult.h"
#include "FloatList.h"
+#include "FuncRequest.h"
#include "FuncStatus.h"
#include "InsetLayout.h"
+#include "InsetList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
-#include "FuncRequest.h"
#include "MetricsInfo.h"
+#include "output_xhtml.h"
+#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
+#include "sgml.h"
#include "TextClass.h"
#include "frontends/FontMetrics.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(BufferView const & bv) const
+{
+ if (decoration() == InsetLayout::CONGLOMERATE)
+ return status_;
+ return auto_open_[&bv] ? Open : status_;
+}
-InsetCollapsable::CollapseStatus InsetCollapsable::status() const
+
+InsetCollapsable::Geometry InsetCollapsable::geometry(BufferView const & bv) const
{
- return autoOpen_ ? Open : status_;
+ switch (decoration()) {
+ case InsetLayout::CLASSIC:
+ if (status(bv) == Open)
+ return openinlined_ ? LeftButton : TopButton;
+ return ButtonOnly;
+
+ case InsetLayout::MINIMALISTIC:
+ return status(bv) == Open ? NoButton : ButtonOnly ;
+
+ case InsetLayout::CONGLOMERATE:
+ return status(bv) == Open ? SubLabel : Corners ;
+
+ case InsetLayout::DEFAULT:
+ break; // this shouldn't happen
+ }
+
+ // dummy return value to shut down a warning,
+ // this is dead code.
+ return NoButton;
}
InsetCollapsable::Geometry InsetCollapsable::geometry() const
{
switch (decoration()) {
- case InsetLayout::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 InsetLayout::Minimalistic:
- return status() == Open ? NoButton : ButtonOnly ;
+ case InsetLayout::MINIMALISTIC:
+ return status_ == Open ? NoButton : ButtonOnly ;
- case InsetLayout::Conglomerate:
- return status() == Open ? SubLabel : Corners ;
+ case InsetLayout::CONGLOMERATE:
+ return status_ == Open ? SubLabel : Corners ;
- case InsetLayout::Default:
+ case InsetLayout::DEFAULT:
break; // this shouldn't happen
}
}
-InsetCollapsable::InsetCollapsable(BufferParams const & bp,
- CollapseStatus status, TextClassPtr tc)
- : InsetText(bp), status_(status),
- openinlined_(false), autoOpen_(false), mouse_hover_(false)
+InsetCollapsable::InsetCollapsable(Buffer const & buf, InsetText::UsePlain ltype)
+ : InsetText(buf, ltype), status_(Inset::Open),
+ openinlined_(false), mouse_hover_(false)
{
- setLayout(tc);
+ setLayout(&buf.params().documentClass());
setAutoBreakRows(true);
setDrawFrame(true);
setFrameColor(Color_collapsableframe);
- paragraphs().back().layout(bp.getTextClass().emptyLayout());
}
InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
: InsetText(rhs),
- textClass_(rhs.textClass_),
- 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)
+ status_(rhs.status_),
+ layout_(rhs.layout_),
+ 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)
{
}
docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
{
- Dimension dim = dimensionCollapsed();
- if (geometry() == NoButton)
- return layout_->labelstring();
- else if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+ 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();
- switch (status_) {
- case Open:
- return _("Left-click to collapse the inset");
- case Collapsed:
- return _("Left-click to open the inset");
- }
- return docstring();
+ OutputParams rp(&buffer().params().encoding());
+ odocstringstream ods;
+ InsetText::plaintext(ods, rp);
+ docstring const content_tip = ods.str();
+ return support::wrapParas(content_tip, 4);
}
void InsetCollapsable::setLayout(BufferParams const & bp)
{
- setLayout(bp.getTextClassPtr());
+ setLayout(bp.documentClassPtr());
}
-void InsetCollapsable::setLayout(TextClassPtr tc)
+void InsetCollapsable::setLayout(DocumentClass const * const dc)
{
- textClass_ = tc;
- if ( tc.get() != 0 ) {
- layout_ = &tc->insetlayout(name());
- labelstring_ = layout_->labelstring();
+ if (dc) {
+ layout_ = &(dc->insetLayout(name()));
+ labelstring_ = translateIfPossible(getLayout().labelstring());
} else {
- layout_ = &TextClass::emptyInsetLayout();
+ layout_ = &DocumentClass::plainInsetLayout();
labelstring_ = _("UNDEFINED");
}
}
-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 {
- 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);
+ 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());
+ InsetText::read(lex);
+ // set button label again as the inset contents was not read yet at
+ // setLayout() time.
+ setButtonLabel();
// Force default font, if so requested
// This avoids paragraphs in buffer language that would have a
}
-Dimension InsetCollapsable::dimensionCollapsed() const
+Dimension InsetCollapsable::dimensionCollapsed(BufferView const & bv) const
{
- BOOST_ASSERT(layout_);
+ 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
{
- BOOST_ASSERT(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
{
- BOOST_ASSERT(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(*pi.base.bv) == TopButton ||
+ geometry(*pi.base.bv) == LeftButton ||
+ geometry(*pi.base.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());
+ pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3,
+ 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;
- BOOST_ASSERT(geometry() != ButtonOnly);
+ LASSERT(geometry(bv) != 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;
}
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 (cmd.button() == mouse_button::button1
- && hitButton(cmd)
- && geometry() != NoButton) {
- // reset selection if necessary (see bug 3060)
- if (cur.selection())
- cur.bv().cursor().clearSelection();
- else
+ if (hitButton(cmd)) {
+ switch (cmd.button()) {
+ case mouse_button::button1:
+ 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::button4:
+ case mouse_button::button5:
+ // Nothing to do.
cur.noUpdate();
- cur.dispatched();
- break;
- }
- if (geometry() == NoButton)
- InsetText::doDispatch(cur, cmd);
- else if (geometry() != ButtonOnly
- && !hitButton(cmd))
+ break;
+ }
+ } 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 (cmd.button() == mouse_button::button3) {
- // There is no button to right click:
- if (decoration() == InsetLayout::Minimalistic ||
- geometry() == Corners ||
- geometry() == SubLabel ||
- geometry() == NoButton
- ) {
- if (status_ == Open)
- setStatus(cur, Collapsed);
- else
- setStatus(cur, Open);
- break;
- } else {
- // Open the Inset
- // configuration dialog
- showInsetDialog(&cur.bv());
- break;
- }
- }
-
- if (geometry() == NoButton) {
+ 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 && 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.
- 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;
+ if (cmd.button() != mouse_button::button1) {
+ // Nothing to do.
+ cur.noUpdate();
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(cur.bv()) == ButtonOnly) {
+ setStatus(cur, Open);
+ edit(cur, true);
+ }
+ else
+ setStatus(cur, Collapsed);
+ cur.bv().cursor() = cur;
break;
case LFUN_INSET_TOGGLE:
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);
case LFUN_PASTE:
case LFUN_CLIPBOARD_PASTE:
+ case LFUN_SELECTION_PASTE:
case LFUN_PRIMARY_SELECTION_PASTE: {
InsetText::doDispatch(cur, cmd);
// Since we can only store plain text, we must reset all
break;
}
+ case LFUN_TAB_INSERT: {
+ bool const multi_par_selection = cur.selection() &&
+ cur.selBegin().pit() != cur.selEnd().pit();
+ if (multi_par_selection) {
+ // If there is a multi-paragraph selection, a tab is inserted
+ // at the beginning of each paragraph.
+ cur.recordUndoSelection();
+ pit_type const pit_end = cur.selEnd().pit();
+ for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) {
+ paragraphs()[pit].insertChar(0, '\t',
+ buffer().params().trackChanges);
+ // Update the selection pos to make sure the selection does not
+ // change as the inserted tab will increase the logical pos.
+ if (cur.anchor_.pit() == pit)
+ cur.anchor_.forwardPos();
+ if (cur.pit() == pit)
+ cur.forwardPos();
+ }
+ cur.finishUndo();
+ } else {
+ // Maybe we shouldn't allow tabs within a line, because they
+ // are not (yet) aligned as one might do expect.
+ FuncRequest cmd(LFUN_SELF_INSERT, from_ascii("\t"));
+ dispatch(cur, cmd);
+ }
+ break;
+ }
+
+ case LFUN_TAB_DELETE:
+ if (cur.selection()) {
+ // If there is a selection, a tab (if present) is removed from
+ // the beginning of each paragraph.
+ cur.recordUndoSelection();
+ pit_type const pit_end = cur.selEnd().pit();
+ for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) {
+ Paragraph & par = paragraphs()[pit];
+ if (par.getChar(0) == '\t') {
+ if (cur.pit() == pit)
+ cur.posBackward();
+ if (cur.anchor_.pit() == pit && cur.anchor_.pos() > 0 )
+ cur.anchor_.backwardPos();
+
+ par.eraseChar(0, buffer().params().trackChanges);
+ } else
+ // If no tab was present, try to remove up to four spaces.
+ for (int n_spaces = 0;
+ par.getChar(0) == ' ' && n_spaces < 4; ++n_spaces) {
+ if (cur.pit() == pit)
+ cur.posBackward();
+ if (cur.anchor_.pit() == pit && cur.anchor_.pos() > 0 )
+ cur.anchor_.backwardPos();
+
+ par.eraseChar(0, buffer().params().trackChanges);
+ }
+ }
+ cur.finishUndo();
+ } else {
+ // If there is no selection, try to remove a tab or some spaces
+ // before the position of the cursor.
+ Paragraph & par = paragraphs()[cur.pit()];
+ pos_type const pos = cur.pos();
+
+ if (pos == 0)
+ break;
+
+ char_type const c = par.getChar(pos - 1);
+ cur.recordUndo();
+ if (c == '\t') {
+ cur.posBackward();
+ par.eraseChar(cur.pos(), buffer().params().trackChanges);
+ } else
+ for (int n_spaces = 0; cur.pos() > 0
+ && par.getChar(cur.pos() - 1) == ' ' && n_spaces < 4;
+ ++n_spaces) {
+ cur.posBackward();
+ par.eraseChar(cur.pos(), buffer().params().trackChanges);
+ }
+ cur.finishUndo();
+ }
+ break;
+
default:
- if (layout_ && layout_->isForceLtr()) {
+ if (getLayout().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_->isMultiPar();
+ return getLayout().isMultiPar();
}
void InsetCollapsable::resetParagraphsFont()
{
- Font font;
- font.fontInfo() = inherit_font;
- if (layout_->isForceLtr())
+ Font font(inherit_font, buffer().params().language);
+ if (getLayout().isForceLtr())
font.setLanguage(latex_language);
- if (layout_->isPassThru()) {
+ if (getLayout().isPassThru()) {
ParagraphList::iterator par = paragraphs().begin();
ParagraphList::iterator const end = paragraphs().end();
while (par != end) {
FuncStatus & flag) const
{
switch (cmd.action) {
- // suppress these
+ // FIXME At present, these are being enabled and disabled according to
+ // whether PASSTHRU has been set in the InsetLayout. This makes some
+ // sense, but there are other checks that should really be done. E.g.,
+ // one should not be able to inset IndexPrint inside an optional argument!!
case LFUN_ACCENT_ACUTE:
case LFUN_ACCENT_BREVE:
case LFUN_ACCENT_CARON:
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_LIST_INSERT:
case LFUN_FLOAT_WIDE_INSERT:
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLDSYMBOL:
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_SIZE:
case LFUN_FONT_STATE:
case LFUN_FONT_UNDERLINE:
+ case LFUN_FONT_STRIKEOUT:
+ case LFUN_FONT_UULINE:
+ case LFUN_FONT_UWAVE:
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_LINE_INSERT:
case LFUN_MARGINALNOTE_INSERT:
case LFUN_MATH_DISPLAY:
case LFUN_MATH_INSERT:
+ case LFUN_MATH_AMS_MATRIX:
case LFUN_MATH_MATRIX:
case LFUN_MATH_MODE:
case LFUN_MENU_OPEN:
+ case LFUN_NEWLINE_INSERT:
+ case LFUN_NEWPAGE_INSERT:
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_PHANTOM_INSERT:
case LFUN_REFERENCE_NEXT:
case LFUN_SERVER_GOTO_FILE_ROW:
case LFUN_SERVER_NOTIFY:
case LFUN_SPACE_INSERT:
case LFUN_SPECIALCHAR_INSERT:
case LFUN_TABULAR_INSERT:
+ case LFUN_TEXTSTYLE_APPLY:
+ case LFUN_TEXTSTYLE_UPDATE:
case LFUN_TOC_INSERT:
case LFUN_WRAP_INSERT:
- if (layout_->isPassThru()) {
- flag.enabled(false);
- return true;
- } else
+ if (getLayout().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_->isForceLtr());
+ flag.setEnabled(!getLayout().isForceLtr());
return InsetText::getStatus(cur, cmd, flag);
case LFUN_BREAK_PARAGRAPH:
- case LFUN_BREAK_PARAGRAPH_SKIP:
- flag.enabled(layout_->isMultiPar());
+ flag.setEnabled(getLayout().isMultiPar());
return true;
+ case LFUN_TAB_INSERT:
+ case LFUN_TAB_DELETE:
+ if (getLayout().isPassThru()) {
+ flag.setEnabled(true);
+ return true;
+ }
+ return InsetText::getStatus(cur, cmd, flag);
+
default:
return InsetText::getStatus(cur, cmd, flag);
}
{
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, 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());
InsetLayout::InsetDecoration InsetCollapsable::decoration() const
{
- if (!layout_)
- return InsetLayout::Classic;
- InsetLayout::InsetDecoration const dec = layout_->decoration();
+ InsetLayout::InsetDecoration const dec = getLayout().decoration();
switch (dec) {
- case InsetLayout::Classic:
- case InsetLayout::Minimalistic:
- case InsetLayout::Conglomerate:
+ case InsetLayout::CLASSIC:
+ case InsetLayout::MINIMALISTIC:
+ case InsetLayout::CONGLOMERATE:
return dec;
- case InsetLayout::Default:
+ case InsetLayout::DEFAULT:
break;
}
if (lyxCode() == FLEX_CODE)
- // FIXME: Is this really necessary?
- return InsetLayout::Conglomerate;
- return InsetLayout::Classic;
-}
-
-
-bool InsetCollapsable::isMacroScope(Buffer const &) const
-{
- // 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;
+ 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 (!getLayout().latexname().empty()) {
+ if (getLayout().latextype() == InsetLayout::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(getLayout().latexname());
+ if (!getLayout().latexparam().empty())
+ os << from_utf8(getLayout().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 (getLayout().latextype() == InsetLayout::ENVIRONMENT) {
+ os << "%\n\\begin{" << from_utf8(getLayout().latexname()) << "}\n";
+ if (!getLayout().latexparam().empty())
+ os << from_utf8(getLayout().latexparam());
}
}
OutputParams rp = runparams;
- if (layout_->isPassThru())
+ if (getLayout().isPassThru())
rp.verbatim = true;
- if (layout_->isNeedProtect())
+ if (getLayout().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 (!getLayout().latexname().empty()) {
+ if (getLayout().latextype() == InsetLayout::COMMAND) {
os << "}";
- } else if (layout_->latextype() == "environment") {
- os << "\n\\end{" << from_utf8(layout_->latexname()) << "}\n";
+ } else if (getLayout().latextype() == InsetLayout::ENVIRONMENT) {
+ os << "\n\\end{" << from_utf8(getLayout().latexname()) << "}\n";
i += 4;
}
}
}
-void InsetCollapsable::validate(LaTeXFeatures & features) const
+// FIXME It seems as if it ought to be possible to do this more simply,
+// maybe by calling InsetText::docbook() in the middle there.
+int InsetCollapsable::docbook(odocstream & os, OutputParams const & runparams) const
{
- if (!layout_)
- return;
+ ParagraphList::const_iterator const beg = paragraphs().begin();
+ ParagraphList::const_iterator par = paragraphs().begin();
+ ParagraphList::const_iterator const end = paragraphs().end();
- // Force inclusion of preamble snippet in layout file
- features.require(to_utf8(layout_->name()));
+ if (!undefined())
+ sgml::openTag(os, getLayout().latexname(),
+ par->getID(buffer(), runparams) + getLayout().latexparam());
+
+ for (; par != end; ++par) {
+ par->simpleDocBookOnePar(buffer(), os, runparams,
+ outerFont(distance(beg, par),
+ paragraphs()));
+ }
+
+ if (!undefined())
+ sgml::closeTag(os, getLayout().latexname());
+
+ return 0;
+}
+
+
+docstring InsetCollapsable::xhtml(odocstream & os, OutputParams const & runparams) const
+{
+ InsetLayout const & il = getLayout();
+ if (undefined())
+ return InsetText::xhtml(os, runparams);
+
+ bool const opened = html::openTag(os, il.htmltag(), il.htmlattr());
+ if (!il.counter().empty()) {
+ BufferParams const & bp = buffer().masterBuffer()->params();
+ Counters & cntrs = bp.documentClass().counters();
+ cntrs.step(il.counter());
+ // FIXME: translate to paragraph language
+ if (!il.htmllabel().empty())
+ os << cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code());
+ }
+ bool innertag_opened = false;
+ if (!il.htmlinnertag().empty())
+ innertag_opened = html::openTag(os, il.htmlinnertag(), il.htmlinnerattr());
+ docstring deferred = InsetText::xhtml(os, runparams);
+ if (innertag_opened)
+ html::closeTag(os, il.htmlinnertag());
+ if (opened)
+ html::closeTag(os, il.htmltag());
+ return deferred;
+}
+
+
+void InsetCollapsable::validate(LaTeXFeatures & features) const
+{
+ features.useInsetLayout(getLayout());
InsetText::validate(features);
}
bool InsetCollapsable::undefined() const
{
docstring const & n = getLayout().name();
- return n.empty() || n == TextClass::emptyInsetLayout().name();
+ return n.empty() || n == DocumentClass::plainInsetLayout().name();
+}
+
+
+docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+ int y) const
+{
+ if (decoration() == InsetLayout::CONGLOMERATE)
+ return from_ascii("context-conglomerate");
+
+ if (geometry(bv) == NoButton)
+ return from_ascii("context-collapsable");
+
+ Dimension dim = dimensionCollapsed(bv);
+ if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+ return from_ascii("context-collapsable");
+
+ return InsetText::contextMenu(bv, x, y);
+}
+
+void InsetCollapsable::tocString(odocstream & os) const
+{
+ if (!getLayout().isInToc())
+ return;
+ os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
}
projects / lyx.git / blobdiff