Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index d7af96cc2cecd428b42722b5183e4fbf5ce6d5a6..8eb58801b3783318a2da48e175770c6bac3fb9fb 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -5,7 +5,7 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -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"
@@ -33,12 +34,14 @@
 
 using std::ostream;
 using std::endl;
+using std::auto_ptr;
 
 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();
@@ -72,22 +75,14 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
 }
 
 
-InsetWrap::InsetWrap(InsetWrap const & in, bool same_id)
-       : InsetCollapsable(in, same_id), params_(in.params_)
-{}
-
-
 InsetWrap::~InsetWrap()
 {
-       InsetWrapMailer mailer(*this);
-       mailer.hideDialog();
+       InsetWrapMailer(*this).hideDialog();
 }
 
 
 dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
 {
-       Inset::RESULT result = UNDISPATCHED;
-
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
                InsetWrapParams params;
@@ -97,32 +92,26 @@ dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
                params_.width     = params.width;
 
                cmd.view()->updateInset(this);
-               result = DISPATCHED;
+               return DISPATCHED;
        }
-       break;
 
-       case LFUN_INSET_DIALOG_UPDATE: {
-               InsetWrapMailer mailer(*this);
-               mailer.updateDialog(cmd.view());
-       }
-       break;
+       case LFUN_INSET_DIALOG_UPDATE:
+               InsetWrapMailer(*this).updateDialog(cmd.view());
+               return DISPATCHED;
 
        default:
-               result = InsetCollapsable::localDispatch(cmd);
+               return InsetCollapsable::localDispatch(cmd);
        }
-
-       return result;
 }
 
 
 void InsetWrapParams::write(ostream & os) const
 {
-       os << "Wrap " // getInsetName()
-          << type << '\n';
+       os << "Wrap " << type << '\n';
 
-       if (!placement.empty()) {
+       if (!placement.empty())
                os << "placement " << placement << "\n";
-       }
+
        os << "width \"" << width.asString() << "\"\n";
 }
 
@@ -156,14 +145,14 @@ void InsetWrapParams::read(LyXLex & lex)
 }
 
 
-void InsetWrap::write(Buffer const * buf, ostream & os) const
+void InsetWrap::write(Buffer const & buf, ostream & os) const
 {
        params_.write(os);
        InsetCollapsable::write(buf, os);
 }
 
 
-void InsetWrap::read(Buffer const * buf, LyXLex & lex)
+void InsetWrap::read(Buffer const & buf, LyXLex & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(buf, lex);
@@ -177,9 +166,9 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetWrap::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetWrap::clone() const
 {
-       return new InsetWrap(*const_cast<InsetWrap *>(this), same_id);
+       return auto_ptr<InsetBase>(new InsetWrap(*this));
 }
 
 
@@ -189,8 +178,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,14 +187,14 @@ 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;
 }
 
 
-int InsetWrap::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetWrap::docbook(Buffer const & buf, ostream & os, bool mixcont) const
 {
        os << '<' << params_.type << '>';
        int const i = inset.docbook(buf, os, mixcont);
@@ -215,7 +204,7 @@ int InsetWrap::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 }
 
 
-bool InsetWrap::insetAllowed(Inset::Code code) const
+bool InsetWrap::insetAllowed(InsetOld::Code code) const
 {
        switch(code) {
        case FLOAT_CODE:
@@ -228,26 +217,6 @@ bool InsetWrap::insetAllowed(Inset::Code code) const
 }
 
 
-int InsetWrap::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
-       const
-{
-       if (owner() &&
-           static_cast<UpdatableInset*>(owner())->getMaxWidth(bv, inset) < 0) {
-               return -1;
-       }
-       if (!params_.width.zero()) {
-               int const ww1 = latexTextWidth(bv);
-               int const ww2 = InsetCollapsable::getMaxWidth(bv, inset);
-               if (ww2 > 0 && ww2 < ww1) {
-                       return ww2;
-               }
-               return ww1;
-       }
-       // this should not happen!
-       return InsetCollapsable::getMaxWidth(bv, inset);
-}
-
-
 int InsetWrap::latexTextWidth(BufferView * bv) const
 {
        return params_.width.inPixels(InsetCollapsable::latexTextWidth(bv));
@@ -258,14 +227,13 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 {
        if (!inset.showInsetDialog(bv)) {
                InsetWrap * tmp = const_cast<InsetWrap *>(this);
-               InsetWrapMailer mailer(*tmp);
-               mailer.showDialog(bv);
+               InsetWrapMailer(*tmp).showDialog(bv);
        }
        return true;
 }
 
 
-void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
+void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
 {
        // Now find the caption in the float...
        ParagraphList::iterator tmp = inset.paragraphs.begin();
@@ -273,11 +241,11 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
 
        for (; tmp != end; ++tmp) {
                if (tmp->layout()->name() == caplayout) {
-                       string const name = floatname(params_.type, buf->params);
+                       string const name = floatname(params_.type, buf.params);
                        string const str =
                                tostr(toclist[name].size() + 1)
                                + ". " + tmp->asString(buf, false);
-                       toc::TocItem const item(tmp->id(), 0 , str);
+                       lyx::toc::TocItem const item(tmp->id(), 0 , str);
                        toclist[name].push_back(item);
                }
        }
@@ -291,7 +259,7 @@ InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
 {}
 
 
-string const InsetWrapMailer::inset2string() const
+string const InsetWrapMailer::inset2string(Buffer const &) const
 {
        return params2string(inset_.params());
 }
@@ -304,8 +272,8 @@ 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 +299,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());
 }