* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
- * \author Uwe Stöhr
+ * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "InsetWrap.h"
+#include "InsetCaption.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "FuncStatus.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
-#include "OutputParams.h"
+#include "output_xhtml.h"
#include "TextClass.h"
-#include "TocBackend.h"
-#include "support/convert.h"
-#include "support/docstream.h"
#include "support/debug.h"
+#include "support/docstream.h"
#include "support/gettext.h"
#include "frontends/Application.h"
using namespace std;
-namespace lyx {
+namespace lyx {
-InsetWrap::InsetWrap(Buffer const & buf, string const & type)
- : InsetCollapsable(buf), name_(from_utf8(type))
+InsetWrap::InsetWrap(Buffer * buf, string const & type)
+ : InsetCollapsable(buf)
{
- setLabel(_("wrap: ") + floatName(type, buf.params()));
+ setLabel(_("wrap: ") + floatName(type));
params_.type = type;
params_.lines = 0;
params_.placement = "o";
}
+docstring InsetWrap::name() const
+{
+ return "Wrap:" + from_utf8(params_.type);
+}
+
+
+docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const
+{
+ OutputParams rp(&buffer().params().encoding());
+ docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
+ docstring caption_tip = getCaptionText(rp);
+ if (!isOpen(bv) && !caption_tip.empty())
+ return caption_tip + '\n' + default_tip;
+ return default_tip;
+}
+
+
void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
InsetWrapParams params;
InsetWrap::string2params(to_utf8(cmd.argument()), params);
bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY:
case LFUN_INSET_DIALOG_UPDATE:
- flag.enabled(true);
+ flag.setEnabled(true);
return true;
default:
}
-void InsetWrap::updateLabels(ParIterator const & it)
+void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype)
{
- setLabel(_("wrap: ") + floatName(params_.type, buffer().params()));
- Counters & cnts = buffer().params().documentClass().counters();
+ setLabel(_("wrap: ") + floatName(params_.type));
+ Counters & cnts =
+ buffer().masterBuffer()->params().documentClass().counters();
+ if (utype == OutputUpdate) {
+ // counters are local to the wrap
+ cnts.saveLastCounter();
+ }
string const saveflt = cnts.current_float();
// Tell to captions what the current float is
cnts.current_float(params().type);
- InsetCollapsable::updateLabels(it);
+ InsetCollapsable::updateBuffer(it, utype);
// reset afterwards
cnts.current_float(saveflt);
+ if (utype == OutputUpdate)
+ cnts.restoreLastCounter();
}
void InsetWrapParams::write(ostream & os) const
{
os << "Wrap " << type << '\n';
- os << "lines " << lines << "\n";
- os << "placement " << placement << "\n";
- os << "overhang " << overhang.asString() << "\n";
+ os << "lines " << lines << '\n';
+ os << "placement " << placement << '\n';
+ os << "overhang " << overhang.asString() << '\n';
os << "width \"" << width.asString() << "\"\n";
}
void InsetWrapParams::read(Lexer & lex)
{
- string token;
-
- lex >> token;
- if (token == "lines")
- lex >> lines;
- else {
- lyxerr << "InsetWrap::Read:: Missing 'lines'-tag!"
- << endl;
- // take countermeasures
- lex.pushToken(token);
- }
- if (!lex)
- return;
- lex >> token;
- if (token == "placement")
- lex >> placement;
- else {
- lyxerr << "InsetWrap::Read:: Missing 'placement'-tag!"
- << endl;
- lex.pushToken(token);
- }
- if (!lex)
- return;
- lex >> token;
- if (token == "overhang") {
- lex.next();
- overhang = Length(lex.getString());
- } else {
- lyxerr << "InsetWrap::Read:: Missing 'overhang'-tag!"
- << endl;
- lex.pushToken(token);
- }
- if (!lex)
- return;
- lex >> token;
- if (token == "width") {
- lex.next();
- width = Length(lex.getString());
- } else {
- lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
- << endl;
- lex.pushToken(token);
- }
+ lex.setContext("InsetWrapParams::read");
+ lex >> "lines" >> lines;
+ lex >> "placement" >> placement;
+ lex >> "overhang" >> overhang;
+ lex >> "width" >> width;
}
void InsetWrap::validate(LaTeXFeatures & features) const
{
features.require("wrapfig");
+ features.inFloat(true);
InsetCollapsable::validate(features);
+ features.inFloat(false);
}
-docstring InsetWrap::editMessage() const
-{
- return _("Opened Wrap Inset");
-}
-
-
-int InsetWrap::latex(odocstream & os, OutputParams const & runparams) const
+int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
{
+ OutputParams runparams(runparams_in);
+ runparams.inFloat = OutputParams::MAINFLOAT;
os << "\\begin{wrap" << from_ascii(params_.type) << '}';
// no optional argument when lines are zero
if (params_.lines != 0)
int InsetWrap::plaintext(odocstream & os, OutputParams const & runparams) const
{
os << '[' << buffer().B_("wrap") << ' '
- << floatName(params_.type, buffer().params()) << ":\n";
+ << floatName(params_.type) << ":\n";
InsetText::plaintext(os, runparams);
os << "\n]";
}
+docstring InsetWrap::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+{
+ string const len = params_.width.asHTMLString();
+ string const width = len.empty() ? "50%" : len;
+ string const attr = "class='wrap' style='width: " + len + ";'";
+ xs << html::StartTag("div", attr);
+ docstring const deferred =
+ InsetText::insetAsXHTML(xs, rp, InsetText::WriteInnerTag);
+ if (!len.empty())
+ xs << html::EndTag("div");
+ return deferred;
+}
+
+
bool InsetWrap::insetAllowed(InsetCode code) const
{
switch(code) {
- case FLOAT_CODE:
+ case WRAP_CODE:
case FOOT_CODE:
case MARGIN_CODE:
return false;
void InsetWrap::string2params(string const & in, InsetWrapParams & params)
{
params = InsetWrapParams();
- if (in.empty())
- return;
-
istringstream data(in);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(data);
-
- string name;
- lex >> name;
- if (!lex || name != "wrap") {
- LYXERR0("Expected arg 1 to be \"wrap\" in " << in);
- return;
- }
-
- // This is part of the inset proper that is usually swallowed
- // by Text::readInset
- string id;
- lex >> id;
- if (!lex || id != "Wrap") {
- LYXERR0("Expected arg 2 to be \"Wrap\" in " << in);
- return;
- }
-
- // We have to read the type here!
- lex >> params.type;
+ lex.setContext("InsetWrap::string2params");
+ lex >> "wrap";
+ lex >> "Wrap"; // Part of the inset proper, swallowed by Text::readInset
+ lex >> params.type; // We have to read the type here!
params.read(lex);
}
projects / lyx.git / blobdiff