Rename LatexRunParams::fragile as moving_arg.

[lyx.git] / src / insets / insetwrap.C

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 9068d7c53e8347eab70540c1793b09c49b099c1c..97cd8d3b05a1c9da97df24d453318aab11e5c9ff 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -20,6 +20,7 @@
 #include "FloatList.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
+#include "Lsstream.h"
 #include "lyxfont.h"
 #include "lyxlex.h"
 #include "lyxtext.h"
@@ -29,16 +30,18 @@
 #include "frontends/Dialogs.h"
 
 #include "support/LOstream.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
 
 using std::ostream;
 using std::endl;
 
+
 namespace {
 
 // this should not be hardcoded, but be part of the definition
 // of the float (JMarc)
 string const caplayout("Caption");
+
 string floatname(string const & type, BufferParams const & bp)
 {
        FloatList const & floats = bp.getLyXTextClass().floats();
@@ -189,8 +192,8 @@ string const InsetWrap::editMessage() const
 }
 
 
-int InsetWrap::latex(Buffer const * buf,
-                     ostream & os, bool fragile, bool fp) const
+int InsetWrap::latex(Buffer const * buf, ostream & os,
+                    LatexRunParams const & runparams) const
 {
        os << "\\begin{floating" << params_.type << '}';
        if (!params_.placement.empty()) {
@@ -198,7 +201,7 @@ int InsetWrap::latex(Buffer const * buf,
        }
        os  << '{' << params_.width.asLatexString() << "}%\n";
 
-       int const i = inset.latex(buf, os, fragile, fp);
+       int const i = inset.latex(buf, os, runparams);
 
        os << "\\end{floating" << params_.type << "}%\n";
        return i + 2;
@@ -305,7 +308,7 @@ void InsetWrapMailer::string2params(string const & in,
        if (in.empty())
                return;
        
-       istringstream data(in);
+       istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);
 
@@ -331,12 +334,10 @@ void InsetWrapMailer::string2params(string const & in,
 }
 
 
-string const
-InsetWrapMailer::params2string(InsetWrapParams const & params)
+string const InsetWrapMailer::params2string(InsetWrapParams const & params)
 {
        ostringstream data;
        data << name_ << ' ';
        params.write(data);
-
-       return data.str();
+       return STRCONV(data.str());
 }