Fix GRAPHICS_EDIT of InsetGraphics

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

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index ba253d2c4b80e00ddc556838f95883d1b72225cd..37ffc6fe9a097b29b03a0f376be8c38ebf38a3b8 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -145,6 +145,7 @@ EmbeddedFile const includedFilename(Buffer const & buffer,
        EmbeddedFile file(to_utf8(params["filename"]),
               onlyPath(parentFilename(buffer)));
        file.setEmbed(!params["embed"].empty());
+       file.setInzipName(to_utf8(params["embed"]));
        file.enable(buffer.embedded(), &buffer, false);
        return file;
 }
@@ -215,6 +216,19 @@ InsetInclude::~InsetInclude()
 
 void InsetInclude::setBuffer(Buffer & buffer)
 {
+       if (buffer_) {
+               try {
+                       EmbeddedFile file_from = includedFilename(*buffer_, params());
+                       EmbeddedFile file_to = file_from.copyTo(&buffer);
+                       if (file_to.embedded())
+                               setParam("embed", from_utf8(file_to.inzipName()));
+               } catch (ExceptionMessage const & message) {
+                       Alert::error(message.title_, message.details_);
+                       // failed to embed
+                       setParam("embed", docstring());
+               }
+
+       }
        buffer_ = &buffer;
        if (label_)
                label_->setBuffer(buffer);
@@ -252,7 +266,6 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
                InsetCommandParams p(INCLUDE_CODE);
                InsetCommandMailer::string2params("include", to_utf8(cmd.argument()), p);
                if (!p.getCmdName().empty()) {
-                       Buffer const & buf = cur.buffer();
                        if (isListings(p)){
                                InsetListingsParams new_params(to_utf8(p["lstparams"]));
                                docstring const label_str = from_utf8(new_params.getParamValue("label"));
@@ -266,21 +279,6 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
                                        label_->initView();
                                }
                        }
-                       try {
-                               // the embed parameter passed back from the dialog
-                               // is "true" or "false", we need to change it.
-                               if (p["embed"] == _("false"))
-                                       p["embed"].clear();
-                               else
-                                       p["embed"] = from_utf8(EmbeddedFile(to_utf8(p["filename"]),
-                                               onlyPath(parentFilename(buf))).inzipName());
-                               // test parameter
-                               includedFilename(cur.buffer(), p);
-                       } catch (ExceptionMessage const & message) {
-                               Alert::error(message.title_, message.details_);
-                               // do not set parameter if an error happens
-                               break;
-                       }
                        setParams(p);
                        buffer().updateBibfilesCache();
                } else
@@ -470,13 +468,12 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
                        // FIXME UNICODE
                        docstring text = bformat(_("Included file `%1$s'\n"
-                                               "has textclass `%2$s'\n"
-                                                            "while parent file has textclass `%3$s'."),
-                                             included_file.displayName(),
-                                             from_utf8(tmp->params().documentClass().name()),
-                                             from_utf8(masterBuffer->params().documentClass().name()));
+                               "has textclass `%2$s'\n"
+                               "while parent file has textclass `%3$s'."),
+                               included_file.displayName(),
+                               from_utf8(tmp->params().documentClass().name()),
+                               from_utf8(masterBuffer->params().documentClass().name()));
                        Alert::warning(_("Different textclasses"), text);
-                       //return 0;
                }
 
                // Make sure modules used in child are all included in master
@@ -490,11 +487,11 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                        string const module = *it;
                        vector<string>::const_iterator found =
                                find(masterModules.begin(), masterModules.end(), module);
-                       if (found != masterModules.end()) {
+                       if (found == masterModules.end()) {
                                docstring text = bformat(_("Included file `%1$s'\n"
-                                                       "uses module `%2$s'\n"
-                                                       "which is not used in parent file."),
-                                      included_file.displayName(), from_utf8(module));
+                                       "uses module `%2$s'\n"
+                                       "which is not used in parent file."),
+                                       included_file.displayName(), from_utf8(module));
                                Alert::warning(_("Module not found"), text);
                        }
                }
@@ -864,6 +861,9 @@ void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
 
 void InsetInclude::addToToc(ParConstIterator const & cpit) const
 {
+       bool const embedded_status = !params()["embed"].empty();
+       TocBackend & backend = buffer().tocBackend();
+
        if (isListings(params())) {
                if (label_)
                        label_->addToToc(cpit);
@@ -872,28 +872,42 @@ void InsetInclude::addToToc(ParConstIterator const & cpit) const
                string caption = p.getParamValue("caption");
                if (caption.empty())
                        return;
-               Toc & toc = buffer().tocBackend().toc("listing");
-               docstring const str = convert<docstring>(toc.size() + 1)
+               Toc & toc = backend.toc("listing");
+               docstring str = convert<docstring>(toc.size() + 1)
                        + ". " +  from_utf8(caption);
+               if (embedded_status) {
+                       backend.toc("embedded").push_back(TocItem(cpit, 0, str));
+                       str += _(" (embedded)");
+               }
                ParConstIterator pit = cpit;
                pit.push_back(*this);
                toc.push_back(TocItem(pit, 0, str));
                return;
        }
        Buffer const * const childbuffer = getChildBuffer(buffer(), params());
-       if (!childbuffer)
+       if (!childbuffer) {
+               if (embedded_status) 
+                       // Add it to the embedded list nonetheless.
+                       backend.toc("embedded").push_back(TocItem(cpit, 0,
+                               params()["filename"]));
                return;
+       }
 
-       Toc & toc = buffer().tocBackend().toc("child");
-       toc.push_back(TocItem(cpit, 0, childbuffer->fileName().displayName()));
+       Toc & toc = backend.toc("child");
+       docstring str = childbuffer->fileName().displayName();
+       if (embedded_status) {
+               backend.toc("embedded").push_back(TocItem(cpit, 0, str));
+               str += _(" (embedded)");
+       }
+       toc.push_back(TocItem(cpit, 0, str));
 
-       TocList & toclist = buffer().tocBackend().tocs();
+       TocList & toclist = backend.tocs();
        TocList const & childtoclist = childbuffer->tocBackend().tocs();
        TocList::const_iterator it = childtoclist.begin();
        TocList::const_iterator const end = childtoclist.end();
        for(; it != end; ++it)
                toclist[it->first].insert(toclist[it->first].end(),
-                               it->second.begin(), it->second.end());
+                       it->second.begin(), it->second.end());
 }