* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Jürgen Vigna
- * \author Lars Gullik Bjønnes
- * \author Jürgen Spitzmüller
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "FloatList.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "InsetList.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
-#include "OutputParams.h"
+#include "output_xhtml.h"
#include "ParIterator.h"
#include "TextClass.h"
#include "support/debug.h"
+#include "support/docstream.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/docstream.h"
-#include "support/convert.h"
+
+#include "frontends/Application.h"
using namespace std;
-namespace lyx {
+namespace lyx {
// With this inset it will be possible to support the latex package
// float.sty, and I am sure that with this and some additional support
// (read DocBook).
// By using float.sty we will have the same handling for all floats, both
// for those already in existance (table and figure) and all user created
-// ones¹. So suddenly we give the users the possibility of creating new
+// ones¹. So suddenly we give the users the possibility of creating new
// kinds of floats on the fly. (and with a uniform look)
//
// API to float.sty:
// \listof{type}{title}
// title -
-// ¹ the algorithm float is defined using the float.sty package. Like this
+// ¹ the algorithm float is defined using the float.sty package. Like this
// \floatstyle{ruled}
// \newfloat{algorithm}{htbp}{loa}[<sect>]
// \floatname{algorithm}{Algorithm}
// Lgb
-InsetFloat::InsetFloat(Buffer const & buf, string const & type)
+InsetFloat::InsetFloat(Buffer * buf, string const & type)
: InsetCollapsable(buf), name_(from_utf8(type))
{
- setLabel(_("float: ") + floatName(type, buf.params()));
+ setLabel(_("float: ") + floatName(type));
params_.type = type;
}
InsetFloat::~InsetFloat()
{
- InsetFloatMailer(*this).hideDialog();
+ hideDialogs("float", this);
+}
+
+
+docstring InsetFloat::name() const
+{
+ return "Float:" + name_;
+}
+
+
+docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
+{
+ if (InsetCollapsable::toolTip(bv, x, y).empty() || isOpen(bv))
+ return docstring();
+
+ OutputParams rp(&buffer().params().encoding());
+ return getCaptionText(rp);
}
case LFUN_INSET_MODIFY: {
InsetFloatParams params;
- InsetFloatMailer::string2params(to_utf8(cmd.argument()), params);
- params_.placement = params.placement;
- params_.wide = params.wide;
- params_.sideways = params.sideways;
- params_.subfloat = params.subfloat;
- wide(params_.wide, cur.buffer().params());
- sideways(params_.sideways, cur.buffer().params());
- break;
- }
+ string2params(to_utf8(cmd.argument()), params);
- case LFUN_INSET_DIALOG_UPDATE: {
- InsetFloatMailer(*this).updateDialog(&cur.bv());
+ // placement, wide and sideways are not used for subfloats
+ if (!params_.subfloat) {
+ params_.placement = params.placement;
+ params_.wide = params.wide;
+ params_.sideways = params.sideways;
+ }
+
+ setNewLabel();
break;
}
- case LFUN_MOUSE_RELEASE: {
- if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
- if (params_.subfloat)
- break;
- InsetFloatMailer(*this).showDialog(&cur.bv());
- break;
- }
- InsetCollapsable::doDispatch(cur, cmd);
+ case LFUN_INSET_DIALOG_UPDATE: {
+ cur.bv().updateDialog("float", params2string(params()));
break;
}
case LFUN_INSET_MODIFY:
case LFUN_INSET_DIALOG_UPDATE:
- flag.enabled(true);
+ flag.setEnabled(true);
return true;
+ case LFUN_INSET_SETTINGS:
+ if (InsetCollapsable::getStatus(cur, cmd, flag)) {
+ flag.setEnabled(flag.enabled() && !params_.subfloat);
+ return true;
+ } else
+ return false;
+
default:
return InsetCollapsable::getStatus(cur, cmd, flag);
}
}
-void InsetFloat::updateLabels(ParIterator const & it)
+void InsetFloat::updateLabels(ParIterator const & it, bool out)
{
- Counters & cnts = buffer().params().documentClass().counters();
+ Counters & cnts =
+ buffer().masterBuffer()->params().documentClass().counters();
string const saveflt = cnts.current_float();
bool const savesubflt = cnts.isSubfloat();
- bool const subflt = it.innerInsetOfType(FLOAT_CODE);
+ bool const subflt = (it.innerInsetOfType(FLOAT_CODE)
+ || it.innerInsetOfType(WRAP_CODE));
// floats can only embed subfloats of their own kind
if (subflt)
params_.type = saveflt;
- subfloat(subflt, buffer().params());
+ setSubfloat(subflt);
// Tell to captions what the current float is
cnts.current_float(params().type);
cnts.isSubfloat(subflt);
- InsetCollapsable::updateLabels(it);
+ InsetCollapsable::updateLabels(it, out);
//reset afterwards
cnts.current_float(saveflt);
void InsetFloatParams::read(Lexer & lex)
{
- string token;
- lex >> token;
- if (token == "placement") {
+ lex.setContext("InsetFloatParams::read");
+ if (lex.checkFor("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);
- }
+ lex >> "wide" >> wide;
+ lex >> "sideways" >> sideways;
}
void InsetFloat::read(Lexer & lex)
{
params_.read(lex);
- wide(params_.wide, buffer().params());
- sideways(params_.sideways, buffer().params());
- subfloat(params_.subfloat, buffer().params());
InsetCollapsable::read(lex);
}
if (params_.sideways)
features.require("rotfloat");
- if (params_.subfloat)
+ if (features.inFloat())
features.require("subfig");
- features.useFloat(params_.type, params_.subfloat);
+ features.useFloat(params_.type, features.inFloat());
+ features.inFloat(true);
InsetCollapsable::validate(features);
+ features.inFloat(false);
}
-docstring InsetFloat::editMessage() const
+docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
{
- return _("Opened Float Inset");
+ FloatList const & floats = buffer().params().documentClass().floats();
+ Floating const & ftype = floats.getType(params_.type);
+ string const & htmltype = ftype.htmlTag();
+ string const & attr = ftype.htmlAttrib();
+
+ odocstringstream ods;
+ XHTMLStream newxs(ods);
+ newxs << StartTag(htmltype, attr);
+ InsetText::XHTMLOptions const opts =
+ InsetText::WriteLabel | InsetText::WriteInnerTag;
+ docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);
+ newxs << EndTag(htmltype);
+
+ if (rp.inFloat == OutputParams::NONFLOAT)
+ // In this case, this float needs to be deferred, but we'll put it
+ // before anything the text itself deferred.
+ deferred = ods.str() + '\n' + deferred;
+ else
+ // In this case, the whole thing is already being deferred, so
+ // we can write to the stream.
+ // Note that things will already have been escaped, so we do not
+ // want to escape them again.
+ xs << XHTMLStream::NextRaw() << ods.str();
+ return deferred;
}
-int InsetFloat::latex(odocstream & os, OutputParams const & runparams) const
+int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
{
- if (params_.subfloat) {
- if (runparams.moving_arg)
+ if (runparams_in.inFloat != OutputParams::NONFLOAT) {
+ if (runparams_in.moving_arg)
os << "\\protect";
os << "\\subfloat";
- OutputParams rp = runparams;
+ OutputParams rp = runparams_in;
docstring const caption = getCaption(rp);
if (!caption.empty()) {
os << caption;
}
os << '{';
- int const i = InsetText::latex(os, runparams);
+ rp.inFloat = OutputParams::SUBFLOAT;
+ int const i = InsetText::latex(os, rp);
os << "}";
return i + 1;
}
+ OutputParams runparams(runparams_in);
+ runparams.inFloat = OutputParams::MAINFLOAT;
FloatList const & floats = buffer().params().documentClass().floats();
string tmptype = params_.type;
int InsetFloat::plaintext(odocstream & os, OutputParams const & runparams) const
{
os << '[' << buffer().B_("float") << ' '
- << floatName(params_.type, buffer().params()) << ":\n";
+ << floatName(params_.type) << ":\n";
InsetText::plaintext(os, runparams);
os << "\n]";
bool InsetFloat::insetAllowed(InsetCode code) const
{
- return code != FOOT_CODE
- && code != MARGIN_CODE
- && (code != FLOAT_CODE || !params_.subfloat);
+ // The case that code == FLOAT_CODE is handled in Text3.cpp,
+ // because we need to know what type of float is meant.
+ switch(code) {
+ case WRAP_CODE:
+ case FOOT_CODE:
+ case MARGIN_CODE:
+ return false;
+ default:
+ return InsetCollapsable::insetAllowed(code);
+ }
}
bool InsetFloat::showInsetDialog(BufferView * bv) const
{
if (!InsetText::showInsetDialog(bv))
- InsetFloatMailer(const_cast<InsetFloat &>(*this)).showDialog(bv);
+ bv->showDialog("float", params2string(params()),
+ const_cast<InsetFloat *>(this));
return true;
}
-void InsetFloat::wide(bool w, BufferParams const & bp)
+void InsetFloat::setWide(bool w, bool update_label)
{
params_.wide = w;
- docstring lab = _("float: ") + floatName(params_.type, bp);
- if (params_.wide)
- lab += '*';
- setLabel(lab);
+ if (update_label)
+ setNewLabel();
}
-void InsetFloat::sideways(bool s, BufferParams const & bp)
+void InsetFloat::setSideways(bool s, bool update_label)
{
params_.sideways = s;
- docstring lab = _("float: ") + floatName(params_.type, bp);
- if (params_.sideways)
- lab += _(" (sideways)");
- setLabel(lab);
+ if (update_label)
+ setNewLabel();
}
-void InsetFloat::subfloat(bool s, BufferParams const & bp)
+void InsetFloat::setSubfloat(bool s, bool update_label)
{
params_.subfloat = s;
- docstring lab = _("float: ") + floatName(params_.type, bp);
- if (s)
- lab = _("subfloat: ") + floatName(params_.type, bp);
- setLabel(lab);
+ if (update_label)
+ setNewLabel();
}
-docstring InsetFloat::getCaption(OutputParams const & runparams) const
+void InsetFloat::setNewLabel()
{
- if (paragraphs().empty())
- return docstring();
+ docstring lab = _("float: ");
- ParagraphList::const_iterator pit = paragraphs().begin();
- for (; pit != paragraphs().end(); ++pit) {
- InsetList::const_iterator it = pit->insetList().begin();
- for (; it != pit->insetList().end(); ++it) {
- Inset & inset = *it->inset;
- if (inset.lyxCode() == CAPTION_CODE) {
- odocstringstream ods;
- InsetCaption * ins =
- static_cast<InsetCaption *>(it->inset);
- ins->getOptArg(ods, runparams);
- ods << '[';
- ins->getArgument(ods, runparams);
- ods << ']';
- return ods.str();
- }
- }
- }
- return docstring();
-}
+ if (params_.subfloat)
+ lab = _("subfloat: ");
+
+ lab += floatName(params_.type);
+ if (params_.wide)
+ lab += '*';
-string const InsetFloatMailer::name_("float");
+ if (params_.sideways)
+ lab += _(" (sideways)");
-InsetFloatMailer::InsetFloatMailer(InsetFloat & inset)
- : inset_(inset)
-{}
+ setLabel(lab);
+}
-string const InsetFloatMailer::inset2string(Buffer const &) const
+docstring InsetFloat::getCaption(OutputParams const & runparams) const
{
- return params2string(inset_.params());
+ if (paragraphs().empty())
+ return docstring();
+
+ InsetCaption const * ins = getCaptionInset();
+ if (ins == 0)
+ return docstring();
+
+ odocstringstream ods;
+ ins->getOptArg(ods, runparams);
+ ods << '[';
+ ins->getArgument(ods, runparams);
+ ods << ']';
+ return ods.str();
}
-void InsetFloatMailer::string2params(string const & in,
- InsetFloatParams & params)
+void InsetFloat::string2params(string const & in, InsetFloatParams & params)
{
params = InsetFloatParams();
if (in.empty())
return;
istringstream data(in);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(data);
-
- 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 Text::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;
+ lex.setContext("InsetFloat::string2params");
+ lex >> "float" >> "Float";
+ lex >> params.type; // We have to read the type here!
params.read(lex);
}
-string const InsetFloatMailer::params2string(InsetFloatParams const & params)
+string InsetFloat::params2string(InsetFloatParams const & params)
{
ostringstream data;
- data << name_ << ' ';
+ data << "float" << ' ';
params.write(data);
return data.str();
}