* \author Jürgen Vigna
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "insetert.h"
#include "insettext.h"
+#include "metricsinfo.h"
#include "buffer.h"
#include "BufferView.h"
#include "support/LAssert.h"
#include "support/tostr.h"
+using namespace lyx::support;
+
+using lyx::pos_type;
using std::ostream;
using std::min;
using std::endl;
-
-using lyx::pos_type;
+using std::auto_ptr;
void InsetERT::init()
}
-Inset * InsetERT::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetERT::clone() const
{
- return new InsetERT(*this);
+ return auto_ptr<InsetBase>(new InsetERT(*this));
}
InsetERT::~InsetERT()
{
- InsetERTMailer mailer(*this);
- mailer.hideDialog();
+ InsetERTMailer(*this).hideDialog();
}
-void InsetERT::read(Buffer const * buf, LyXLex & lex)
+void InsetERT::read(Buffer const & buf, LyXLex & lex)
{
bool token_found = false;
if (lex.isOK()) {
}
-void InsetERT::write(Buffer const * buf, ostream & os) const
+void InsetERT::write(Buffer const & buf, ostream & os) const
{
string st;
<< "status "<< st << "\n";
//inset.writeParagraphData(buf, os);
- string const layout(buf->params.getLyXTextClass().defaultLayoutName());
+ string const layout(buf.params.getLyXTextClass().defaultLayoutName());
ParagraphList::iterator par = inset.paragraphs.begin();
ParagraphList::iterator end = inset.paragraphs.end();
for (; par != end; ++par) {
- os << "\n\\layout " << layout << "\n";
+ os << "\n\\begin_layout " << layout << "\n";
pos_type siz = par->size();
for (pos_type i = 0; i < siz; ++i) {
Paragraph::value_type c = par->getChar(i);
switch (c) {
case Paragraph::META_INSET:
- if (par->getInset(i)->lyxCode() != Inset::NEWLINE_CODE) {
+ if (par->getInset(i)->lyxCode() != InsetOld::NEWLINE_CODE) {
lyxerr << "Element is not allowed in insertERT"
<< endl;
} else {
break;
}
}
+ os << "\n\\end_layout\n";
}
}
}
-bool InsetERT::insertInset(BufferView *, Inset *)
+bool InsetERT::insertInset(BufferView *, InsetOld *)
{
return false;
}
}
-Inset::EDITABLE InsetERT::editable() const
+InsetOld::EDITABLE InsetERT::editable() const
{
if (status_ == Collapsed)
return IS_EDITABLE;
return true;
}
- if (status_ != Inlined && (cmd.x >= 0) && (cmd.x < button_length) &&
- (cmd.y >= button_top_y) && (cmd.y <= button_bottom_y)) {
+ if (status_ != Inlined && hitButton(cmd)) {
updateStatus(bv, true);
} else {
- LyXFont font(LyXFont::ALL_SANE);
FuncRequest cmd1 = cmd;
- cmd1.y = ascent(bv, font) + cmd.y - inset.ascent(bv, font);
+#warning metrics?
+ cmd1.y = ascent() + cmd.y - inset.ascent();
// inlined is special - the text appears above
- // button_bottom_y
+ // button_dim.y2
if (status_ == Inlined)
inset.localDispatch(cmd1);
- else if (!collapsed_ && (cmd.y > button_bottom_y)) {
+ else if (!collapsed_ && (cmd.y > button_dim.y2)) {
cmd1.y -= height_collapsed();
inset.localDispatch(cmd1);
}
}
-int InsetERT::latex(Buffer const *, ostream & os,
+int InsetERT::latex(Buffer const &, ostream & os,
LatexRunParams const &) const
{
ParagraphList::iterator par = inset.paragraphs.begin();
}
++par;
if (par != end) {
- os << "\n\n";
- lines += 2;
+ os << "\n";
+ ++lines;
}
}
}
-int InsetERT::ascii(Buffer const *, ostream &, int /*linelen*/) const
+int InsetERT::ascii(Buffer const &, ostream &, int /*linelen*/) const
{
return 0;
}
-int InsetERT::linuxdoc(Buffer const *, ostream & os) const
+int InsetERT::linuxdoc(Buffer const &, ostream & os) const
{
ParagraphList::iterator par = inset.paragraphs.begin();
ParagraphList::iterator end = inset.paragraphs.end();
}
-int InsetERT::docbook(Buffer const *, ostream & os, bool) const
+int InsetERT::docbook(Buffer const &, ostream & os, bool) const
{
ParagraphList::iterator par = inset.paragraphs.begin();
ParagraphList::iterator end = inset.paragraphs.end();
}
-Inset::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
+InsetOld::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
{
- Inset::RESULT result = UNDISPATCHED;
+ InsetOld::RESULT result = UNDISPATCHED;
BufferView * bv = cmd.view();
if (inset.paragraphs.begin()->empty()) {
* 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);
+ inset.getLyXText(cmd.view())->fullRebreak();
bv->updateInset(this);
result = DISPATCHED;
}
la += inset.paragraphs.begin()->getChar(j);
++i;
}
- if (boost::next(inset.paragraphs.begin()) != inset.paragraphs.end() ||
- (i > 0 && j < p_siz)) {
+ if (inset.paragraphs.size() > 1 || (i > 0 && j < p_siz)) {
la += "...";
}
if (la.empty()) {
}
-void InsetERT::dimension(BufferView * bv, LyXFont const & font,
- Dimension & dim) const
+void InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ setButtonLabel();
if (inlined())
- inset.dimension(bv, font, dim);
+ inset.metrics(mi, dim);
else
- InsetCollapsable::dimension(bv, font, dim);
+ InsetCollapsable::metrics(mi, dim);
+ // Make it stand out on its own as it is code, not part of running
+ // text:
+ if (isOpen() && !inlined())
+ dim.wid = mi.base.textwidth;
+ dim_ = dim;
}
-void InsetERT::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x) const
+void InsetERT::draw(PainterInfo & pi, int x, int y) const
{
- InsetCollapsable::draw(bv, f, baseline, x, inlined());
+ InsetCollapsable::draw(pi, x, y, inlined());
}
status_ = st;
switch (st) {
case Inlined:
- if (bv)
- inset.setUpdateStatus(bv, InsetText::INIT);
break;
case Open:
collapsed_ = false;
break;
}
if (bv) {
- bv->updateInset(const_cast<InsetERT *>(this));
+ bv->updateInset(this);
bv->buffer()->markDirty();
}
}
bool InsetERT::showInsetDialog(BufferView * bv) const
{
- InsetERTMailer mailer(const_cast<InsetERT &>(*this));
- mailer.showDialog(bv);
+ InsetERTMailer(const_cast<InsetERT &>(*this)).showDialog(bv);
return true;
}
}
-int InsetERT::getMaxWidth(BufferView * bv, UpdatableInset const * in) const
-{
- int w = InsetCollapsable::getMaxWidth(bv, in);
- if (status_ != Inlined || w < 0)
- return w;
- LyXText * text = inset.getLyXText(bv);
- int rw = text->rows().begin()->width();
- if (!rw)
- rw = w;
- rw += 40;
- if (text->rows().size() == 1 && rw < w)
- return -1;
- return w;
-}
-
-
-void InsetERT::update(BufferView * bv, bool reinit)
-{
- if (inset.need_update & InsetText::INIT ||
- inset.need_update & InsetText::FULL) {
- setButtonLabel();
- }
-
- InsetCollapsable::update(bv, reinit);
-}
-
-
string const InsetERTMailer::name_("ert");
InsetERTMailer::InsetERTMailer(InsetERT & inset)
{}
-string const InsetERTMailer::inset2string() const
+string const InsetERTMailer::inset2string(Buffer const &) const
{
return params2string(inset_.status());
}
projects / lyx.git / blobdiff