* src/paragraph_funcs.cpp (breakParagraph): change parameter 'flag' to

[lyx.git] / src / insets / InsetWrap.cpp

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index dd655c3603a18b4323381dfdb7a00efb53065b4c..64b7ccd55fa9fa4eccafc36ad2da1b7d0e38b3d6 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -15,6 +15,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "Counters.h"
 #include "Cursor.h"
 #include "debug.h"
 #include "DispatchResult.h"
@@ -36,7 +37,6 @@ namespace lyx {
 
 using std::string;
 using std::endl;
-using std::auto_ptr;
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
@@ -52,6 +52,9 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
        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);
 }
 
@@ -68,8 +71,10 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
        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;
        }
 
@@ -108,13 +113,27 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-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();
+
+       // Tell to captions what the current float is
+       cnts.current_float(params().type);
+
+       InsetCollapsable::updateLabels(buf, it);
+
+       //reset afterwards
+       cnts.current_float(saveflt);
+}
 
-       if (!placement.empty())
-               os << "placement " << placement << "\n";
 
+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";
 }
 
@@ -122,11 +141,35 @@ void InsetWrapParams::write(ostream & os) const
 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)
@@ -138,7 +181,6 @@ void InsetWrapParams::read(Lexer & lex)
        } else {
                lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
                        << endl;
-               // take countermeasures
                lex.pushToken(token);
        }
 }
@@ -160,14 +202,14 @@ void InsetWrap::read(Buffer const & buf, Lexer & lex)
 
 void InsetWrap::validate(LaTeXFeatures & features) const
 {
-       features.require("floatflt");
+       features.require("wrapfig");
        InsetCollapsable::validate(features);
 }
 
 
-auto_ptr<Inset> InsetWrap::doClone() const
+Inset * InsetWrap::clone() const
 {
-       return auto_ptr<Inset>(new InsetWrap(*this));
+       return new InsetWrap(*this);
 }
 
 
@@ -180,12 +222,18 @@ docstring const InsetWrap::editMessage() const
 int InsetWrap::latex(Buffer const & buf, odocstream & os,
                     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;
 }