prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 9fa54c073f20403c2ba7cfb833866834b80e9f8c..0db037a0da8f5e9025cdb60450db76e224301da4 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -162,7 +162,7 @@ InsetFloat::~InsetFloat()
 
 dispatch_result InsetFloat::localDispatch(FuncRequest const & cmd)
 {
-       Inset::RESULT result = UNDISPATCHED;
+       InsetOld::RESULT result = UNDISPATCHED;
 
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
@@ -316,6 +316,43 @@ int InsetFloat::latex(Buffer const * buf, ostream & os,
 }
 
 
+int InsetFloat::linuxdoc(Buffer const * buf, ostream & os) const
+{
+       FloatList const & floats = buf->params.getLyXTextClass().floats();
+       string const tmptype =  params_.type;
+       // Figure out the float placement to use.
+       // From lowest to highest:
+       // - float default placement
+       // - document wide default placement
+       // - specific float placement
+       // This is the same as latex, as linuxdoc is modeled after latex.
+
+       string placement;
+       string const buf_placement = buf->params.float_placement;
+       string const def_placement = floats.defaultPlacement(params_.type);
+       if (!params_.placement.empty()
+           && params_.placement != def_placement) {
+               placement = params_.placement;
+       } else if (params_.placement.empty()
+                  && !buf_placement.empty()
+                  && buf_placement != def_placement) {
+               placement = buf_placement;
+       }
+
+       os << "\n<" << tmptype ;
+       // We only output placement if different from the def_placement.
+       if (!placement.empty()) {
+               os << " loc=\"" << placement << '"';
+       }
+       os << ">";
+
+       int const i = inset.linuxdoc(buf, os);
+       os << "</" << tmptype << ">\n";
+
+       return i;
+}
+
+
 int InsetFloat::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 {
        os << '<' << params_.type << '>';
@@ -326,13 +363,13 @@ int InsetFloat::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 }
 
 
-bool InsetFloat::insetAllowed(Inset::Code code) const
+bool InsetFloat::insetAllowed(InsetOld::Code code) const
 {
-       if (code == Inset::FLOAT_CODE)
+       if (code == InsetOld::FLOAT_CODE)
                return false;
        if (inset.getLockingInset() != const_cast<InsetFloat *>(this))
                return inset.insetAllowed(code);
-       if ((code == Inset::FOOT_CODE) || (code == Inset::MARGIN_CODE))
+       if ((code == InsetOld::FOOT_CODE) || (code == InsetOld::MARGIN_CODE))
                return false;
        return true;
 }
@@ -353,7 +390,7 @@ void InsetFloat::wide(bool w, BufferParams const & bp)
 {
        params_.wide = w;
 
-       string lab(_("float:"));
+       string lab(_("float: "));
        lab += floatname(params_.type, bp);
 
        if (params_.wide)
@@ -363,7 +400,7 @@ void InsetFloat::wide(bool w, BufferParams const & bp)
 }
 
 
-void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
+void InsetFloat::addToToc(lyx::toc::TocList & toclist, Buffer const * buf) const
 {
        ParIterator pit(inset.paragraphs.begin(), inset.paragraphs);
        ParIterator end(inset.paragraphs.end(), inset.paragraphs);
@@ -375,7 +412,7 @@ void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
                        string const str =
                                tostr(toclist[name].size() + 1)
                                + ". " + pit->asString(buf, false);
-                       toc::TocItem const item(pit->id(), 0 , str);
+                       lyx::toc::TocItem const item(pit->id(), 0 , str);
                        toclist[name].push_back(item);
                }
        }