#include "buffer.h"
#include "BufferView.h"
+#include "cursor.h"
#include "dispatchresult.h"
#include "funcrequest.h"
#include "gettext.h"
#include "frontends/font_metrics.h"
#include "frontends/Painter.h"
-#include "support/std_sstream.h"
+#include <sstream>
using std::istringstream;
using std::ostream;
}
-DispatchResult
-InsetVSpace::priv_dispatch(FuncRequest const & cmd,
- idx_type & idx, pos_type & pos)
+void InsetVSpace::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
InsetVSpaceMailer::string2params(cmd.argument, space_);
- return DispatchResult(true, true);
+ break;
}
case LFUN_MOUSE_PRESS:
- InsetVSpaceMailer(*this).showDialog(cmd.view());
- return DispatchResult(true, true);
+ InsetVSpaceMailer(*this).showDialog(&cur.bv());
+ break;
default:
- return InsetOld::priv_dispatch(cmd, idx, pos);
+ InsetOld::priv_dispatch(cur, cmd);
+ break;
}
}
-
+
void InsetVSpace::read(Buffer const &, LyXLex & lex)
{
- if (lex.isOK()) {
- lex.next();
- space_ = VSpace(lex.getString());
- }
+ BOOST_ASSERT(lex.isOK());
+ string vsp;
+ lex >> vsp;
+ if (lex)
+ space_ = VSpace(vsp);
+
+ string end_token;
+ lex >> end_token;
+ if (end_token != "\\end_inset")
+ lex.printError("Missing \\end_inset at this point. "
+ "Read: `$$Token'");
}
{
static std::string const label = _("Vertical Space");
- xo_ = x;
- yo_ = y;
+ setPosCache(pi, x, y);
x += ADD_TO_VSPACE_WIDTH;
string const InsetVSpaceMailer::inset2string(Buffer const &) const
{
- return params2string(inset_.space_);
+ return params2string(inset_.space());
}
void InsetVSpaceMailer::string2params(string const & in, VSpace & vspace)
{
vspace = VSpace();
-
if (in.empty())
return;
LyXLex lex(0,0);
lex.setStream(data);
- if (lex.isOK()) {
- lex.next();
- string const name = lex.getString();
- }
+ string name;
+ lex >> name;
+ if (!lex || name != name_)
+ return print_mailer_error("InsetVSpaceMailer", in, 1, name_);
- // This is part of the inset proper that is usually swallowed
- // by Buffer::readInset
- if (lex.isOK()) {
- lex.next();
- vspace = VSpace(lex.getString());
- }
+ string vsp;
+ lex >> vsp;
+ if (lex)
+ vspace = VSpace(vsp);
}