]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetwrap.C
Rename LatexRunParams::fragile as moving_arg.
[lyx.git] / src / insets / insetwrap.C
index adc97759b53b446044c99948dab1f27d727d858d..97cd8d3b05a1c9da97df24d453318aab11e5c9ff 100644 (file)
 
 #include <config.h>
 
-
 #include "insetwrap.h"
+#include "insettext.h"
+
+#include "buffer.h"
+#include "BufferView.h"
+#include "debug.h"
+#include "funcrequest.h"
+#include "FloatList.h"
 #include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "Lsstream.h"
 #include "lyxfont.h"
-#include "BufferView.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
-#include "LaTeXFeatures.h"
-#include "debug.h"
-#include "buffer.h"
+#include "Lsstream.h"
+
 #include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
-#include "lyxlex.h"
-#include "FloatList.h"
+
+#include "support/LOstream.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();
@@ -49,7 +56,7 @@ string floatname(string const & type, BufferParams const & bp)
 
 
 InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
-       : InsetCollapsable(bp), width_(50, LyXLength::PCW)
+       : InsetCollapsable(bp)
 {
        string lab(_("wrap: "));
        lab += floatname(type, bp);
@@ -59,48 +66,78 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
        font.decSize();
        font.setColor(LColor::collapsable);
        setLabelFont(font);
-       Type_ = type;
+       params_.type = type;
+       params_.width = LyXLength(50, LyXLength::PCW);
        setInsetName(type);
        LyXTextClass const & tclass = bp.getLyXTextClass();
        if (tclass.hasLayout(caplayout))
-               inset.paragraph()->layout(tclass[caplayout]);
+               inset.paragraphs.begin()->layout(tclass[caplayout]);
 }
 
 
 InsetWrap::InsetWrap(InsetWrap const & in, bool same_id)
-       : InsetCollapsable(in, same_id), Type_(in.Type_),
-         Placement_(in.Placement_), width_(in.width_)
+       : InsetCollapsable(in, same_id), params_(in.params_)
 {}
 
 
 InsetWrap::~InsetWrap()
 {
-       hideDialog();
+       InsetWrapMailer mailer(*this);
+       mailer.hideDialog();
 }
 
 
-void InsetWrap::write(Buffer const * buf, ostream & os) const
+dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
 {
-       os << "Wrap " // getInsetName()
-          << Type_ << '\n';
+       Inset::RESULT result = UNDISPATCHED;
+
+       switch (cmd.action) {
+       case LFUN_INSET_MODIFY: {
+               InsetWrapParams params;
+               InsetWrapMailer::string2params(cmd.argument, params);
 
-       if (!Placement_.empty()) {
-               os << "placement " << Placement_ << "\n";
+               params_.placement = params.placement;
+               params_.width     = params.width;
+
+               cmd.view()->updateInset(this);
+               result = DISPATCHED;
        }
-       os << "width \"" << width_.asString() << "\"\n";
+       break;
 
-       InsetCollapsable::write(buf, os);
+       case LFUN_INSET_DIALOG_UPDATE: {
+               InsetWrapMailer mailer(*this);
+               mailer.updateDialog(cmd.view());
+       }
+       break;
+
+       default:
+               result = InsetCollapsable::localDispatch(cmd);
+       }
+
+       return result;
 }
 
 
-void InsetWrap::read(Buffer const * buf, LyXLex & lex)
+void InsetWrapParams::write(ostream & os) const
+{
+       os << "Wrap " // getInsetName()
+          << type << '\n';
+
+       if (!placement.empty()) {
+               os << "placement " << placement << "\n";
+       }
+       os << "width \"" << width.asString() << "\"\n";
+}
+
+
+void InsetWrapParams::read(LyXLex & lex)
 {
        if (lex.isOK()) {
                lex.next();
                string token = lex.getString();
                if (token == "placement") {
                        lex.next();
-                       Placement_ = lex.getString();
+                       placement = lex.getString();
                } else {
                        // take countermeasures
                        lex.pushToken(token);
@@ -111,7 +148,7 @@ void InsetWrap::read(Buffer const * buf, LyXLex & lex)
                string token = lex.getString();
                if (token == "width") {
                        lex.next();
-                       width_ = LyXLength(lex.getString());
+                       width = LyXLength(lex.getString());
                } else {
                        lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
                               << endl;
@@ -119,6 +156,19 @@ void InsetWrap::read(Buffer const * buf, LyXLex & lex)
                        lex.pushToken(token);
                }
        }
+}
+
+
+void InsetWrap::write(Buffer const * buf, ostream & os) const
+{
+       params_.write(os);
+       InsetCollapsable::write(buf, os);
+}
+
+
+void InsetWrap::read(Buffer const * buf, LyXLex & lex)
+{
+       params_.read(lex);
        InsetCollapsable::read(buf, lex);
 }
 
@@ -142,27 +192,27 @@ 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" << Type_ << '}';
-       if (!Placement_.empty()) {
-               os << '[' << Placement_ << ']';
+       os << "\\begin{floating" << params_.type << '}';
+       if (!params_.placement.empty()) {
+               os << '[' << params_.placement << ']';
        }
-       os  << '{' << width_.asLatexString() << "}%\n";
+       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" << Type_ << "}%\n";
+       os << "\\end{floating" << params_.type << "}%\n";
        return i + 2;
 }
 
 
 int InsetWrap::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 {
-       os << '<' << Type_ << '>';
+       os << '<' << params_.type << '>';
        int const i = inset.docbook(buf, os, mixcont);
-       os << "</" << Type_ << '>';
+       os << "</" << params_.type << '>';
 
        return i;
 }
@@ -188,7 +238,7 @@ int InsetWrap::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
            static_cast<UpdatableInset*>(owner())->getMaxWidth(bv, inset) < 0) {
                return -1;
        }
-       if (!width_.zero()) {
+       if (!params_.width.zero()) {
                int const ww1 = latexTextWidth(bv);
                int const ww2 = InsetCollapsable::getMaxWidth(bv, inset);
                if (ww2 > 0 && ww2 < ww1) {
@@ -203,67 +253,91 @@ int InsetWrap::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
 
 int InsetWrap::latexTextWidth(BufferView * bv) const
 {
-       return width_.inPixels(InsetCollapsable::latexTextWidth(bv));
+       return params_.width.inPixels(InsetCollapsable::latexTextWidth(bv));
 }
 
 
-string const & InsetWrap::type() const
+bool InsetWrap::showInsetDialog(BufferView * bv) const
 {
-       return Type_;
+       if (!inset.showInsetDialog(bv)) {
+               InsetWrap * tmp = const_cast<InsetWrap *>(this);
+               InsetWrapMailer mailer(*tmp);
+               mailer.showDialog(bv);
+       }
+       return true;
 }
 
 
-LyXLength const & InsetWrap::pageWidth() const
+void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
 {
-       return width_;
-}
-
+       // Now find the caption in the float...
+       ParagraphList::iterator tmp = inset.paragraphs.begin();
+       ParagraphList::iterator end = inset.paragraphs.end();
 
-void InsetWrap::pageWidth(LyXLength const & ll)
-{
-       if (ll != width_) {
-               width_ = ll;
-               need_update = FULL;
+       for (; tmp != end; ++tmp) {
+               if (tmp->layout()->name() == caplayout) {
+                       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);
+                       toclist[name].push_back(item);
+               }
        }
 }
 
 
-void InsetWrap::placement(string const & p)
-{
-       Placement_ = p;
-}
+string const InsetWrapMailer::name_("wrap");
 
+InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
+       : inset_(inset)
+{}
 
-string const & InsetWrap::placement() const
+
+string const InsetWrapMailer::inset2string() const
 {
-       return Placement_;
+       return params2string(inset_.params());
 }
 
 
-bool InsetWrap::showInsetDialog(BufferView * bv) const
+void InsetWrapMailer::string2params(string const & in,
+                                   InsetWrapParams & params)
 {
-       if (!inset.showInsetDialog(bv)) {
-               bv->owner()->getDialogs().showWrap(const_cast<InsetWrap *>(this));
+       params = InsetWrapParams();
+
+       if (in.empty())
+               return;
+       
+       istringstream data(STRCONV(in));
+       LyXLex lex(0,0);
+       lex.setStream(data);
+
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != name_)
+                       return;
+       }
+
+       // This is part of the inset proper that is usually swallowed
+       // by Buffer::readInset
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != "Wrap" || !lex.eatLine())
+                       return;
+       }
+
+       if (lex.isOK()) {
+               params.read(lex);
        }
-       return true;
 }
 
 
-void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
+string const InsetWrapMailer::params2string(InsetWrapParams const & params)
 {
-       // Now find the caption in the float...
-       // We now tranverse the paragraphs of
-       // the inset...
-       Paragraph * tmp = inset.paragraph();
-       while (tmp) {
-               if (tmp->layout()->name() == caplayout) {
-                       string const name = floatname(type(), buf->params);
-                       string const str =
-                               tostr(toclist[name].size() + 1)
-                               + ". " + tmp->asString(buf, false);
-                       toc::TocItem const item(tmp, 0 , str);
-                       toclist[name].push_back(item);
-               }
-               tmp = tmp->next();
-       }
+       ostringstream data;
+       data << name_ << ' ';
+       params.write(data);
+       return STRCONV(data.str());
 }