]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetInclude.cpp
#7379 avoid the wrap spell check question when buffer is empty
[lyx.git] / src / insets / InsetInclude.cpp
index c91a70eeb5d5358a91c680f33cc8f7c477a79116..d62f4ccb6ed29c231082db811aaa40c60eb371df 100644 (file)
@@ -48,6 +48,8 @@
 #include "insets/InsetListingsParams.h"
 #include "insets/RenderPreview.h"
 
+#include "mathed/MacroTable.h"
+
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -170,7 +172,8 @@ InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p)
        if (isListings(params())) {
                InsetListingsParams listing_params(to_utf8(p["lstparams"]));
                label_ = createLabel(buffer_, from_utf8(listing_params.getParamValue("label")));
-       }
+       } else if (isInputOrInclude(params()) && buf)
+               loadIfNeeded();
 }
 
 
@@ -443,31 +446,46 @@ Buffer * InsetInclude::loadIfNeeded() const
                        // Buffer creation is not possible.
                        return 0;
 
+               // Set parent before loading, such that macros can be tracked
+               child->setParent(&buffer());
+
                if (child->loadLyXFile() != Buffer::ReadSuccess) {
                        failedtoload_ = true;
+                       child->setParent(0);
                        //close the buffer we just opened
                        theBufferList().release(child);
                        return 0;
                }
-       
+
                if (!child->errorList("Parse").empty()) {
                        // FIXME: Do something.
                }
+       } else {
+               // The file was already loaded, so, simply
+               // inform parent buffer about local macros.
+               Buffer const * parent = &buffer();
+               child->setParent(parent);
+               MacroNameSet macros;
+               child->listMacroNames(macros);
+               MacroNameSet::const_iterator cit = macros.begin();
+               MacroNameSet::const_iterator end = macros.end();
+               for (; cit != end; ++cit)
+                       parent->usermacros.insert(*cit);
        }
-       child->setParent(&buffer());
+
        // Cache the child buffer.
        child_buffer_ = child;
        return child;
 }
 
 
-int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
+void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 {
        string incfile = to_utf8(params()["filename"]);
 
        // Do nothing if no file name has been specified
        if (incfile.empty())
-               return 0;
+               return;
 
        FileName const included_file = includedFileName(buffer(), params());
 
@@ -481,7 +499,7 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                Alert::error(_("Recursive input"),
                               bformat(_("Attempted to include file %1$s in itself! "
                               "Ignoring inclusion."), from_utf8(incfile)));
-               return 0;
+               return;
        }
 
        Buffer const * const masterBuffer = buffer().masterBuffer();
@@ -537,8 +555,14 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                // try to load it so we can write the associated latex
                
                Buffer * tmp = loadIfNeeded();
-               if (!tmp)
-                       return false;
+               if (!tmp) {
+                       docstring text = bformat(_("Could not load included "
+                               "file\n`%1$s'\n"
+                               "Please, check whether it actually exists."),
+                               included_file.displayName());
+                       Alert::warning(_("Missing included file"), text);
+                       return;
+               }
 
                if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
                        // FIXME UNICODE
@@ -588,9 +612,21 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                        encodings.fromLyXName("utf8-plain")
                        : &tmp->params().encoding();
                runparams.master_language = buffer().params().language;
-               tmp->makeLaTeXFile(writefile,
-                                  masterFileName(buffer()).onlyPath().absFileName(),
-                                  runparams, false);
+               runparams.par_begin = 0;
+               runparams.par_end = tmp->paragraphs().size();
+               if (!tmp->makeLaTeXFile(writefile, masterFileName(buffer()).
+                               onlyPath().absFileName(), runparams, false)) {
+                       docstring msg = bformat(_("Included file `%1$s' "
+                                       "was not exported correctly.\nWarning: "
+                                       "LaTeX export is probably incomplete."),
+                                       included_file.displayName());
+                       ErrorList & el = tmp->errorList("Export");
+                       if (!el.empty())
+                               msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"),
+                                               msg, el.begin()->error,
+                                               el.begin()->description);
+                       Alert::warning(_("Export failure"), msg);
+               }
                runparams.encoding = oldEnc;
                runparams.master_language = oldLang;
        } else {
@@ -608,7 +644,7 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                                        to_utf8(bformat(_("Could not copy the file\n%1$s\n"
                                                                  "into the temporary directory."),
                                                   from_utf8(included_file.absFileName()))));
-                               return 0;
+                               return;
                        }
                }
        }
@@ -669,8 +705,6 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
        case NONE:
                break;
        }
-
-       return 0;
 }
 
 
@@ -940,14 +974,16 @@ bool preview_wanted(InsetCommandParams const & params, Buffer const & buffer)
 
 docstring latexString(InsetInclude const & inset)
 {
-       odocstringstream os;
+       TexRow texrow;
+       odocstringstream ods;
+       otexstream os(ods, texrow);
        // We don't need to set runparams.encoding since this will be done
        // by latex() anyway.
        OutputParams runparams(0);
        runparams.flavor = OutputParams::LATEX;
        inset.latex(os, runparams);
 
-       return os.str();
+       return ods.str();
 }
 
 
@@ -978,7 +1014,7 @@ void InsetInclude::addPreview(DocIterator const & /*inset_pos*/,
 }
 
 
-void InsetInclude::addToToc(DocIterator const & cpit)
+void InsetInclude::addToToc(DocIterator const & cpit) const
 {
        TocBackend & backend = buffer().tocBackend();