* \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 "buffer.h"
+#include "bufferparams.h"
#include "BufferView.h"
#include "debug.h"
#include "funcrequest.h"
#include "gettext.h"
#include "language.h"
-#include "lyxfont.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "lyxrow.h"
-#include "lyxtext.h"
+#include "metricsinfo.h"
+#include "paragraph.h"
#include "WordLangTuple.h"
#include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
-#include "support/LOstream.h"
-#include "support/LAssert.h"
#include "support/tostr.h"
-using namespace lyx::support;
-
using lyx::pos_type;
-using std::ostream;
-using std::min;
+using lyx::support::split;
+using lyx::support::strToInt;
+
using std::endl;
+using std::min;
+using std::string;
using std::auto_ptr;
+using std::ostream;
void InsetERT::init()
{
setButtonLabel();
- labelfont = LyXFont(LyXFont::ALL_SANE);
- labelfont.decSize();
- labelfont.decSize();
- labelfont.setColor(LColor::latex);
+
+ LyXFont font(LyXFont::ALL_SANE);
+ font.decSize();
+ font.decSize();
+ font.setColor(LColor::latex);
+ setLabelFont(font);
+
setInsetName("ERT");
}
}
-void InsetERT::read(Buffer const * buf, LyXLex & lex)
+void InsetERT::read(Buffer const & buf, LyXLex & lex)
{
bool token_found = false;
if (lex.isOK()) {
string const token = lex.getString();
if (token == "collapsed") {
lex.next();
- collapsed_ = lex.getBool();
+ setCollapsed(lex.getBool());
} else {
// Take countermeasures
lex.pushToken(token);
#endif
if (!token_found) {
- if (collapsed_) {
- status(0, Collapsed);
- } else {
+ if (isOpen())
status(0, Open);
- }
+ else
+ status(0, Collapsed);
}
setButtonLabel();
}
-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) {
void InsetERT::updateStatus(BufferView * bv, bool swap) const
{
if (status_ != Inlined) {
- if (collapsed_) {
- status(bv, swap ? Open : Collapsed);
- } else {
+ if (isOpen())
status(bv, swap ? Collapsed : Open);
- }
+ else
+ status(bv, swap ? Open : Collapsed);
}
}
cmd1.y = ascent() + cmd.y - inset.ascent();
// inlined is special - the text appears above
- // button_dim.y2
if (status_ == Inlined)
inset.localDispatch(cmd1);
- else if (!collapsed_ && (cmd.y > button_dim.y2)) {
+ else if (isOpen() && (cmd.y > buttonDim().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();
}
-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();
}
-InsetOld::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetERT::localDispatch(FuncRequest const & cmd)
{
- InsetOld::RESULT result = UNDISPATCHED;
+ dispatch_result result = UNDISPATCHED;
BufferView * bv = cmd.view();
if (inset.paragraphs.begin()->empty()) {
inset.metrics(mi, dim);
else
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;
}
status_ = st;
switch (st) {
case Inlined:
- if (bv)
- inset.setUpdateStatus(InsetText::INIT);
break;
case Open:
- collapsed_ = false;
+ setCollapsed(false);
setButtonLabel();
break;
case Collapsed:
- collapsed_ = true;
+ setCollapsed(true);
setButtonLabel();
if (bv)
bv->unlockInset(const_cast<InsetERT *>(this));
break;
}
if (bv) {
- bv->updateInset(const_cast<InsetERT *>(this));
+ bv->updateInset(this);
bv->buffer()->markDirty();
}
}
void InsetERT::open(BufferView * bv)
{
- if (!collapsed_)
+ if (isOpen())
return;
status(bv, Open);
}