#include "support/LOstream.h"
#include "support/LAssert.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
using std::ostream;
}
-InsetERT::InsetERT(InsetERT const & in, bool same_id)
- : InsetCollapsable(in, same_id), status_(in.status_)
+InsetERT::InsetERT(InsetERT const & in)
+ : InsetCollapsable(in), status_(in.status_)
{
init();
}
-Inset * InsetERT::clone(Buffer const &, bool same_id) const
+Inset * InsetERT::clone() const
{
- return new InsetERT(*const_cast<InsetERT *>(this), same_id);
+ return new InsetERT(*this);
}
string::const_iterator end = contents.end();
pos_type pos = 0;
for (; cit != end; ++cit) {
- inset.paragraph()->insertChar(pos++, *cit, font);
+ inset.paragraphs.begin()->insertChar(pos++, *cit, font);
}
// the init has to be after the initialization of the paragraph
// because of the label settings (draw_label for ert insets).
LyXFont font(LyXFont::ALL_INHERIT, latex_language);
font.setFamily(LyXFont::TYPEWRITER_FAMILY);
font.setColor(LColor::latex);
- Paragraph * par = inset.paragraph();
- while (par) {
- pos_type siz = par->size();
+
+ ParagraphList::iterator pit = inset.paragraphs.begin();
+ ParagraphList::iterator pend = inset.paragraphs.end();
+ for (; pit != pend; ++pit) {
+ pos_type siz = pit->size();
for (pos_type i = 0; i < siz; ++i) {
- par->setFont(i, font);
+ pit->setFont(i, font);
}
- par = par->next();
}
#endif
//inset.writeParagraphData(buf, os);
string const layout(buf->params.getLyXTextClass().defaultLayoutName());
- Paragraph * par = inset.paragraph();
- while (par) {
+ ParagraphList::iterator par = inset.paragraphs.begin();
+ ParagraphList::iterator end = inset.paragraphs.end();
+ for (; par != end; ++par) {
os << "\n\\layout " << layout << "\n";
pos_type siz = par->size();
for (pos_type i = 0; i < siz; ++i) {
break;
}
}
- par = par->next();
}
}
void InsetERT::setFont(BufferView *, LyXFont const &, bool, bool selectall)
{
+#ifdef WITH_WARNINGS
+#warning FIXME. More UI stupidity...
+#endif
// if selectall is activated then the fontchange was an outside general
// fontchange and this messages is not needed
if (!selectall)
- Alert::alert(_("Impossible operation!"),
- _("Not permitted to change font-types inside ERT-insets!"),
- _("Sorry."));
+ Alert::error(_("Cannot change font"),
+ _("You cannot change font settings inside TeX code."));
}
}
}
-void InsetERT::edit(BufferView * bv, int x, int y, mouse_button::state button)
-{
- if (button == mouse_button::button3)
- return;
-
- if (status_ == Inlined) {
- if (!bv->lockInset(this))
- return;
- inset.edit(bv, x, y, button);
- } else {
- InsetCollapsable::edit(bv, x, y, button);
- }
- set_latex_font(bv);
- updateStatus(bv);
-}
-
Inset::EDITABLE InsetERT::editable() const
{
}
-void InsetERT::edit(BufferView * bv, bool front)
-{
- InsetCollapsable::edit(bv, front);
- updateStatus(0);
- set_latex_font(bv);
-}
-
-
void InsetERT::lfunMousePress(FuncRequest const & cmd)
{
if (status_ == Inlined)
if (status_ == Inlined)
inset.localDispatch(cmd1);
else if (!collapsed_ && (cmd.y > button_bottom_y)) {
- cmd1.y -= ascent_collapsed() + descent_collapsed();
+ cmd1.y -= height_collapsed();
inset.localDispatch(cmd1);
}
}
}
-int InsetERT::latex(Buffer const *, ostream & os, bool /*fragile*/,
- bool /*free_spc*/) const
+int InsetERT::latex(Buffer const *, ostream & os,
+ LatexRunParams const &) const
{
- Paragraph * par = inset.paragraph();
+ ParagraphList::iterator par = inset.paragraphs.begin();
+ ParagraphList::iterator end = inset.paragraphs.end();
+
int lines = 0;
- while (par) {
+ while (par != end) {
pos_type siz = par->size();
for (pos_type i = 0; i < siz; ++i) {
// ignore all struck out text
if (isDeletedText(*par, i))
continue;
-
+
if (par->isNewline(i)) {
os << '\n';
++lines;
os << par->getChar(i);
}
}
- par = par->next();
- if (par) {
- os << "\n\n";
- lines += 2;
+ ++par;
+ if (par != end) {
+ os << "\n";
+ ++lines;
}
}
int InsetERT::linuxdoc(Buffer const *, ostream & os) const
{
- Paragraph * par = inset.paragraph();
+ ParagraphList::iterator par = inset.paragraphs.begin();
+ ParagraphList::iterator end = inset.paragraphs.end();
+
int lines = 0;
- while (par) {
+ while (par != end) {
pos_type siz = par->size();
for (pos_type i = 0; i < siz; ++i) {
if (par->isNewline(i)) {
os << par->getChar(i);
}
}
- par = par->next();
- if (par) {
+ ++par;
+ if (par != end) {
os << "\n";
lines ++;
}
int InsetERT::docbook(Buffer const *, ostream & os, bool) const
{
- Paragraph * par = inset.paragraph();
+ ParagraphList::iterator par = inset.paragraphs.begin();
+ ParagraphList::iterator end = inset.paragraphs.end();
+
int lines = 0;
- while (par) {
+ while (par != end) {
pos_type siz = par->size();
for (pos_type i = 0; i < siz; ++i) {
if (par->isNewline(i)) {
os << par->getChar(i);
}
}
- par = par->next();
- if (par) {
+ ++par;
+ if (par != end) {
os << "\n";
lines ++;
}
Inset::RESULT result = UNDISPATCHED;
BufferView * bv = cmd.view();
- if (inset.paragraph()->empty()) {
+ if (inset.paragraphs.begin()->empty()) {
set_latex_font(bv);
}
switch (cmd.action) {
+
+ case LFUN_INSET_EDIT:
+ if (cmd.button() == mouse_button::button3)
+ break;
+ if (status_ == Inlined) {
+ if (!bv->lockInset(this))
+ break;
+ result = inset.localDispatch(cmd);
+ } else {
+ result = InsetCollapsable::localDispatch(cmd);
+ }
+ set_latex_font(bv);
+ updateStatus(bv);
+ break;
+
case LFUN_INSET_MODIFY: {
InsetERT::ERTStatus status_;
InsetERTMailer::string2params(cmd.argument, status_);
status(bv, status_);
- bv->updateInset(this, true);
+
+ /* FIXME: I refuse to believe we have to live
+ * with ugliness like this ! Note that this
+ * rebreak *is* needed. Consider a change from
+ * Open (needfullrow) to Inlined (only the space
+ * taken by the text).
+ */
+ LyXText * t = inset.getLyXText(cmd.view());
+ t->need_break_row = t->rows().begin();
+ t->fullRebreak();
+ t->setCursorIntern(t->cursor.par(), t->cursor.pos());
+ inset.update(cmd.view(), true);
+ bv->updateInset(this);
result = DISPATCHED;
}
break;
-
+
case LFUN_MOUSE_PRESS:
lfunMousePress(cmd);
result = DISPATCHED;
break;
case LFUN_LAYOUT:
- bv->owner()->setLayout(inset.paragraph()->layout()->name());
+ bv->owner()->setLayout(inset.paragraphs.begin()->layout()->name());
result = DISPATCHED_NOUPDATE;
break;
{
string la;
pos_type const max_length = 15;
- pos_type const p_siz = inset.paragraph()->size();
+ pos_type const p_siz = inset.paragraphs.begin()->size();
pos_type const n = min(max_length, p_siz);
pos_type i = 0;
pos_type j = 0;
for(; i < n && j < p_siz; ++j) {
- if (inset.paragraph()->isInset(j))
+ if (inset.paragraphs.begin()->isInset(j))
continue;
- la += inset.paragraph()->getChar(j);
+ la += inset.paragraphs.begin()->getChar(j);
++i;
}
- if (inset.paragraph()->next() || (i > 0 && j < p_siz)) {
+ if (boost::next(inset.paragraphs.begin()) != inset.paragraphs.end() ||
+ (i > 0 && j < p_siz)) {
la += "...";
}
if (la.empty()) {
}
-int InsetERT::ascent(BufferView * bv, LyXFont const & font) const
+void InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
{
- if (!inlined())
- return InsetCollapsable::ascent(bv, font);
-
- return inset.ascent(bv, font);
-}
-
-
-int InsetERT::descent(BufferView * bv, LyXFont const & font) const
-{
- if (!inlined())
- return InsetCollapsable::descent(bv, font);
-
- return inset.descent(bv, font);
+ if (inlined())
+ inset.metrics(mi, dim);
+ else
+ InsetCollapsable::metrics(mi, dim);
}
-int InsetERT::width(BufferView * bv, LyXFont const & font) const
+void InsetERT::draw(PainterInfo & pi, int x, int y) const
{
- if (!inlined())
- return InsetCollapsable::width(bv, font);
-
- return inset.width(bv, font);
-}
-
-
-void InsetERT::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x) const
-{
- lyx::Assert(bv);
- cache(bv);
-
- Painter & pain = bv->painter();
-
- button_length = width_collapsed();
- button_top_y = -ascent(bv, f);
- button_bottom_y = -ascent(bv, f) + ascent_collapsed() +
- descent_collapsed();
-
- if (!isOpen()) {
- draw_collapsed(pain, baseline, x);
- return;
- }
-
- float old_x = x;
-
- if (!owner())
- x += static_cast<float>(scroll());
-
- top_x = int(x);
- topx_set = true;
- top_baseline = baseline;
-
- int const bl = baseline - ascent(bv, f) + ascent_collapsed();
-
- if (inlined()) {
- inset.draw(bv, f, baseline, x);
- } else {
- draw_collapsed(pain, bl, old_x);
- inset.draw(bv, f, bl + descent_collapsed() + inset.ascent(bv, f), x);
- }
- need_update = NONE;
+ InsetCollapsable::draw(pi, x, y, inlined());
}
{
if (st != status_) {
status_ = st;
- need_update = FULL;
switch (st) {
case Inlined:
if (bv)
bv->unlockInset(const_cast<InsetERT *>(this));
break;
}
- if (bv)
- bv->updateInset(const_cast<InsetERT *>(this), false);
+ if (bv) {
+ bv->updateInset(const_cast<InsetERT *>(this));
+ bv->buffer()->markDirty();
+ }
}
}
if (status_ != Inlined || w < 0)
return w;
LyXText * text = inset.getLyXText(bv);
- int rw = text->firstRow()->width();
+ int rw = text->rows().begin()->width();
if (!rw)
rw = w;
rw += 40;
- if (!text->firstRow()->next() && rw < w)
+ if (text->rows().size() == 1 && rw < w)
return -1;
return w;
}
-void InsetERT::update(BufferView * bv, LyXFont const & font,
- bool reinit)
+void InsetERT::update(BufferView * bv, bool reinit)
{
if (inset.need_update & InsetText::INIT ||
- inset.need_update & InsetText::FULL)
- {
+ inset.need_update & InsetText::FULL) {
setButtonLabel();
}
- InsetCollapsable::update(bv, font, reinit);
+
+ InsetCollapsable::update(bv, reinit);
}
projects / lyx.git / blobdiff