* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
+ * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "Counters.h"
#include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
#include "DispatchResult.h"
#include "Floating.h"
#include "FloatList.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "LaTeXFeatures.h"
-#include "Color.h"
#include "Lexer.h"
#include "OutputParams.h"
-#include "Paragraph.h"
+#include "TextClass.h"
#include "TocBackend.h"
#include "support/convert.h"
+#include "support/docstream.h"
+using namespace std;
namespace lyx {
-using std::string;
-using std::endl;
-using std::auto_ptr;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-
InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
- : InsetCollapsable(bp)
+ : InsetCollapsable(bp), name_(from_utf8(type))
{
setLabel(_("wrap: ") + floatName(type, bp));
- LyXFont font(LyXFont::ALL_SANE);
- font.decSize();
- font.decSize();
- font.setColor(Color::collapsable);
- setLabelFont(font);
params_.type = type;
+ params_.lines = 0;
+ params_.placement = "o";
+ params_.overhang = Length(0, Length::PCW);
params_.width = Length(50, Length::PCW);
- setInsetName(from_utf8(type));
}
case LFUN_INSET_MODIFY: {
InsetWrapParams params;
InsetWrapMailer::string2params(to_utf8(cmd.argument()), params);
+ params_.lines = params.lines;
params_.placement = params.placement;
- params_.width = params.width;
+ params_.overhang = params.overhang;
+ params_.width = params.width;
break;
}
}
-void InsetWrapParams::write(ostream & os) const
+void InsetWrap::updateLabels(Buffer const & buf, ParIterator const & it)
{
- os << "Wrap " << type << '\n';
+ Counters & cnts = buf.params().getTextClass().counters();
+ string const saveflt = cnts.current_float();
- if (!placement.empty())
- os << "placement " << placement << "\n";
+ // Tell to captions what the current float is
+ cnts.current_float(params().type);
+ InsetCollapsable::updateLabels(buf, it);
+
+ //reset afterwards
+ cnts.current_float(saveflt);
+}
+
+
+void InsetWrapParams::write(ostream & os) const
+{
+ os << "Wrap " << type << '\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 {
- // take countermeasures
+ 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)
} else {
lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
<< endl;
- // take countermeasures
lex.pushToken(token);
}
}
void InsetWrap::validate(LaTeXFeatures & features) const
{
- features.require("floatflt");
+ features.require("wrapfig");
InsetCollapsable::validate(features);
}
-auto_ptr<InsetBase> InsetWrap::doClone() const
+Inset * InsetWrap::clone() const
{
- return auto_ptr<InsetBase>(new InsetWrap(*this));
+ return new InsetWrap(*this);
}
int InsetWrap::latex(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
- os << "\\begin{floating" << from_ascii(params_.type) << '}';
- if (!params_.placement.empty())
- os << '[' << from_ascii(params_.placement) << ']';
+ os << "\\begin{wrap" << from_ascii(params_.type) << '}';
+ // no optional argument when lines are zero
+ if (params_.lines != 0)
+ os << '[' << params_.lines << ']';
+ os << '{' << from_ascii(params_.placement) << '}';
+ Length over(params_.overhang);
+ // no optional argument when the value is zero
+ if (over.value() != 0)
+ os << '[' << from_ascii(params_.overhang.asLatexString()) << ']';
os << '{' << from_ascii(params_.width.asLatexString()) << "}%\n";
int const i = InsetText::latex(buf, os, runparams);
- os << "\\end{floating" << from_ascii(params_.type) << "}%\n";
+ os << "\\end{wrap" << from_ascii(params_.type) << "}%\n";
return i + 2;
}
int InsetWrap::plaintext(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
- os << '[' << _("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n";
+ os << '[' << buf.B_("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n";
InsetText::plaintext(buf, os, runparams);
os << "\n]";
int InsetWrap::docbook(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
- // FIXME UNICODE
- os << '<' << from_ascii(params_.type) << '>';
+ // FIXME UNICODE
+ os << '<' << from_ascii(params_.type) << '>';
int const i = InsetText::docbook(buf, os, runparams);
os << "</" << from_ascii(params_.type) << '>';
return i;
}
-bool InsetWrap::insetAllowed(InsetBase::Code code) const
+bool InsetWrap::insetAllowed(InsetCode code) const
{
switch(code) {
case FLOAT_CODE:
}
-void InsetWrap::addToToc(TocList & toclist, Buffer const & buf) const
-{
- // Is there a need to provide a list of wrap insets?
- return;
-}
-
-
string const InsetWrapMailer::name_("wrap");
InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
return print_mailer_error("InsetWrapMailer", in, 1, name_);
// This is part of the inset proper that is usually swallowed
- // by LyXText::readInset
+ // by Text::readInset
string id;
lex >> id;
if (!lex || id != "Wrap")
projects / lyx.git / blobdiff