#include "buffer.h"
#include "bufferparams.h"
#include "BufferView.h"
+#include "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
#include "Floating.h"
#include "FloatList.h"
#include "funcrequest.h"
#include "gettext.h"
-#include "iterators.h"
#include "LaTeXFeatures.h"
#include "LColor.h"
#include "lyxlex.h"
#include "outputparams.h"
#include "paragraph.h"
+#include "pariterator.h"
#include "support/lstrings.h"
#include "support/tostr.h"
-
#include "support/std_sstream.h"
using lyx::support::contains;
InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
: InsetCollapsable(bp)
{
- string lab(_("float: "));
- lab += floatname(type, bp);
- setLabel(lab);
+ setLabel(_("float: ") + floatname(type, bp));
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
setInsetName(type);
LyXTextClass const & tclass = bp.getLyXTextClass();
if (tclass.hasLayout(caplayout))
- inset.paragraphs.begin()->layout(tclass[caplayout]);
+ paragraphs().begin()->layout(tclass[caplayout]);
}
-InsetFloat::InsetFloat(InsetFloat const & in)
- : InsetCollapsable(in), params_(in.params_)
-{}
-
-
InsetFloat::~InsetFloat()
{
- InsetFloatMailer mailer(*this);
- mailer.hideDialog();
+ InsetFloatMailer(*this).hideDialog();
}
-DispatchResult
-InsetFloat::priv_dispatch(FuncRequest const & cmd,
- idx_type & idx, pos_type & pos)
+void InsetFloat::priv_dispatch(LCursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
InsetFloatParams params;
InsetFloatMailer::string2params(cmd.argument, params);
-
params_.placement = params.placement;
params_.wide = params.wide;
-
- wide(params_.wide, cmd.view()->buffer()->params());
- cmd.view()->update();
- return DispatchResult(true, true);
+ params_.sideways = params.sideways;
+ wide(params_.wide, cur.buffer().params());
+ sideways(params_.sideways, cur.buffer().params());
+ cur.bv().update();
+ break;
}
case LFUN_INSET_DIALOG_UPDATE: {
- InsetFloatMailer(*this).updateDialog(cmd.view());
- return DispatchResult(true, true);
+ InsetFloatMailer(*this).updateDialog(&cur.bv());
+ break;
+ }
+
+ case LFUN_MOUSE_RELEASE: {
+ if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
+ InsetFloatMailer(*this).showDialog(&cur.bv());
+ break;
+ }
+ InsetCollapsable::priv_dispatch(cur, cmd);
+ break;
}
default:
- return InsetCollapsable::priv_dispatch(cmd, idx, pos);
+ InsetCollapsable::priv_dispatch(cur, cmd);
+ break;
}
}
void InsetFloatParams::write(ostream & os) const
{
- os << "Float " // getInsetName()
- << type << '\n';
+ os << "Float " << type << '\n';
if (!placement.empty())
os << "placement " << placement << "\n";
os << "wide true\n";
else
os << "wide false\n";
+
+ if (sideways)
+ os << "sideways true\n";
+ else
+ os << "sideways false\n";
}
void InsetFloatParams::read(LyXLex & lex)
{
- if (lex.isOK()) {
- lex.next();
- string token = lex.getString();
- if (token == "placement") {
- lex.next();
- placement = lex.getString();
- } else {
- // take countermeasures
- lex.pushToken(token);
- }
- lex.next();
- token = lex.getString();
- if (token == "wide") {
- lex.next();
- string const tmptoken = lex.getString();
- wide = (tmptoken == "true");
- } else {
- lyxerr << "InsetFloat::Read:: Missing wide!"
- << endl;
- // take countermeasures
- lex.pushToken(token);
- }
+ string token;
+ lex >> token;
+ if (token == "placement") {
+ lex >> placement;
+ } else {
+ // take countermeasures
+ lex.pushToken(token);
+ }
+ lex >> token;
+ if (token == "wide") {
+ lex >> wide;
+ } else {
+ lyxerr << "InsetFloat::Read:: Missing wide!"
+ << endl;
+ // take countermeasures
+ lex.pushToken(token);
+ }
+ lex >> token;
+ if (token == "sideways") {
+ lex >> sideways;
+ } else {
+ lyxerr << "InsetFloat::Read:: Missing sideways!"
+ << endl;
+ // take countermeasures
+ lex.pushToken(token);
}
}
{
params_.read(lex);
wide(params_.wide, buf.params());
+ sideways(params_.sideways, buf.params());
InsetCollapsable::read(buf, lex);
}
void InsetFloat::validate(LaTeXFeatures & features) const
{
- if (contains(params_.placement, "H")) {
+ if (contains(params_.placement, 'H')) {
features.require("float");
}
+ if (params_.sideways)
+ features.require("rotating");
+
features.useFloat(params_.type);
InsetCollapsable::validate(features);
}
OutputParams const & runparams) const
{
FloatList const & floats = buf.params().getLyXTextClass().floats();
- string const tmptype = (params_.wide ? params_.type + "*" : params_.type);
+ string tmptype = (params_.wide ? params_.type + "*" : params_.type);
+ if (params_.sideways) {
+ if (params_.type == "table")
+ tmptype = "sidewaystable";
+ else if (params_.type == "figure")
+ tmptype = "sidewaysfigure";
+ }
// Figure out the float placement to use.
// From lowest to highest:
// - float default placement
// when the current output line is empty.
os << "%\n\\begin{" << tmptype << '}';
// We only output placement if different from the def_placement.
- if (!placement.empty()) {
+ // sidewaysfloats always use their own page
+ if (!placement.empty() && !params_.sideways) {
os << '[' << placement << ']';
}
os << '\n';
- int const i = inset.latex(buf, os, runparams);
+ int const i = InsetText::latex(buf, os, runparams);
// The \n is used to force \end{<floatname>} to appear in a new line.
// In this case, we do not case if the current output line is empty.
}
os << ">";
- int const i = inset.linuxdoc(buf, os, runparams);
+ int const i = InsetText::linuxdoc(buf, os, runparams);
os << "</" << tmptype << ">\n";
return i;
OutputParams const & runparams) const
{
os << '<' << params_.type << '>';
- int const i = inset.docbook(buf, os, runparams);
+ int const i = InsetText::docbook(buf, os, runparams);
os << "</" << params_.type << '>';
return i;
bool InsetFloat::insetAllowed(InsetOld::Code code) const
{
- if (code == InsetOld::FLOAT_CODE)
- return false;
- if (code == InsetOld::FOOT_CODE || code == InsetOld::MARGIN_CODE)
- return false;
- return true;
+ return code != InsetOld::FLOAT_CODE
+ && code != InsetOld::FOOT_CODE
+ && code != InsetOld::MARGIN_CODE;
}
bool InsetFloat::showInsetDialog(BufferView * bv) const
{
- if (!inset.showInsetDialog(bv))
+ if (!InsetText::showInsetDialog(bv))
InsetFloatMailer(const_cast<InsetFloat &>(*this)).showDialog(bv);
return true;
}
}
+void InsetFloat::sideways(bool s, BufferParams const & bp)
+{
+ params_.sideways = s;
+ string lab = _("float: ") + floatname(params_.type, bp);
+ if (params_.sideways)
+ lab += _(" (sideways)");
+ setLabel(lab);
+}
+
+
void InsetFloat::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
{
- ParIterator pit(inset.paragraphs.begin(), inset.paragraphs);
- ParIterator end(inset.paragraphs.end(), inset.paragraphs);
+ ParConstIterator pit = par_const_iterator_begin(*this);
+ ParConstIterator end = par_const_iterator_end(*this);
// Find a caption layout in one of the (child inset's) pars
for (; pit != end; ++pit) {
InsetFloatParams & params)
{
params = InsetFloatParams();
-
if (in.empty())
return;
LyXLex lex(0,0);
lex.setStream(data);
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token != name_)
- return;
- }
+ string name;
+ lex >> name;
+ if (!lex || name != name_)
+ return print_mailer_error("InsetFloatMailer", in, 1, name_);
// This is part of the inset proper that is usually swallowed
- // by Buffer::readInset
- if (lex.isOK()) {
- lex.next();
- string const token = lex.getString();
- if (token != "Float" || !lex.eatLine())
- return;
- }
-
- if (lex.isOK()) {
- params.read(lex);
- }
+ // by LyXText::readInset
+ string id;
+ lex >> id;
+ if (!lex || id != "Float")
+ return print_mailer_error("InsetBoxMailer", in, 2, "Float");
+
+ // We have to read the type here!
+ lex >> params.type;
+ params.read(lex);
}
projects / lyx.git / blobdiff